Changeset 6641

Timestamp:

2004-01-28T14:50:48+13:00 (20 years ago)

Author:

jmt12

Message:

In an attempt to solve the intermitant spooty modal dialog hang bug, which seems to be caused by realizing a modal dialog in a thread other than the AWT Event Thread while something else is being painted, all ModalDialogs are queued to be realized by Swing Thread Workers.

File:

• trunk/gli/src/org/greenstone/gatherer/gui/ModalDialog.java (modified) (2 diffs)

trunk/gli/src/org/greenstone/gatherer/gui/ModalDialog.java

@@ -133 +133 @@
      */
     public void setVisible (boolean visible) {
-    ///ystem.err.println("setVisible(" + visible + ")");
-    getParent ().setEnabled (!(visible && modal));
-    super.setVisible (visible);
-    if (modal && visible) {
+    if(visible) {
         Gatherer.current_modal = this;
-        try {
-        if (SwingUtilities.isEventDispatchThread ()) {
-            ///ystem.err.println("is Event Dispatch Thread. Only process certain events.");
-            EventQueue theQueue = getToolkit().getSystemEventQueue();
-            while (isVisible ()) {
+    }
+    else {
+        Gatherer.current_modal = null;
+    }
+    // If we are in the AWT Dispatch thread then it is all good.
+    if (SwingUtilities.isEventDispatchThread ()) {
+        getParent ().setEnabled (!(visible && modal));
+        super.setVisible (visible);
+        if (modal && visible) {
+        ///ystem.err.println("is Event Dispatch Thread. Only process certain events.");
+        EventQueue theQueue = getToolkit().getSystemEventQueue();
+        while (isVisible ()) {
+            try {
             AWTEvent event = theQueue.getNextEvent();
             Object src = event.getSource ();
@@ -156 +161 @@
             }
             }
-            ///ystem.err.println("No longer visible - AWT");
-                } else synchronized (getTreeLock ()) {
-            ///ystem.err.println("is other Thread. Block all events.");
-            while (isVisible ()) {
-            try {
-                waiting = true;
-                getTreeLock().wait();
-                waiting = false;
-            } catch (InterruptedException e) {
-                ///ystem.err.println("Interrupted!!!");
-                break;
-            }
+            catch(Exception exception) {
+            Gatherer.printStackTrace(exception);
             }
-            ///ystem.err.println("No longer visible - Other");
         }
-            } catch (Exception ex) { 
-        ex.printStackTrace(); 
         }
     }
-    else if(modal && !visible && waiting) {
-        Gatherer.current_modal = null;
-        ///ystem.err.println("Hiding dialog. Tree lock is: " + getTreeLock());
-        synchronized(getTreeLock()) {
-        ///ystem.err.println("Notify!");
-        getTreeLock().notify();
+    else {
+        try {
+        SwingUtilities.invokeAndWait(new MakeDialogVisibleTask(this, visible));
         }
-    }
-    else if(modal && !waiting) {
-        Gatherer.current_modal = null;
-        ///ystem.err.println("Modal Dialog is not currently waiting.");
-    }
-    else if(!modal) {
-        ///ystem.err.println("Dialog is not modal.");
+        catch(Exception exception) {
+        Gatherer.printStackTrace(exception);
+        }
     }
     }
     
+    private class MakeDialogVisibleTask
+    implements Runnable {
+    private boolean make_visible;
+    private ModalDialog dialog;
+    public MakeDialogVisibleTask(ModalDialog dialog, boolean make_visible) {
+        this.dialog = dialog;
+        this.make_visible = make_visible;
+    }
+    public void run() {
+        // Blocks until the user dismisses the dialog
+        dialog.setVisible(make_visible);
+    }
+    }
+
     /** Overridden method so we can control modality and not rely on the Dialog default.
      * @param modal true if this dialog should be modal, ie block user actions to its owner window, false otherwise.