Changeset 2273

Timestamp:

2001-04-03T21:36:37+12:00 (23 years ago)

Author:

daven

Message:

retain state of non-explicit preferences (e.g. casfolding, stemming)

Location:

trunk/java-client/org/nzdl/gsdl

Files:

• SimpleGraphicalClient/CSFrame.java (modified) (1 diff)
• SimpleGraphicalClient/SearchPanel.java (modified) (4 diffs)
• util/NzdlConstants.java (modified) (2 diffs)
• util/NzdlPreferences.java (modified) (2 diffs)

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

@@ -153 +153 @@
                 case QUIT_ID:
                      System.out.println("quit chosen from menu");
+                     //save preferences not in dialog
+                     searchPanel.savePrefs();
                      dispose();       // free resources
                      System.exit(0);  // exit program

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

@@ -142 +142 @@
     searchTextFieldPanel.add(searchTextField);
 
+
+    String queryType = NzdlConstants.DEFAULT_QUERY_TYPE;
+    System.err.println("default queryType = " + queryType);
+    if (NzdlPreferences.getInstance().isString(NzdlConstants.QUERYTYPE)) {
+    queryType = NzdlPreferences.getInstance().getString(NzdlConstants.QUERYTYPE);
+    }
+    System.err.println("queryType = " + queryType);
+    boolean stemming = NzdlConstants.DEFAULT_STEMMING;
+    if (NzdlPreferences.getInstance().isBoolean(NzdlConstants.STEMMING))
+    stemming = NzdlPreferences.getInstance().getBoolean(NzdlConstants.STEMMING);
+    boolean caseFolding = NzdlConstants.DEFAULT_CASE_FOLDING;
+    if (NzdlPreferences.getInstance().isBoolean(NzdlConstants.CASE_FOLDING))
+    caseFolding = NzdlPreferences.getInstance().getBoolean(NzdlConstants.CASE_FOLDING);
+    
     optionsPanel = new JPanel();
 
@@ -148 +162 @@
     rankedRadioButton = new JRadioButton("ranked");
     rankedRadioButton.setActionCommand(rankedRadioButton.getText());
-    rankedRadioButton.setSelected(rankedRadioButton.getText() == NzdlConstants.DEFAULT_QUERY_TYPE);
+    rankedRadioButton.setSelected(queryType.equals(rankedRadioButton.getText()));
     rankedRadioButton.setToolTipText("Display results in a ranked list");
     
     booleanRadioButton = new JRadioButton("boolean");
     booleanRadioButton.setActionCommand(booleanRadioButton.getText());
-    booleanRadioButton.setSelected(booleanRadioButton.getText() == NzdlConstants.DEFAULT_QUERY_TYPE);
+    booleanRadioButton.setSelected(queryType.equals(booleanRadioButton.getText()));
     booleanRadioButton.setToolTipText("Allows the use of Boolean operators: AND(&) OR(|) and NOT(!)");
     buttonGroup = new ButtonGroup();
@@ -160 +174 @@
     queryTypePanel.add(rankedRadioButton);
     queryTypePanel.add(booleanRadioButton);
-    
-    stemCheckBox = new JCheckBox("Stemming", true);
+
+    stemCheckBox = new JCheckBox("Stemming", stemming);
     stemCheckBox.setToolTipText("Strip endings such as '...ing', '...ed'");
-    caseFoldCheckBox = new JCheckBox("Match case", false);
+    caseFoldCheckBox = new JCheckBox("Match case", caseFolding);
     caseFoldCheckBox.setToolTipText("Only match when the case is the same");
 
@@ -416 +430 @@
     }
 
-
-     } //end SearchPanel
+    /*
+     * save prefs not in preferencesDialog 
+     */
+    public void savePrefs() {
+    NzdlPreferences.getInstance().setBoolean(NzdlConstants.STEMMING,stemCheckBox.isSelected());
+    NzdlPreferences.getInstance().setBoolean(NzdlConstants.CASE_FOLDING,caseFoldCheckBox.isSelected());
+    NzdlPreferences.getInstance().setString(NzdlConstants.QUERYTYPE,buttonGroup.getSelection().getActionCommand());
+    } //savePrefs
+
+
+} //end SearchPanel

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

@@ -27 +27 @@
  * @author Aziz Mahoui    ([email protected])
  * @author Gordon Paynter ([email protected])
+ * @author Dave Nichols   ([email protected])
  * @version $Revision$
  */
@@ -41 +42 @@
   int    DEFAULT_END_RESULTS   = 10;
   int    DEFAULT_MAX_DOCS      = 200;
+
+    /* preferences not under explicit dialog/user control */
+
+    String STEMMING = "stemming";
+    String CASE_FOLDING = "casefolding";
+    String QUERYTYPE = "querytype";
+
 
   /* Preference Strings */

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

@@ -97 +97 @@
     getInstance().save();
   }
+
+
+    public static boolean isBoolean(String key) {
+    String value = (String) getInstance()._preferences.get(key);
+    if (value == null)
+        return false;
+    return true;
+    }
+
   /**
    * Get a String preference
@@ -109 +118 @@
     return value;
   }
+
+    public static boolean isString(String key){
+    //String value = (String) getInstance()._preferences.get(key);
+    if (getInstance()._preferences.get(key) == null )
+        return false;
+    else
+        return true;
+    }
+
+
+
   /**
    * Set a String preference