# HG changeset patch
# Parent aa51208482a826431d67d1219039fa6db3d3b7ed
diff --git a/cnd.highlight/nbproject/project.xml b/cnd.highlight/nbproject/project.xml
--- a/cnd.highlight/nbproject/project.xml
+++ b/cnd.highlight/nbproject/project.xml
@@ -149,7 +149,7 @@
                     <compile-dependency/>
                     <run-dependency>
                         <release-version>1</release-version>
-                        <specification-version>2.0</specification-version>
+                        <specification-version>2.3</specification-version>
                     </run-dependency>
                 </dependency>
                 <dependency>
diff --git a/cnd.highlight/src/org/netbeans/modules/cnd/highlight/resources/DefaultKeyBindings.xml b/cnd.highlight/src/org/netbeans/modules/cnd/highlight/resources/DefaultKeyBindings.xml
deleted file mode 100644
--- a/cnd.highlight/src/org/netbeans/modules/cnd/highlight/resources/DefaultKeyBindings.xml
+++ /dev/null
@@ -1,51 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
-
-Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
-
-Oracle and Java are registered trademarks of Oracle and/or its affiliates.
-Other names may be trademarks of their respective owners.
-
-
-The contents of this file are subject to the terms of either the GNU
-General Public License Version 2 only ("GPL") or the Common
-Development and Distribution License("CDDL") (collectively, the
-"License"). You may not use this file except in compliance with the
-License. You can obtain a copy of the License at
-http://www.netbeans.org/cddl-gplv2.html
-or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the
-specific language governing permissions and limitations under the
-License.  When distributing the software, include this License Header
-Notice in each file and include the License file at
-nbbuild/licenses/CDDL-GPL-2-CP.  Oracle designates this
-particular file as subject to the "Classpath" exception as provided
-by Oracle in the GPL Version 2 section of the License file that
-accompanied this code. If applicable, add the following below the
-License Header, with the fields enclosed by brackets [] replaced by
-your own identifying information:
-"Portions Copyrighted [year] [name of copyright owner]"
-
-Contributor(s):
-
-The Original Software is NetBeans. The Initial Developer of the Original
-Software is Sun Microsystems, Inc. Portions Copyright 1997-2008 Sun
-Microsystems, Inc. All Rights Reserved.
-
-If you wish your version of this file to be governed by only the CDDL
-or only the GPL Version 2, indicate your decision by adding
-"[Contributor] elects to include this software in this distribution
-under the [CDDL or GPL Version 2] license." If you do not indicate a
-single choice of license, a recipient has the option to distribute
-your version of this file under either the CDDL, the GPL Version 2 or
-to extend the choice of license to its licensees as provided above.
-However, if you add GPL Version 2 code and therefore, elected the GPL
-Version 2 license, then the option applies only if the new code is
-made subject to such option by the copyright holder.
--->
-<!DOCTYPE bindings PUBLIC "-//NetBeans//DTD Editor KeyBindings settings 1.1//EN" "http://www.netbeans.org/dtds/EditorKeyBindings-1_1.dtd">
-
-<bindings>
-    <bind actionName="cpp-next-marked-occurrence" key="O-DOWN"/>
-    <bind actionName="cpp-prev-marked-occurrence" key="O-UP"/>
-</bindings>
diff --git a/cnd.highlight/src/org/netbeans/modules/cnd/highlight/resources/layer.xml b/cnd.highlight/src/org/netbeans/modules/cnd/highlight/resources/layer.xml
--- a/cnd.highlight/src/org/netbeans/modules/cnd/highlight/resources/layer.xml
+++ b/cnd.highlight/src/org/netbeans/modules/cnd/highlight/resources/layer.xml
@@ -53,13 +53,6 @@
                     <file name="org-netbeans-modules-cnd-highlight-error-CppUpToDateStatusProviderFactory.instance">
                     </file>
                 </folder>
