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

Timestamp:

2007-01-12T17:20:20+13:00 (17 years ago)

Author:

mdewsnip

Message:

Now always downloads the collection configurations when the GLI is starting up, as nothing much works without them. This simplifies the code and means that the openCollectionFromLastTime() function works.

File:

• trunk/gli/src/org/greenstone/gatherer/gui/GUIManager.java (modified) (3 diffs)

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

@@ -673 +673 @@
     public void run()
     {
-        // If using a remote Greenstone check if the collection configurations have been downloaded; do so if not
-        if (Gatherer.isGsdlRemote && !CollectionManager.downloaded_collection_configurations) {
-        if (RemoteGreenstoneServer.downloadCollectionConfigurations().equals("")) {
-            // Something went wrong downloading the collection configurations
-            return;
-        }
-
-        CollectionManager.downloaded_collection_configurations = true;
-        }
-
         String collection_file_path = showOpenCollectionDialog();
 
@@ -727 +717 @@
     public void run()
     {
-        // If using a remote Greenstone check if the collection configurations have been downloaded; do so if not
-        if (Gatherer.isGsdlRemote && !CollectionManager.downloaded_collection_configurations) {
-        if (RemoteGreenstoneServer.downloadCollectionConfigurations().equals("")) {
-            // Something went wrong downloading the collection configurations
-            return;
-        }
-
-        CollectionManager.downloaded_collection_configurations = true;
-        }
-
         // Create the collection details prompt from new collection prompt
         NewCollectionDetailsPrompt ncd_prompt = new NewCollectionDetailsPrompt();
@@ -763 +743 @@
     public void run()
     {
-        // If using a remote Greenstone check if the collection configurations have been downloaded; do so if not
-        if (Gatherer.isGsdlRemote && !CollectionManager.downloaded_collection_configurations) {
-        if (RemoteGreenstoneServer.downloadCollectionConfigurations().equals("")) {
-            // Something went wrong downloading the collection configurations
-            return;
-        }
-
-        CollectionManager.downloaded_collection_configurations = true;
-        }
-
         // The rest is handled by the DeleteCollectionPrompt
         DeleteCollectionPrompt dc_prompt = new DeleteCollectionPrompt();