Changeset 19438 for gli/trunk/src/org/greenstone/gatherer/gui/Preferences.java

Timestamp:

2009-05-13T14:45:08+12:00 (15 years ago)

Author:

kjdon

Message:

If you change the language then the locale is set in the configuration, then when you come to save the collection config file, the worng locale is used, and you get the wrong language in the file for metadata anmes. So now we save the collection before setting the locale, but also need to call a new exit method in GUIManager so it doesn't overwrite our general.open_collection setting

File:

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

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

@@ -723 +723 @@
         // interface font, interface language, changed gliserver url or library url
         boolean restart_required = false;
+        boolean keep_collection_open = false;
         String restart_message = "";
 
@@ -743 +744 @@
             restart_required = true;
             restart_message = Dictionary.get("Preferences.General.Manual_Restart_Required");
+            
         }
         if(Gatherer.c_man.getCollection() != null) {
             // if the gliserver url has changed while a collection is open, 
             // close the open collection of the old library URL
-            Gatherer.c_man.saveCollection();
-            Gatherer.c_man.closeCollection();
+            Gatherer.g_man.saveThenCloseCurrentCollection();
             Configuration.setString("general.open_collection"+Configuration.gliPropertyNameSuffix(), true, "");
         }
@@ -777 +778 @@
             // if the gliserver url has changed while a collection is open, 
             // close the open collection of the old gliserver URL
-            Gatherer.c_man.saveCollection();
-            Gatherer.c_man.closeCollection();
+            Gatherer.g_man.saveThenCloseCurrentCollection();
             Configuration.setString("general.open_collection"+Configuration.gliPropertyNameSuffix(), true, "");
             }
@@ -824 +824 @@
         restart_required = true;
         restart_message = Dictionary.get("Preferences.General.Restart_Required");
+
         }
 
@@ -829 +830 @@
         String current_lang = Configuration.getLanguage();
         if (!current_lang.equals(((DictionaryEntry) language_combobox.getSelectedItem()).getLocale().getLanguage())) {
+          // need to save the collection before changing the locale otherwise it stuffs the metadata names up
+          if(Gatherer.c_man.getCollection() != null) {
+          Configuration.setString("general.open_collection"+Configuration.gliPropertyNameSuffix(), true, Gatherer.c_man.getLoadedCollectionColFilePath());
+          Gatherer.g_man.saveThenCloseCurrentCollection();
+          keep_collection_open = true;
+        }
+
         Configuration.setLocale("general.locale", Configuration.GENERAL_SETTING, ((DictionaryEntry) language_combobox.getSelectedItem()).getLocale());
         restart_required = true;
@@ -904 +912 @@
 
         if (restart_required) {
+          if (keep_collection_open) {
+        Gatherer.g_man.exitNoCollectionSave(Gatherer.EXIT_THEN_RESTART);
+          } else {
         Gatherer.g_man.exit(Gatherer.EXIT_THEN_RESTART);
+          }
         }
     }