Changeset 4530

Timestamp:

2003-06-10T12:02:49+12:00 (21 years ago)

Author:

jmt12

Message:

2030111: X11R6 crash was caused by MetadataEditorManager not collectly disposing then releasing all references to its child dialogs (which it does now). Why that should cause the JScrollPane to take offence I don't know.

Location:

trunk/gli/src/org/greenstone/gatherer

Files:

• mem/MetadataEditorManager.java (modified) (6 diffs)
• msm/MetadataSetManager.java (modified) (1 diff)

trunk/gli/src/org/greenstone/gatherer/mem/MetadataEditorManager.java

@@ -487 +487 @@
     target = null;
     // Dispose of inner dialogs
-    add_element_action_listener.dispose();
-    add_or_edit_attribute_action_listener.dispose();
-    add_or_edit_value_action_listener.dispose();
+    if(add_element_action_listener != null) {
+        add_element_action_listener.dispose();
+        add_element_action_listener = null;
+    }
+    if(add_or_edit_attribute_action_listener != null) {
+        add_or_edit_attribute_action_listener.dispose();
+        add_or_edit_attribute_action_listener = null;
+    }
+    if(add_or_edit_value_action_listener != null) {
+        add_or_edit_value_action_listener.dispose();
+        add_or_edit_value_action_listener = null;
+    }
+    ///ystem.err.println("Dispose MetadataEditorManager.");
     super.dispose();
     }
@@ -924 +934 @@
         target = null;
         value = null;
+        ///ystem.err.println("Dispose AddOrEditAttributeActionListener");
+        super.dispose();
     }
     }
@@ -1047 +1059 @@
         name_field = null;
         set_field = null;
+        ///ystem.err.println("Dispose AddElementActionListener");
+        super.dispose();
     }
     }
@@ -1150 +1164 @@
         ok_button = null;
         name_field = null;
+        ///ystem.err.println("Dispose AddFileActionListener");
+        super.dispose();
     }
     }
@@ -1267 +1283 @@
         ok_button = null;
         name_field = null;
+        ///ystem.err.println("Dispose AddSetActionListener");
+        super.dispose();
     }
     }
@@ -1488 +1506 @@
         subject_tree = null;
         value = null;
+        ///ystem.err.println("Dispose AddOrEditValueActionListener");
+        super.dispose();
     }
 

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

@@ -181 +181 @@
      */
     public boolean editMDS() {
-    /* TODO - implement. Something here like: new MSMEditor() */
     MetadataEditorManager mem = new MetadataEditorManager();
     mem.dispose();