Changeset 8846 for trunk/gli/src/org/greenstone/gatherer/gui/GatherPane.java

Timestamp:

2004-12-17T15:07:36+13:00 (19 years ago)

Author:

mdewsnip

Message:

Tidied up the workspace and collection trees a bit more, in preparation for having special icons for some collection files.

File:

• trunk/gli/src/org/greenstone/gatherer/gui/GatherPane.java (modified) (5 diffs)

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

@@ -48 +48 @@
 import org.greenstone.gatherer.Dictionary;
 import org.greenstone.gatherer.Gatherer;
+import org.greenstone.gatherer.collection.CollectionTree;
 import org.greenstone.gatherer.collection.CollectionTreeNode;
-import org.greenstone.gatherer.collection.CollectionManager;
 import org.greenstone.gatherer.file.FileNode;
 import org.greenstone.gatherer.file.FileOpenActionListener;
@@ -73 +73 @@
     private DragGroup group               =  null;
     /** The tree showing the files within the collection. */
-    private DragTree 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;
@@ -80 +80 @@
     /** The filter currently applied to the workspace tree. */
     private Filter workspace_filter = null;
-    /** The collection model which is used to build, and hold the data of, the collection tree. */
-    private TreeModel collection    = null;
     /** The button used to cancel all pending file queue jobs. */
     private JButton stop_action        =  null;
@@ -259 +257 @@
     Dictionary.registerText(collection_label, "Collection.No_Collection");
 
-    collection = Gatherer.c_man.getRecordSet();
-    if (collection != null) {
-        collection_tree = new DragTree(Utility.COLLECTION_TREE, collection, null, true);
-        collection_tree.setEnabled(true);
-    }
-    else {
-        collection_tree = new DragTree(Utility.COLLECTION_TREE, null, true);
-        collection_tree.setEnabled(false);
-    }
+    collection_tree = new CollectionTree(Utility.COLLECTION_TREE, Gatherer.c_man.getCollectionTreeModel(), true);
+    collection_tree.setEnabled(Gatherer.c_man.getCollectionTreeModel() != null);
     group.add(collection_tree);
     collection_tree.addFocusListener(this);
@@ -425 +416 @@
         // Update collection tree
         if (refresh_reason == Gatherer.COLLECTION_OPENED) {
-        collection_tree.setModel(Gatherer.c_man.getRecordSet());
+        collection_tree.setModel(Gatherer.c_man.getCollectionTreeModel());
         }