This Bugzilla instance is a read-only archive of historic NetBeans bug reports. To report a bug in NetBeans please follow the project's instructions for reporting issues.

View | Details | Raw Unified | Return to bug 41097
Collapse All | Expand All

(-)src/org/openide/explorer/view/TreeView.java (-6 / +9 lines)
Lines 1314-1325 Link Here
1314 
                } else if (keyCode == KeyEvent.VK_ENTER) {
 1314 
                } else if (keyCode == KeyEvent.VK_ENTER) {
1315 
                    removeSearchField();
 1315 
                    removeSearchField();
1316 
                    // bugfix #39607, don't expand selected node when default action invoked
 1316 
                    // bugfix #39607, don't expand selected node when default action invoked
1317 
                    TreeNode selectedTNode = (TreeNode)getSelectionPath().getLastPathComponent();
 1317 
                    TreePath selectedTPath = getSelectionPath ();
1318 
                    Node selectedNode = Visualizer.findNode (selectedTNode);
 1318 
                    if (selectedTPath != null) {
1319 
                    if (selectedNode.getPreferredAction () != null && selectedNode.getPreferredAction ().isEnabled ()) {
 1319 
                        TreeNode selectedTNode = (TreeNode)selectedTPath.getLastPathComponent();
1320 
                        selectedNode.getPreferredAction ().actionPerformed (new ActionEvent (this, ActionEvent.ACTION_PERFORMED, ""));
 1320 
                        Node selectedNode = Visualizer.findNode (selectedTNode);
1321 
                    } else {
 1321 
                        if (selectedNode.getPreferredAction () != null && selectedNode.getPreferredAction ().isEnabled ()) {
1322 
                        expandPath (getSelectionPath ());
 1322 
                            selectedNode.getPreferredAction ().actionPerformed (new ActionEvent (this, ActionEvent.ACTION_PERFORMED, ""));
1323 
                        } else {
1324 
                            expandPath (getSelectionPath ());
1325 
                        }
1323 
                    }
 1326 
                    }
1324 
                    ExplorerTree.this.requestFocus();
 1327 
                    ExplorerTree.this.requestFocus();
1325 
                    ExplorerTree.this.dispatchEvent(e);
 1328 
                    ExplorerTree.this.dispatchEvent(e);

Return to bug 41097