-                <folder name="Keybindings">
-                    <folder name="NetBeans">
-                        <folder name="Defaults">
-                            <file name="highlighting-keybindings.xml" url="DefaultKeyBindings.xml"/>
-                        </folder>
-                    </folder>
-                </folder>
                 <folder name="Actions">
                     <file name="org-netbeans-modules-cnd-highlight-semantic-actions-GotoNextOccurrenceAction.instance">
                         <attr name="instanceOf" stringvalue="javax.swing.Action"/>
diff --git a/cnd.highlight/src/org/netbeans/modules/cnd/highlight/semantic/actions/Bundle.properties b/cnd.highlight/src/org/netbeans/modules/cnd/highlight/semantic/actions/Bundle.properties
--- a/cnd.highlight/src/org/netbeans/modules/cnd/highlight/semantic/actions/Bundle.properties
+++ b/cnd.highlight/src/org/netbeans/modules/cnd/highlight/semantic/actions/Bundle.properties
@@ -41,7 +41,7 @@
 # made subject to such option by the copyright holder.
 #
 
-cpp-next-marked-occurrence=Navigate to Next Occurrence
-cpp-prev-marked-occurrence=Navigate to Previous Occurrence
+next-marked-occurrence=Navigate to Next Occurrence
+prev-marked-occurrence=Navigate to Previous Occurrence
 cpp-no-marked-occurrence=There is no occurrence to navigate to.
 
diff --git a/cnd.highlight/src/org/netbeans/modules/cnd/highlight/semantic/actions/GotoNextOccurrenceAction.java b/cnd.highlight/src/org/netbeans/modules/cnd/highlight/semantic/actions/GotoNextOccurrenceAction.java
--- a/cnd.highlight/src/org/netbeans/modules/cnd/highlight/semantic/actions/GotoNextOccurrenceAction.java
+++ b/cnd.highlight/src/org/netbeans/modules/cnd/highlight/semantic/actions/GotoNextOccurrenceAction.java
@@ -45,6 +45,7 @@
 
 import java.awt.event.ActionEvent;
 import javax.swing.text.JTextComponent;
+import org.netbeans.api.editor.EditorActionNames;
 import org.netbeans.editor.BaseAction;
 import org.openide.util.NbBundle;
 
