Changeset 22605 for main/trunk/gli/src/org/greenstone/gatherer/collection/CollectionManager.java

Timestamp:

2010-08-11T21:28:34+12:00 (14 years ago)

Author:

ak19

Message:

Ticket #152: Allowing different paths to collect dir so that GLI can work with collect dirs on pen drives. NONE OF THESE CHANGES ARE FOR Client-GLI AS YET. 1. Preferences (Connection tab), Open and New Collection dialogs allow one to change the current collect directory containing the collections to select from. 2. New Collection dialog allows one to base a new collection on an existing collection in a collect dir other than the current collect dir. 3. Collections in the Documents in Greenstone Collections Workspace Tree Node now have two additional rightclick options: to move and copy these collections to another location.

File:

• main/trunk/gli/src/org/greenstone/gatherer/collection/CollectionManager.java (modified) (3 diffs)

main/trunk/gli/src/org/greenstone/gatherer/collection/CollectionManager.java

@@ -402 +402 @@
      */
     public void closeCollection() {
+    if (collection == null) {
+        return;
+    }
     DebugStream.println("Close collection: " + collection.getName());
 
@@ -1154 +1157 @@
     public void loadCollection(String collection_file_path)
     {
+    if(new File(collection_file_path).isDirectory()) { // collect folder instead of previously-opened collection
+        Gatherer.setMenuBarEnabled(true);
+        return; // nothing else to be done, no collection to open
+    }
+
     // Display a modal progress popup to indicate that the collection is being loaded
     ModalProgressPopup load_collection_progress_popup = new ModalProgressPopup(Dictionary.get("CollectionManager.Loading_Collection"), Dictionary.get("CollectionManager.Loading_Collection_Please_Wait"));
@@ -1552 +1560 @@
       // If there was an open collection last session, reopen it
       if (Gatherer.open_collection_file_path != null) {
-        // Load the collection now
-        loadCollection(Gatherer.open_collection_file_path);
+     // Load the collection now
+     loadCollection(Gatherer.open_collection_file_path);
       }