Changeset 9340

Timestamp:

2005-03-09T14:14:50+13:00 (19 years ago)

Author:

mdewsnip

Message:

Changed to use Gatherer.g_man.wait() instead of setModal() to implement its modality. This makes it a lot easier to use and prevents nasty race conditions.

File:

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

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

@@ -41 +41 @@
 
     private String message = null;
-    private JProgressBar progress_bar = null;
 
 
-    /** Constructor */
     public ModalProgressPopup(String title, String message)
     {
     super(Gatherer.g_man, title);
-
     this.message = message;
     }
 
 
-    /** Method to display the popup on screen.
-     */
+    /** Method to close the popup. */
+    public void close()
+    {
+    setVisible(false);
+    Gatherer.g_man.wait(false);
+    }
+
+
+    /** Method to display the popup on screen. */
     public void display()
     {
     setDefaultCloseOperation(DO_NOTHING_ON_CLOSE);
-    setModal(true);
     setSize(SIZE);
 
     // Create
-    progress_bar = new JProgressBar();
+    JProgressBar progress_bar = new JProgressBar();
     progress_bar.setIndeterminate(true);
 
@@ -75 +78 @@
     setLocation((screen_size.width - SIZE.width) / 2, (screen_size.height - SIZE.height) / 2);
     setVisible(true);
+
+    // Lock the rest of the GLI interface until close() is called
+    Gatherer.g_man.wait(true);
     }
 }