Changeset 8846

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.

Location:

trunk/gli/src/org/greenstone/gatherer

Files:

• collection/Collection.java (modified) (1 diff)
• collection/CollectionManager.java (modified) (1 diff)
• collection/CollectionTree.java (added)
• file/WorkspaceTree.java (modified) (1 diff)
• gui/EnrichPane.java (modified) (5 diffs)
• gui/GatherPane.java (modified) (5 diffs)
• gui/tree/DragTree.java (modified) (3 diffs)

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

@@ -129 +129 @@
     /** Determine the number of documents and folders in this collection. */
     public int getCount() {
-    return getCount((TreeNode)Gatherer.c_man.getRecordSet().getRoot(), true, true);
+    return getCount((TreeNode)Gatherer.c_man.getCollectionTreeModel().getRoot(), true, true);
     }
     
     /** Calculates the number of documents in this collection. */
     public int getDocumentCount() {
-    return getCount((TreeNode)Gatherer.c_man.getRecordSet().getRoot(), false, true);
+    return getCount((TreeNode)Gatherer.c_man.getCollectionTreeModel().getRoot(), false, true);
     }
     

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

@@ -704 +704 @@
 
 
-    /** Retrieve the record set (tree model) associated with the current collection. */
-    public TreeModel getRecordSet() {
+    /** Retrieve the tree model associated with the current collection. */
+    public CollectionTreeModel getCollectionTreeModel()
+    {
     if (collection_model == null && collection != null) {
         // Use the import directory to generate a new CollectionTreeModel

trunk/gli/src/org/greenstone/gatherer/file/WorkspaceTree.java

@@ -47 +47 @@
     public WorkspaceTree(String name)
     {
-    super(name, WorkspaceTreeModel.getWorkspaceTreeModel(), null, true);
+    super(name, WorkspaceTreeModel.getWorkspaceTreeModel(), true);
     }
 

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

@@ -50 +50 @@
 import org.greenstone.gatherer.Dictionary;
 import org.greenstone.gatherer.Gatherer;
-import org.greenstone.gatherer.collection.CollectionManager;
+import org.greenstone.gatherer.collection.CollectionTree;
 import org.greenstone.gatherer.collection.CollectionTreeNode;
 import org.greenstone.gatherer.gui.tree.DragTree;
@@ -123 +123 @@
     private JTextField table_label;
     /** A reference to the collection tree. */
-    private DragTree collection_tree;
+    private CollectionTree collection_tree;
     /** Provide synchronization between the collection trees in this view and the collection pane view. */
     private TreeSynchronizer collection_tree_sync = null;
@@ -235 +235 @@
     /** Used to create, connect and layout the components to be shown on this control panel.
      * @see org.greenstone.gatherer.Gatherer
-     * @see org.greenstone.gatherer.collection.CollectionManager
      * @see org.greenstone.gatherer.file.FileOpenActionListener
      * @see org.greenstone.gatherer.gui.Filter
@@ -253 +252 @@
 
     DragGroup group = new DragGroup();
-    TreeModel collection_model = Gatherer.c_man.getRecordSet();
-    if (collection_model != null) {
-        collection_tree = new DragTree("Enrich", collection_model, null, false);
-    }
-    else {
-        collection_tree = new DragTree("Enrich", null, false);
-    }
+    collection_tree = new CollectionTree("Enrich", Gatherer.c_man.getCollectionTreeModel(), false);
     group.add(collection_tree);
     collection_tree.getSelectionModel().setSelectionMode(TreeSelectionModel.DISCONTIGUOUS_TREE_SELECTION);
@@ -456 +449 @@
         // Update collection tree
         if (refresh_reason == Gatherer.COLLECTION_OPENED) {
-        collection_tree.setModel(Gatherer.c_man.getRecordSet());
+        collection_tree.setModel(Gatherer.c_man.getCollectionTreeModel());
         }
 

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());
         }
 

trunk/gli/src/org/greenstone/gatherer/gui/tree/DragTree.java

@@ -22 +22 @@
 import org.greenstone.gatherer.util.Utility;
 
-public class DragTree
+public abstract class DragTree
     extends JTree
     implements Autoscroll, DragGestureListener, DragSourceListener, DropTargetListener, DragComponent, TreeSelectionListener {
@@ -63 +63 @@
 
 
-    public DragTree(String name, String background_name, boolean mixed_selection) {
-    super();
-    init(name, background_name, mixed_selection);
-    }
-
-    public DragTree(String name, TreeModel model, String background_name, boolean mixed_selection) {
+    public DragTree(String name, TreeModel model, boolean mixed_selection)
+    {
     super(model);
-    init(name, background_name, mixed_selection);
+    init(name, mixed_selection);
+
     // Connection
     setModel(model);
     }
 
-    public void init(String name, String background_name, boolean mixed_selection) {
+    public void init(String name, boolean mixed_selection) {
     if(NO_DRAG_CURSOR == null) {
         NO_DRAG_CURSOR = DragSource.DefaultMoveNoDrop;
@@ -85 +82 @@
     // Init
     this.name = name;
-    if(background_name != null) {
-        this.disabled_background = new ImageIcon("background.gif");
-        this.normal_background = new ImageIcon(background_name);
-    }
 
     // Creation