Changeset 2222 for trunk/java-client

Timestamp:

2001-03-24T15:16:44+12:00 (23 years ago)

Author:

daven

Message:

dynamically update display mode based on preference changes. i.e. if the user
switches to raw text mode the document display should update on the
exit of the prefences dialog, not until the user selects a new result.
Altered the listhandler in SearchPanel.java to simplify this and reduce
occurrences of multiple code.

Location:

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

Files:

• CSFrame.java (modified) (4 diffs)
• CollectionInfoDialog.java (modified) (2 diffs)
• Constants.java (modified) (2 diffs)
• PreferencesDialog.java (modified) (4 diffs)
• SearchPanel.java (modified) (4 diffs)

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

@@ -91 +91 @@
     content.add(searchPanel);
     
-        addWindowListener(new WindowHandler());
+    addWindowListener(new WindowHandler());
         
     pack();
@@ -110 +110 @@
   abstract class CSAction extends AbstractAction {
       int menuItemID;
-      Frame frame;
-  
-          CSAction( String name, int newMenuItemID, Frame f)
+      CSFrame frame;
+  
+          CSAction( String name, int newMenuItemID, CSFrame f)
           {
             super(name);
@@ -125 +125 @@
   class FileAction extends CSAction
   {
-        FileAction(String name, int newMenuItemID, Frame frame)
+        FileAction(String name, int newMenuItemID, CSFrame frame)
         {
              super(name,newMenuItemID, frame );
@@ -159 +159 @@
   class EditAction extends CSAction 
   {
-        EditAction(String name, int newMenuItemID, Frame frame)
+        EditAction(String name, int newMenuItemID, CSFrame frame)
         {
              super(name,newMenuItemID, frame );

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

@@ -55 +55 @@
 private String fullCollectionName = "";
 private String descString = "";
+private String numOfWordsString, numOfDocsString;
 private NumberFormat numFormat = NumberFormat.getInstance();
 
@@ -81 +82 @@
     contentPanel.add(collectionLabel);
     contentPanel.add(new JLabel("Number of Documents:"));
-    String numOfDocs = numFormat.format( collectionInfo.getNumOfDocs());
-    contentPanel.add(new JLabel(numOfDocs));
+
+    long numOfDocs =  collectionInfo.getNumOfDocs();
+    if (numOfDocs == 0) 
+    numOfDocsString = "unknown";
+    else 
+    numOfDocsString = numFormat.format(numOfDocs);
+    contentPanel.add(new JLabel(numOfDocsString));
     contentPanel.add(new JLabel("Number of Words:"));
-    String numOfWords = numFormat.format( collectionInfo.getNumOfWords());
-    contentPanel.add(new JLabel(numOfWords));
+
+    long numOfWords = collectionInfo.getNumOfWords();
+    if (numOfWords == 0) 
+    numOfWordsString = "unknown";
+    else
+    numOfWordsString = numFormat.format(numOfWords);
+    contentPanel.add(new JLabel(numOfWordsString));
     contentPanel.add(new JLabel("Size:"));
     long numOfBytes = collectionInfo.getNumOfBytes();
     contentPanel.add(new JLabel(formatByteSize(numOfBytes)));
     contentPanel.add(new JLabel("Last built on:"));
+    // waiting for API to return a correct Date object ...
     Date buildDate = new Date( collectionInfo.getBuildDate()*1000);
     contentPanel.add(new JLabel(DateFormat.getDateTimeInstance().format(buildDate)));

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

@@ -19 +19 @@
 package org.nzdl.gsdl.SimpleGraphicalClient;
 
-import java.awt.Font;
+import java.awt.*;
 
 /**
@@ -59 +59 @@
     String SAVE_DOCS = "Save documents";
 
+    /* Cursors */
+
+    Cursor NORMAL_CURSOR = Cursor.getPredefinedCursor(Cursor.DEFAULT_CURSOR);
+    Cursor WAIT_CURSOR = Cursor.getPredefinedCursor(Cursor.WAIT_CURSOR);
+
+
+
+
 /*Fonts */
 

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

@@ -47 +47 @@
 public class PreferencesDialog extends JDialog implements ActionListener {
 
+    private CSFrame parentFrame;
 private JButton okButton, cancelButton;
 private JPanel  buttonPanel, holderPanel;
@@ -54 +55 @@
 
 
-PreferencesDialog(Frame f, String title, boolean modal) {
+PreferencesDialog(CSFrame f, String title, boolean modal) {
     super(f, title, modal );
+    parentFrame = f;
 
     contentBox = Box.createVerticalBox();
@@ -138 +140 @@
         //System.err.println("ok button pressed!");
 
+        boolean oldRawText =  NzdlPreferences.getBoolean(Constants.RAW_TEXT);
+
         NzdlPreferences.setBoolean(Constants.DISPLAY_FIRST_DOC,showFirstDocCheckBox.isSelected());
         NzdlPreferences.setBoolean(Constants.RAW_TEXT, showAsTextCheckBox.isSelected());
@@ -148 +152 @@
       // update the current display if raw text option has changed ?
 
+      boolean newRawText = NzdlPreferences.getBoolean(Constants.RAW_TEXT);
+      
+      if (oldRawText != newRawText) {
+          //System.err.println("raw text option changed");
+          if (newRawText) {
+          // kludgy direct access to instance and method 
+          parentFrame.searchPanel.switchToRawText();
+          }
+          else
+          // kludgy direct access to instance and method
+              parentFrame.searchPanel.switchToHTML();
+      } // end if oldRawText != newRawTex
+
       dispose(); //close window
-    }
+    } // end if source == okButton
     else
     {

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

@@ -210 +210 @@
       
       nzdl.service( collectionName, request, response );
-     Date t8 = new Date();
       NzdlResultSet results = response.getResultSet();
       ArrayList docIDs = new ArrayList(results.getDocumentIDs());
@@ -225 +224 @@
     titleMap.put(docID, titleList.get(0)); 
       } // end for
-      Date t9 = new Date();
-      long sdiff = t9.getTime() - t8.getTime();
-      System.err.println("processing results = " + sdiff + " ms");
       // update the results list
       csModel.clearResults();
@@ -251 +247 @@
     else {
     if (e.getSource() == collectionInfoButton) {
-        //System.err.println("colllection info button pressed");
         CollectionInfoDialog cid = new CollectionInfoDialog(windowParent, collectionList.getSelectedItem().toString(), nzdl);
     }
@@ -278 +273 @@
       System.err.println("clicked on fake result");
       }
-      else {
- // a real result representing a real document to deal with
-
-      windowParent.setCursor(Cursor.getPredefinedCursor(Cursor.WAIT_CURSOR));
-      //trash the old htmlDoc for memory/garbage collection
-      try {
-        if (htmlDoc != null)
-          htmlDoc.remove(0, htmlDoc.getLength());
-        if (defaultStyledDoc != null)
-        defaultStyledDoc.remove(0, defaultStyledDoc.getLength());
-      } catch (Exception exception) {
-      throw new Error (exception.toString());
+      else { // a real result representing a real document to deal with
+
+      windowParent.setCursor(WAIT_CURSOR);
+
+      deleteDocContents(); // for memory/garbage collection
+
+      StringReader sr = new StringReader(nzdl.getDocument(result.getCollectionName(),  result.getDocID()));
+
+      if (NzdlPreferences.getInstance().getBoolean(Constants.RAW_TEXT)) 
+          // display the document as raw text
+          displayAsRawText(sr);
+      else {
+          // treat as HTML
+          displayAsHTML(sr);
+          htmlDoc.getImageData(nzdl, result.getCollectionName());
       }
-      defaultStyledDoc = new DefaultStyledDocument();
-      htmlDoc = new GMLDocument(); 
-
-      try { // get the document 
-          String docContents = csModel.getNzdlService().getDocument(result.getCollectionName(),  result.getDocID());
-           StringReader sr = new StringReader(docContents);
-           if (NzdlPreferences.getInstance().getBoolean(Constants.RAW_TEXT)) { // display the document as raw text
-           documentPane.setEditorKit(styledEditorKit);
-           styledEditorKit.read( sr, defaultStyledDoc, 0);
-           documentPane.setDocument(defaultStyledDoc);
-           docLength = defaultStyledDoc.getLength();
-           }
-           else { // treat as HTML
-           documentPane.setEditorKit(htmlEditorKit);
-           htmlEditorKit.read( sr, htmlDoc, 0);
-           documentPane.setStyledDocument( htmlDoc );
-           docLength = htmlDoc.getLength();
-           }
-      } // end try
-      catch(BadLocationException badLocException)
-      {
-      System.err.println("Bad Location Exception in creating HTML doc" + badLocException);
-      }
-      catch(IOException ioException)
-      {
-          System.err.println("IO Exception whilst reading doc contents" + ioException);
-      } 
-
-      if (docLength > 0)
-          documentPane.setCaretPosition(1);
-      // we might not be using htmlDoc at this point!!
-      htmlDoc.getImageData(nzdl, result.getCollectionName());
-      windowParent.setCursor(Cursor.getPredefinedCursor(Cursor.DEFAULT_CURSOR));
-      //System.err.println("prefix = " + nzdl.getCollectionInfo(result.getCollectionName()).getHTTPPrefix());
+
+      windowParent.setCursor(NORMAL_CURSOR);
       }
     } //end valueChanged
   }//end ResultListSelectionHandler
 
-} //end SearchPanel
+
+
+    private void deleteDocContents() {
+    //trash the old htmlDoc for memory/garbage collection
+    try {
+        if (htmlDoc != null)
+        htmlDoc.remove(0, htmlDoc.getLength());
+        if (defaultStyledDoc != null)
+        defaultStyledDoc.remove(0, defaultStyledDoc.getLength());
+    }
+    catch (Exception exception) {
+        throw new Error (exception.toString());
+    }
+    } // end deleteDocContents
+
+
+    public void switchToRawText() {
+    windowParent.setCursor(WAIT_CURSOR);
+    System.err.println("switching to raw text");
+    displayAsRawText(new StringReader(documentPane.getText()));
+    windowParent.setCursor(NORMAL_CURSOR);
+    }
+
+    public void displayAsRawText(StringReader sr) {
+        defaultStyledDoc = new DefaultStyledDocument();
+        documentPane.setEditorKit(styledEditorKit);
+        try {
+        styledEditorKit.read( sr, defaultStyledDoc, 0);
+        }
+        catch (Exception e) {
+        System.err.println(e);
+        }
+        documentPane.setDocument(defaultStyledDoc);
+        setCaretToStart(defaultStyledDoc.getLength());
+     } // end displayAsRawText
+
+
+    public void switchToHTML() {
+         windowParent.setCursor(WAIT_CURSOR);
+         System.err.println("switching to HTML");
+         displayAsHTML(new StringReader(documentPane.getText()));
+         windowParent.setCursor(NORMAL_CURSOR);
+    }
+
+     public void displayAsHTML(StringReader sr) {
+         htmlDoc = new GMLDocument();
+         documentPane.setEditorKit(htmlEditorKit);
+         try {
+         htmlEditorKit.read( sr, htmlDoc, 0);
+         }
+         catch (Exception e) {
+         System.err.println(e);
+         }
+         documentPane.setStyledDocument( htmlDoc );
+         setCaretToStart(htmlDoc.getLength());
+      } // end displayAsHTML
+
+
+    private void setCaretToStart(int docLength) {
+         // it seems as if they haven't considered 
+         // documents with > MAX_INT num of chars ...
+    if (docLength > 0)
+        documentPane.setCaretPosition(1);
+    }
+
+
+     } //end SearchPanel