Changeset 18364 for gli/branches/rtl-gli/src/org/greenstone/gatherer/gui/Preferences.java

Timestamp:

2009-01-12T11:40:15+13:00 (15 years ago)

Author:

kjdon

Message:

updated the rtl-gli branch with files from trunk. Result of a merge 14807:18318, and fixed some conflicts. I think this is the last commit following merging the files. Haven't tried to compile yet... here goes...

File:

• gli/branches/rtl-gli/src/org/greenstone/gatherer/gui/Preferences.java (modified) (11 diffs)

gli/branches/rtl-gli/src/org/greenstone/gatherer/gui/Preferences.java

@@ -731 +731 @@
     public void actionPerformed(ActionEvent event)
     {
+        // Several options requiring restarting the GLI to apply: 
+        // interface font, interface language, changed gliserver url or library url
+        boolean restart_required = false;
+        String restart_message = "";
+
+        
         // Connection preferences
         String program_str = program_field.getText();
@@ -738 +744 @@
         Configuration.setPreviewCommand(program_str);
 
+        String old_library_url = (Configuration.library_url == null) ? null : Configuration.library_url.toString();
         String library_url_string = library_path_field.getText();
+        if(old_library_url != null && !old_library_url.equals(library_url_string)) {
+
+        // If the server is remote and the library path's been changed, then GLI client needs restart
+        // If the server is local, GLI is going to work with the collection of GSDLPath anyway, 
+        // even if the library path for previewing has changed
+        if (Gatherer.isGsdlRemote) {
+            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();
+            Configuration.setString("general.open_collection"+Configuration.gliPropertyNameSuffix(), true, "");
+        }
+        }
         if (library_url_string.equals("")) {
         Configuration.library_url = null;
@@ -750 +774 @@
         }
         }
-        Configuration.setString("general.library_url", true, library_url_string);
+
+        Configuration.setString("general.library_url"+Configuration.gliPropertyNameSuffix(), 
+                    true, library_url_string);
 
         if (Gatherer.isGsdlRemote && !Gatherer.GS3) {
+        String old_gliserver_url = Configuration.gliserver_url.toString(); 
         String gliserver_url_string = gliserver_url_field.getText();
+        if(!old_gliserver_url.equals(gliserver_url_string)) {
+            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 gliserver URL
+            Gatherer.c_man.saveCollection();
+            Gatherer.c_man.closeCollection();
+            Configuration.setString("general.open_collection"+Configuration.gliPropertyNameSuffix(), true, "");
+            }
+        }
         if (gliserver_url_string.equals("")) {
             Configuration.gliserver_url = null;
@@ -767 +806 @@
         Configuration.setString("general.gliserver_url", true, gliserver_url_string);
         }
+        
 
         boolean site_changed = false;
@@ -777 +817 @@
         Configuration.setSiteAndServlet(new_site, (String)servlet_combobox.getSelectedItem());
         }
-
+       
         Configuration.set("general.use_proxy", true, use_proxy_checkbox.isSelected());
         Configuration.setString("general.proxy_host", true, proxy_host_field.getText());
@@ -788 +828 @@
         Configuration.set("general.view_extracted_metadata", Configuration.COLLECTION_SPECIFIC, view_extracted_metadata_checkbox.isSelected());
 
-        // Two options requiring restarting the GLI to apply: interface font, and interface language
-        boolean restart_required = false;
 
         // GLI interface font
@@ -796 +834 @@
         Configuration.setString("general.font", true, font_field.getText());
         restart_required = true;
+        restart_message = Dictionary.get("Preferences.General.Restart_Required");
         }
 
@@ -803 +842 @@
         Configuration.setLocale("general.locale", Configuration.GENERAL_SETTING, ((DictionaryEntry) language_combobox.getSelectedItem()).getLocale());
         restart_required = true;
+        restart_message = Dictionary.get("Preferences.General.Restart_Required");
         }
 
         // Inform the user that a restart is required, if necessary
         if (restart_required) {
-        JOptionPane.showMessageDialog(Gatherer.g_man, Dictionary.get("Preferences.General.Restart_Required"), Dictionary.get("General.Warning"), JOptionPane.WARNING_MESSAGE);
+        JOptionPane.showMessageDialog(Gatherer.g_man, restart_message, Dictionary.get("General.Warning"), JOptionPane.WARNING_MESSAGE);
         }
 
@@ -845 +885 @@
         if (Gatherer.GS3 && site_changed && Gatherer.c_man.getCollection() != null && !Gatherer.isGsdlRemote) {
         // shut down the collection
-        System.err.println("shutting down teh collection");
+        System.err.println("shutting down the collection");
         Gatherer.g_man.saveThenCloseCurrentCollection();
         }
@@ -867 +907 @@
         Configuration.save();
         if (Gatherer.isGsdlRemote && Gatherer.GS3 && site_changed ){
-        RemoteGreenstoneServer.downloadCollectionConfigurations();
+        Gatherer.remoteGreenstoneServer.downloadCollectionConfigurations();
         }
         // Refresh the GLI to account for the configuration changes
@@ -997 +1037 @@
             if (Gatherer.c_man.getCollection()!=null){
             File lock_file = new File(Gatherer.c_man.getLoadedCollectionDirectoryPath() + "gli.lck");
-            RemoteGreenstoneServer.deleteCollectionFile(Gatherer.c_man.getLoadedCollectionName(),lock_file);
+            Gatherer.remoteGreenstoneServer.deleteCollectionFile(Gatherer.c_man.getLoadedCollectionName(),lock_file);
             Gatherer.g_man.closeCurrentCollection();
             }
             Configuration.site_name=site;
-            RemoteGreenstoneServer.set_remote_greenstone_server_authentication_to_null();
-            RemoteGreenstoneServer.downloadCollectionConfigurations();
+            Gatherer.remoteGreenstoneServer.set_remote_greenstone_server_authentication_to_null();
+            Gatherer.remoteGreenstoneServer.downloadCollectionConfigurations();
         }
         }