[hg] main-silver: #225244 - Find bar does not open in diff

  • From: Milutin Kristofic < >
  • To: ,
  • Subject: [hg] main-silver: #225244 - Find bar does not open in diff
  • Date: Thu, 24 Jan 2013 07:12:46 -0800

changeset 18b2aa214e3f in main-silver ((none))
details: http://hg.netbeans.org/main-silver/rev/18b2aa214e3f
description:
        #225244 - Find bar does not open in diff

diffstat:

 defaults/src/org/netbeans/modules/defaults/Eclipse-keybindings.xml        |  
3 +--
 defaults/src/org/netbeans/modules/defaults/Emacs-keybindings.xml          |  
4 ++--
 defaults/src/org/netbeans/modules/defaults/Idea-keybindings.xml           |  
3 +--
 defaults/src/org/netbeans/modules/defaults/NetBeans55-keybindings.xml     |  
4 ++--
 editor.search/src/org/netbeans/modules/editor/search/SearchBar.java       |  
2 +-
 editor/src/org/netbeans/modules/editor/NbEditorKit.java                   |  
2 --
 editor/src/org/netbeans/modules/editor/resources/NetBeans-keybindings.xml |  
4 ++--
 7 files changed, 9 insertions(+), 13 deletions(-)

diffs (92 lines):

diff --git 
a/defaults/src/org/netbeans/modules/defaults/Eclipse-keybindings.xml 
b/defaults/src/org/netbeans/modules/defaults/Eclipse-keybindings.xml
--- a/defaults/src/org/netbeans/modules/defaults/Eclipse-keybindings.xml
+++ b/defaults/src/org/netbeans/modules/defaults/Eclipse-keybindings.xml
@@ -102,8 +102,7 @@
     <bind actionName="goto" key="D-L"/>
     <bind actionName="goto-declaration" key="F3"/>
     <bind actionName="in-place-refactoring" key="OS-R"/>
-    <bind actionName="incremental-search-forward" key="D-J"/>
-    <bind actionName="incremental-search-backward" key="DS-J"/>
+    <bind actionName="find" key="D-J"/>
     <bind actionName="insert-break" key="ENTER"/>
     <bind actionName="insert-tab" key="TAB"/>
     <bind actionName="jump-list-last-edit" key="D-Q"/>
diff --git a/defaults/src/org/netbeans/modules/defaults/Emacs-keybindings.xml 
b/defaults/src/org/netbeans/modules/defaults/Emacs-keybindings.xml
--- a/defaults/src/org/netbeans/modules/defaults/Emacs-keybindings.xml
+++ b/defaults/src/org/netbeans/modules/defaults/Emacs-keybindings.xml
@@ -99,8 +99,8 @@
     <bind actionName="expand-fold" key="C-ADD"/>
     <bind actionName="expand-fold" key="C-EQUALS"/>
     <bind actionName="expand-fold" key="C-PLUS"/>
-    <bind actionName="incremental-search-forward" key="FIND"/>
-    <bind actionName="incremental-search-forward" key="C-S"/>    
+    <bind actionName="find" key="FIND"/>
+    <bind actionName="find" key="C-S"/>    
     <bind actionName="find-next" key="O-S"/>
     <bind actionName="find-next" key="F3"/>
     <bind actionName="find-previous" key="O-R"/>
diff --git a/defaults/src/org/netbeans/modules/defaults/Idea-keybindings.xml 
b/defaults/src/org/netbeans/modules/defaults/Idea-keybindings.xml
--- a/defaults/src/org/netbeans/modules/defaults/Idea-keybindings.xml
+++ b/defaults/src/org/netbeans/modules/defaults/Idea-keybindings.xml
@@ -94,8 +94,7 @@
     <bind actionName="format" key="CA-L"/>
     <bind actionName="generate-code" key="A-INSERT"/>
     <bind actionName="goto" key="C-G"/>
-    <bind actionName="incremental-search-backward" key="OS-F3"/>
-    <bind actionName="incremental-search-forward" key="A-F3"/>
+    <bind actionName="find" key="A-F3"/>
     <bind actionName="insert-break" key="ENTER"/>
     <bind actionName="insert-tab" key="TAB"/>
     <bind actionName="jump-list-last-edit" key="CS-BACK_SPACE"/>
