Changeset 4519

Timestamp:

2003-06-09T13:00:47+12:00 (21 years ago)

Author:

mdewsnip

Message:

Moved the functionality of the "Append" button into a new thread, to hopefully prevent some nasty AWT deadlocks. Not very confident about it.

File:

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

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

@@ -205 +205 @@
     Object esrc = event.getSource();
     if(esrc == add) {
+        (new AppendMetadataTask()).start();
+    }
+    else if(esrc == update) {
+        // You can only update if there is a selected_metadata and
+        // you have valid values in all fields.
+        ElementWrapper element = tree.getSelectedMetadataElement();
+        String value = tree.getSelectedValue();
+        if(selected_metadata != null && records != null && element != null && value != null) {
+        selected_metadata = Gatherer.c_man.getCollection().msm.updateMetadata(System.currentTimeMillis(), selected_metadata, records, value, MetaEditPrompt.OVERWRITE, selected_metadata.isFileLevel());
+        }
+        GValueNode value_node = ((GValueModel) tree.getModel()).addValue(value);
+        model.setSelectedMetadata(new Metadata(element, value_node));
+    }
+    else if(esrc == remove) {
+        if(selected_metadata != null && records != null) {
+        Gatherer.c_man.getCollection().msm.removeMetadata(System.currentTimeMillis(), selected_metadata, records);
+        }
+    }
+    else if(esrc == expand) {
+        EditorDialog ed = new EditorDialog();
+        String temp = ed.display(tree.getSelectedValue());
+        if(temp != null) {
+        tree.setSelectedValue(temp);
+        }
+    }
+    //else if(esrc == assigned_metadata_view || esrc == unassigned_metadata_view) {
+    //  model.changeView();
+    //}
+    validateControls();
+    }
+
+    private class AppendMetadataTask
+    extends Thread {
+
+    AppendMetadataTask() {
+    }
+
+    public void run() {
         // Check the new metadata is valid
         ElementWrapper element = tree.getSelectedMetadataElement();
@@ -222 +260 @@
         }
         GValueNode value_node = ((GValueModel) tree.getModel()).addValue(value);
+        System.err.println("Back from model.addValue()...");
         model.setSelectedMetadata(new Metadata(element, value_node));
-        }
-    }
-    else if(esrc == update) {
-        // You can only update if there is a selected_metadata and
-        // you have valid values in all fields.
-        ElementWrapper element = tree.getSelectedMetadataElement();
-        String value = tree.getSelectedValue();
-        if(selected_metadata != null && records != null && element != null && value != null) {
-        selected_metadata = Gatherer.c_man.getCollection().msm.updateMetadata(System.currentTimeMillis(), selected_metadata, records, value, MetaEditPrompt.OVERWRITE, selected_metadata.isFileLevel());
-        }
-        GValueNode value_node = ((GValueModel) tree.getModel()).addValue(value);
-        model.setSelectedMetadata(new Metadata(element, value_node));
-    }
-    else if(esrc == remove) {
-        if(selected_metadata != null && records != null) {
-        Gatherer.c_man.getCollection().msm.removeMetadata(System.currentTimeMillis(), selected_metadata, records);
-        }
-    }
-    else if(esrc == expand) {
-        EditorDialog ed = new EditorDialog();
-        String temp = ed.display(tree.getSelectedValue());
-        if(temp != null) {
-        tree.setSelectedValue(temp);
-        }
-    }
-    //else if(esrc == assigned_metadata_view || esrc == unassigned_metadata_view) {
-    //  model.changeView();
-    //}
-    validateControls();
-    }
+        System.err.println("Done setSelectedMetadata()...");
+        }
+    }
+    }
+
     /** Some actions can only occur after this panel has been displayed on-screen, so this method is provided to do exactly that. Such actions include the proportioning of the split panes and the setting of table column widths.
     * @see org.greenstone.gatherer.gui.table.GTableModel