Changeset 2188

Timestamp:

2001-03-16T13:47:02+13:00 (23 years ago)

Author:

say1

Message:

added NzdlPreferences.java and hooked it up in all the necessary places. The PreferencesDialog doesn"t save \(yet\).

Location:

trunk/java-client/org/nzdl/gsdl

Files:

• SimpleGraphicalClient/Makefile (modified) (1 diff)
• SimpleGraphicalClient/PreferencesDialog.java (modified) (4 diffs)
• SimpleServer.java (modified) (2 diffs)
• service/NzdlMultiWayWrapper.java (modified) (2 diffs)
• util/Makefile (modified) (1 diff)
• util/NzdlPreferences.java (added)
• util/NzdlServiceFactory.java (modified) (2 diffs)

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

@@ -1 @@
-CLASSES = CSFrame.class \
+CLASSES = PreferencesDialog.class\
+  CSFrame.class \
   CSModel.class\
   Constants.class\

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

@@ -37 +37 @@
 package org.nzdl.gsdl.SimpleGraphicalClient;
 
+import org.nzdl.gsdl.util.NzdlPreferences;
 import javax.swing.*;
 import java.awt.*;
@@ -69 +70 @@
 
     //contentBox.add();
+    String preferanceName = null;
     // the preferences themselves ...
 
-    JCheckBox showFirstDocCheckBox = new JCheckBox("Automatically display the document contents of the first result", true); //should read initial value from preferences data structure
+    preferanceName = "Automatically display the first document";
+    JCheckBox showFirstDocCheckBox = 
+      new JCheckBox(preferanceName, NzdlPreferences.getBoolean(preferanceName));
     showFirstDocCheckBox.setHorizontalAlignment(SwingConstants.LEFT);
 
-    JCheckBox showAsTextCheckBox = new JCheckBox("Always display raw text (don't interpret HTML)", false); //should read initial value from preferences data structure
+    preferanceName = "Always display raw text (don't interpret HTML)";
+    JCheckBox showAsTextCheckBox = 
+      new JCheckBox(preferanceName, NzdlPreferences.getBoolean(preferanceName));
     showAsTextCheckBox.setHorizontalAlignment(SwingConstants.LEFT);
 
+    preferanceName = "Connect to multiple servers";
+    JCheckBox connectToMultipleCheckBox = 
+      new JCheckBox(preferanceName, NzdlPreferences.getBoolean(preferanceName));
+    connectToMultipleCheckBox.setHorizontalAlignment(SwingConstants.LEFT);
+
+    preferanceName = "Log at the NzdlService level";
+    JCheckBox logNetworkLevelCheckBox = 
+      new JCheckBox(preferanceName, NzdlPreferences.getBoolean(preferanceName));
+    logNetworkLevelCheckBox.setHorizontalAlignment(SwingConstants.LEFT);
+
+    preferanceName = "Cache corba requests";
+    JCheckBox useCacheCheckBox = 
+      new JCheckBox(preferanceName, NzdlPreferences.getBoolean(preferanceName));
+    useCacheCheckBox.setHorizontalAlignment(SwingConstants.LEFT);
+
+    preferanceName = "Save documents";
+    JCheckBox saveDocsCheckBox = 
+      new JCheckBox(preferanceName, NzdlPreferences.getBoolean(preferanceName));
+    saveDocsCheckBox.setHorizontalAlignment(SwingConstants.LEFT);
 
 
@@ -84 +109 @@
     contentBox.add(showFirstDocCheckBox);
     contentBox.add(showAsTextCheckBox);
+    contentBox.add(connectToMultipleCheckBox);
+    contentBox.add(logNetworkLevelCheckBox);
+    contentBox.add(useCacheCheckBox);
+    contentBox.add(saveDocsCheckBox);
 
     okButton = new JButton("Ok");
@@ -115 +144 @@
         //System.err.println("ok button pressed!");
 
-        dispose(); //close window
+      NzdlPreferences.getInstance().save();
+      dispose(); //close window
     }
     else

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

@@ -40 +40 @@
 import org.nzdl.gsdl.util.NzdlCorbaFactory;
 import org.nzdl.gsdl.util.NzdlServiceFactory;
+import org.nzdl.gsdl.util.NzdlPreferences;
 
 
@@ -69 +70 @@
     corbaComErrorHolder error = NzdlCorbaFactory.createComErrorHolder();
     try{
-      NzdlServiceFactory.caching = true;
-      NzdlServiceFactory.doMultiple = true;
-      NzdlServiceFactory.saveDocs = true;
       
+      NzdlPreferences.setBoolean("Connect to multiple servers", true);
+      NzdlPreferences.setBoolean("Cache corba requests", true);
+      NzdlPreferences.setBoolean("Save documents", true);
+      NzdlPreferences.setBoolean("Log at the NzdlService level", true);
+
       NzdlService client = NzdlServiceFactory.createNzdlService(args,
                                 null,

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

@@ -34 +34 @@
 import java.io.FileWriter;
 import org.nzdl.gsdl.util.NzdlServiceFactory;
+import org.nzdl.gsdl.util.NzdlPreferences;
 
 
@@ -72 +73 @@
       String key = (String)  e.nextElement();
       NzdlService server = (NzdlService) servers.get(key);
-      if (NzdlServiceFactory.logMultiple)
+      
+      if (NzdlPreferences.getBoolean("Log at the NzdlService level"))
     server = new NzdlLogWrapper(server, 
                     "log.file.after.split." + key + "cache", 

trunk/java-client/org/nzdl/gsdl/util/Makefile

@@ -13 +13 @@
     $(JAVAC) $(JAVACOPTIONS)  $<
 
-CLASSFILES=NzdlConstants.class  \
+CLASSFILES=NzdlPreferences.class\
+     NzdlConstants.class  \
      NzdlCorbaFactory.class  \
      NzdlHosts.class  \

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

@@ -102 +102 @@
   };
 
-  /** Are we using a caching NzdlService ? */
-  static public boolean caching = true;
-  /** Are we logging before the cache ? */
-  static public boolean logBefore = true;
-  /** Are we logging after the cache ? */
-  static public boolean logAfter = true;
-  /** Are we saving documents ? */
-  static public boolean saveDocs = false;
-  /** Are we trying for multiple servers ? */
-  static public boolean doMultiple = false;
-  /** Are we logging after individual servers ? */
-  static public boolean logMultiple = false;
 
   /**
@@ -533 +521 @@
     NzdlService nzdl = null;
     
-    if (doMultiple)
+    if (NzdlPreferences.getBoolean("Connect to multiple servers"))
       nzdl = new NzdlMultiWayWrapper(_args,_props,_URL,_filename,_IOR);
     else
       nzdl = findIOR(_args,_props,_URL,_filename,_IOR);
     
-    if (saveDocs)
+    if (NzdlPreferences.getBoolean("Save documents"))
       nzdl = new NzdlDocSaveWrapper(nzdl);
     
-    if (logAfter)
+    if (NzdlPreferences.getBoolean("Log at the NzdlService level"))
       nzdl = new NzdlLogWrapper(nzdl, "log.file.after.cache", "AFTER: ");
     
-    if (caching)
+    if (NzdlPreferences.getBoolean("Cache corba requests"))
       nzdl = new NzdlCacheWrapper(nzdl);
 
-    if (logBefore)
+    if (NzdlPreferences.getBoolean("Log at the NzdlService level"))
       nzdl = new NzdlLogWrapper(nzdl, "log.file.before.cache", "BEFORE: ");