Index: src/org/openide/explorer/view/TreeView.java =================================================================== RCS file: /cvs/openide/src/org/openide/explorer/view/TreeView.java,v retrieving revision 1.155.2.1 diff -u -r1.155.2.1 TreeView.java --- src/org/openide/explorer/view/TreeView.java 9 Mar 2004 10:36:51 -0000 1.155.2.1 +++ src/org/openide/explorer/view/TreeView.java 18 Mar 2004 09:28:18 -0000 @@ -1314,12 +1314,15 @@ } else if (keyCode == KeyEvent.VK_ENTER) { removeSearchField(); // bugfix #39607, don't expand selected node when default action invoked - TreeNode selectedTNode = (TreeNode)getSelectionPath().getLastPathComponent(); - Node selectedNode = Visualizer.findNode (selectedTNode); - if (selectedNode.getPreferredAction () != null && selectedNode.getPreferredAction ().isEnabled ()) { - selectedNode.getPreferredAction ().actionPerformed (new ActionEvent (this, ActionEvent.ACTION_PERFORMED, "")); - } else { - expandPath (getSelectionPath ()); + TreePath selectedTPath = getSelectionPath (); + if (selectedTPath != null) { + TreeNode selectedTNode = (TreeNode)selectedTPath.getLastPathComponent(); + Node selectedNode = Visualizer.findNode (selectedTNode); + if (selectedNode.getPreferredAction () != null && selectedNode.getPreferredAction ().isEnabled ()) { + selectedNode.getPreferredAction ().actionPerformed (new ActionEvent (this, ActionEvent.ACTION_PERFORMED, "")); + } else { + expandPath (getSelectionPath ()); + } } ExplorerTree.this.requestFocus(); ExplorerTree.this.dispatchEvent(e);