Changeset 2270 for trunk/java-client

Timestamp:

2001-04-03T17:08:23+12:00 (23 years ago)

Author:

say1

Message:

comments in NzdlPreferences. Moved some constants from SimpleGraphicalClient/Constants to util/NzdlConstants so everyone could play with them. Made NzdlMultiWayWrapper dynamically load-balancing, with a rebalance on every getCollectionSet

Location:

trunk/java-client

Files:

• ChangeLog (modified) (1 diff)
• org/nzdl/gsdl/SimpleGraphicalClient/Constants.java (modified) (1 diff)
• org/nzdl/gsdl/SimpleGraphicalClient/PreferencesDialog.java (modified) (3 diffs)
• org/nzdl/gsdl/SimpleGraphicalClient/SearchPanel.java (modified) (2 diffs)
• org/nzdl/gsdl/service/NzdlMultiWayWrapper.java (modified) (4 diffs)
• org/nzdl/gsdl/util/NzdlConstants.java (modified) (1 diff)
• org/nzdl/gsdl/util/NzdlPreferences.java (modified) (2 diffs)

trunk/java-client/ChangeLog

@@ +1 @@
+2001-04-03 15:45  say1
+
+    * org/nzdl/gsdl/: Makefile, Proxy.java, SimpleServer.java,
+    service/NzdlMultiWayWrapper.java, util/NzdlServiceFactory.java:
+    renamed SimpleServer.java Proxy.java. Fixed bug in
+    NzdlServiceFactory.java. Fixed NzdlMultiWayWrapper.java so i only
+    found a single instance of each collection
+
+2001-04-03 13:08  daven
+
+    * org/nzdl/gsdl/SimpleGraphicalClient/ChangeLogDialog.java: tidied
+    up ChangeLogDialog  appearance
+
+2001-04-03 12:54  say1
+
+    * ChangeLog,
+    org/nzdl/gsdl/SimpleGraphicalClient/ChangeLogDialog.java: added the
+    ChangeLogDialog.java file
+
 2001-04-03 02:31  say1
 

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

@@ -51 +51 @@
 
 
-    /* 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";
 
     /* Cursors */

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

@@ -37 +37 @@
 package org.nzdl.gsdl.SimpleGraphicalClient;
 
+import org.nzdl.gsdl.util.NzdlConstants;
 import org.nzdl.gsdl.util.NzdlPreferences;
 import javax.swing.*;
@@ -77 +78 @@
 
     showFirstDocCheckBox = 
-      new JCheckBox( Constants.DISPLAY_FIRST_DOC, NzdlPreferences.getBoolean( Constants.DISPLAY_FIRST_DOC));
+      new JCheckBox( NzdlConstants.DISPLAY_FIRST_DOC, NzdlPreferences.getBoolean( NzdlConstants.DISPLAY_FIRST_DOC));
     showFirstDocCheckBox.setHorizontalAlignment(SwingConstants.LEFT);
 
     showAsTextCheckBox = 
-      new JCheckBox( Constants.RAW_TEXT, NzdlPreferences.getBoolean(Constants.RAW_TEXT));
+      new JCheckBox( NzdlConstants.RAW_TEXT, NzdlPreferences.getBoolean(NzdlConstants.RAW_TEXT));
     showAsTextCheckBox.setHorizontalAlignment(SwingConstants.LEFT);
 
     connectToMultipleCheckBox = 
-      new JCheckBox(Constants.MULTIPLE_SERVERS, NzdlPreferences.getBoolean(Constants.MULTIPLE_SERVERS));
+      new JCheckBox(NzdlConstants.MULTIPLE_SERVERS, NzdlPreferences.getBoolean(NzdlConstants.MULTIPLE_SERVERS));
     connectToMultipleCheckBox.setHorizontalAlignment(SwingConstants.LEFT);
 
     logNetworkLevelCheckBox = 
-      new JCheckBox(Constants.LOG_SERVICE, NzdlPreferences.getBoolean(Constants.LOG_SERVICE));
+      new JCheckBox(NzdlConstants.LOG_SERVICE, NzdlPreferences.getBoolean(NzdlConstants.LOG_SERVICE));
     logNetworkLevelCheckBox.setHorizontalAlignment(SwingConstants.LEFT);
 
     useCacheCheckBox = 
-      new JCheckBox(Constants.CACHE_CORBA, NzdlPreferences.getBoolean(Constants.CACHE_CORBA));
+      new JCheckBox(NzdlConstants.CACHE_CORBA, NzdlPreferences.getBoolean(NzdlConstants.CACHE_CORBA));
     useCacheCheckBox.setHorizontalAlignment(SwingConstants.LEFT);
 
     saveDocsCheckBox = 
-      new JCheckBox(Constants.SAVE_DOCS, NzdlPreferences.getBoolean(Constants.SAVE_DOCS));
+      new JCheckBox(NzdlConstants.SAVE_DOCS, NzdlPreferences.getBoolean(NzdlConstants.SAVE_DOCS));
     saveDocsCheckBox.setHorizontalAlignment(SwingConstants.LEFT);
 
