Changeset 4393

Timestamp:

2003-05-28T14:47:44+12:00 (21 years ago)

Author:

kjdon

Message:

now test if path is null before seeing if the path is valid, when dragging a folder/file

File:

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

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

@@ -191 +191 @@
         setSelectionPath(path);
     }
+    if(path == null) {
+        return;
+    }
     if (!isValidDrag()) {
         return;
@@ -200 +203 @@
     group.grabFocus(this);
     // Ghost Image stuff.
-    if(path != null) {
-        Rectangle rect = this.getPathBounds(path);
-        group.mouse_offset = new Point(origin.x - rect.x, origin.y - rect.y);
-                // Create the ghost image.
-                // Retrieve the selected files.
-        int selection_count = getSelectionCount();
-        if(selection_count > 0) {
-        JLabel label;
-        if(selection_count == 1) {
-            TreePath node_path = getSelectionPath();
-            FileNode node = (FileNode) path.getLastPathComponent();
-            label = new JLabel(node.toString(), ((DefaultTreeCellRenderer)getCellRenderer()).getLeafIcon(), JLabel.CENTER);
-        }
-        else {
-            String title = getSelectionCount() + " files";
-            label = new JLabel(title, ((DefaultTreeCellRenderer)getCellRenderer()).getClosedIcon(), JLabel.CENTER);
-            title = null;
-        }
-        // The layout manager normally does this.
-        Dimension label_size = label.getPreferredSize();
-        label.setSize(label_size);
-        label.setBackground(TRANSPARENT_COLOR);
-        label.setOpaque(true);
-        // Get a buffered image of the selection for dragging a ghost image.
-        group.image_ghost = new BufferedImage(label_size.width, label_size.height, BufferedImage.TYPE_INT_ARGB_PRE);
-        label_size = null;
-        // Get a graphics context for this image.
-        Graphics2D g2 = group.image_ghost.createGraphics();
-        // Make the image ghostlike
-        g2.setComposite(AlphaComposite.getInstance (AlphaComposite.SRC, 0.5f));
-        // Ask the cell renderer to paint itself into the BufferedImage
-        label.paint(g2);
-        g2 = null;
-        label = null;
-        try {
-            event.startDrag(new Cursor(Cursor.DEFAULT_CURSOR), group.image_ghost, new Point(5,5), new StringSelection("dummy"), this);
-            //dragging = true;
-        }
-        catch(Exception error) {
-            error.printStackTrace();
-        }
-        }
-    }
+    Rectangle rect = this.getPathBounds(path);
+    group.mouse_offset = new Point(origin.x - rect.x, origin.y - rect.y);
+    // Create the ghost image.
+    // Retrieve the selected files.
+    int selection_count = getSelectionCount();
+    if(selection_count > 0) {
+        JLabel label;
+        if(selection_count == 1) {
+        TreePath node_path = getSelectionPath();
+        FileNode node = (FileNode) path.getLastPathComponent();
+        label = new JLabel(node.toString(), ((DefaultTreeCellRenderer)getCellRenderer()).getLeafIcon(), JLabel.CENTER);
+        }
+        else {
+        String title = getSelectionCount() + " files";
+        label = new JLabel(title, ((DefaultTreeCellRenderer)getCellRenderer()).getClosedIcon(), JLabel.CENTER);
+        title = null;
+        }
+        // The layout manager normally does this.
+        Dimension label_size = label.getPreferredSize();
+        label.setSize(label_size);
+        label.setBackground(TRANSPARENT_COLOR);
+        label.setOpaque(true);
+        // Get a buffered image of the selection for dragging a ghost image.
+        group.image_ghost = new BufferedImage(label_size.width, label_size.height, BufferedImage.TYPE_INT_ARGB_PRE);
+        label_size = null;
+        // Get a graphics context for this image.
+        Graphics2D g2 = group.image_ghost.createGraphics();
+        // Make the image ghostlike
+        g2.setComposite(AlphaComposite.getInstance (AlphaComposite.SRC, 0.5f));
+        // Ask the cell renderer to paint itself into the BufferedImage
+        label.paint(g2);
+        g2 = null;
+        label = null;
+        try {
+        event.startDrag(new Cursor(Cursor.DEFAULT_CURSOR), group.image_ghost, new Point(5,5), new StringSelection("dummy"), this);
+        //dragging = true;
+        }
+        catch(Exception error) {
+        error.printStackTrace();
+        }
+    }
+    
     }