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

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/gui

Files:

• ExplodeMetadataDatabasePrompt.java (modified) (2 diffs)
• GUIManager.java (modified) (1 diff)
• NewCollectionDetailsPrompt.java (modified) (1 diff)
• Preferences.java (modified) (2 diffs)
• ReplaceSrcDocWithHtmlPrompt.java (modified) (3 diffs)

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

@@ -274 +274 @@
         String collection_name = CollectionManager.getLoadedCollectionName();
         String collection_directory_path = CollectionManager.getCollectionDirectoryPath(collection_name);
-        String metadata_file_relative_path = RemoteGreenstoneServer.getPathRelativeToDirectory(metadata_file, collection_directory_path);
+        String metadata_file_relative_path = Gatherer.remoteGreenstoneServer.getPathRelativeToDirectory(
+                                                          metadata_file, collection_directory_path);
         command_parts_list.add("-file");
         command_parts_list.add(metadata_file_relative_path);
@@ -345 +346 @@
         if (Gatherer.isGsdlRemote) {
             Utility.delete(metadata_file.getParentFile());
-            RemoteGreenstoneServer.downloadCollectionFile(CollectionManager.getLoadedCollectionName(), metadata_file.getParentFile());
+            Gatherer.remoteGreenstoneServer.downloadCollectionFile(
+                             CollectionManager.getLoadedCollectionName(), metadata_file.getParentFile());
         }
 

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

@@ -438 +438 @@
         remote_greenstone_server_progress_panel.setLayout(new BorderLayout());
         remote_greenstone_server_progress_panel.add(remote_greenstone_server_progress_label, BorderLayout.WEST);
-        remote_greenstone_server_progress_panel.add(RemoteGreenstoneServer.getProgressBar(), BorderLayout.CENTER);
+        remote_greenstone_server_progress_panel.add(Gatherer.remoteGreenstoneServer.getProgressBar(), BorderLayout.CENTER);
         content_pane.add(remote_greenstone_server_progress_panel, BorderLayout.SOUTH);
         }

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

@@ -259 +259 @@
     // Remote collections that aren't shared have the user's username prefixed to the collection name
     if (Gatherer.isGsdlRemote && personal_collection_button.isSelected()) {
-        name_buffer = new StringBuffer(RemoteGreenstoneServer.getUsername() + "-" + name_buffer.toString());
+        name_buffer = new StringBuffer(Gatherer.remoteGreenstoneServer.getUsername() + "-" + name_buffer.toString());
     }
 

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

@@ -826 +826 @@
         Configuration.save();
         if (Gatherer.isGsdlRemote && Gatherer.GS3 && site_changed ){
-        RemoteGreenstoneServer.downloadCollectionConfigurations();
+        Gatherer.remoteGreenstoneServer.downloadCollectionConfigurations();
         }
         // Refresh the GLI to account for the configuration changes
@@ -956 +956 @@
             if (Gatherer.c_man.getCollection()!=null){
             File lock_file = new File(Gatherer.c_man.getLoadedCollectionDirectoryPath() + "gli.lck");
-            RemoteGreenstoneServer.deleteCollectionFile(Gatherer.c_man.getLoadedCollectionName(),lock_file);
+            Gatherer.remoteGreenstoneServer.deleteCollectionFile(Gatherer.c_man.getLoadedCollectionName(),lock_file);
             Gatherer.g_man.closeCurrentCollection();
             }
             Configuration.site_name=site;
-            RemoteGreenstoneServer.set_remote_greenstone_server_authentication_to_null();
-            RemoteGreenstoneServer.downloadCollectionConfigurations();
+            Gatherer.remoteGreenstoneServer.set_remote_greenstone_server_authentication_to_null();
+            Gatherer.remoteGreenstoneServer.downloadCollectionConfigurations();
         }
         }

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

@@ -272 +272 @@
         String collection_name = CollectionManager.getLoadedCollectionName();
         String collection_directory_path = CollectionManager.getCollectionDirectoryPath(collection_name);
-        String srcdoc_file_relative_path = RemoteGreenstoneServer.getPathRelativeToDirectory(
+        String srcdoc_file_relative_path = Gatherer.remoteGreenstoneServer.getPathRelativeToDirectory(
         this.srcdoc_files[fileNum], collection_directory_path); // preserves spaces in filename
         command_parts_list.add("-file");
@@ -382 +382 @@
             // download the generated html file from the server side to put it 
             // into the import directory on the client side
-            RemoteGreenstoneServer.downloadCollectionFile(
+            Gatherer.remoteGreenstoneServer.downloadCollectionFile(
                           CollectionManager.getLoadedCollectionName(),
                           new File(srcdoc_files[i].getParentFile(), htmlFile));
@@ -389 +389 @@
             File assoc_folder = new File(srcdoc_files[i].getParentFile(), suffixlessFilename+"_files");
             // If an associated_folder by such a name exists, download it
-            if(RemoteGreenstoneServer.exists(CollectionManager.getLoadedCollectionName(), assoc_folder)) {
-              RemoteGreenstoneServer.downloadCollectionFile(
+            if(Gatherer.remoteGreenstoneServer.exists(CollectionManager.getLoadedCollectionName(), assoc_folder)) {
+              Gatherer.remoteGreenstoneServer.downloadCollectionFile(
                                     CollectionManager.getLoadedCollectionName(), assoc_folder);
             }