Changeset 4448

Timestamp:

2003-06-03T12:16:05+12:00 (21 years ago)

Author:

jmt12

Message:

2030100: Since the LockFileDialog has no parent during GLI startup, our magical not-really-modal ModalDialog doesn't work properly. The short-term solution was to revert this to a modal JDialog.

File:

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

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

@@ -14 +14 @@
 import org.w3c.dom.*;
 
+/** A lock file dialog is shown whenever GLI detects an existing lock on a collection it is trying to open. The user can look at the details provided with the dialog, and decide whether to 'steal' the lock or to cancel the loading. While I would have loved to make this one of the modal-but-not-really-modal dialog boxes, it turns out this doesn't work as there is theoretically no parent frame if this dialog is created during GLI startup. So instead I'll use a boring old JDialog and hope that nobody ever asks for a help item to be added to this dialog. */
 public class LockFileDialog
-    extends ModalDialog {
+    extends JDialog {
+    // extends ModalDialog {
 
     private int choice;
@@ -125 +127 @@
 
     public int getChoice() {
-    setVisible(true);
+    show();
+    ///ystem.err.println("Get choice... blocks here.");
+    ///setVisible(true);
+    ///ystem.err.println("Dispose recieved, return.");
     return choice;
     }
@@ -154 +159 @@
         choice = NO_OPTION;
         }
-        self.setVisible(false);
+        ///ystem.err.println("setVisible(false)"); 
+        ///self.setVisible(false);
+        ///ystem.err.println("dispose()");
         self.dispose();
     }