Changeset 2274 for trunk/java-client/org

Timestamp:

2001-04-03T22:01:12+12:00 (23 years ago)

Author:

daven

Message:

added integrity checking for boolean/ranked preference

File:

• trunk/java-client/org/nzdl/gsdl/SimpleGraphicalClient/SearchPanel.java (modified) (2 diffs)

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

@@ -142 +142 @@
     searchTextFieldPanel.add(searchTextField);
 
-
+    //NzdlPreferences prefs = NzdlPreferences.getInstance();
     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);
+    System.err.println(queryType);
+    // check integrity of queryType
+    if (!((queryType.equals(NzdlConstants.RANKED_STRING)) | (queryType.equals(NzdlConstants.BOOLEAN_STRING)))) 
+    // preferences may have been corrupted!
+    queryType = NzdlConstants.DEFAULT_QUERY_TYPE;
     boolean stemming = NzdlConstants.DEFAULT_STEMMING;
     if (NzdlPreferences.getInstance().isBoolean(NzdlConstants.STEMMING))
@@ -160 +163 @@
     queryTypePanel = new JPanel();
     queryTypePanel.setLayout(new GridLayout(2,1));
-    rankedRadioButton = new JRadioButton("ranked");
-    rankedRadioButton.setActionCommand(rankedRadioButton.getText());
+    rankedRadioButton = new JRadioButton(NzdlConstants.RANKED_STRING);
+    rankedRadioButton.setActionCommand(NzdlConstants.RANKED_STRING);
     rankedRadioButton.setSelected(queryType.equals(rankedRadioButton.getText()));
     rankedRadioButton.setToolTipText("Display results in a ranked list");
     
-    booleanRadioButton = new JRadioButton("boolean");
-    booleanRadioButton.setActionCommand(booleanRadioButton.getText());
+    booleanRadioButton = new JRadioButton(NzdlConstants.BOOLEAN_STRING);
+    booleanRadioButton.setActionCommand(NzdlConstants.BOOLEAN_STRING);
     booleanRadioButton.setSelected(queryType.equals(booleanRadioButton.getText()));
     booleanRadioButton.setToolTipText("Allows the use of Boolean operators: AND(&) OR(|) and NOT(!)");