Changeset 10462

Timestamp:

2005-08-10T15:07:57+12:00 (19 years ago)

Author:

mdewsnip

Message:

More GEMS tidy ups: no classes now import the Gatherer class.

Location:

trunk/gli/src/org/greenstone/gatherer/gems

Files:

• GEMS.java (modified) (1 diff)
• GEMSPreferences.java (modified) (5 diffs)

trunk/gli/src/org/greenstone/gatherer/gems/GEMS.java

@@ -211 +211 @@
         File child_file = directory_files[i];
         if (!child_file.isDirectory() && child_file.getName().endsWith(".mds")) {
-            System.err.println("Found mds file: " + child_file);
             MetadataSet metadata_set = msm.loadMetadataSet(child_file);
             model.add(null, metadata_set, GEMSNode.SET);

trunk/gli/src/org/greenstone/gatherer/gems/GEMSPreferences.java

@@ -37 +37 @@
 import org.greenstone.gatherer.Configuration;
 import org.greenstone.gatherer.Dictionary;
-import org.greenstone.gatherer.Gatherer;
 import org.greenstone.gatherer.cdm.LanguageManager;
 import org.greenstone.gatherer.gui.*;
@@ -65 +64 @@
     public GEMSPreferences() {
     // Initialize
-    super(Gatherer.g_man, true);
+    super((JFrame) null, true);
     this.self = this;
     setSize(SIZE);
@@ -205 +204 @@
             }   
         }
-       
-    // Connect
-    language_combobox.addActionListener(new LanguageComboboxListener());
 
     // Layout
@@ -251 +247 @@
         if (!current_lang.equals(new_lang)) {
         Configuration.setLocale("general.locale", Configuration.GENERAL_SETTING, ((DictionaryEntry)language_combobox.getSelectedItem()).getLocale());
+        JOptionPane.showMessageDialog(null, Dictionary.get("Preferences.General.Restart_Required"), Dictionary.get("General.Warning"), JOptionPane.WARNING_MESSAGE);
         }
             
@@ -316 +313 @@
     }
     }
-
-
-    private class LanguageComboboxListener
-    implements ActionListener {
-    public void actionPerformed(ActionEvent event) {
-        // Retrieve the entry
-        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);
-        }
-    }
-    }
 }