Changeset 4458

Timestamp:

2003-06-03T14:04:26+12:00 (21 years ago)

Author:

jmt12

Message:

2030102: If the modal dialog was opened by any thread other than the DispatchThread, then it was being blocked with wait() but never being sent notify(). It does now.

File:

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

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

@@ -40 +40 @@
     /** true if this dialog should be modal, ie block user actions to its owner window, false otherwise. */
     protected boolean modal = false;
-
+    /** true if this dialog is currently waiting some thread. */
+    protected boolean waiting = false;
     /** Constructor.
      */
@@ -119 +120 @@
      */
     public void setVisible (boolean visible) {
+    ///ystem.err.println("setVisible(" + visible + ")");
     getParent ().setEnabled (!(visible && modal));
     super.setVisible (visible);
-    if (modal && visible)
+    if (modal && visible) {
         try {
         if (SwingUtilities.isEventDispatchThread ()) {
+            ///ystem.err.println("is Event Dispatch Thread.");
             EventQueue theQueue = getToolkit().getSystemEventQueue();
             while (isVisible ()) {
@@ -134 +137 @@
             }
             }
+            ///ystem.err.println("No longer visible - AWT");
                 } else synchronized (getTreeLock ()) {
-            while (isVisible ())
+            ///ystem.err.println("is other Thread.");
+            while (isVisible ()) {
             try {
+                waiting = true;
                 getTreeLock().wait();
+                waiting = false;
             } catch (InterruptedException e) {
+                ///ystem.err.println("Interrupted!!!");
                 break;
             }
+            ///ystem.err.println("No longer visible - Other");
+            }
         }
             } catch (Exception ex) { 
         ex.printStackTrace(); 
         }
+    }
+    else if(modal && !visible && waiting) {
+        ///ystem.err.println("Tree lock is: " + getTreeLock());
+        synchronized(getTreeLock()) {
+        ///ystem.err.println("Notify!");
+        getTreeLock().notify();
+        }
+    }
     }