Changeset 32923 for main/trunk/gli/src/org/greenstone/gatherer/GathererProg.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/GathererProg.java (modified) (2 diffs)

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

@@ -76 +76 @@
     // Create an instance of the Gatherer class, which will parse the args and prepare the rest of the GLI
     Gatherer gatherer = new Gatherer(args);
-    
-    // Display the GUI immediately
-    gatherer.openGUI();
-    
-    /*  
+        
     // TESTING circumventing the old GUI event dispatch thread exceptions in GLI. Follows
     // https://docs.oracle.com/javase/6/docs/api/javax/swing/package-summary.html#threading
@@ -90 +86 @@
     SwingUtilities.invokeLater(new Runnable() {
             public void run() {
-        // These lines used to be done immediate after setGLIDirectoryPath() call above
-        // but are now inside an invokeLater().
-        
-        // Create an instance of the Gatherer class, which will parse the args and prepare the rest of the GLI
-        Gatherer gatherer = new Gatherer(args);
-        
+        // This line used to be done immediately after setGLIDirectoryPath()
+        // and new Gatherer() above, but is now inside an invokeLater() to do graphical stuff here.
+
         // Display the GUI immediately
         gatherer.openGUI();
             }
         });
-    */
+    
     }
 }