Changeset 10342 for trunk/gli/src/org/greenstone/gatherer/cdm

Timestamp:

2005-07-28T15:50:17+12:00 (19 years ago)

Author:

mdewsnip

Message:

Tidied up a lot of path variables. These were all over the place, and were often duplicated. Now all GLI related paths are accessed via static methods in the Gatherer class.

Location:

trunk/gli/src/org/greenstone/gatherer/cdm

Files:

• ClassifierManager.java (modified) (3 diffs)
• MetadataSetView.java (modified) (1 diff)
• PluginManager.java (modified) (3 diffs)

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(Gatherer.getGLIUserDirectoryPath() + "classifiers.dat");
     if (class_file.exists()) {
         return Utility.delete(class_file);
@@ -261 +261 @@
     private void saveClassifiers() {
     try {
-        File classifiers_dat_file = new File(Utility.getGLIUserFolder(), "classifiers.dat");
+        File classifiers_dat_file = new File(Gatherer.getGLIUserDirectoryPath() + "classifiers.dat");
         FileOutputStream file = new FileOutputStream(classifiers_dat_file);
         ObjectOutputStream out = new ObjectOutputStream(file);
@@ -369 +369 @@
     private void loadClassifiers() {
     // Attempt to restore the cached file.
-    File classifiers_dat_file = new File(Utility.getGLIUserFolder(), "classifiers.dat");
+    File classifiers_dat_file = new File(Gatherer.getGLIUserDirectoryPath() + "classifiers.dat");
     try {
         FileInputStream file = new FileInputStream(classifiers_dat_file);

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

@@ -289 +289 @@
         public void actionPerformed(ActionEvent event)
         {
-        JFileChooser chooser = new JFileChooser(new File(Utility.METADATA_DIR));
+        JFileChooser chooser = new JFileChooser(new File(Gatherer.getGLIMetadataDirectoryPath()));
         chooser.setFileFilter(new MetadataSet.MetadataSetFileFilter());
         int return_val = chooser.showDialog(Gatherer.g_man, Dictionary.get("CDM.MetadataSetManager.Add"));

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

@@ -107 +107 @@
 
     DebugStream.println("deleting plugins.dat");
-    File plugin_file = new File(Utility.getGLIUserFolder(), "plugins.dat");
+    File plugin_file = new File(Gatherer.getGLIUserDirectoryPath() + "plugins.dat");
     if (plugin_file.exists()) {
         return Utility.delete(plugin_file);
@@ -359 +359 @@
     private void savePlugins() {
     try {
-        File plugins_dat_file = new File(Utility.getGLIUserFolder(), "plugins.dat");
+        File plugins_dat_file = new File(Gatherer.getGLIUserDirectoryPath() + "plugins.dat");
         FileOutputStream file = new FileOutputStream(plugins_dat_file);
         ObjectOutputStream out = new ObjectOutputStream(file);
@@ -499 +499 @@
     private void loadPlugins() {
     // Attempt to restore the cached file.
-    File plugins_dat_file = new File(Utility.getGLIUserFolder(), "plugins.dat");
+    File plugins_dat_file = new File(Gatherer.getGLIUserDirectoryPath() + "plugins.dat");
     try {
         FileInputStream file = new FileInputStream(plugins_dat_file);