Changeset 10564

Timestamp:

2005-08-25T13:39:56+12:00 (19 years ago)

Author:

mdewsnip

Message:

Added a openCollectionFromLastTime function to CollectionManager to reduce duplicated code.

Location:

trunk/gli/src/org/greenstone/gatherer

Files:

• GathererApplet.java (modified) (1 diff)
• GathererProg.java (modified) (1 diff)
• collection/CollectionManager.java (modified) (1 diff)

trunk/gli/src/org/greenstone/gatherer/GathererApplet.java

@@ -186 +186 @@
 
     // If there was an open collection last session, reopen it
-    Gatherer.open_collection_file_path = Configuration.getString("general.open_collection", true);
-    if (Gatherer.open_collection_file_path != null && !Gatherer.open_collection_file_path.equals("")) {
-        Gatherer.c_man.loadCollection(Gatherer.open_collection_file_path);
-    }
+    Gatherer.c_man.openCollectionFromLastTime();
     }
 }

trunk/gli/src/org/greenstone/gatherer/GathererProg.java

@@ -81 +81 @@
 
     // If there was an open collection last session, reopen it
-    if (Gatherer.open_collection_file_path != null) {
-        Gatherer.c_man.loadCollection(Gatherer.open_collection_file_path);
-    }
+    Gatherer.c_man.openCollectionFromLastTime();
     }
 }

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

@@ -981 +981 @@
     if (collection != null) {
         collection.setMetadataChanged(true);
+    }
+    }
+
+
+    public void openCollectionFromLastTime()
+    {
+    // If there was an open collection last session, reopen it
+    if (Gatherer.open_collection_file_path != null) {
+        // If we're using a remote Greenstone server we must download the collection configurations first
+        if (Gatherer.isGsdlRemote) {
+        RemoteGreenstoneServer.downloadCollectionConfigurations();
+        }
+
+        // Load the collection now
+        loadCollection(Gatherer.open_collection_file_path);
     }
     }