Changeset 32923 for main/trunk/gli/src/org/greenstone/gatherer/Gatherer.java

Timestamp:

2019-03-25T18:13:17+13:00 (5 years ago)

Author:

ak19

Message:

Changes to reinstate SwingUtilities.invokeLater() calls added for GUI testing so that it will still work with the remote GS server. Note however that new Gatherer() calls Gatherer.init() does a lot of GUI stuff too depending on circumstances (such as requestGLIServerURL(), missingGSDL(), missingExec(), popupFedoraInfo(), initCollectDirectoryPath() which calls nonStandardCollectHomeMessage()). But Gatherer.init() is not yet wrapped in an invokeLater(), so this will conflict with GLI GUI testing.

File:

• main/trunk/gli/src/org/greenstone/gatherer/Gatherer.java (modified) (2 diffs)

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

@@ -672 +672 @@
         }
 
+    }
+
+    
+    /** Returns the correct version of the (local or remote) Greenstone server if init() has already been called. */
+    public static int serverVersionNumber() { 
+        return GS3 ? 3 : 2;
+    } 
+
+    /** Returns "Server: version number" if init() has already been called. */
+    public static String getServerVersionAsString() { 
+        return "Server: v" + serverVersionNumber();
+    } 
+
+    public void openGUI()
+    {
+
+        // openGUI() is called on the EDT (graphical/swing thread)
+        // remoteGS.downloadCollectionConfigurations() moved here as it calls remoteGS3.authenticateUser()
+        // which displays a dialog to get user input and therefore belongs on the EDT.
         // If using a remote Greenstone we need to download the collection configurations now
         if (Gatherer.isGsdlRemote) {
@@ -682 +701 @@
             }
         }
-    }
-
-    
-    /** Returns the correct version of the (local or remote) Greenstone server if init() has already been called. */
-    public static int serverVersionNumber() { 
-        return GS3 ? 3 : 2;
-    } 
-
-    /** Returns "Server: version number" if init() has already been called. */
-    public static String getServerVersionAsString() { 
-        return "Server: v" + serverVersionNumber();
-    } 
-
-    public void openGUI()
-    {
+        
         // Size and place the frame on the screen
         Rectangle bounds = Configuration.getBounds("general.bounds", true);