Changeset 6622 for trunk/gli/src/org/greenstone/gatherer/gui/ModalDialog.java

Timestamp:

2004-01-27T16:35:34+13:00 (20 years ago)

Author:

jmt12

Message:

More modifications to mirroring including testing for a valid version of Wget (and complaining if its missing or it is old) and rearranging buttons on the GProgressBar

File:

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

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

@@ -49 +49 @@
     public ModalDialog() {
     super((Frame)null, "", false);
-    Gatherer.current_modal = this;
     }
 
@@ -57 +56 @@
     public ModalDialog(Dialog parent) {
     super(parent, "", false);
-    Gatherer.current_modal = this;
     }
 
@@ -67 +65 @@
     super(parent, "", false);
     this.modal = modal;
-    Gatherer.current_modal = this;
     }
     
@@ -77 +74 @@
     super (parent, title, false);
     this.modal = false;
-    Gatherer.current_modal = this;
     }
 
@@ -88 +84 @@
     super (parent, title, false);
     this.modal = modal;
-    Gatherer.current_modal = this;
     }
 
@@ -96 +91 @@
     public ModalDialog(Frame parent) {
     super(parent, "", false);
-    Gatherer.current_modal = this;
     }
 
@@ -106 +100 @@
     super(parent, "", false);
     this.modal = modal;
-    Gatherer.current_modal = this;
     }
     
@@ -115 +108 @@
     public ModalDialog(Frame parent, String title) {
     super (parent, title, false);
-    Gatherer.current_modal = this;
     }
 
@@ -126 +118 @@
     super (parent, title, false);
     this.modal = modal;
-    Gatherer.current_modal = this;
     }
 
     public void dispose() {
-    Gatherer.current_modal = null;
     super.dispose();
+    }
+
+    /** Ensures the current dialog is visible. */
+    public void makeVisible() {
+    super.setVisible(true);
     }
 
@@ -142 +137 @@
     super.setVisible (visible);
     if (modal && visible) {
+        Gatherer.current_modal = this;
         try {
         if (SwingUtilities.isEventDispatchThread ()) {
@@ -180 +176 @@
     }
     else if(modal && !visible && waiting) {
+        Gatherer.current_modal = null;
         ///ystem.err.println("Hiding dialog. Tree lock is: " + getTreeLock());
         synchronized(getTreeLock()) {
@@ -187 +184 @@
     }
     else if(modal && !waiting) {
+        Gatherer.current_modal = null;
         ///ystem.err.println("Modal Dialog is not currently waiting.");
     }