Changeset 11622

Timestamp:

2006-04-07T13:19:24+12:00 (18 years ago)

Author:

mdewsnip

Message:

Lots more object-orientation improvements to the collection and workspace trees.

Location:

trunk/gli/src/org/greenstone/gatherer

Files:

• collection/CollectionTree.java (modified) (3 diffs)
• file/WorkspaceTree.java (modified) (3 diffs)
• gui/EnrichPane.java (modified) (2 diffs)
• gui/GatherPane.java (modified) (2 diffs)
• gui/tree/DragTree.java (modified) (9 diffs)
• util/Utility.java (modified) (2 diffs)

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

@@ -43 +43 @@
     implements MouseListener
 {
-    public CollectionTree(String name, CollectionTreeModel collection_tree_model, boolean mixed_selection)
-    {
-    super(name, collection_tree_model, mixed_selection);
+    public CollectionTree(CollectionTreeModel collection_tree_model, boolean mixed_selection)
+    {
+    super(collection_tree_model, mixed_selection);
     addMouseListener(this);
 
@@ -59 +59 @@
 
 
+    public boolean isDraggable()
+    {
+    return true;
+    }
+
+
+    public boolean isDroppable()
+    {
+    return true;
+    }
+
+
     public void mouseClicked(MouseEvent event)
     {
@@ -73 +85 @@
 
     public void mouseReleased(MouseEvent event) { }
+
+
+    public String toString()
+    {
+    return "Collection";
+    }
 
 

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

@@ -49 +49 @@
 
 
-    public WorkspaceTree(String name)
-    {
-    super(name, WorkspaceTreeModel.getWorkspaceTreeModel(), true);
+    public WorkspaceTree()
+    {
+    super(WorkspaceTreeModel.getWorkspaceTreeModel(), true);
     addMouseListener(this);
 
@@ -71 +71 @@
     // Now update the tree
     refresh(FOLDER_SHORTCUTS_CHANGED);
+    }
+
+
+    public boolean isDraggable()
+    {
+    return true;
+    }
+
+
+    public boolean isDroppable()
+    {
+    return false;
     }
 
@@ -170 +182 @@
     // Update tree
     refresh(FOLDER_SHORTCUTS_CHANGED);
+    }
+
+
+    public String toString()
+    {
+    return "Workspace";
     }
 

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

@@ -66 +66 @@
     /** The currently reported selection. */
     private CollectionTreeNode[] file_nodes = null;
-    /** Used to dynamically filter the collection tree. Synchronized with the same filter in the Gather view. */
+    /** Used to dynamically filter the collection tree. */
     private Filter collection_filter = null;
     /** The label at the top of the collection tree, which shows the collection name. */
@@ -127 +127 @@
 
     DragGroup group = new DragGroup();
-    collection_tree = new CollectionTree("Enrich", Gatherer.c_man.getCollectionTreeModel(), false);
+    collection_tree = new CollectionTree(Gatherer.c_man.getCollectionTreeModel(), false);
     group.add(collection_tree);
     collection_tree.getSelectionModel().setSelectionMode(TreeSelectionModel.DISCONTIGUOUS_TREE_SELECTION);

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

@@ -219 +219 @@
     Dictionary.registerText(workspace_label, "Collection.Workspace");
 
-    workspace_tree = new WorkspaceTree(Utility.WORKSPACE_TREE);
+    workspace_tree = new WorkspaceTree();
     group.add(workspace_tree);
     workspace_scroll = new JScrollPane(workspace_tree);
@@ -234 +234 @@
     Dictionary.registerText(collection_label, "Collection.No_Collection");
 
-    collection_tree = new CollectionTree(Utility.COLLECTION_TREE, Gatherer.c_man.getCollectionTreeModel(), true);
+    collection_tree = new CollectionTree(Gatherer.c_man.getCollectionTreeModel(), true);
     collection_tree.setEnabled(Gatherer.c_man.getCollectionTreeModel() != null);
     group.add(collection_tree);

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

@@ -50 +50 @@
     /** The region borderer by the upper cue line. */
     private Rectangle upper_cue_line;
-    /** The identifying name of this Tree. */
-    private String name;
     /** The last tree path the drag was hovered over. */
     private TreePath previous_path = null;
@@ -66 +64 @@
 
 
-    public DragTree(String name, TreeModel model, boolean mixed_selection)
+    public DragTree(TreeModel model, boolean mixed_selection)
     {
     super();
@@ -78 +76 @@
     }
 
-    init(name, mixed_selection);
+    init(mixed_selection);
     if (model != null) {
         setModel(model);
@@ -84 +82 @@
     }
 
-    public void init(String name, boolean mixed_selection) {
+    public void init(boolean mixed_selection) {
     if (NO_DRAG_CURSOR == null) {
         NO_DRAG_CURSOR = DragSource.DefaultMoveNoDrop;
@@ -90 +88 @@
 
     // Init
-    this.name = name;
     this.filter = new Filter(this, null);
 
@@ -213 +210 @@
      * the drag event.
      */
-    public void dragGestureRecognized(DragGestureEvent event) {
-    // Can never drag from Enrich tree
-    if(name.equals("Enrich")) {
+    public void dragGestureRecognized(DragGestureEvent event)
+    {
+    // Check that the tree is draggable
+    if (!isDraggable()) {
         return;
     }
+
     // Disable editing, unless you want to have the edit box pop-up part way through dragging.
     this.setEditable(false);
@@ -365 +364 @@
     ///start = System.currentTimeMillis();
     ///ystem.err.println("Drop target drop: " + this);
+    if (!isDroppable()) {
+        return;
+    }
+
     event.acceptDrop(drag_action);
-    if(!name.equals(Utility.WORKSPACE_TREE)) {
-        // Determine what node we dropped over.
-        Point pt = event.getLocation();
-        TreePath target_path = this.getPathForLocation(pt.x, pt.y);
-        FileNode target = null;
-        if(target_path != null) {
-        if(isValidDrop(target_path)) {
-            target = (FileNode) target_path.getLastPathComponent();
-        } else if (isValidDropOntoFile(target_path)) {
-            target = (FileNode) target_path.getParentPath().getLastPathComponent();
+
+    // Determine what node we dropped over.
+    Point pt = event.getLocation();
+    TreePath target_path = this.getPathForLocation(pt.x, pt.y);
+    FileNode target = null;
+    if(target_path != null) {
+        if(isValidDrop(target_path)) {
+        target = (FileNode) target_path.getLastPathComponent();
+        } else if (isValidDropOntoFile(target_path)) {
+        target = (FileNode) target_path.getParentPath().getLastPathComponent();
+        }
+    }
+    else {
+        TreeModel m = getModel();
+        // check that we have a model and is a FileSystemModel (ie check that a collection is loaded
+        if (m != null && m instanceof FileSystemModel) {
+        target = (FileNode) m.getRoot();
+        }
+    }
+    target_path = null;
+    pt = null;
+    if(target != null) {
+        ///ystem.err.println("Valid drop.");
+        TreePath[] selection = group.getSelection();
+        if(target != null && selection != null) {
+        FileNode[] source_nodes = new FileNode[selection.length];
+        for(int i = 0; i < source_nodes.length; i++) {
+            source_nodes[i] = (FileNode) selection[i].getLastPathComponent();
         }
-        }
-        else {
-        TreeModel m = getModel();
-        // check that we have a model and is a FileSystemModel (ie check that a collection is loaded
-        if (m != null && m instanceof FileSystemModel) {
-            target = (FileNode) m.getRoot();
-        }
-        }
-        target_path = null;
-        pt = null;
-        if(target != null) {
-        ///ystem.err.println("Valid drop.");
-        TreePath[] selection = group.getSelection();
-        if(target != null && selection != null) {
-            FileNode[] source_nodes = new FileNode[selection.length];
-            for(int i = 0; i < source_nodes.length; i++) {
-            source_nodes[i] = (FileNode) selection[i].getLastPathComponent();
-            }
-            Gatherer.f_man.action(group.getSource(), source_nodes, this, target);
-            source_nodes = null;
-        }
-        group.setSelection(null);
-        group.setSource(null);
-        selection = null;
-        target = null;
-        }
-    }
+        Gatherer.f_man.action(group.getSource(), source_nodes, this, target);
+        source_nodes = null;
+        }
+        group.setSelection(null);
+        group.setSource(null);
+        selection = null;
+        target = null;
+    }
+
     // Clear up the group.image_ghost
     paintImmediately(ra_ghost.getBounds());
@@ -469 +472 @@
     return (FileSystemModel) getModel();
     }
+
+
+    protected abstract boolean isDraggable();
+
+
+    protected abstract boolean isDroppable();
+
 
     /** This method is used to inform this component when it loses focus,
@@ -624 +634 @@
     ((DefaultTreeCellRenderer)cellRenderer).setTextSelectionColor(color);
     repaint();
-    }
-
-    public String toString() {
-    return name;
     }
 

trunk/gli/src/org/greenstone/gatherer/util/Utility.java

@@ -65 +65 @@
     static final public String CFG_CLASSIFY_SORT = "-sort";
     static final public String CFG_FORMAT = "format";
-    static final public String COLLECTION_TREE = "Collection";
     /** Definition of an important directory name, in this case the file the collection configuration is expect to be in. */
     static final public String CONFIG_FILE = "etc" + File.separator + "collect.cfg";
@@ -84 +83 @@
     /** The current version of the GLI. */
     static final public String PROGRAM_VERSION = "v2.70";
-    static final public String WORKSPACE_TREE = "Workspace";