Changeset 17612 for gli/trunk/src/org/greenstone/gatherer/Gatherer.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/Gatherer.java (modified) (6 diffs)

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

@@ -85 +85 @@
 
     static private Dimension size = new Dimension(800, 540);
+    static public RemoteGreenstoneServer remoteGreenstoneServer = null;
 
     /** Has the exit flag been set? */
@@ -299 +300 @@
         // Finally, we're ready to find out the version of the remote Greenstone server 
         if(isGsdlRemote) {
+        // instantiate the RemoteGreenstoneServer object first
+        remoteGreenstoneServer = new RemoteGreenstoneServer();
+
         int greenstoneVersion = 2;
         requestGLIServerURL();
         gliserver_url_string = Configuration.gliserver_url.toString();
         
-        greenstoneVersion = RemoteGreenstoneServer.getGreenstoneVersion();
+        greenstoneVersion = remoteGreenstoneServer.getGreenstoneVersion();
         // Display the version to make error reports a lot more useful
         System.err.println("Remote Greenstone server version: " + greenstoneVersion);
@@ -316 +320 @@
             library_url_string = fedora_info.getLibraryURL();
         } else {
-            library_url_string = RemoteGreenstoneServer.getLibraryURL(Configuration.gliserver_url.toString());
+            library_url_string = remoteGreenstoneServer.getLibraryURL(Configuration.gliserver_url.toString());
         }
         }
@@ -472 +476 @@
     // If using a remote Greenstone we need to download the collection configurations now
     if (Gatherer.isGsdlRemote) {
-        if (RemoteGreenstoneServer.downloadCollectionConfigurations().equals("")) {
+        if (remoteGreenstoneServer.downloadCollectionConfigurations().equals("")) {
         // !! Something went wrong downloading the collection configurations
         System.err.println("Error: Could not download collection configurations.");
@@ -551 +555 @@
     // If using a remote Greenstone we need to download the collection configurations now
     if (Gatherer.isGsdlRemote) {
-        if (RemoteGreenstoneServer.downloadCollectionConfigurations().equals("")) {
+        if (remoteGreenstoneServer.downloadCollectionConfigurations().equals("")) {
         // !! Something went wrong downloading the collection configurations
         System.err.println("Error: Could not download collection configurations.");
@@ -616 +620 @@
     // If we're using a remote Greenstone server we need to make sure that all jobs have completed first
     if (isGsdlRemote) {
-        RemoteGreenstoneServer.exit();
+        remoteGreenstoneServer.exit();
     }