Changeset 8256 for trunk/gli/src/org

Timestamp:

2004-10-08T16:07:35+13:00 (20 years ago)

Author:

mdewsnip

Message:

Moved the current_modal static variable out of the Gatherer class into the ModalDialog class. This removes more dependencies on the Gatherer class.

Location:

trunk/gli/src/org/greenstone/gatherer

Files:

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

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

@@ -98 +98 @@
     /** a reference to the Servlet Configuration is GS3 */
     static public ServletConfiguration servlet_config;
-    /** The current modal dialog being shown on screen, if any. */
-    static public ModalDialog current_modal = null;
     /** A public reference to the Dictionary. */
     static public Dictionary dictionary;

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

@@ -146 +146 @@
     extends FocusAdapter {
     public void focusGained(FocusEvent e) {
-        if(Gatherer.current_modal != null) {
-        Gatherer.current_modal.makeVisible();
-        Gatherer.current_modal.toFront();
+        if (ModalDialog.current_modal != null) {
+        ModalDialog.current_modal.makeVisible();
+        ModalDialog.current_modal.toFront();
         }
     }

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

@@ -37 +37 @@
 public class ModalDialog
     extends JDialog {
+
+    /** The current modal dialog being shown on screen, if any. */
+    static public ModalDialog current_modal = null;
+
     /** true if this dialog should be modal, ie block user actions to its owner window, false otherwise. */
     protected boolean modal = false;
@@ -131 +135 @@
     public void setVisible (boolean visible) {
     if(visible) {
-        Gatherer.current_modal = this;
+        current_modal = this;
     }
     else {
-        Gatherer.current_modal = null;
+        current_modal = null;
     }
     // If we are in the AWT Dispatch thread then it is all good.