Changeset 8670

Timestamp:

2004-11-25T15:04:45+13:00 (19 years ago)

Author:

mdewsnip

Message:

Fixed my changes from yesterday to store plugins.dat, classifiers.dat, and recycle bin information in the user-specific GLI folder.

Location:

trunk/gli/src/org/greenstone/gatherer

Files:

• cdm/ClassifierManager.java (modified) (3 diffs)
• cdm/PluginManager.java (modified) (3 diffs)
• file/RecycleBin.java (modified) (1 diff)

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

@@ -103 +103 @@
 
     DebugStream.println("deleting classifiers.dat");
-    File class_file = new File(Utility.getGLIUserFolder() + "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.getGLIUserFolder() + "classifiers.dat");
+        File classifiers_dat_file = new File(Utility.getGLIUserFolder(), "classifiers.dat");
+        FileOutputStream file = new FileOutputStream(classifiers_dat_file);
         ObjectOutputStream out = new ObjectOutputStream(file);
         out.writeObject(library);
@@ -367 +368 @@
     private void loadClassifiers() {
     // Attempt to restore the cached file.
+    File classifiers_dat_file = new File(Utility.getGLIUserFolder(), "classifiers.dat");
     try {
-        FileInputStream file = new FileInputStream(Utility.getGLIUserFolder() + "classifiers.dat");
+        FileInputStream file = new FileInputStream(classifiers_dat_file);
         ObjectInputStream input = new ObjectInputStream(file);
         library = (ArrayList) input.readObject();
     }
     catch (Exception error) {
-        DebugStream.println("Unable to open "+ Utility.getGLIUserFolder() + "classifier.dat");
+        DebugStream.println("Unable to open " + classifiers_dat_file);
     }
 

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

@@ -105 +105 @@
 
     DebugStream.println("deleting plugins.dat");
-    File plugin_file = new File(Utility.getGLIUserFolder() + "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.getGLIUserFolder() + "plugins.dat");
+        File plugins_dat_file = new File(Utility.getGLIUserFolder(), "plugins.dat");
+        FileOutputStream file = new FileOutputStream(plugins_dat_file);
         ObjectOutputStream out = new ObjectOutputStream(file);
         out.writeObject(library);
@@ -471 +472 @@
     private void loadPlugins() {
     // Attempt to restore the cached file.
+    File plugins_dat_file = new File(Utility.getGLIUserFolder(), "plugins.dat");
     try {
-        FileInputStream file = new FileInputStream(Utility.getGLIUserFolder() + "plugins.dat");
+        FileInputStream file = new FileInputStream(plugins_dat_file);
         ObjectInputStream input = new ObjectInputStream(file);
         library = (ArrayList) input.readObject();
     }
     catch (Exception error) {
-        DebugStream.println("Unable to open "+ Utility.getGLIUserFolder() + "plugins.dat");
+        DebugStream.println("Unable to open " + plugins_dat_file);
     }
 

trunk/gli/src/org/greenstone/gatherer/file/RecycleBin.java

@@ -80 +80 @@
     setOpaque(true);
 
-    this.model = new FileSystemModel(new FileNode(new File(Utility.getGLIUserFolder() + "recycle" + File.separator), "Undo"));
+    this.model = new FileSystemModel(new FileNode(new File(Utility.getGLIUserFolder(), "recycle"), "Undo"));
     }