Changeset 4525

Timestamp:

2003-06-09T15:19:26+12:00 (21 years ago)

Author:

kjdon

Message:

drop now checks that the model is appropriate - ie that htere is a collection loaded - disable dropping into a non-collection

File:

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

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

@@ -315 +315 @@
     event.acceptDrop(drag_action);
     if(!name.equals(Utility.WORKSPACE_TREE)) {
-                // Determine what node we dropped over. 
+        // Determine what node we dropped over. 
         Point pt = event.getLocation();
         TreePath target_path = this.getPathForLocation(pt.x, pt.y);
@@ -331 +331 @@
         }
         else {
-        target = (FileNode) getModel().getRoot();
+        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;