Changeset 17612 for gli/trunk/src/org/greenstone/gatherer/cdm

Timestamp:

2008-10-24T17:45:51+13:00 (16 years ago)

Author:

ak19

Message:

Turned class RemoteGreenstoneServer.java from an all-static class into a regular OOP class. It is now also split into three files (the other two being ActionQueue.java and RemoteGreenstoneServerAction.java).

Location:

gli/trunk/src/org/greenstone/gatherer/cdm

Files:

• CollectionConfiguration.java (modified) (2 diffs)
• GeneralManager.java (modified) (1 diff)
• MacrosManager.java (modified) (1 diff)

gli/trunk/src/org/greenstone/gatherer/cdm/CollectionConfiguration.java

@@ -3707 +3707 @@
         // If we're using a remote Greenstone server, upload the new 'collectionConfig.xml' file
         if (Gatherer.isGsdlRemote) {
-            RemoteGreenstoneServer.uploadCollectionFile (collection_name, collect_cfg_file);
+            Gatherer.remoteGreenstoneServer.uploadCollectionFile (collection_name, collect_cfg_file);
         }
         
@@ -3799 +3799 @@
             // If we're using a remote Greenstone server, upload the new collect.cfg file
             if (Gatherer.isGsdlRemote) {
-                RemoteGreenstoneServer.uploadCollectionFile (collection_name, collect_cfg_file);
+                Gatherer.remoteGreenstoneServer.uploadCollectionFile (collection_name, collect_cfg_file);
             }
         }

gli/trunk/src/org/greenstone/gatherer/cdm/GeneralManager.java

@@ -344 +344 @@
                 // If we're using a remote Greenstone server, upload the image
                 if (Gatherer.isGsdlRemote) {
-                RemoteGreenstoneServer.uploadCollectionFile(CollectionManager.getLoadedCollectionName(), collection_image_file);
+                Gatherer.remoteGreenstoneServer.uploadCollectionFile(
+                                   CollectionManager.getLoadedCollectionName(), collection_image_file);
                 }
             }

gli/trunk/src/org/greenstone/gatherer/cdm/MacrosManager.java

@@ -217 +217 @@
         // Users need to wait until the upload has finished before pressing Preview Collection!
         if (Gatherer.isGsdlRemote) {
-            RemoteGreenstoneServer.uploadCollectionFile(CollectionManager.getLoadedCollectionName(), extra_dm_file);
+            Gatherer.remoteGreenstoneServer.uploadCollectionFile(CollectionManager.getLoadedCollectionName(), extra_dm_file);
         }
         }