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

Timestamp:

2005-10-14T15:19:36+13:00 (19 years ago)

Author:

mdewsnip

Message:

(MAJOR CHANGE) This is the remote Greenstone building functionality implemented for the West Yorkshire Fire and Rescue Service. It allows collections to be built without having a local version of Greenstone, using either a stand-alone version of the GLI or the applet.

The collections are stored on the server (allowing people to collaborate on collections -- but not at the same time), and only what is necessary to let the user edit the collection is downloaded. Any changes to the collection are uploaded to the server.

An access restriction mechanism is implemented which uses the standard Greenstone user database to control who has access to collections.

File:

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

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

@@ -54 +54 @@
 import org.greenstone.gatherer.Gatherer;
 import org.greenstone.gatherer.collection.Collection;
+import org.greenstone.gatherer.collection.CollectionManager;
 import org.greenstone.gatherer.file.FileOpenActionListener;
 import org.greenstone.gatherer.file.WorkspaceTree;
@@ -394 +395 @@
         content_pane.add(tab_pane, BorderLayout.CENTER);
 
+        // Add an extra progress bar at the bottom of every screen when using a remote Greenstone server
+        if (Gatherer.isGsdlRemote) {
+        JPanel remote_greenstone_server_progress_panel = new JPanel();
+        JLabel remote_greenstone_server_progress_label = new JLabel(Dictionary.get("RemoteGreenstoneServer.Progress"));
+        remote_greenstone_server_progress_panel.setBorder(BorderFactory.createEmptyBorder(5,5,5,5));
+        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);
+        content_pane.add(remote_greenstone_server_progress_panel, BorderLayout.SOUTH);
+        }
+
         // Call refresh to update all controls to reflect current collection status.
         refresh(-1, Gatherer.c_man.ready());
@@ -641 +653 @@
     {
         // If using a remote Greenstone check if the collection configurations have been downloaded; do so if not
-        if (Gatherer.isGsdlRemote) {
-        File collect_directory = new File(Gatherer.getCollectDirectoryPath());
-        if (!collect_directory.exists() || collect_directory.listFiles().length == 0) {
-            if (!RemoteGreenstoneServer.downloadCollectionConfigurations()) {
-            // Something went wrong downloading the collection configurations
-            return;
-            }
-        }
+        if (Gatherer.isGsdlRemote && !CollectionManager.downloaded_collection_configurations) {
+        if (RemoteGreenstoneServer.downloadCollectionConfigurations().equals("")) {
+            // Something went wrong downloading the collection configurations
+            return;
+        }
+
+        CollectionManager.downloaded_collection_configurations = true;
         }
 
@@ -712 +723 @@
     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
         NewCollectionMetadataPrompt ncm_prompt = null;
-        // Create the collection details prompt from new collection prompt
         NewCollectionDetailsPrompt ncd_prompt = new NewCollectionDetailsPrompt();
         // If no previous collection was indicated as a model design, then show the metadata selection prompt from new collection prompt