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

Timestamp:

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

Author:

ak19

Message:

What seemed like the key change in the previous commit was unnecessary. The key change was actually just moving new Gatherer() outside of the invokeLater(). Moving the line only caused errors previously because the RemoteGSServer code would return immediately if it was run on the EDT thread, which it now was. But with RemoteGSServer no longer returning if it is run in the EDT thread, the line 'new Gatherer' in GathererProg can now be placed outside of the invokeLater() without also having to move the downloadCollectionConfigurations step from Gatherer.init() into Gatherer.openGLI(). Although the downloadCollectionConfigurations step ends up calling remoteGSServer.downloadFile() which then calls remoteGSServer.authenticateGLI() which displays a dialog, this didn't happen earlier during the dowloadWebXML step possibly due to my then having debugging turned on/unlinking turned off in gliserver.pl so the web zip file was already present and authenticating was shifted to downloadCollConfigurations. Whether that explains it or not, the situation now is that when all of the call to Gatherer.init() from Gatherer constructor is embedded in an invokeAndWait(), the program starts hanging during authenticateUser() of the downloadWebXML task (called from new ServletConfugration step in Gatherer). RemoteGSServer.downloadFile() calls authenticateUser which already runs in an invokeAndWait(), which is the most sensible place in the code to ensure authenticateUser popup happens on the EDT. For this reason, Gatherer.init() call need not be wrapped in entirety in invokeAndWait(). Rather, any individual dialogs called by Gatherer.init() should be made to happen on the EDT herefter. For a list of dialogs called by init() see the previous commit message.

File:

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

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

@@ -671 +671 @@
             // if gsdlsite.cfg does not exist (if using server.exe for instance), the above method will just return
         }
-
-    }
-
-    
-    /** 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) {
@@ -701 +682 @@
             }
         }
-        
+    }
+
+    
+    /** 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);