Changeset 7335

Timestamp:

2004-05-14T12:01:38+12:00 (20 years ago)

Author:

kjdon

Message:

fixed a NPE for gs2 preferences

File:

• trunk/gli/src/org/greenstone/gatherer/gui/Preferences.java (modified) (2 diffs)

trunk/gli/src/org/greenstone/gatherer/gui/Preferences.java

@@ -305 +305 @@
     use_proxy_checkbox.addActionListener(new UseProxyListener());
     clear_cache_button.addActionListener(new ClearCacheListener());
-    site_combobox.addActionListener(new SiteComboboxListener());
-
+    if (Gatherer.GS3) {
+        site_combobox.addActionListener(new SiteComboboxListener());
+    }
     // Layout
     program_pane.setLayout(new BorderLayout());
@@ -943 +944 @@
         }
         }
-    }
-    /*      if (!ignore_event) {
-        ignore_event=true;
-        // Retrieve the entry
-        String site = (String) site_combobox.getSelectedItem();
-        if (!site.equals(current_site_selection)) {
-        current_site_selection = site;
-        System.err.println("current selection ="+current_site_selection);
-        ArrayList servlet_options = Gatherer.servlet_config.getServletsForSite(current_site_selection);
-        System.err.println(ArrayTools.objectArrayToString(servlet_options.toArray()));
-
-        servlet_combobox.setModel(new DefaultComboBoxModel(servlet_options.toArray()));
-        servlet_pane.updateUI();
-        }*/
-        //DictionaryEntry entry = (DictionaryEntry) language_combobox.getSelectedItem();
-        //if(entry != null) {
-        //Gatherer.dictionary.changeDictionary(entry.getLocale());
-        // Display message
-        //JOptionPane.showMessageDialog(Gatherer.g_man, Dictionary.get("Preferences.General.Restart_Required"), Dictionary.get("General.Warning"), JOptionPane.WARNING_MESSAGE);
-        // }
-        //ignore_event=false;
-    //}
-    
+    }    
     }