Changeset 4526

Timestamp:

2003-06-09T16:13:37+12:00 (21 years ago)

Author:

mdewsnip

Message:

Moved the functionality of the "replace" and "remove" buttons into their own thread, in the same way as the "append" button. This (hopefully) will mean no more nasty AWT deadlocks.

File:

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

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

@@ -210 +210 @@
     }
     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));
+        (new UpdateMetadataTask()).start();
     }
     else if(esrc == remove) {
-        if(selected_metadata != null && records != null) {
-        Gatherer.c_man.getCollection().msm.removeMetadata(System.currentTimeMillis(), selected_metadata, records);
-        }
+        (new RemoveMetadataTask()).start();
     }
     else if(esrc == expand) {
@@ -241 +231 @@
     extends Thread {
 
-    AppendMetadataTask() {
-    }
+    public AppendMetadataTask() { }
 
     public void run() {
@@ -262 +251 @@
         }
         GValueNode value_node = ((GValueModel) tree.getModel()).addValue(value);
-        System.err.println("Back from model.addValue()...");
         model.setSelectedMetadata(new Metadata(element, value_node));
-        System.err.println("Done setSelectedMetadata()...");
+        }
+    }
+    }
+
+    private class UpdateMetadataTask
+    extends Thread {
+
+    public UpdateMetadataTask() { }
+
+    public void run() {
+        // 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));
+    }
+    }
+
+    private class RemoveMetadataTask
+    extends Thread {
+
+    public RemoveMetadataTask() { }
+
+    public void run() {
+        if(selected_metadata != null && records != null) {
+        Gatherer.c_man.getCollection().msm.removeMetadata(System.currentTimeMillis(), selected_metadata, records);
         }
     }