Changeset 8480

Timestamp:

2004-11-08T11:52:49+13:00 (19 years ago)

Author:

mdewsnip

Message:

Fixed the ModalDialog so it works with Java 1.5.0.

Location:

trunk/gli/src/org/greenstone/gatherer

Files:

• Gatherer.java (modified) (1 diff)
• gui/ModalDialog.java (modified) (3 diffs)

trunk/gli/src/org/greenstone/gatherer/Gatherer.java

@@ -46 +46 @@
 import org.greenstone.gatherer.file.FileAssociationManager;
 import org.greenstone.gatherer.gui.GUIManager;
-import org.greenstone.gatherer.gui.ModalDialog;
 import org.greenstone.gatherer.gui.Splash;
 import org.greenstone.gatherer.gui.URLField;

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

@@ -27 +27 @@
 
 import java.awt.*;
+import java.awt.event.*;
 import javax.swing.*;
 import org.greenstone.gatherer.DebugStream;
+
 
 /** An extension of the JDialog that overrides the JVM's typical modal behaviour. This typical behaviour is that when a modal dialog is opened, all other windows cease to respond to user events until the modal dialog is disposed. However this prevents us opening the help documents property whenever a modal dialog is open. Thus we override the modal behaviour so that only the owner frame or dialog is blocked. 
@@ -133 +135 @@
      * @param visible true if this dialog should be painted on-screen, false otherwise.
      */
-    public void setVisible (boolean visible) {
-    if(visible) {
+    public void setVisible(boolean visible)
+    {
+    if (visible) {
         current_modal = this;
     }
@@ -140 +143 @@
         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 (SwingUtilities.isEventDispatchThread()) {
+        super.setVisible(visible);
         if (modal && visible) {
-        ///ystem.err.println("is Event Dispatch Thread. Only process certain events.");
         EventQueue theQueue = getToolkit().getSystemEventQueue();
-        while (isVisible ()) {
+        while (isVisible()) {
             try {
             AWTEvent event = theQueue.getNextEvent();
-            Object src = event.getSource ();
+            Object src = event.getSource();
+
+            // Block all keyboard and mouse events to the parent component
+            if (src.equals(getParent())) {
+                if (event instanceof KeyEvent || event instanceof MouseEvent) {
+                // System.err.println("Event to parent component blocked.");
+                continue;
+                }
+            }
+
+            // Re-dispatch other events
             if (event instanceof ActiveEvent) {
-                ///ystem.err.println("ActiveEvent:");
-                ((ActiveEvent) event).dispatch ();
-            } else if (src instanceof Component) {
-                ///ystem.err.println("Source is component");
-                ((Component) src).dispatchEvent (event);
-            }
-            else {
-                ///ystem.err.println("Event blocked");
+                ((ActiveEvent) event).dispatch();
+            }               
+            else if (src instanceof Component) {
+                ((Component) src).dispatchEvent(event);
             }
             }
-            catch(Exception exception) {
+            catch (Exception exception) {
             DebugStream.printStackTrace(exception);
             }
         }
         }
-    }
-    else {
-        try {
-        SwingUtilities.invokeAndWait(new MakeDialogVisibleTask(this, visible));
-        }
-        catch(Exception exception) {
-        DebugStream.printStackTrace(exception);
-        }
-    }
+    }
+    else {
+        try {
+        SwingUtilities.invokeAndWait(new MakeDialogVisibleTask(this, visible));
+        }
+        catch (Exception exception) {
+        DebugStream.printStackTrace(exception);
+        }
+    }
     }