Changeset 6593

Timestamp:

2004-01-23T09:40:26+13:00 (20 years ago)

Author:

jmt12

Message:

Have finalised the code for user specific settings under windows. I've tested on WinXP and Win98 with multiple users, and Win98 with a single user. Under single user the user.home is C:\Windows. Apparently its pretty common to just create an Application Data folder and put settings there, with or without multiple users. I'm not sure if thats true for WinXP, but I can't really tes that.

Location:

trunk/gli/src/org/greenstone/gatherer

Files:

• Configuration.java (modified) (2 diffs)
• util/Utility.java (modified) (1 diff)

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

@@ -178 +178 @@
 
     // Try to reload the configuration. The first place we look is the user specific location
-    File user_config_xml = null;
-    // Windows. What to do, what to do?
-    if(Utility.isWindows()) {
-        
-    }
-    // Unix based systems. This one I know. Look for .gli/config.xml in the users home folder
-    else {
-        user_config_xml = new File(Utility.getGLIUserFolder(), CONFIG_XML);     
-    }
+    File user_config_xml = new File(Utility.getGLIUserFolder(), CONFIG_XML);        
     if(user_config_xml != null && user_config_xml.exists()) {
         general_config = Utility.parse(user_config_xml.getAbsolutePath(), false);
@@ -618 +610 @@
     File user_config_xml = null;
     try {
-        if(Utility.isWindows()) {
-        
-        }
-        // Unix systems save user preferences in . folders in the home directory.
-        else {
-        user_config_xml = new File(Utility.getGLIUserFolder(), CONFIG_XML);
-        ///ystem.err.println("Trying to save to: " + user_config_xml.getAbsolutePath());
-        ///ystem.err.println("Writing.");
-        user_config_xml.getParentFile().mkdirs();
-        Utility.export(general_config, user_config_xml.getAbsolutePath());
-        }
+        user_config_xml = new File(Utility.getGLIUserFolder(), CONFIG_XML);
+        ///ystem.err.println("Trying to save to: " + user_config_xml.getAbsolutePath());
+        ///ystem.err.println("Writing.");
+        user_config_xml.getParentFile().mkdirs();
+        Utility.export(general_config, user_config_xml.getAbsolutePath());
     }
     catch(Exception exception) {

trunk/gli/src/org/greenstone/gatherer/util/Utility.java

@@ -554 +554 @@
     }
 
+    static final private String APPLICATION_DATA_FOLDER = "Application Data";
+    static final private String UNIX_GLI_CONFIG_FOLDER = ".gli";
+    static final private String USER_HOME_PROPERTY = "user.home";
+    static final private String WIN_GLI_CONFIG_FOLDER = "Greenstone" + File.separator + "GLI";
+
     static public File getGLIUserFolder() {
-    File gli_user_folder = new File(System.getProperty("user.home") + File.separator + ".gli" + File.separator);
+    File gli_user_folder = null;
+    if(Utility.isWindows()) {
+        gli_user_folder = new File(System.getProperty(USER_HOME_PROPERTY) + File.separator + APPLICATION_DATA_FOLDER + File.separator + GLI_CONFIG_FOLDER + File.separator);
+    }
+    else {
+        gli_user_folder = new File(System.getProperty(USER_HOME_PROPERTY) + File.separator + GLI_CONFIG_FOLDER + File.separator);
+    }
     return gli_user_folder;
     }