Changeset 17612 for gli/trunk/src/org/greenstone/gatherer/shell/GShell.java

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).

File:

• gli/trunk/src/org/greenstone/gatherer/shell/GShell.java (modified) (4 diffs)

gli/trunk/src/org/greenstone/gatherer/shell/GShell.java

@@ -217 +217 @@
         System.err.println("Script args: " + script_args);
         buffered_output_stream = bos;
-        String command_output = RemoteGreenstoneServer.runScript(collection_name, script_name, script_args, this);
+        String command_output = Gatherer.remoteGreenstoneServer.runScript(collection_name, script_name, script_args, this);
         status = (command_output.equals("") ? CANCELLED : OK);
     }
@@ -383 +383 @@
         if (type == NEW) {
         if (Gatherer.isGsdlRemote) {
-            RemoteGreenstoneServer.downloadCollection(col_name);
+            Gatherer.remoteGreenstoneServer.downloadCollection(col_name);
         }
         }
@@ -395 +395 @@
             }
 
-            RemoteGreenstoneServer.downloadCollectionArchives(col_name);
+            Gatherer.remoteGreenstoneServer.downloadCollectionArchives(col_name);
 
             if (progress!=null) {
@@ -428 +428 @@
             // Only need to download build.cfg file
             File build_cfg_file = new File(CollectionManager.getLoadedCollectionBuildingDirectoryPath(), "build.cfg");
-            RemoteGreenstoneServer.downloadCollectionFile(col_name, build_cfg_file);
+            Gatherer.remoteGreenstoneServer.downloadCollectionFile(col_name, build_cfg_file);
             }else{
             // Only need to download buildConfig.xml file
             File buildConfig_xml_file = new File(CollectionManager.getLoadedCollectionBuildingDirectoryPath(), "buildConfig.xml");
-            RemoteGreenstoneServer.downloadCollectionFile(col_name, buildConfig_xml_file);
+            Gatherer.remoteGreenstoneServer.downloadCollectionFile(col_name, buildConfig_xml_file);
             }