Changeset 9334

Timestamp:

2005-03-09T12:05:40+13:00 (19 years ago)

Author:

mdewsnip

Message:

Improved previous change so the GLI won't completely crap out if an exception happens while adding/replacing/removing metadata.

File:

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

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

@@ -553 +553 @@
     public void run()
     {
-        // Edit metadata.xml files to add the metadata
-        MetadataXMLFileManager.addMetadata(file_nodes, metadata_value);
-
-        // Update the metadata value table and tree
-        metadata_edit_event = true;
-        metadata_value_table.rebuildAndSelectRowWithValueClosestTo(metadata_value);
-        metadata_edit_event = false;
-
-        // Operation finished, so turn busy cursor off
+        try {
+        // Edit metadata.xml files to add the metadata
+        MetadataXMLFileManager.addMetadata(file_nodes, metadata_value);
+
+        // Update the metadata value table and tree
+        metadata_edit_event = true;
+        metadata_value_table.rebuildAndSelectRowWithValueClosestTo(metadata_value);
+        metadata_edit_event = false;
+        }
+        catch (Exception exception) {
+        // We need to catch any exceptions here so the interface is unlocked below
+        DebugStream.printStackTrace(exception);
+        }
+
+        // Operation finished, so turn busy cursor off and unlock interface
         Gatherer.g_man.wait(false);
     }
@@ -581 +587 @@
     public void run()
     {
-        // Edit metadata.xml files to replace the metadata
-        MetadataXMLFileManager.removeMetadata(file_nodes, selected_metadata_value_table_entry);
-        MetadataXMLFileManager.addMetadata(file_nodes, metadata_value);
-
-        // Update the metadata value table and tree
-        metadata_edit_event = true;
-        metadata_value_table.rebuildAndSelectRowWithValueClosestTo(metadata_value);
-        metadata_edit_event = false;
-
-        // Operation finished, so turn busy cursor off
+        try {
+        // Edit metadata.xml files to replace the metadata
+        MetadataXMLFileManager.removeMetadata(file_nodes, selected_metadata_value_table_entry);
+        MetadataXMLFileManager.addMetadata(file_nodes, metadata_value);
+
+        // Update the metadata value table and tree
+        metadata_edit_event = true;
+        metadata_value_table.rebuildAndSelectRowWithValueClosestTo(metadata_value);
+        metadata_edit_event = false;
+        }
+        catch (Exception exception) {
+        // We need to catch any exceptions here so the interface is unlocked below
+        DebugStream.printStackTrace(exception);
+        }
+
+        // Operation finished, so turn busy cursor off and unlock interface
         Gatherer.g_man.wait(false);
     }
@@ -608 +620 @@
     public void run()
     {
-        // Edit metadata.xml files to remove the metadata
-        MetadataXMLFileManager.removeMetadata(file_nodes, selected_metadata_value_table_entry);
-
-        // Update the metadata value table and tree
-        metadata_edit_event = true;
-        metadata_value_table.rebuildAndSelectRowWithValueClosestTo(selected_metadata_value_table_entry);
-        metadata_edit_event = false;
-
-        // Operation finished, so turn busy cursor off
+        try {
+        // Edit metadata.xml files to remove the metadata
+        MetadataXMLFileManager.removeMetadata(file_nodes, selected_metadata_value_table_entry);
+
+        // Update the metadata value table and tree
+        metadata_edit_event = true;
+        metadata_value_table.rebuildAndSelectRowWithValueClosestTo(selected_metadata_value_table_entry);
+        metadata_edit_event = false;
+        }
+        catch (Exception exception) {
+        // We need to catch any exceptions here so the interface is unlocked below
+        DebugStream.printStackTrace(exception);
+        }
+
+        // Operation finished, so turn busy cursor off and unlock interface
         Gatherer.g_man.wait(false);
     }