diff --git 
a/defaults/src/org/netbeans/modules/defaults/NetBeans55-keybindings.xml 
b/defaults/src/org/netbeans/modules/defaults/NetBeans55-keybindings.xml
--- a/defaults/src/org/netbeans/modules/defaults/NetBeans55-keybindings.xml
+++ b/defaults/src/org/netbeans/modules/defaults/NetBeans55-keybindings.xml
@@ -96,8 +96,8 @@
     <bind actionName="expand-fold" key="D-ADD"/>
     <bind actionName="expand-fold" key="D-EQUALS"/>
     <bind actionName="expand-fold" key="D-PLUS"/>
-    <bind actionName="incremental-search-forward" key="FIND"/>
-    <bind actionName="incremental-search-forward" key="D-F"/>
+    <bind actionName="find" key="FIND"/>
+    <bind actionName="find" key="D-F"/>
     <bind actionName="find-next" key="F3"/>
     <bind actionName="find-previous" key="S-F3"/>
     <bind actionName="find-selection" key="D-F3"/>
diff --git 
a/editor.search/src/org/netbeans/modules/editor/search/SearchBar.java 
b/editor.search/src/org/netbeans/modules/editor/search/SearchBar.java
--- a/editor.search/src/org/netbeans/modules/editor/search/SearchBar.java
+++ b/editor.search/src/org/netbeans/modules/editor/search/SearchBar.java
@@ -421,7 +421,7 @@
                     MultiKeymap multiKeymap = (MultiKeymap) keymap;
 
                     Action[] actions = lastFocusedComponent.getActions();
-                    for (Action action : actions) { // Discover the 
keyStrokes for incremental-search-forward
+                    for (Action action : actions) { 
                         String actionName = (String) 
action.getValue(Action.NAME);
                         if (actionName == null) {
                             LOG.log(Level.WARNING, "SearchBar: Null 
Action.NAME property of action: {0}\n", action); //NOI18N
diff --git a/editor/src/org/netbeans/modules/editor/NbEditorKit.java 
b/editor/src/org/netbeans/modules/editor/NbEditorKit.java
--- a/editor/src/org/netbeans/modules/editor/NbEditorKit.java
+++ b/editor/src/org/netbeans/modules/editor/NbEditorKit.java
@@ -249,8 +249,6 @@
         addSystemActionMapping(deleteNextCharAction, "delete");
         addSystemActionMapping(showPopupMenuAction, 
org.openide.actions.PopupAction.class);
 
-//        
addSystemActionMapping(SearchAndReplaceBarHandler.INCREMENTAL_SEARCH_FORWARD, 
org.openide.actions.FindAction.class);
-//        addSystemActionMapping(SearchAndReplaceBarHandler.REPLACE_ACTION, 
org.openide.actions.ReplaceAction.class);
         addSystemActionMapping(gotoAction, 
org.openide.actions.GotoAction.class);
 
         addSystemActionMapping(undoAction, 
org.openide.actions.UndoAction.class);
diff --git 
a/editor/src/org/netbeans/modules/editor/resources/NetBeans-keybindings.xml 
b/editor/src/org/netbeans/modules/editor/resources/NetBeans-keybindings.xml
--- 
a/editor/src/org/netbeans/modules/editor/resources/NetBeans-keybindings.xml
+++ 
b/editor/src/org/netbeans/modules/editor/resources/NetBeans-keybindings.xml
@@ -107,8 +107,8 @@
     <bind actionName="generate-code" key="O-INSERT"/>
     <bind actionName="remove-surrounding-code" key="O-BACK_SPACE"/>
     <bind actionName="in-place-refactoring" key="D-R"/>
-    <bind actionName="incremental-search-forward" key="FIND"/>
-    <bind actionName="incremental-search-forward" key="D-F"/>
+    <bind actionName="find" key="FIND"/>
+    <bind actionName="find" key="D-F"/>
     <bind actionName="format" key="OS-F"/>
     <bind actionName="goto" key="D-G"/>
     <bind actionName="goto-declaration" key="D-B"/>

[hg] main-silver: #225244 - Find bar does not open in diff

Milutin Kristofic 01/24/2013

Project Features

About this Project

Editor was started in November 2009, is owned by Martin Ryzl, and has 147 members.
By use of this website, you agree to the NetBeans Policies and Terms of Use (revision 20131025.e7cbc9d). © 2013, Oracle Corporation and/or its affiliates. Sponsored by Oracle logo
 
 
Close
loading
Please Confirm
Close