Changeset 20877

Timestamp:

2009-11-02T13:40:10+13:00 (14 years ago)

Author:

ak19

Message:

Fixed minor bug: clicking on trash icon when nothing's selected caused a null pointer exveption.

File:

• gli/trunk/src/org/greenstone/gatherer/gui/GatherPane.java (modified) (1 diff)

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

@@ -150 +150 @@
         // Find the active tree (you've made selections in).
         DragTree tree = (DragTree) group.getActive();
-        // Fudge things a bit
-        group.setSource(tree);
-        // Determine the selection.
-        TreePath paths[] = tree.getSelectionPaths();
-        if(paths != null) {
-            FileNode[] source_nodes = new FileNode[paths.length];
-            for(int i = 0; i < paths.length; i++) {
-            source_nodes[i] = (FileNode)(paths[i].getLastPathComponent());
+        if (tree != null) { // if something has indeed been selected
+            // Fudge things a bit
+            group.setSource(tree);
+            // Determine the selection.
+            TreePath paths[] = tree.getSelectionPaths();
+            if(paths != null) {
+            FileNode[] source_nodes = new FileNode[paths.length];
+            for(int i = 0; i < paths.length; i++) {
+                source_nodes[i] = (FileNode)(paths[i].getLastPathComponent());
+            }
+            Gatherer.f_man.action(tree, source_nodes, Gatherer.recycle_bin, null);
             }
-            Gatherer.f_man.action(tree, source_nodes, Gatherer.recycle_bin, null);
         }
         }