Changeset 8650

Timestamp:

2004-11-24T13:30:46+13:00 (19 years ago)

Author:

mdewsnip

Message:

The plugins.dat and classifiers.dat files are now stored in the GLI user directory, as part of making the GLI work nicely with one installation and multiple people using it.

Location:

trunk/gli/src/org/greenstone/gatherer

Files:

• cdm/ClassifierManager.java (modified) (3 diffs)
• cdm/PluginManager.java (modified) (3 diffs)
• util/Utility.java (modified) (2 diffs)

trunk/gli/src/org/greenstone/gatherer/cdm/ClassifierManager.java

@@ -103 +103 @@
 
     DebugStream.println("deleting classifiers.dat");
-    File class_file = new File(Utility.BASE_DIR + "classifiers.dat");
+    File class_file = new File(Utility.getGLIUserFolder() + "classifiers.dat");
     if (class_file.exists()) {
         return Utility.delete(class_file);
@@ -260 +260 @@
     private void saveClassifiers() {
     try {
-        FileOutputStream file = new FileOutputStream(Utility.BASE_DIR + "classifiers.dat");
+        FileOutputStream file = new FileOutputStream(Utility.getGLIUserFolder() + "classifiers.dat");
         ObjectOutputStream out = new ObjectOutputStream(file);
         out.writeObject(library);
@@ -368 +368 @@
     // Attempt to restore the cached file.
     try {
-        FileInputStream file = new FileInputStream(Utility.BASE_DIR + "classifiers.dat");
+        FileInputStream file = new FileInputStream(Utility.getGLIUserFolder() + "classifiers.dat");
         ObjectInputStream input = new ObjectInputStream(file);
         library = (ArrayList) input.readObject();
     }
     catch (Exception error) {
-        DebugStream.println("Unable to open "+ Utility.BASE_DIR + "classifier.dat");
+        DebugStream.println("Unable to open "+ Utility.getGLIUserFolder() + "classifier.dat");
     }
 

trunk/gli/src/org/greenstone/gatherer/cdm/PluginManager.java

@@ -105 +105 @@
 
     DebugStream.println("deleting plugins.dat");
-    File plugin_file = new File(Utility.BASE_DIR + "plugins.dat");
+    File plugin_file = new File(Utility.getGLIUserFolder() + "plugins.dat");
     if (plugin_file.exists()) {
         return Utility.delete(plugin_file);
@@ -332 +332 @@
     private void savePlugins() {
     try {
-        FileOutputStream file = new FileOutputStream(Utility.BASE_DIR + "plugins.dat");
+        FileOutputStream file = new FileOutputStream(Utility.getGLIUserFolder() + "plugins.dat");
         ObjectOutputStream out = new ObjectOutputStream(file);
         out.writeObject(library);
@@ -472 +472 @@
     // Attempt to restore the cached file.
     try {
-        FileInputStream file = new FileInputStream(Utility.BASE_DIR + "plugins.dat");
+        FileInputStream file = new FileInputStream(Utility.getGLIUserFolder() + "plugins.dat");
         ObjectInputStream input = new ObjectInputStream(file);
         library = (ArrayList) input.readObject();
     }
     catch (Exception error) {
-        DebugStream.println("Unable to open "+ Utility.BASE_DIR + "plugins.dat");
+        DebugStream.println("Unable to open "+ Utility.getGLIUserFolder() + "plugins.dat");
     }
 

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

@@ -524 +524 @@
     }
 
+
     static final private String APPLICATION_DATA_FOLDER = "Application Data";
     static final private String UNIX_GLI_CONFIG_FOLDER = ".gli";
@@ -529 +530 @@
     static final private String WIN_GLI_CONFIG_FOLDER = "Greenstone" + File.separator + "GLI";
 
-    static public File getGLIUserFolder() {
-    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 + WIN_GLI_CONFIG_FOLDER + File.separator);
+    static public File getGLIUserFolder()
+    {
+    if (Utility.isWindows()) {
+        return new File(System.getProperty(USER_HOME_PROPERTY) + File.separator + APPLICATION_DATA_FOLDER + File.separator + WIN_GLI_CONFIG_FOLDER + File.separator);
     }
     else {
-        gli_user_folder = new File(System.getProperty(USER_HOME_PROPERTY) + File.separator + UNIX_GLI_CONFIG_FOLDER + File.separator);
-    }
-    return gli_user_folder;
-    }
+        return new File(System.getProperty(USER_HOME_PROPERTY) + File.separator + UNIX_GLI_CONFIG_FOLDER + File.separator);
+    }
+    }
+
 
     /** Retrieve the full file path to the help index xml file.