Changeset 6155

Timestamp:

2003-12-08T14:31:50+13:00 (20 years ago)

Author:

jmt12

Message:

Changed file format to unix

File:

• trunk/gli/src/org/greenstone/gatherer/gui/WarningDialog.java (modified) (5 diffs)

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

@@ -7 +7 @@
 import org.greenstone.gatherer.Dictionary;
 import org.greenstone.gatherer.Gatherer;
-import org.greenstone.gatherer.util.FocusChangerTask;
 import org.greenstone.gatherer.util.Utility;
 
 /** Warn a user that they are about to add folder level metadata. */
 public class WarningDialog
-    extends JDialog 
+    extends ModalDialog 
     implements ActionListener, KeyListener {
 
@@ -104 +103 @@
     ok_button.addKeyListener(this);
     cancel_button.addKeyListener(this);
+    getRootPane().setDefaultButton(ok_button);
 
     // Layout
@@ -179 +179 @@
         }
         // Done.
-        dispose();
+        setVisible(false);
     }
     else {
@@ -207 +207 @@
     if(Gatherer.config == null || Gatherer.config.get(full_property, false)) {
         // Create and run the shortlived move focus thread
-        FocusChangerTask task = null;
-        if(affected_property != null) {
-        task = new FocusChangerTask(value_field);
-        }
-        else {
-        task = new FocusChangerTask(ok_button);
-        }
-        task.start();
-        show();
+        //FocusChangerTask task = null;
+        //if(affected_property != null) {
+        //  task = new FocusChangerTask(value_field);
+        //}
+        //else {
+        //  task = new FocusChangerTask(ok_button);
+        //}
+        //task.start();
+        //show();
+        setVisible(true);
     }
     // We are no longer showing this dialog, so result must always be true.
@@ -235 +236 @@
     value_panel.add(value_field, BorderLayout.CENTER);
     }
+
+    protected void processWindowEvent(WindowEvent event) {
+    if(event.getID() == WindowEvent.WINDOW_ACTIVATED) {
+        if(affected_property != null) {
+        value_field.requestFocus();
+        }
+        else {
+        ok_button.requestFocus();
+        }
+    }
+    else {
+        super.processWindowEvent(event);
+    }
+    }
 }
+
+
+
+
+
+
+
+