Changeset 10461

Timestamp:

2005-08-10T14:56:20+12:00 (19 years ago)

Author:

mdewsnip

Message:

Fixed a bug where the GEMS didn't know the GLI user directory, so updates to the config.xml file would fail.

Location:

trunk/gli/src/org/greenstone/gatherer

Files:

• Configuration.java (modified) (17 diffs)
• Gatherer.java (modified) (1 diff)
• gems/GEMS.java (modified) (2 diffs)
• gems/GEMSLanguageManager.java (modified) (1 diff)

trunk/gli/src/org/greenstone/gatherer/Configuration.java

@@ -94 +94 @@
 
     static public Configuration self = null;
+    static private String gli_user_directory_path = null;
 
     static public boolean just_updated_config_xml_file = false;
@@ -137 +138 @@
      * @param site_name The name of the Greenstone 3 site currently in use.
      */
-    public Configuration(String gsdl_path, String gsdl3_path, String gsdl3_src_path, String site_name)
+    public Configuration(String gli_user_directory_path, String gsdl_path, String gsdl3_path, String gsdl3_src_path, String site_name)
     {
     super();
     self = this;
 
+    this.gli_user_directory_path = gli_user_directory_path;
     this.gsdl_path = gsdl_path;
     this.gsdl3_path = gsdl3_path;
@@ -154 +156 @@
 
     // If the existing user config.xml file isn't recent enough, backup the old version and update it
-    File config_xml_file = new File(Gatherer.getGLIUserDirectoryPath() + config_xml_file_name);
+    File config_xml_file = new File(gli_user_directory_path + config_xml_file_name);
     if (config_xml_file != null && config_xml_file.exists()) {
         just_updated_config_xml_file = updateUserConfigXMLFileIfNecessary(config_xml_file);
@@ -392 +394 @@
         }
     }
-    catch(Exception error) {
+    catch (Exception exception) {
+        DebugStream.printStackTrace(exception);
     }
     return properties;
@@ -421 +424 @@
         document_element = null;
     }
-    catch(Exception error) {
+    catch (Exception exception) {
+        DebugStream.printStackTrace(exception);
     }
     return argument_element;
@@ -451 +455 @@
         result = new Rectangle(x, y, width, height);
     }
-    catch(Exception error) {
-        DebugStream.printStackTrace(error);
+    catch (Exception exception) {
+        DebugStream.printStackTrace(exception);
     }
     return result;
@@ -469 +473 @@
         result = new Color(red, green, blue);
     }
-    catch(Exception error) {
-        error.printStackTrace();
+    catch (Exception exception) {
+        DebugStream.printStackTrace(exception);
     }
     return result;
@@ -496 +500 @@
         mappings = null;
     }
-    catch(Exception exception) {
+    catch (Exception exception) {
         DebugStream.printStackTrace(exception);
     }
@@ -537 +541 @@
         result = new FontUIResource(face, style, size);
     }
-    catch(Exception error) {
-        DebugStream.printStackTrace(error);
+    catch (Exception exception) {
+        DebugStream.printStackTrace(exception);
     }
     return result;
@@ -550 +554 @@
         result = Integer.parseInt(raw);
     }
-    catch(Exception error) {
-        DebugStream.printStackTrace(error);
+    catch (Exception exception) {
+        DebugStream.printStackTrace(exception);
     }
     return result;
@@ -582 +586 @@
         }
     }
-    catch(Exception error) {
-        DebugStream.printStackTrace(error);
+    catch (Exception exception) {
+        DebugStream.printStackTrace(exception);
     }
     return result;
@@ -664 +668 @@
         }
     }
-    catch (Exception error) {
-        error.printStackTrace();
+    catch (Exception exception) {
+        DebugStream.printStackTrace(exception);
     }
     // If we still have no result, and the search was made in the collection configuration, retrieve the general one instead.
@@ -707 +711 @@
         mappings = null;
     }
-    catch(Exception error) {
-        DebugStream.printStackTrace(error);
+    catch (Exception exception) {
+        DebugStream.printStackTrace(exception);
     }
     return file;
@@ -723 +727 @@
     }
     try {
-        user_config_xml = new File(Gatherer.getGLIUserDirectoryPath() + config_xml_name);
+        user_config_xml = new File(gli_user_directory_path + config_xml_name);
         ///ystem.err.println("Trying to save to: " + user_config_xml.getAbsolutePath());
         ///ystem.err.println("Writing.");
@@ -729 +733 @@
         XMLTools.writeXMLFile(new File(user_config_xml.getAbsolutePath()), general_config);
     }
-    catch(Exception exception) {
+    catch (Exception exception) {
+        DebugStream.printStackTrace(exception);
         user_config_xml = null;
     }
@@ -768 +773 @@
         document_element = null;
     }
-    catch (Exception error) {
-        DebugStream.println("Error in Configuration.setArguments(): " + error);
-        DebugStream.printStackTrace(error);
+    catch (Exception exception) {
+        DebugStream.println("Error in Configuration.setArguments(): " + exception);
+        DebugStream.printStackTrace(exception);
     }
     }
@@ -926 +931 @@
         }
     }
-    catch (Exception error) {
+    catch (Exception exception) {
+        DebugStream.printStackTrace(exception);
     }
     }

trunk/gli/src/org/greenstone/gatherer/Gatherer.java

@@ -209 +209 @@
     try {
         // Load GLI config file
-        new Configuration(gsdl_path, gsdl3_path, gsdl3_src_path, site_name);
+        new Configuration(getGLIUserDirectoryPath(), gsdl_path, gsdl3_path, gsdl3_src_path, site_name);
         if (Configuration.just_updated_config_xml_file) {
         // Delete the plugins.dat and classifiers.dat files

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

@@ -66 +66 @@
 import org.greenstone.gatherer.util.Codec;
 import org.greenstone.gatherer.util.JarTools;
+import org.greenstone.gatherer.util.Utility;
 import org.greenstone.gatherer.util.XMLTools;
 import org.w3c.dom.*;
@@ -172 +173 @@
     public GEMS(String gsdl_path)
     {
+    // Determine the GLI user directory path
+    String gli_user_directory_path = System.getProperty("user.home") + File.separator;
+        if (Utility.isWindows()) {
+        gli_user_directory_path += "Application Data" + File.separator + "Greenstone" + File.separator + "GLI" + File.separator;
+        }
+        else {
+            gli_user_directory_path += ".gli" + File.separator;
+        }
+
     //Load configuration file
     this.self = this;
     JarTools.initialise(this);
-    config = new Configuration(gsdl_path, null, null, null);
+    config = new Configuration(gli_user_directory_path, gsdl_path, null, null, null);
 
     // Read Dictionary

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

@@ -48 +48 @@
 import org.greenstone.gatherer.DebugStream;
 import org.greenstone.gatherer.Dictionary;
-import org.greenstone.gatherer.Gatherer;
 import org.greenstone.gatherer.gui.GLIButton;
 import org.w3c.dom.*;