Changeset 2198

Timestamp:

2001-03-20T10:35:58+12:00 (23 years ago)

Author:

daven

Message:

tidying and error trapping for caret setting in empty documents

File:

• trunk/java-client/org/nzdl/gsdl/SimpleGraphicalClient/SearchPanel.java (modified) (13 diffs)

trunk/java-client/org/nzdl/gsdl/SimpleGraphicalClient/SearchPanel.java

@@ -130 +130 @@
     searchTextFieldPanel.setLayout(new FlowLayout(FlowLayout.LEFT));
     searchTextFieldPanel.add(searchTextField);
-    
+
     searchButtonPanel = new JPanel();
     searchButtonPanel.setLayout(new FlowLayout(FlowLayout.RIGHT));
     searchButtonPanel.add(searchButton);
-    
+
     queryFormulationPanel = new JPanel();
     queryFormulationPanel.setBorder(BorderFactory.createEmptyBorder(5,5,5,5));
@@ -142 +142 @@
     queryFormulationPanel.add(searchTextFieldPanel);
     queryFormulationPanel.add(searchButtonPanel);
-    
+
     resultsPanel = new JPanel();
     resultsPanel.setLayout(new BorderLayout());
@@ -154 +154 @@
     resultsPanel.add(scrollResultsPane, BorderLayout.CENTER);
     csModel.addResult(Result.INITIAL_FAKE_RESULT);
-    
+
     dataPanel = new JPanel();
     dataPanel.setLayout(new BorderLayout());
@@ -170 +170 @@
                            } 
     }; // end custom JTextPane
+
     documentPane.setEditable(false);
     documentPane.setFont(docFont);
@@ -178 +179 @@
     scrollDataPane.setPreferredSize(new Dimension(300, 300));
     dataPanel.add(scrollDataPane, BorderLayout.CENTER);
-    
+
     parent.getRootPane().setDefaultButton(searchButton);
 
@@ -193 +194 @@
 
   public void actionPerformed(ActionEvent e) {
-    if (e.getSource() == searchButton ) { //assume only searchButton generates events
-    // cursor not set when RETURN pressed, only when button clicked ?
+    if (e.getSource() == searchButton ) {
+      // cursor not set when RETURN pressed, only when button clicked ?
       windowParent.setCursor(Cursor.getPredefinedCursor(Cursor.WAIT_CURSOR));
-      //System.err.println("set wait cursor..");
       String queryString = searchTextField.getText();
       String collectionName = collectionList.getSelectedItem().toString();
@@ -215 +215 @@
       // System.err.println("Size of docIDs = " + docIDs.size());
       // paired collection of docIDs and Titles - but as Sets!
-      Map titleMetaData = csModel.getNzdlService().getMetaData( collectionName, docIDs, "Title" );
+      Map titleMetaData = nzdl.getMetaData( collectionName, docIDs, "Title" );
       // created a paired collection of docIDs and Titles - as simple Strings!
       HashMap titleMap = new HashMap();
@@ -233 +233 @@
       if (docIDs.size() == 0 ) { // give some feedback for 0 results
     csModel.addResult(Result.FAKE_RESULT);
-    //documentPane.setText("");
     documentPane.setStyledDocument(blankDoc);
       }
@@ -274 +273 @@
       if (e.getValueIsAdjusting()) { return; }
       Result result =  (Result) resultsList.getSelectedValue();
-      // System.err.println("result = " + result);
-      // System.err.println("fake result = " + Result.FAKE_RESULT);
       if ((result == Result.FAKE_RESULT) || (result == Result.INITIAL_FAKE_RESULT)) {
-      //documentPane.setText("");
       documentPane.setStyledDocument( blankDoc );
       System.err.println("clicked on fake result");
@@ -292 +288 @@
         defaultStyledDoc.remove(0, defaultStyledDoc.getLength());
       } catch (Exception exception) {
-        throw new Error (exception.toString());
+      throw new Error (exception.toString());
       }
       defaultStyledDoc = new DefaultStyledDocument();
@@ -299 +295 @@
       try { // get the document 
           String docContents = csModel.getNzdlService().getDocument(result.getCollectionName(),  result.getDocID());
-           StringReader sr = new StringReader( docContents);
+           StringReader sr = new StringReader(docContents);
            if (NzdlPreferences.getInstance().getBoolean(Constants.RAW_TEXT)) { // display the document as raw text
            documentPane.setEditorKit(styledEditorKit);
@@ -310 +306 @@
            documentPane.setStyledDocument( htmlDoc );
            }
-           // htmlEditorKit.read( new StringReader(csModel.getNzdlService().getDocument(result.getCollectionName(),  result.getDocID())), htmlDoc, 0);
-           }
+      } // end try
       catch(BadLocationException badLocException)
       {
@@ -321 +316 @@
       } 
 
-      //documentPane.setStyledDocument( htmlDoc );
-      // should check for empty document here
-      documentPane.setCaretPosition(1);
+      if (documentPane.getLength > 0)
+          documentPane.setCaretPosition(1);
       // we might not be using htmlDoc at this point!!
       htmlDoc.getImageData(nzdl, result.getCollectionName());