Changeset 4460 for trunk/gli

Timestamp:

2003-06-03T14:06:50+12:00 (21 years ago)

Author:

jmt12

Message:

2030102: The reason metadata importing was dying was that the MSMPrompt was never returning the selected metadata element. Now the ModalDialog acts appropriately this problem is fixed.

File:

• trunk/gli/src/org/greenstone/gatherer/msm/MSMPrompt.java (modified) (6 diffs)

trunk/gli/src/org/greenstone/gatherer/msm/MSMPrompt.java

@@ -763 +763 @@
     // Display
     dialog.setLocation((screen_size.width - SELECT_ELEMENT_SIZE.width) / 2, (screen_size.height - SELECT_ELEMENT_SIZE.height) / 2);
+    System.err.println("Showing selection dialog. Block...");
     dialog.setVisible(true);
+    System.err.println("and release. Returning value.");
     // Deallocate everything because JDK1.4 won't.
     // Why, oh why did I do this?
@@ -872 +874 @@
     // Display
     dialog.setLocation((screen_size.width - SELECT_SET_SIZE.width) / 2, (screen_size.height - SELECT_SET_SIZE.height) / 2);
+    System.err.println("Showing selection dialog. Block...");
     dialog.setVisible(true);
+    System.err.println("and release. Returning value.");
     Object value = set.getSelectedItem();
     if(value instanceof MetadataSet) {
@@ -919 +923 @@
         n = null;
         element = null;
-        dialog.dispose();
+        dialog.setVisible(false);
     }
     }
@@ -958 +962 @@
     public void actionPerformed(ActionEvent event) {
         dialog_cancelled = true;
-        dialog.dispose();
+        dialog.setVisible(false);
     }         
     }
@@ -969 +973 @@
     }
     public void actionPerformed(ActionEvent event) {
-        dialog.dispose();
+        dialog.setVisible(false);
     }
     }
@@ -984 +988 @@
                 // Return the currently selected element
         result = (ElementWrapper)element.getSelectedItem();
-        dialog.dispose();
+        dialog.setVisible(false);
     }
     }