[hg] main-silver: Reverting changeset a00df06085ee in NbEditorKi...

  • From: Svata Dedic < >
  • To:
  • Subject: [hg] main-silver: Reverting changeset a00df06085ee in NbEditorKi...
  • Date: Tue, 04 Dec 2012 14:39:15 -0800

changeset d6bf03b2dd74 in main-silver ((none))
details: http://hg.netbeans.org/main-silver/rev/d6bf03b2dd74
description:
        Reverting changeset a00df06085ee in NbEditorKit; the translation of . 
to - should be better placed to the EditorBridge to have effect just on 
keymaps

diffstat:

 editor/src/org/netbeans/modules/editor/NbEditorKit.java                      
   |  2 +-
 
options.editor/src/org/netbeans/modules/options/editor/keymap/EditorBridge.java
 |  3 +++
 2 files changed, 4 insertions(+), 1 deletions(-)

diffs (25 lines):

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
@@ -229,7 +229,7 @@
     protected void addSystemActionMapping(String editorActionName, Class 
systemActionClass) {
         Action a = getActionByName(editorActionName);
         if (a != null) {
-            a.putValue(SYSTEM_ACTION_CLASS_NAME_PROPERTY, 
systemActionClass.getName().replaceAll("\\.", "-"));
+            a.putValue(SYSTEM_ACTION_CLASS_NAME_PROPERTY, 
systemActionClass.getName());
         }
         systemAction2editorAction.put(systemActionClass.getName(), 
editorActionName);
     }
diff --git 
a/options.editor/src/org/netbeans/modules/options/editor/keymap/EditorBridge.java
 
b/options.editor/src/org/netbeans/modules/options/editor/keymap/EditorBridge.java
--- 
a/options.editor/src/org/netbeans/modules/options/editor/keymap/EditorBridge.java
+++ 
b/options.editor/src/org/netbeans/modules/options/editor/keymap/EditorBridge.java
@@ -622,6 +622,9 @@
         public String getDelegatingActionId() {
             if (delegaitngActionId == null) {
                 delegaitngActionId = (String) 
action.getValue(NbEditorKit.SYSTEM_ACTION_CLASS_NAME_PROPERTY);
+                if (delegaitngActionId != null) {
+                    delegaitngActionId = 
delegaitngActionId.replaceAll("\\.", "-");
+                }
             }
             return delegaitngActionId;
         }

[hg] main-silver: Reverting changeset a00df06085ee in NbEditorKi...

Svata Dedic 12/04/2012

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 20140418.2d69abc). © 2013, Oracle Corporation and/or its affiliates. Sponsored by Oracle logo
 
 
Close
loading
Please Confirm
Close