Changeset 19547 for gli/trunk/src/org/greenstone/gatherer/gui/PreviewButton.java

Timestamp:

2009-05-21T16:44:28+12:00 (15 years ago)

Author:

ak19

Message:

Fixed up loose ends: restarting an external server - just as relaunching a server from within GLI - will work with the previewbutton.

File:

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

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

@@ -91 +91 @@
     // !! Don't like this here
     LocalLibraryServer.checkServerRunning();
+    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);
+        preview_address = null;
+        return;   
+    } 
     
     // FLI or GLI for GS2 case (no library_url)
@@ -135 +144 @@
         Gatherer.c_man.saveCollection();
         
-        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();
-        }
+        configureHomeURL();
         
         if (Gatherer.GS3) {
@@ -152 +151 @@
         Gatherer.configGS3Server(Configuration.site_name, ServletConfiguration.ADD_COMMAND + Gatherer.c_man.getLoadedCollectionName());
         }
-        Gatherer.spawnBrowser(preview_address);
+        if(preview_address != null) {
+        Gatherer.spawnBrowser(preview_address);
+        }
 
     }