Changeset 32920

Timestamp:

2019-03-21T16:48:24+13:00 (5 years ago)

Author:

ak19

Message:

EDT related changes for setting up GUI testing worked okay with GLI but break client-GLI. Undoing these changes for the release at least.

Location:

main/trunk/gli/src/org/greenstone/gatherer

Files:

• GathererProg.java (modified) (3 diffs)
• gui/GUIManager.java (modified) (7 diffs)

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

@@ -74 +74 @@
     Gatherer.setGLIDirectoryPath(System.getProperty("user.dir") + File.separator);
     
-
+    // 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
@@ -81 +87 @@
     // Schedule a job for the event-dispatching thread:
         // creating and showing this application's GUI.
-        SwingUtilities.invokeLater(new Runnable() {
+
+    SwingUtilities.invokeLater(new Runnable() {
             public void run() {
         // These lines used to be done immediate after setGLIDirectoryPath() call above
@@ -93 +100 @@
             }
         });
+    */
     }
 }

main/trunk/gli/src/org/greenstone/gatherer/gui/GUIManager.java

@@ -183 +183 @@
     }
     else if (esrc == menu_bar.file_delete) {
-        //new DeleteCollectionTask().start();
-        SwingUtilities.invokeLater(new DeleteCollectionTask());
+        new DeleteCollectionTask().start();
+        //SwingUtilities.invokeLater(new DeleteCollectionTask());
     }
     else if (esrc == menu_bar.file_cdimage) {
@@ -203 +203 @@
     }
         else if (esrc == menu_bar.file_new) {
-        //new NewCollectionTask().start();
-        SwingUtilities.invokeLater(new NewCollectionTask());
+        new NewCollectionTask().start();
+        //SwingUtilities.invokeLater(new NewCollectionTask());
     }
     else if (esrc == menu_bar.file_open) {
-        //new OpenCollectionTask().start(); // will cause an EDT access violation exception
+        new OpenCollectionTask().start(); // will cause an EDT access violation exception
         // since the GUI stuff of opening a collection is not done in a Swing thread
-        SwingUtilities.invokeLater(new OpenCollectionTask());
+        //SwingUtilities.invokeLater(new OpenCollectionTask());
     }
     else if (esrc == menu_bar.file_options) {
@@ -940 +940 @@
 
     private class OpenCollectionTask
-    implements Runnable //extends Thread -> If this extends Thread, it will cause an EDT access
+    extends Thread
+    //implements Runnable //extends Thread -> If this extends Thread, it will cause an EDT access
            // violation since the GUI stuff in run() is not done in the Swing Event Dispatch Thread/EDT.
     {
@@ -988 +989 @@
 
     private class NewCollectionTask
-    implements Runnable //extends Thread
+    extends Thread
+    //implements Runnable //extends Thread
     {
     public void run()
@@ -1020 +1022 @@
 
     private class DeleteCollectionTask
-    implements Runnable //extends Thread
+    extends Thread
+    //implements Runnable //extends Thread
     {
     public void run()
@@ -1089 +1092 @@
     public void updateUI()
     {
-    SwingUtilities.invokeLater(new Runnable() {
-        public void run() {
+    //SwingUtilities.invokeLater(new Runnable() {
+    //  public void run() {
             JPanel pane = (JPanel) getContentPane();
             pane.updateUI();
@@ -1100 +1103 @@
             workflowUpdate("Create", Configuration.get("workflow.create", false));
             workflowUpdate("Format", Configuration.get("workflow.format", false));
-        }
-        });
+        //  }
+        //      });
     }