Changeset 12589 for trunk/gli/src

Timestamp:

2006-08-29T14:26:32+12:00 (18 years ago)

Author:

kjdon

Message:

need to call collection.destroy in closeCollection, otherwise old managers and listeners are still hanging around

Location:

trunk/gli/src/org/greenstone/gatherer/collection

Files:

• Collection.java (modified) (1 diff)
• CollectionManager.java (modified) (1 diff)

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

@@ -119 +119 @@
     cdm.destroy();
     Configuration.setCollectionConfiguration(null);
-    if (Gatherer.g_man != null) {
-        Gatherer.g_man.updateUI();
-    }
+    // this is called after calling collection.destroy, so we shouldn't need it here too.
+//  if (Gatherer.g_man != null) {
+//      Gatherer.g_man.updateUI();
+//  }
     cdm = null;
     document = null;

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

@@ -239 +239 @@
     ProfileXMLFileManager.clearProfileXMLFile();
 
+    collection.destroy();
     collection = null;
     collection_tree_model = null;
-    Configuration.setCollectionConfiguration(null);
+    //Configuration.setCollectionConfiguration(null);
     Gatherer.refresh(Gatherer.COLLECTION_CLOSED);
     if (Gatherer.g_man != null) {