Changeset 4313

Timestamp:

2003-05-23T16:36:19+12:00 (21 years ago)

Author:

jmt12

Message:

allow for drop anywhere on collection tree to mean a copy to the root node

File:

• trunk/gli/src/org/greenstone/gatherer/gui/tree/DragTree.java (modified) (2 diffs)

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

@@ -18 +18 @@
 import org.greenstone.gatherer.util.DragGroup;
 import org.greenstone.gatherer.util.DragTreeSelectionModel;
+import org.greenstone.gatherer.util.Utility;
 
 public class DragTree
@@ -304 +305 @@
           ///ystem.err.println("Drop target drop: " + this);
           event.acceptDrop(drag_action);
-          // Determine what node we dropped over. The current valid drop path, if any, is stored in previous path.
-          if(previous_path != null && isValidDrop(previous_path)) {
-                ///ystem.err.println("Valid drop.");
-                FileNode target = (FileNode) previous_path.getLastPathComponent();
-                TreePath[] selection = group.getSelection();
+          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 {
+                          // Warn that this is an invalid drop.
+                          JOptionPane.showMessageDialog(Gatherer.g_man, Gatherer.dictionary.get("FileActions.InvalidTarget"), Gatherer.dictionary.get("General.Error"), JOptionPane.ERROR_MESSAGE);
+                     }
+                }
+                else {
+                     target = (FileNode) getModel().getRoot();
+                }
+                target_path = null;
+                pt = null;
                 if(target != 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;
+                     ///ystem.err.println("Valid drop.");
+                     TreePath[] selection = group.getSelection();
+                     if(target != 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;
+                }
           }
           else {
-                ///ystem.err.println("Not a valid drop.");
+                // Warn that this is an invalid drop.
+                JOptionPane.showMessageDialog(Gatherer.g_man, Gatherer.dictionary.get("FileActions.ReadOnlyTarget"), Gatherer.dictionary.get("General.Error"), JOptionPane.ERROR_MESSAGE);
           }
           // Clear up the group.image_ghost