Changeset 2190 for trunk/java-client

Timestamp:

2001-03-18T12:39:16+12:00 (23 years ago)

Author:

daven

Message:

preference for displaying raw text or HTML now working

Location:

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

Files:

• Constants.java (modified) (1 diff)
• PreferencesDialog.java (modified) (3 diffs)
• SearchPanel.java (modified) (6 diffs)
• SimpleGraphicalClient.java (modified) (1 diff)

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

@@ -50 +50 @@
 
 
+    /* Preference Strings */
+
+    String DISPLAY_FIRST_DOC = "Automatically display the first document";
+    String RAW_TEXT = "Always display raw text (don't interpret HTML)";
+    String MULTIPLE_SERVERS =  "Connect to multiple servers";
+    String LOG_SERVICE = "Log at the NzdlService level";
+    String CACHE_CORBA = "Cache corba requests";
+    String SAVE_DOCS = "Save documents";
+
 /*Fonts */
 

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

@@ -50 +50 @@
 private JPanel  buttonPanel, holderPanel;
 private Box contentBox;
+    private JCheckBox showFirstDocCheckBox, showAsTextCheckBox, connectToMultipleCheckBox, logNetworkLevelCheckBox, useCacheCheckBox,  saveDocsCheckBox;
+
 
 
@@ -70 +72 @@
 
     //contentBox.add();
-    String preferanceName = null;
     // the preferences themselves ...
 
-    preferanceName = "Automatically display the first document";
-    JCheckBox showFirstDocCheckBox = 
-      new JCheckBox(preferanceName, NzdlPreferences.getBoolean(preferanceName));
+    showFirstDocCheckBox = 
+      new JCheckBox( Constants.DISPLAY_FIRST_DOC, NzdlPreferences.getBoolean( Constants.DISPLAY_FIRST_DOC));
     showFirstDocCheckBox.setHorizontalAlignment(SwingConstants.LEFT);
 
-    preferanceName = "Always display raw text (don't interpret HTML)";
-    JCheckBox showAsTextCheckBox = 
-      new JCheckBox(preferanceName, NzdlPreferences.getBoolean(preferanceName));
+    showAsTextCheckBox = 
+      new JCheckBox( Constants.RAW_TEXT, NzdlPreferences.getBoolean(Constants.RAW_TEXT));
     showAsTextCheckBox.setHorizontalAlignment(SwingConstants.LEFT);
 
-    preferanceName = "Connect to multiple servers";
-    JCheckBox connectToMultipleCheckBox = 
-      new JCheckBox(preferanceName, NzdlPreferences.getBoolean(preferanceName));
+    connectToMultipleCheckBox = 
+      new JCheckBox(Constants.MULTIPLE_SERVERS, NzdlPreferences.getBoolean(Constants.MULTIPLE_SERVERS));
     connectToMultipleCheckBox.setHorizontalAlignment(SwingConstants.LEFT);
 
-    preferanceName = "Log at the NzdlService level";
-    JCheckBox logNetworkLevelCheckBox = 
-      new JCheckBox(preferanceName, NzdlPreferences.getBoolean(preferanceName));
+    logNetworkLevelCheckBox = 
+      new JCheckBox(Constants.LOG_SERVICE, NzdlPreferences.getBoolean(Constants.LOG_SERVICE));
     logNetworkLevelCheckBox.setHorizontalAlignment(SwingConstants.LEFT);
 
-    preferanceName = "Cache corba requests";
-    JCheckBox useCacheCheckBox = 
-      new JCheckBox(preferanceName, NzdlPreferences.getBoolean(preferanceName));
+    useCacheCheckBox = 
+      new JCheckBox(Constants.CACHE_CORBA, NzdlPreferences.getBoolean(Constants.CACHE_CORBA));
     useCacheCheckBox.setHorizontalAlignment(SwingConstants.LEFT);
 
-    preferanceName = "Save documents";
-    JCheckBox saveDocsCheckBox = 
-      new JCheckBox(preferanceName, NzdlPreferences.getBoolean(preferanceName));
+    saveDocsCheckBox = 
+      new JCheckBox(Constants.SAVE_DOCS, NzdlPreferences.getBoolean(Constants.SAVE_DOCS));
     saveDocsCheckBox.setHorizontalAlignment(SwingConstants.LEFT);
-
 
     // add the preferences ...
@@ -144 +138 @@
         //System.err.println("ok button pressed!");
 
+        NzdlPreferences.setBoolean(Constants.DISPLAY_FIRST_DOC,showFirstDocCheckBox.isSelected());
+        NzdlPreferences.setBoolean(Constants.RAW_TEXT, showAsTextCheckBox.isSelected());
+        NzdlPreferences.setBoolean(Constants.MULTIPLE_SERVERS, connectToMultipleCheckBox.isSelected());
+        NzdlPreferences.setBoolean(Constants.LOG_SERVICE,logNetworkLevelCheckBox.isSelected());
+        NzdlPreferences.setBoolean(Constants.CACHE_CORBA, useCacheCheckBox.isSelected());
+        NzdlPreferences.setBoolean(Constants.SAVE_DOCS, saveDocsCheckBox.isSelected());
       NzdlPreferences.getInstance().save();
       dispose(); //close window

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

@@ -38 +38 @@
 import org.nzdl.gsdl.service.NzdlService;
 import org.nzdl.gsdl.service.NzdlServiceClient;
+import org.nzdl.gsdl.util.NzdlPreferences;
 
 
@@ -70 +71 @@
   JFrame windowParent;
     //JEditorPane documentPane;
-    JTextPane documentPane;
-  HTMLEditorKit htmlEditorKit;
+    JTextPane documentPane; // make this a JTextComponent ??
+    JTextArea documentArea;
+    JTextComponent documentComponent;
+    HTMLEditorKit htmlEditorKit = new HTMLEditorKit();
+    StyledEditorKit styledEditorKit = new StyledEditorKit();
     GMLDocument htmlDoc = new GMLDocument();
