Changeset 9045 for trunk/gli/src/org/greenstone/gatherer/gui

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!

Location:

trunk/gli/src/org/greenstone/gatherer/gui

Files:

• DeleteCollectionPrompt.java (modified) (1 diff)
• ExportCollectionPrompt.java (modified) (1 diff)
• GUIManager.java (modified) (1 diff)
• NewCollectionDetailsPrompt.java (modified) (3 diffs)
• OptionsPane.java (modified) (2 diffs)
• SimpleOpenCollectionDialog.java (modified) (2 diffs)

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

@@ -215 +215 @@
     private void scanForCollections() {
     // Start at the collect dir.
-    File collect_directory;
-    if (Gatherer.GS3) {
-        collect_directory = new File(Utility.getCollectDir(Configuration.gsdl3_path, Configuration.site_name));
-    } else {
-        collect_directory = new File(Utility.getCollectDir(Configuration.gsdl_path));
-    }
-    if(collect_directory.exists()) {
+    File collect_directory = new File(Gatherer.getCollectDirectoryPath());
+    if (collect_directory.exists()) {
         // Now for each child directory see if it contains a .col file and
         // if so try to load it..

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

@@ -335 +335 @@
     private void scanForCollections() {
     // Start at the collect dir.
-    File collect_directory;
-    if (Gatherer.GS3) {
-        collect_directory = new File(Utility.getCollectDir(Configuration.gsdl3_path, Configuration.site_name));
-    } else {
-        collect_directory = new File(Utility.getCollectDir(Configuration.gsdl_path));
-    }
-    if(collect_directory.exists()) {
+    File collect_directory = new File(Gatherer.getCollectDirectoryPath());
+    if (collect_directory.exists()) {
         // Now for each child directory see if it contains a .col file and
         // if so try to load it..

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();

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

@@ -49 +49 @@
         return false;
     }
-    File collection_directory;
-    if (Gatherer.GS3) {
-        collection_directory = new File(Utility.getCollectDir(Configuration.gsdl3_path, Configuration.site_name));
-    } else {
-        collection_directory = new File(Utility.getCollectDir(Configuration.gsdl_path));
-    }
-    File children[] = collection_directory.listFiles();
+    File collect_directory = new File(Gatherer.getCollectDirectoryPath());
+    File children[] = collect_directory.listFiles();
     for(int i = 0; children != null && i < children.length; i++) {
         if(children[i].isDirectory()) {
@@ -102 +97 @@
     // need to modify this to base a coll on any collection from any site
     if (Gatherer.GS3) {
-        File sites_dir = new File(Utility.getSitesDir(Configuration.gsdl3_path));
+        File sites_dir = new File(Gatherer.getSitesDirectoryPath());
         File [] sites = sites_dir.listFiles();
         for (int i=0; i<sites.length; i++) {
-        File collect_dir = new File(Utility.getCollectDir(Configuration.gsdl3_path, sites[i].getName()));
-        if (collect_dir.exists()) {
-            addCollectionsToModel(base_collection_model, collect_dir, sites[i].getName());
+        File collect_directory = new File(sites_dir + sites[i].getName() + File.separator + "collect");
+        if (collect_directory.exists()) {
+            addCollectionsToModel(base_collection_model, collect_directory, sites[i].getName());
         }
         }
     } else {
-       File gsdl_collection_directory = new File(Utility.getCollectDir(Configuration.gsdl_path));
-       addCollectionsToModel(base_collection_model, gsdl_collection_directory, null);
+       File collect_directory = new File(Gatherer.getCollectDirectoryPath());
+       addCollectionsToModel(base_collection_model, collect_directory, null);
     }
 
@@ -266 +261 @@
     }
     
-    private boolean filenameClashes(String filename) {
-    File collection_directory;
-    if (Gatherer.GS3) {
-        collection_directory = new File(Utility.getCollectDir(Configuration.gsdl3_path, Configuration.site_name));
-    } else {
-        collection_directory = new File(Utility.getCollectDir(Configuration.gsdl_path));
-    }
-
-    File children[] = collection_directory.listFiles();
+    private boolean filenameClashes(String filename)
+    {
+    File collect_directory = new File(Gatherer.getCollectDirectoryPath());
+    File children[] = collect_directory.listFiles();
     for(int i = 0; children != null && i < children.length; i++) {
         if(children[i].getName().equals(filename)) {

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

@@ -236 +236 @@
         // Build a list of the log files available, ordering by last modified. Log files are like build_log.date.txt
         DefaultListModel contents = new DefaultListModel();
-        File log_directory = new File(Gatherer.c_man.getCollectionLog());
+        File log_directory = new File(Gatherer.c_man.getCollectionLogDirectoryPath());
         File children[] = log_directory.listFiles();
         for(int i = 0; children != null && i < children.length; i++) {
@@ -289 +289 @@
     name.append(".txt");
     // just in case there is no log directory
-    File file = new File(Gatherer.c_man.getCollectionLog() + name.toString());
+    File file = new File(Gatherer.c_man.getCollectionLogDirectoryPath() + name.toString());
     File parent_file = file.getParentFile();
     parent_file.mkdirs();

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

@@ -264 +264 @@
     public CollectionListModel() {
         data = new TreeSet();
-        File collect_folder;
-        if (Gatherer.GS3) {
-        collect_folder = new File(Utility.getCollectDir(Configuration.gsdl3_path, Configuration.site_name) );
-        } else {
-        collect_folder = new File(Utility.getCollectDir(Configuration.gsdl_path));
-        }
-        if (!collect_folder.exists()) {
-        collect_folder = null;
+        File collect_directory = new File(Gatherer.getCollectDirectoryPath());
+        if (!collect_directory.exists()) {
+        collect_directory = null;
         return;
         }
-        File[] collection_folders = collect_folder.listFiles();
+        File[] collection_folders = collect_directory.listFiles();
         for(int i = 0; i < collection_folders.length; i++) {
         File collection_folder = collection_folders[i];
@@ -290 +285 @@
         }
         collection_folders = null;
-        collect_folder = null;
+        collect_directory = null;
     }