Changeset 9019

Timestamp:

2005-02-14T11:34:01+13:00 (19 years ago)

Author:

mdewsnip

Message:

Fixed bug where CollectionContentsChangedListener isn't removed from destroyed PluginManager object.

Location:

trunk/gli/src/org/greenstone/gatherer

Files:

• cdm/PluginManager.java (modified) (1 diff)
• collection/CollectionManager.java (modified) (2 diffs)

trunk/gli/src/org/greenstone/gatherer/cdm/PluginManager.java

@@ -115 +115 @@
 
     /** Destructor. */
-    public void destroy() {
-    if(controls != null) {
+    public void destroy()
+    {
+    Gatherer.c_man.removeCollectionContentsChangedListener(this);
+
+    if (controls != null) {
         controls.destroy();
         controls = null;
     }
+
     library.clear();
     library = null;

trunk/gli/src/org/greenstone/gatherer/collection/CollectionManager.java

@@ -219 +219 @@
     collection = null;
     collection_model = null;
-    // workspace_model = null;
     Configuration.setCollectionConfiguration(null);
     Gatherer.refresh(Gatherer.COLLECTION_CLOSED);
@@ -1162 +1161 @@
     public void registerImportMonitor(GShellProgressMonitor monitor) {
     import_monitor = monitor;
+    }
+
+
+    public void removeCollectionContentsChangedListener(CollectionContentsChangedListener listener)
+    {
+    collection_contents_changed_listeners.remove(listener);
     }