Changeset 5251

Timestamp:

2003-08-22T10:02:41+12:00 (21 years ago)

Author:

jmt12

Message:

Fix 203B123: Right click after new collection causes NPE

File:

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

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

@@ -559 +559 @@
         this.tree = tree;
         TreePath path = tree.getClosestPathForLocation(event.getX(), event.getY());
-        node = (FileNode)path.getLastPathComponent();
-                // Set Options based on selection and tree
-        if(tree.getSelectionCount() != 0 && tree == collection_tree) {
-        show_metaaudit = new JMenuItem(get("Menu.Metadata_View") + " " + collection_tree.getSelectionDetails(), KeyEvent.VK_V);
-        show_metaaudit.addActionListener(this);
-        add(show_metaaudit);
-        }
-        if(tree == collection_tree && node != null && node.getFile() != null && node.getFile().isDirectory() && !node.isReadOnly()) {
-        new_folder = new JMenuItem(get("New_Folder"), KeyEvent.VK_N);
-        new_folder.addActionListener(this);
-        add(new_folder);
-        add(new JSeparator());
-        }
-        if(node == null || (node != null && !node.isReadOnly())) {
-        delete = new JMenuItem(get("Delete"), KeyEvent.VK_D);
-        delete.addActionListener(this);
-        add(delete);
-        }
-        if(tree == workspace_tree && node != null && !node.isLeaf()) {
-        String node_name = node.toString();
-        FileNode root = (FileNode) tree.getModel().getRoot();
-        if(!node_name.equals(get("Tree.World")) && !node_name.equals(get("Tree.Root")) && !node_name.equals(get("Tree.Public")) && !node_name.equals(get("Tree.Private"))) {
-            // You can unmap 1st level nodes.
-            if(root.getIndex(node) != -1) {
-            unmap = new JMenuItem(get("MappingPrompt.Unmap"), KeyEvent.VK_U);
-            unmap.addActionListener(this);
-            add(unmap);
+        if(path != null) {
+        node = (FileNode)path.getLastPathComponent();
+        // Set Options based on selection and tree
+        if(tree.getSelectionCount() != 0 && tree == collection_tree) {
+            show_metaaudit = new JMenuItem(get("Menu.Metadata_View") + " " + collection_tree.getSelectionDetails(), KeyEvent.VK_V);
+            show_metaaudit.addActionListener(this);
+            add(show_metaaudit);
+        }
+        if(tree == collection_tree && node != null && node.getFile() != null && node.getFile().isDirectory() && !node.isReadOnly()) {
+            new_folder = new JMenuItem(get("New_Folder"), KeyEvent.VK_N);
+            new_folder.addActionListener(this);
+            add(new_folder);
+            add(new JSeparator());
+        }
+        if(node == null || (node != null && !node.isReadOnly())) {
+            delete = new JMenuItem(get("Delete"), KeyEvent.VK_D);
+            delete.addActionListener(this);
+            add(delete);
+        }
+        if(tree == workspace_tree && node != null && !node.isLeaf()) {
+            String node_name = node.toString();
+            FileNode root = (FileNode) tree.getModel().getRoot();
+            if(!node_name.equals(get("Tree.World")) && !node_name.equals(get("Tree.Root")) && !node_name.equals(get("Tree.Public")) && !node_name.equals(get("Tree.Private"))) {
+            // You can unmap 1st level nodes.
+            if(root.getIndex(node) != -1) {
+                unmap = new JMenuItem(get("MappingPrompt.Unmap"), KeyEvent.VK_U);
+                unmap.addActionListener(this);
+                add(unmap);
+            }
+            // Or map any other level directories.
+            else {
+                map = new JMenuItem(get("MappingPrompt.Map"), KeyEvent.VK_M);
+                map.addActionListener(this);
+                add(map);
+            }
             }
-            // Or map any other level directories.
-            else {
-            map = new JMenuItem(get("MappingPrompt.Map"), KeyEvent.VK_M);
-            map.addActionListener(this);
-            add(map);
-            }
-        }
-        }
-        show(tree, event.getX(), event.getY());
+        }
+        show(tree, event.getX(), event.getY());
+        }
     }
     /** Called whenever one of the menu items is actioned apon, this method then causes the appropriate effect. */