@@ -140 +141 @@
         //System.err.println("ok button pressed!");
 
-        boolean oldRawText =  NzdlPreferences.getBoolean(Constants.RAW_TEXT);
+        boolean oldRawText =  NzdlPreferences.getBoolean(NzdlConstants.RAW_TEXT);
 
-        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.setBoolean(NzdlConstants.DISPLAY_FIRST_DOC,showFirstDocCheckBox.isSelected());
+        NzdlPreferences.setBoolean(NzdlConstants.RAW_TEXT, showAsTextCheckBox.isSelected());
+        NzdlPreferences.setBoolean(NzdlConstants.MULTIPLE_SERVERS, connectToMultipleCheckBox.isSelected());
+        NzdlPreferences.setBoolean(NzdlConstants.LOG_SERVICE,logNetworkLevelCheckBox.isSelected());
+        NzdlPreferences.setBoolean(NzdlConstants.CACHE_CORBA, useCacheCheckBox.isSelected());
+        NzdlPreferences.setBoolean(NzdlConstants.SAVE_DOCS, saveDocsCheckBox.isSelected());
       NzdlPreferences.getInstance().save();
 
       // update the current display if raw text option has changed ?
 
-      boolean newRawText = NzdlPreferences.getBoolean(Constants.RAW_TEXT);
+      boolean newRawText = NzdlPreferences.getBoolean(NzdlConstants.RAW_TEXT);
       
       if (oldRawText != newRawText) {

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

@@ -289 +289 @@
       csModel.addResult(new Result((String)titleMap.get(resultDocID), resultDocID, collectionName ));
     } //end while
-    if (NzdlPreferences.getInstance().getBoolean(Constants.DISPLAY_FIRST_DOC))
+    if (NzdlPreferences.getInstance().getBoolean(NzdlConstants.DISPLAY_FIRST_DOC))
     resultsList.setSelectedIndex(0); 
       } // end else
@@ -337 +337 @@
       StringReader sr = new StringReader(nzdl.getDocument(result.getCollectionName(),  result.getDocID()));
 
-      if (NzdlPreferences.getInstance().getBoolean(Constants.RAW_TEXT)) 
+      if (NzdlPreferences.getInstance().getBoolean(NzdlConstants.RAW_TEXT)) 
           // display the document as raw text
           displayAsRawText(sr);

trunk/java-client/org/nzdl/gsdl/service/NzdlMultiWayWrapper.java

@@ -38 +38 @@
 
 /**
- *  A NzdlMultiWayWrapper multiple NzdlServices 
+ * A NzdlMultiWayWrapper is a wrapper around multiple NzdlServices. 
+ * It attempts to connect to as many servers as possible and present 
+ * them to the user a single collection.
+ *
+ * When two collections are found to be the same, then only the 
+ * collection with the fastest response time for a getCollectionInfo()
+ * call is added.
  *
  * @author Brett Sheeran ([email protected]) (comments)
  * @author Stuart Yeates  ([email protected])
+ * @see org.nzdl.gsdl.service.NzdlCollectionInfo
  * @version $Revision$
  */
@@ -66 +73 @@
     super(null);
     services = new Hashtable();
-    
+
+    NzdlPreferences.saving = false;
+
     Hashtable servers = NzdlServiceFactory.findIORs(_args,_props,_URL,_filename,_IOR);
     
@@ -135 +144 @@
         
         NzdlService oldServer = (NzdlService) services.get( "" + j );
+        Date startOld = new Date();
         NzdlCollectionInfo oldColl = oldServer.getCollectionInfo(coll);
+        Date endOld = new Date();
+        Date startNew = new Date();
         NzdlCollectionInfo newColl = server.getCollectionInfo(coll);
+        Date endNew = new Date();
         
         if (oldColl.getBuildDate() == newColl.getBuildDate() &&
@@ -143 +156 @@
         oldColl.getNumOfBytes() == newColl.getNumOfBytes() &&
         oldColl.isPublic() == newColl.isPublic() )
-          hit = true;
+          {
+        if ((endOld.getTime() - startOld.getTime()) >
+            (endNew.getTime() - startNew.getTime()))
+          {
+            results.remove(oldcollname);
+            results.add(collname);
+          }
+          }
+        hit = true;
       }
     }

trunk/java-client/org/nzdl/gsdl/util/NzdlConstants.java

@@ -42 +42 @@
   int    DEFAULT_MAX_DOCS      = 200;
 
+  /* 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";
+  
 /* these appear to have been generated by 
 the idlj compiler but not any more - so 

trunk/java-client/org/nzdl/gsdl/util/NzdlPreferences.java

@@ -37 +37 @@
   /** The hashtable we write to disk ... */
   protected Properties _preferences = null;
+  /** 
+   * Should we save the preferences? Should normally be true for
+   * GUI work and false for commandline and/or server work.
+   */
+  public static boolean saving = true;
+  /** The singleton instance */
   static NzdlPreferences instance = null;
   static String preferencesFileName = "preferences";
@@ -50 +56 @@
     }
   }
+
   public void save() {
+    if (!saving)
+      return;
     try {
       File file = new File(preferencesFileName);