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

Timestamp:

2018-12-18T19:23:21+13:00 (5 years ago)

Author:

ak19

Message:

1. Some dialogs do not exist when GLI starts up and becomes visible. These dialogs only get created when the user launches them, such as the new collection dialog appearing when you choose it through the file menu. When testing, such locally instantiated dialogs need to have setNamesRecursively() called on their GUI components too before setVisible() is called on them. 2. Leaving in instances of what I think are safe calls to SwingUntilities.invokeLater() to fix EDT violation exceptions detected during testing, but not committing those cases where I've made the change that actually need proper fixing by using SwingWorker threads.

File:

• main/trunk/gli/src/org/greenstone/gatherer/gui/GUIManager.java (modified) (7 diffs)

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

@@ -183 +183 @@
     }
     else if (esrc == menu_bar.file_delete) {
-        new DeleteCollectionTask().start();
+        //new DeleteCollectionTask().start();
+        SwingUtilities.invokeLater(new DeleteCollectionTask());
     }
     else if (esrc == menu_bar.file_cdimage) {
@@ -193 +194 @@
     else if (esrc == menu_bar.file_exportas) {
         ExportAsPrompt eap = new ExportAsPrompt();
+        TestingPreparation.setNamesRecursively(eap);
         eap.display();
         eap.destroy();
@@ -201 +203 @@
     }
         else if (esrc == menu_bar.file_new) {
-        new NewCollectionTask().start();
+        //new NewCollectionTask().start();
+        SwingUtilities.invokeLater(new NewCollectionTask());
     }
     else if (esrc == menu_bar.file_open) {
@@ -985 +988 @@
 
     private class NewCollectionTask
-    extends Thread
+    implements Runnable //extends Thread
     {
     public void run()
     {
         // Create the collection details prompt from new collection prompt
-        NewCollectionDetailsPrompt ncd_prompt = new NewCollectionDetailsPrompt();
+        NewCollectionDetailsPrompt ncd_prompt = new NewCollectionDetailsPrompt();       
+        //TestingPreparation.setNamesRecursively(ncd_prompt);
+        // 1. names have to be set in NewCollectionDetailsPrompt, as it makes itself visible
+        // and for testing we have to have run setName() on its components before the dialog goes visible
+        // 2. For whatever reason, the NewCollectionDetailsPrompt dialog's own name is set
+        // to "col" and it's not possible to change it at any point before or after
+        // creating the dialog, and whether from inside or outside the dialog's own class
 
         // Create the new collection (if not cancelled) in a new thread.
@@ -1011 +1020 @@
 
     private class DeleteCollectionTask
-    extends Thread
+    implements Runnable //extends Thread
     {
     public void run()
@@ -1017 +1026 @@
         // The rest is handled by the DeleteCollectionPrompt
         DeleteCollectionPrompt dc_prompt = new DeleteCollectionPrompt();
+        TestingPreparation.setNamesRecursively(dc_prompt);
         if (dc_prompt.display()) {
         //closeCurrentCollection();
@@ -1079 +1089 @@
     public void updateUI()
     {
-    JPanel pane = (JPanel) getContentPane();
-    pane.updateUI();
-    // Also update all of the tabs according to workflow.
-    workflowUpdate("Download", Configuration.get("workflow.download", false));
-    workflowUpdate("Gather", Configuration.get("workflow.gather", false));
-    workflowUpdate("Enrich", Configuration.get("workflow.enrich", false));
-    workflowUpdate("Design", Configuration.get("workflow.design", false));
-    workflowUpdate("Create", Configuration.get("workflow.create", false));
-    workflowUpdate("Format", Configuration.get("workflow.format", false));
+    SwingUtilities.invokeLater(new Runnable() {
+        public void run() {
+            JPanel pane = (JPanel) getContentPane();
+            pane.updateUI();
+            // Also update all of the tabs according to workflow.
+            workflowUpdate("Download", Configuration.get("workflow.download", false));
+            workflowUpdate("Gather", Configuration.get("workflow.gather", false));
+            workflowUpdate("Enrich", Configuration.get("workflow.enrich", false));
+            workflowUpdate("Design", Configuration.get("workflow.design", false));
+            workflowUpdate("Create", Configuration.get("workflow.create", false));
+            workflowUpdate("Format", Configuration.get("workflow.format", false));
+        }
+        });
     }