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

Timestamp:

2009-05-20T18:50:16+12:00 (15 years ago)

Author:

ak19

Message:

Put back and corrected the GLI code that was recently reverted for dealing with a GSI that's started independently of GLI (via gs2-server.sh) and which has started the server or not yet autoentered the library. Now it works for Linux.

File:

• gli/trunk/src/org/greenstone/gatherer/gui/PreviewButton.java (modified) (2 diffs)

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

@@ -35 +35 @@
 import javax.swing.*;
 import org.greenstone.gatherer.Configuration;
+import org.greenstone.gatherer.Dictionary;
 import org.greenstone.gatherer.Gatherer;
 import org.greenstone.gatherer.collection.CollectionManager;
@@ -134 +135 @@
         Gatherer.c_man.saveCollection();
         
-        configureHomeURL();
+        if(LocalLibraryServer.isURLPending()) {
+        // Remind the user to press Enter Library, and return from this method
+        JOptionPane.showMessageDialog(Gatherer.g_man,
+                          Dictionary.get("General.LLS_Not_Started"), 
+                          Dictionary.get("General.LLS_Not_Started_Title"),
+                          JOptionPane.ERROR_MESSAGE);
+        return;
+        
+        } else {
+        configureHomeURL();
+        }
         
         if (Gatherer.GS3) {