Changeset 11627

Timestamp:

2006-04-07T16:56:05+12:00 (18 years ago)

Author:

mdewsnip

Message:

The collection tree object is now created and owned by CollectionManager.

Location:

trunk/gli/src/org/greenstone/gatherer

Files:

• collection/CollectionManager.java (modified) (3 diffs)
• gui/EnrichPane.java (modified) (1 diff)
• gui/GatherPane.java (modified) (2 diffs)

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

@@ -91 +91 @@
     /** The collection this manager is managing! */
     static private Collection collection = null;
-    /** The collection_model. */
-    private CollectionTreeModel collection_model = null;
+    /** The collection tree (used in both Gather and Enrich panes). */
+    static private CollectionTree collection_tree = null;
+    /** The collection tree model. */
+    private CollectionTreeModel collection_tree_model = null;
     /** An inner class listener responsible for noting tree changes and resetting saved when they occur. */
     private FMTreeModelListener fm_tree_model_listener = null;
@@ -237 +239 @@
 
     collection = null;
-    collection_model = null;
+    collection_tree_model = null;
     Configuration.setCollectionConfiguration(null);
     Gatherer.refresh(Gatherer.COLLECTION_CLOSED);
@@ -643 +645 @@
 
 
+    public CollectionTree getCollectionTree()
+    {
+    if (collection_tree == null) {
+        collection_tree = new CollectionTree(collection_tree_model, true);
+    }
+
+    return collection_tree;
+    }
+
+
     /** Retrieve the tree model associated with the current collection. */
     public CollectionTreeModel getCollectionTreeModel()
     {
-    if (collection_model == null && collection != null) {
+    if (collection_tree_model == null && collection != null) {
         // Use the import directory to generate a new CollectionTreeModel
-        collection_model = new CollectionTreeModel(new CollectionTreeNode(new File(getCollectionImportDirectoryPath())));
+        collection_tree_model = new CollectionTreeModel(new CollectionTreeNode(new File(getCollectionImportDirectoryPath())));
         // Ensure that the manager is a change listener for the tree.
         if (fm_tree_model_listener == null) {
         fm_tree_model_listener = new FMTreeModelListener();
         }
-        collection_model.addTreeModelListener(fm_tree_model_listener);
-    }
-    return collection_model;
+        collection_tree_model.addTreeModelListener(fm_tree_model_listener);
+    }
+    return collection_tree_model;
     }
 

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

@@ -131 +131 @@
 
     DragGroup group = new DragGroup();
-    collection_tree = Gatherer.g_man.gather_pane.collection_tree;
+    collection_tree = Gatherer.c_man.getCollectionTree();
     group.add(collection_tree);
     collection_tree.getSelectionModel().setSelectionMode(TreeSelectionModel.DISCONTIGUOUS_TREE_SELECTION);

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

@@ -76 +76 @@
     private DragGroup group               =  null;
     /** The tree showing the files within the collection. */
-    public CollectionTree collection_tree = null;
+    private CollectionTree collection_tree = null;
     /** The threaded queue that handles the actually movement of files, so that the gui remains responsive. */
     private FileQueue file_queue          =  null;
@@ -234 +234 @@
     Dictionary.registerText(collection_label, "Collection.No_Collection");
 
-    collection_tree = new CollectionTree(Gatherer.c_man.getCollectionTreeModel(), true);
+    collection_tree = Gatherer.c_man.getCollectionTree();
     collection_tree.setEnabled(Gatherer.c_man.getCollectionTreeModel() != null);
     group.add(collection_tree);