@@ -56,7 +57,7 @@
  */
 public final class GotoNextOccurrenceAction extends BaseAction {
 
-    private static final String actionName = "cpp-next-marked-occurrence"; // NOI18N
+    private static final String actionName = EditorActionNames.gotoNextOccurrence; // NOI18N
     private static GotoNextOccurrenceAction instance;
 
     public static synchronized GotoNextOccurrenceAction getInstance() {
diff --git a/cnd.highlight/src/org/netbeans/modules/cnd/highlight/semantic/actions/GotoPrevOccurrenceAction.java b/cnd.highlight/src/org/netbeans/modules/cnd/highlight/semantic/actions/GotoPrevOccurrenceAction.java
--- a/cnd.highlight/src/org/netbeans/modules/cnd/highlight/semantic/actions/GotoPrevOccurrenceAction.java
+++ b/cnd.highlight/src/org/netbeans/modules/cnd/highlight/semantic/actions/GotoPrevOccurrenceAction.java
@@ -45,6 +45,7 @@
 
 import java.awt.event.ActionEvent;
 import javax.swing.text.JTextComponent;
+import org.netbeans.api.editor.EditorActionNames;
 import org.netbeans.editor.BaseAction;
 import org.openide.util.NbBundle;
 
@@ -56,7 +57,7 @@
  */
 public final class GotoPrevOccurrenceAction extends BaseAction {
 
-    private static final String actionName = "cpp-prev-marked-occurrence"; // NOI18N
+    private static final String actionName = EditorActionNames.gotoPrevOccurrence;
     private static GotoPrevOccurrenceAction instance;
 
     public static synchronized GotoPrevOccurrenceAction getInstance() {
diff --git a/csl.api/nbproject/project.xml b/csl.api/nbproject/project.xml
--- a/csl.api/nbproject/project.xml
+++ b/csl.api/nbproject/project.xml
@@ -169,7 +169,7 @@
                     <compile-dependency/>
                     <run-dependency>
                         <release-version>1</release-version>
-                        <specification-version>2.0</specification-version>
+                        <specification-version>2.3</specification-version>
                     </run-dependency>
                 </dependency>
                 <dependency>
diff --git a/csl.api/src/org/netbeans/modules/csl/api/Bundle.properties b/csl.api/src/org/netbeans/modules/csl/api/Bundle.properties
--- a/csl.api/src/org/netbeans/modules/csl/api/Bundle.properties
+++ b/csl.api/src/org/netbeans/modules/csl/api/Bundle.properties
@@ -14,6 +14,8 @@
 #GoToMarkOccurrencesAction
 csl-next-marked-occurrence=Navigate to Next Occurrence
 csl-prev-marked-occurrence=Navigate to Previous Occurrence
+next-marked-occurrence=Navigate to Next Occurrence
+prev-marked-occurrence=Navigate to Previous Occurrence
 csl-no-marked-occurrence=There is no occurrence to navigate to.
 
 TXT_CalculatingDeclPos=Calculating declaration position
diff --git a/csl.api/src/org/netbeans/modules/csl/api/GoToMarkOccurrencesAction.java b/csl.api/src/org/netbeans/modules/csl/api/GoToMarkOccurrencesAction.java
--- a/csl.api/src/org/netbeans/modules/csl/api/GoToMarkOccurrencesAction.java
+++ b/csl.api/src/org/netbeans/modules/csl/api/GoToMarkOccurrencesAction.java
@@ -58,6 +58,7 @@
 import java.awt.event.ActionEvent;
 import javax.swing.text.Document;
 import javax.swing.text.JTextComponent;
+import org.netbeans.api.editor.EditorActionNames;
 import org.netbeans.editor.BaseAction;
 import org.netbeans.modules.csl.editor.semantic.MarkOccurrencesHighlighter;
 import org.netbeans.spi.editor.highlighting.HighlightsSequence;
@@ -82,8 +83,8 @@
  */
 public final class GoToMarkOccurrencesAction extends BaseAction {
 
-    private static final String prevActionName = "csl-prev-marked-occurrence"; // NOI18N
-    private static final String nextActionName = "csl-next-marked-occurrence"; // NOI18N
+    private static final String prevActionName = EditorActionNames.gotoPrevOccurrence;
+    private static final String nextActionName = EditorActionNames.gotoNextOccurrence;
 
     private final boolean next;
 
diff --git a/csl.api/src/org/netbeans/modules/csl/core/DefaultKeyBindings-Mac.xml b/csl.api/src/org/netbeans/modules/csl/core/DefaultKeyBindings-Mac.xml
deleted file mode 100644
--- a/csl.api/src/org/netbeans/modules/csl/core/DefaultKeyBindings-Mac.xml
+++ /dev/null
@@ -1,57 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
-
-Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
-
-Oracle and Java are registered trademarks of Oracle and/or its affiliates.
-Other names may be trademarks of their respective owners.
-
-
-The contents of this file are subject to the terms of either the GNU
-General Public License Version 2 only ("GPL") or the Common
-Development and Distribution License("CDDL") (collectively, the
-"License"). You may not use this file except in compliance with the
-License. You can obtain a copy of the License at
-http://www.netbeans.org/cddl-gplv2.html
-or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the
-specific language governing permissions and limitations under the
-License.  When distributing the software, include this License Header
-Notice in each file and include the License file at
-nbbuild/licenses/CDDL-GPL-2-CP.  Oracle designates this
-particular file as subject to the "Classpath" exception as provided
-by Oracle in the GPL Version 2 section of the License file that
-accompanied this code. If applicable, add the following below the
-License Header, with the fields enclosed by brackets [] replaced by
-your own identifying information:
-"Portions Copyrighted [year] [name of copyright owner]"
-
-Contributor(s):
-
-The Original Software is NetBeans. The Initial Developer of the Original
-Software is Sun Microsystems, Inc. Portions Copyright 1997-2008 Sun
-Microsystems, Inc. All Rights Reserved.
-
-If you wish your version of this file to be governed by only the CDDL
-or only the GPL Version 2, indicate your decision by adding
-"[Contributor] elects to include this software in this distribution
-under the [CDDL or GPL Version 2] license." If you do not indicate a
-single choice of license, a recipient has the option to distribute
-your version of this file under either the CDDL, the GPL Version 2 or
-to extend the choice of license to its licensees as provided above.
-However, if you add GPL Version 2 code and therefore, elected the GPL
-Version 2 license, then the option applies only if the new code is
-made subject to such option by the copyright holder.
--->
-<!DOCTYPE bindings PUBLIC "-//NetBeans//DTD Editor KeyBindings settings 1.1//EN" "http://www.netbeans.org/dtds/EditorKeyBindings-1_1.dtd">
-
-<!--
-    IMPORTANT:  This file modifies keybindings from DefaultKeyBindings.xml to make them work in Mac OS.
-
-    Check http://docs.info.apple.com/article.html?artnum=75459 for conflicts
--->
-
-<bindings>
-    <bind actionName="csl-next-marked-occurrence" key="O-DOWN"/>
-    <bind actionName="csl-prev-marked-occurrence" key="O-UP"/>
-</bindings>
diff --git a/csl.api/src/org/netbeans/modules/csl/core/DefaultKeyBindings.xml b/csl.api/src/org/netbeans/modules/csl/core/DefaultKeyBindings.xml
deleted file mode 100644
--- a/csl.api/src/org/netbeans/modules/csl/core/DefaultKeyBindings.xml
+++ /dev/null
@@ -1,57 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
-
-Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
-
-Oracle and Java are registered trademarks of Oracle and/or its affiliates.
-Other names may be trademarks of their respective owners.
-
-
-The contents of this file are subject to the terms of either the GNU
-General Public License Version 2 only ("GPL") or the Common
-Development and Distribution License("CDDL") (collectively, the
-"License"). You may not use this file except in compliance with the
-License. You can obtain a copy of the License at
-http://www.netbeans.org/cddl-gplv2.html
-or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the
-specific language governing permissions and limitations under the
-License.  When distributing the software, include this License Header
-Notice in each file and include the License file at
-nbbuild/licenses/CDDL-GPL-2-CP.  Oracle designates this
-particular file as subject to the "Classpath" exception as provided
-by Oracle in the GPL Version 2 section of the License file that
-accompanied this code. If applicable, add the following below the
-License Header, with the fields enclosed by brackets [] replaced by
-your own identifying information:
-"Portions Copyrighted [year] [name of copyright owner]"
-
-Contributor(s):
-
-The Original Software is NetBeans. The Initial Developer of the Original
-Software is Sun Microsystems, Inc. Portions Copyright 1997-2008 Sun
-Microsystems, Inc. All Rights Reserved.
-
-If you wish your version of this file to be governed by only the CDDL
-or only the GPL Version 2, indicate your decision by adding
-"[Contributor] elects to include this software in this distribution
-under the [CDDL or GPL Version 2] license." If you do not indicate a
-single choice of license, a recipient has the option to distribute
-your version of this file under either the CDDL, the GPL Version 2 or
-to extend the choice of license to its licensees as provided above.
-However, if you add GPL Version 2 code and therefore, elected the GPL
-Version 2 license, then the option applies only if the new code is
-made subject to such option by the copyright holder.
--->
-<!DOCTYPE bindings PUBLIC "-//NetBeans//DTD Editor KeyBindings settings 1.1//EN" "http://www.netbeans.org/dtds/EditorKeyBindings-1_1.dtd">
-
-<!-- TODO: The java version of this file contains a comment that there is another
-copy of this file in ide/applemenu. Check whether I need to do something there!
-
-See http://wiki.netbeans.info/wiki/view/DevFaqLogicalKeybindings for action names
-
--->
-<bindings>
-    <bind actionName="csl-prev-marked-occurrence" key="O-UP"/>
-    <bind actionName="csl-next-marked-occurrence" key="O-DOWN"/>
-</bindings>
diff --git a/csl.api/src/org/netbeans/modules/csl/core/layer.xml b/csl.api/src/org/netbeans/modules/csl/core/layer.xml
--- a/csl.api/src/org/netbeans/modules/csl/core/layer.xml
+++ b/csl.api/src/org/netbeans/modules/csl/core/layer.xml
@@ -45,16 +45,6 @@
                 </folder>
             </folder>
         </folder>
-        <folder name="Keybindings">
-            <folder name="NetBeans">
-                <folder name="Defaults">
-                    <file name="org-netbeans-modules-csl-keybindings.xml" url="DefaultKeyBindings.xml"/>
-                    <file name="org-netbeans-modules-csl-keybindings-mac.xml" url="DefaultKeyBindings-Mac.xml">
-                        <attr name="nbeditor-settings-targetOS" stringvalue="OS_MAC"/>
-                    </file>
-                </folder>
-            </folder>
-        </folder>
     </folder>
     
     <folder name="TaskList">
diff --git a/editor.lib2/apichanges.xml b/editor.lib2/apichanges.xml
--- a/editor.lib2/apichanges.xml
+++ b/editor.lib2/apichanges.xml
@@ -107,6 +107,21 @@
     <!-- ACTUAL CHANGES BEGIN HERE: -->
 
     <changes>
+        <change id="occurrences-names">
+            <summary>Added IDs for goto prev/next occurrence actions</summary>
+            <version major="2" minor="3"/>
+            <date day="20" month="5" year="2015"/>
+            <author login="sdedic"/>
+            <compatibility binary="compatible" semantic="compatible" source="compatible" addition="yes"/>
+            <description>
+                <p>
+                    Many languages define their own actions and support for navigating between symbol occurrences.
+                    Common action name allows them to be presented and configured as one action in IDE configuration.
+                </p>
+            </description>
+            <class name="EditorActionNames" package="org.netbeans.api.editor"/>
+            <issue number="194356"/>
+        </change>
         <change id="editor-document-split">
             <summary>Document handling split</summary>
             <version major="2" minor="0"/>
diff --git a/editor.lib2/nbproject/project.properties b/editor.lib2/nbproject/project.properties
--- a/editor.lib2/nbproject/project.properties
+++ b/editor.lib2/nbproject/project.properties
@@ -43,7 +43,7 @@
 is.autoload=true
 javac.source=1.7
 javac.compilerargs=-Xlint:unchecked
-spec.version.base=2.2.0
+spec.version.base=2.3.0
 
 javadoc.arch=${basedir}/arch.xml
 javadoc.apichanges=${basedir}/apichanges.xml
diff --git a/editor.lib2/src/org/netbeans/api/editor/EditorActionNames.java b/editor.lib2/src/org/netbeans/api/editor/EditorActionNames.java
--- a/editor.lib2/src/org/netbeans/api/editor/EditorActionNames.java
+++ b/editor.lib2/src/org/netbeans/api/editor/EditorActionNames.java
@@ -136,4 +136,18 @@
      * @since 1.64
      */
     public static final String organizeMembers = "organize-members"; // NOI18N
+    
+    /**
+     * Navigates to the previous occurence of the symbol under the caret. The action
+     * should be implemented by specific language EditorKit
+     * @since 2.3
+     */
+    public static final String gotoPrevOccurrence = "prev-marked-occurrence"; // NOI18N
+    
+    /**
+     * Navigates to the next occurence of the symbol under the caret. The action
+     * should be implemented by specific language EditorKit
+     * @since 2.3
+     */
+    public static final String gotoNextOccurrence = "next-marked-occurrence"; // NOI18N
 }
diff --git a/editor/src/org/netbeans/modules/editor/resources/NetBeans-keybindings-mac.xml b/editor/src/org/netbeans/modules/editor/resources/NetBeans-keybindings-mac.xml
--- a/editor/src/org/netbeans/modules/editor/resources/NetBeans-keybindings-mac.xml
+++ b/editor/src/org/netbeans/modules/editor/resources/NetBeans-keybindings-mac.xml
@@ -131,4 +131,7 @@
     <!-- conflict with system zoom shortcut (Alt-mousewheel), see issue #212484, comment #12 -->
     <bind actionName="zoom-text-in" key="A-MOUSE_WHEEL_UP"/>
     <bind actionName="zoom-text-out" key="A-MOUSE_WHEEL_DOWN"/>
+
+    <bind actionName="next-marked-occurrence" key="A-DOWN"/>
+    <bind actionName="prev-marked-occurrence" key="A-UP"/>
 </bindings>
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
@@ -199,4 +199,7 @@
     <bind actionName="word-match-prev" key="D-K"/>
     <bind actionName="zoom-text-in" key="O-MOUSE_WHEEL_UP"/>
     <bind actionName="zoom-text-out" key="O-MOUSE_WHEEL_DOWN"/>
+
+    <bind actionName="prev-marked-occurrence" key="O-UP"/>
+    <bind actionName="next-marked-occurrence" key="O-DOWN"/>
 </bindings>
diff --git a/html.editor/nbproject/project.xml b/html.editor/nbproject/project.xml
--- a/html.editor/nbproject/project.xml
+++ b/html.editor/nbproject/project.xml
@@ -161,7 +161,7 @@
                     <compile-dependency/>
                     <run-dependency>
                         <release-version>1</release-version>
-                        <specification-version>2.0</specification-version>
+                        <specification-version>2.3</specification-version>
                     </run-dependency>
                 </dependency>
                 <dependency>
diff --git a/html.editor/src/org/netbeans/modules/html/editor/resources/DefaultKeyBindings.xml b/html.editor/src/org/netbeans/modules/html/editor/resources/DefaultKeyBindings.xml
deleted file mode 100644
--- a/html.editor/src/org/netbeans/modules/html/editor/resources/DefaultKeyBindings.xml
+++ /dev/null
@@ -1,54 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
-
-Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
-
-Oracle and Java are registered trademarks of Oracle and/or its affiliates.
-Other names may be trademarks of their respective owners.
-
-
-The contents of this file are subject to the terms of either the GNU
-General Public License Version 2 only ("GPL") or the Common
-Development and Distribution License("CDDL") (collectively, the
-"License"). You may not use this file except in compliance with the
-License. You can obtain a copy of the License at
-http://www.netbeans.org/cddl-gplv2.html
-or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the
-specific language governing permissions and limitations under the
-License.  When distributing the software, include this License Header
-Notice in each file and include the License file at
-nbbuild/licenses/CDDL-GPL-2-CP.  Oracle designates this
-particular file as subject to the "Classpath" exception as provided
-by Oracle in the GPL Version 2 section of the License file that
-accompanied this code. If applicable, add the following below the
-License Header, with the fields enclosed by brackets [] replaced by
-your own identifying information:
-"Portions Copyrighted [year] [name of copyright owner]"
-
-Contributor(s):
-
-The Original Software is NetBeans. The Initial Developer of the Original
-Software is Sun Microsystems, Inc. Portions Copyright 1997-2008 Sun
-Microsystems, Inc. All Rights Reserved.
-
-If you wish your version of this file to be governed by only the CDDL
-or only the GPL Version 2, indicate your decision by adding
-"[Contributor] elects to include this software in this distribution
-under the [CDDL or GPL Version 2] license." If you do not indicate a
-single choice of license, a recipient has the option to distribute
-your version of this file under either the CDDL, the GPL Version 2 or
-to extend the choice of license to its licensees as provided above.
-However, if you add GPL Version 2 code and therefore, elected the GPL
-Version 2 license, then the option applies only if the new code is
-made subject to such option by the copyright holder.
--->
-<!DOCTYPE bindings PUBLIC "-//NetBeans//DTD Editor KeyBindings settings 1.1//EN" "http://www.netbeans.org/dtds/EditorKeyBindings-1_1.dtd">
-
-<!-- 
-See http://wiki.netbeans.info/wiki/view/DevFaqLogicalKeybindings for action names
--->
-<bindings>
-    <bind actionName="csl-next-marked-occurrence" key="O-DOWN"/>
-    <bind actionName="csl-prev-marked-occurrence" key="O-UP"/>
-</bindings>
diff --git a/html.editor/src/org/netbeans/modules/html/editor/resources/layer.xml b/html.editor/src/org/netbeans/modules/html/editor/resources/layer.xml
--- a/html.editor/src/org/netbeans/modules/html/editor/resources/layer.xml
+++ b/html.editor/src/org/netbeans/modules/html/editor/resources/layer.xml
@@ -230,13 +230,6 @@
                         <attr name="position" intvalue="4200"/>
                     </file>
                 </folder>
-                <folder name="Keybindings">
-                    <folder name="NetBeans">
-                        <folder name="Defaults">
-                            <file name="org-netbeans-modules-html-editor-keybindings.xml" url="DefaultKeyBindings.xml"/>
-                        </folder>
-                    </folder>
-                </folder>
                 <folder name="text">
                     <folder name="html">
                         <folder name="CodeTemplates">
diff --git a/java.editor/nbproject/project.xml b/java.editor/nbproject/project.xml
--- a/java.editor/nbproject/project.xml
+++ b/java.editor/nbproject/project.xml
@@ -187,7 +187,7 @@
                     <compile-dependency/>
                     <run-dependency>
                         <release-version>1</release-version>
-                        <specification-version>2.0</specification-version>
+                        <specification-version>2.3</specification-version>
                     </run-dependency>
                 </dependency>
                 <dependency>
diff --git a/java.editor/src/org/netbeans/modules/java/editor/resources/DefaultKeyBindings-Mac.xml b/java.editor/src/org/netbeans/modules/java/editor/resources/DefaultKeyBindings-Mac.xml
--- a/java.editor/src/org/netbeans/modules/java/editor/resources/DefaultKeyBindings-Mac.xml
+++ b/java.editor/src/org/netbeans/modules/java/editor/resources/DefaultKeyBindings-Mac.xml
@@ -59,7 +59,4 @@
     <bind key="DOS-DOWN" actionName="select-element-previous"/>
     <bind actionName="complete-line" key="D-SEMICOLON"/>
     <bind actionName="complete-line-newline" key="DS-SEMICOLON"/>
-
-    <bind actionName="java-next-marked-occurrence" key="A-DOWN"/>
-    <bind actionName="java-prev-marked-occurrence" key="A-UP"/>
 </bindings>
diff --git a/java.editor/src/org/netbeans/modules/java/editor/resources/DefaultKeyBindings.xml b/java.editor/src/org/netbeans/modules/java/editor/resources/DefaultKeyBindings.xml
--- a/java.editor/src/org/netbeans/modules/java/editor/resources/DefaultKeyBindings.xml
+++ b/java.editor/src/org/netbeans/modules/java/editor/resources/DefaultKeyBindings.xml
@@ -64,7 +64,4 @@
     <bind actionName="select-element-previous" key="OS-COMMA"/>
     <bind actionName="complete-line" key="D-SEMICOLON"/>
     <bind actionName="complete-line-newline" key="DS-SEMICOLON"/>
-    
-    <bind actionName="java-next-marked-occurrence" key="O-DOWN"/>
-    <bind actionName="java-prev-marked-occurrence" key="O-UP"/>
 </bindings>
diff --git a/java.editor/src/org/netbeans/modules/java/editor/semantic/Bundle.properties b/java.editor/src/org/netbeans/modules/java/editor/semantic/Bundle.properties
--- a/java.editor/src/org/netbeans/modules/java/editor/semantic/Bundle.properties
+++ b/java.editor/src/org/netbeans/modules/java/editor/semantic/Bundle.properties
@@ -57,7 +57,7 @@
 
 LBL_ES_TOOLTIP=Mark Occurrences
 
-java-next-marked-occurrence=Navigate to Next Occurrence
-java-prev-marked-occurrence=Navigate to Previous Occurrence
+next-marked-occurrence=Navigate to Next Occurrence
+prev-marked-occurrence=Navigate to Previous Occurrence
 java-no-marked-occurrence=There is no occurrence to navigate to.
 
diff --git a/java.editor/src/org/netbeans/modules/java/editor/semantic/GoToMarkOccurrencesAction.java b/java.editor/src/org/netbeans/modules/java/editor/semantic/GoToMarkOccurrencesAction.java
--- a/java.editor/src/org/netbeans/modules/java/editor/semantic/GoToMarkOccurrencesAction.java
+++ b/java.editor/src/org/netbeans/modules/java/editor/semantic/GoToMarkOccurrencesAction.java
@@ -58,6 +58,7 @@
 import java.awt.event.ActionEvent;
 import javax.swing.text.Document;
 import javax.swing.text.JTextComponent;
+import org.netbeans.api.editor.EditorActionNames;
 import org.netbeans.editor.BaseAction;
 import org.netbeans.lib.editor.util.swing.DocumentUtilities;
 import org.netbeans.spi.editor.highlighting.HighlightsSequence;
@@ -71,8 +72,9 @@
  */
 public class GoToMarkOccurrencesAction extends BaseAction {
 
-    private static final String prevActionName = "java-prev-marked-occurrence"; // NOI18N
-    private static final String nextActionName = "java-next-marked-occurrence"; // NOI18N
+    private static final String prevActionName = EditorActionNames.gotoPrevOccurrence;
+    private static final String nextActionName = EditorActionNames.gotoNextOccurrence;
+    
     static final String markedOccurence = "marked-occurrence"; // NOI18N
 
     private final boolean next;
diff --git a/javascript.editing/src/org/netbeans/modules/javascript/editing/DefaultKeyBindings.xml b/javascript.editing/src/org/netbeans/modules/javascript/editing/DefaultKeyBindings.xml
--- a/javascript.editing/src/org/netbeans/modules/javascript/editing/DefaultKeyBindings.xml
+++ b/javascript.editing/src/org/netbeans/modules/javascript/editing/DefaultKeyBindings.xml
@@ -52,6 +52,6 @@
 
 -->
 <bindings>
-    <bind actionName="csl-next-marked-occurrence" key="O-DOWN"/>
-    <bind actionName="csl-prev-marked-occurrence" key="O-UP"/>
+<!--    <bind actionName="csl-next-marked-occurrence" key="O-DOWN"/>
+    <bind actionName="csl-prev-marked-occurrence" key="O-UP"/>-->
 </bindings>
diff --git a/javascript2.editor/src/org/netbeans/modules/javascript2/editor/resources/DefaultKeyBindings-Mac.xml b/javascript2.editor/src/org/netbeans/modules/javascript2/editor/resources/DefaultKeyBindings-Mac.xml
--- a/javascript2.editor/src/org/netbeans/modules/javascript2/editor/resources/DefaultKeyBindings-Mac.xml
+++ b/javascript2.editor/src/org/netbeans/modules/javascript2/editor/resources/DefaultKeyBindings-Mac.xml
@@ -54,6 +54,4 @@
 <bindings>
     <bind actionName="complete-line" key="D-SEMICOLON"/>
     <bind actionName="complete-line-newline" key="DS-SEMICOLON"/>
-    <bind actionName="csl-next-marked-occurrence" key="O-DOWN"/>
-    <bind actionName="csl-prev-marked-occurrence" key="O-UP"/>
 </bindings>
diff --git a/javascript2.editor/src/org/netbeans/modules/javascript2/editor/resources/DefaultKeyBindings.xml b/javascript2.editor/src/org/netbeans/modules/javascript2/editor/resources/DefaultKeyBindings.xml
--- a/javascript2.editor/src/org/netbeans/modules/javascript2/editor/resources/DefaultKeyBindings.xml
+++ b/javascript2.editor/src/org/netbeans/modules/javascript2/editor/resources/DefaultKeyBindings.xml
@@ -54,6 +54,4 @@
 <bindings>
     <bind actionName="complete-line" key="D-SEMICOLON"/>
     <bind actionName="complete-line-newline" key="DS-SEMICOLON"/>
-    <bind actionName="csl-prev-marked-occurrence" key="O-UP"/>
-    <bind actionName="csl-next-marked-occurrence" key="O-DOWN"/>
 </bindings>