+    DefaultStyledDocument defaultStyledDoc = new DefaultStyledDocument();
     final static GMLDocument blankDoc = new GMLDocument();
   
@@ -149 +154 @@
     dataPanel.setLayout(new BorderLayout());
     dataPanel.setBorder(BorderFactory.createEmptyBorder(3,3,3,3));
-     documentPane = new JTextPane();
-     //documentPane = new JEditorPane();
-    htmlEditorKit  =  new HTMLEditorKit();    
-    documentPane.setEditorKit(htmlEditorKit);
+    documentPane = new JTextPane() { // to control scrolling for raw text docs
+                           public boolean getScrollableTracksViewportWidth() { 
+                           if (getSize().width < getParent().getSize().width)
+                    return true; 
+                           else return false; 
+                           } 
+                           public void setSize(Dimension d) { 
+                           if (d.width < getParent().getSize().width) 
+                    d.width = getParent().getSize().width; 
+                                super.setSize(d); 
+                           } 
+    }; // end custom JTextPane
     documentPane.setEditable(false);
     documentPane.setFont(docFont);
@@ -225 +238 @@
       csModel.addResult(new Result((String)titleMap.get(resultDocID), resultDocID, collectionName ));
     } //end while
+    if (NzdlPreferences.getInstance().getBoolean(Constants.DISPLAY_FIRST_DOC))
     resultsList.setSelectedIndex(0); // should be under Preference control!
       } // end else
@@ -258 +272 @@
       }
       else {
-
-      Date startTime = new Date();
+ // a real result representing a real document to deal with
+
       windowParent.setCursor(Cursor.getPredefinedCursor(Cursor.WAIT_CURSOR));
-      //trash the old htmlDoc ...
+      //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());
       }
+      defaultStyledDoc = new DefaultStyledDocument();
       htmlDoc = new GMLDocument(); 
-      Date t1 = new Date();
-      Date d1 = new Date();
-      Date d2 = new Date();
-      Date d21 = new Date();
-      Date d3 = new Date();
-      try { // get the document and read it in as HTML
-           d1 = new Date();
+
+      try { // get the document 
           String docContents = csModel.getNzdlService().getDocument(result.getCollectionName(),  result.getDocID());
-           d2 = new Date();
-          //long ddiff1 = d2.getTime() - d1.getTime();
-          // System.err.println("getDocument = " + ddiff1 + "ms");
-           StringReader sr = new StringReader(docContents);
-           d21 = new Date();
-           htmlEditorKit.read( sr, htmlDoc, 0); // should be under preference control!
-           d3 = new Date();
-          //long ddiff2 = d3.getTime() - d2.getTime();
-              //System.err.println("StringReader() = " + ddiff2 + "ms");
-          
-          // htmlEditorKit.read( new StringReader(csModel.getNzdlService().getDocument(result.getCollectionName(),  result.getDocID())), htmlDoc, 0);
-      }
+           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);
+           }
+           else { // treat as HTML
+           documentPane.setEditorKit(htmlEditorKit);
+           htmlEditorKit.read( sr, htmlDoc, 0);
+           documentPane.setStyledDocument( htmlDoc );
+           }
+           // htmlEditorKit.read( new StringReader(csModel.getNzdlService().getDocument(result.getCollectionName(),  result.getDocID())), htmlDoc, 0);
+           }
       catch(BadLocationException badLocException)
       {
@@ -297 +310 @@
           System.err.println("IO Exception whilst reading doc contents" + ioException);
       } 
-      Date t2 = new Date();
-      long diff = t2.getTime() - t1.getTime();
-      long ddiff1 = d2.getTime() - d1.getTime();
-      long ddiff2 = d21.getTime() - d2.getTime();
-      long ddiff3 = d3.getTime() - d21.getTime();
-      System.err.println("nzdl.getDocument = " + ddiff1 + "ms");
-      System.err.println("StringReader() constructor = " + ddiff2 + "ms");
-      System.err.println("EditorKit.read() = " + ddiff3 + " ms");
-      System.err.println("getDocument total = " + diff + " ms");
-      
-      Date t3 = new Date(); 
-
-      documentPane.setStyledDocument( htmlDoc );
-
-      Date t4 = new Date();
-      long diff2 = t4.getTime() - t3.getTime();
-      System.err.println("documentPane set " + diff2 + " ms");
-
+
+      //documentPane.setStyledDocument( htmlDoc );
+      // should check for empty document here
       documentPane.setCaretPosition(1);
-
-      //Date t5 = new Date();
-      //long diff7 = t5.getTime() - t4.getTime();
-      //System.err.println("documentPane scroll " + diff7 + " ms");
-
-      //System.err.println("getting image data...");
-          htmlDoc.getImageData(nzdl, result.getCollectionName());
+      // we might not be using htmlDoc at this point!!
+      //htmlDoc.getImageData(nzdl, result.getCollectionName());
       windowParent.setCursor(Cursor.getPredefinedCursor(Cursor.DEFAULT_CURSOR));
-      Date endTime = new Date();
-      long diff5 = endTime.getTime() - startTime.getTime();
-      System.err.println("total time " + diff5 + " ms");
       //System.err.println("prefix = " + nzdl.getCollectionInfo(result.getCollectionName()).getHTTPPrefix());
       }

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

@@ -33 +33 @@
 import org.nzdl.gsdl.service.NzdlService;
 import org.nzdl.gsdl.service.NzdlServiceClient;
+import org.nzdl.gsdl.util.NzdlPreferences;
 import org.nzdl.gsdl.util.NzdlServiceFactory;