Changeset 9045 for trunk/gli/src/org/greenstone/gatherer/gui/GUIManager.java

Timestamp:

2005-02-15T15:39:48+13:00 (19 years ago)

Author:

mdewsnip

Message:

Made major rearrangements to the way path variables are calculated. This is to facilitate being able to specify a "-collectdir" argument to the GLI so one GLI installation can be used in a networked, multi-user situation. Hope I haven't broken anything!

File:

• trunk/gli/src/org/greenstone/gatherer/gui/GUIManager.java (modified) (1 diff)

trunk/gli/src/org/greenstone/gatherer/gui/GUIManager.java

@@ -621 +621 @@
     }
     else if(user_choice == SimpleOpenCollectionDialog.BROWSE_OPTION) {
-        File file;
+        File collect_directory;
         if (Gatherer.GS3) {
-        if (Configuration.gsdl3_path != null) {
-            file = new File(Utility.getSitesDir(Configuration.gsdl3_path));
-        } else {
-            file = new File(Utility.BASE_DIR);
-        }
-
-        } else {
-
-        if(Configuration.gsdl_path != null) {
-            file = new File(Utility.getCollectDir(Configuration.gsdl_path));
-        }
-        else {
-            file = new File(Utility.BASE_DIR);
-        }
-        }
-        OpenCollectionDialog chooser = new OpenCollectionDialog(file);
-        file = null;
+        collect_directory = new File(Utility.getSitesDir(Configuration.gsdl3_path));
+        }
+        else {
+        collect_directory = new File(Gatherer.getCollectDirectoryPath());
+        }
+        OpenCollectionDialog chooser = new OpenCollectionDialog(collect_directory);
         filename = chooser.getFileName();
         chooser.destroy();