Attachment #153742 for bug #194356

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 194356
Collapse All | Expand All

Lines 149-155 Link Here

(-)a/cnd.highlight/nbproject/project.xml (-1 / +1 lines)
149	<compile-dependency/>	149	<compile-dependency/>
150	<run-dependency>	150	<run-dependency>
151	<release-version>1</release-version>	151	<release-version>1</release-version>
152	<specification-version>2.0</specification-version>	152	<specification-version>2.3</specification-version>
153	</run-dependency>	153	</run-dependency>
154	</dependency>	154	</dependency>
155	<dependency>	155	<dependency>




<?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>




                    <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"/>

Lines 41-47 Link Here

(-)a/cnd.highlight/src/org/netbeans/modules/cnd/highlight/semantic/actions/Bundle.properties (-2 / +2 lines)
41	# made subject to such option by the copyright holder.	41	# made subject to such option by the copyright holder.
42	#	42	#
43		43
44	cpp-next-marked-occurrence=Navigate to Next Occurrence	44	next-marked-occurrence=Navigate to Next Occurrence
45	cpp-prev-marked-occurrence=Navigate to Previous Occurrence	45	prev-marked-occurrence=Navigate to Previous Occurrence
46	cpp-no-marked-occurrence=There is no occurrence to navigate to.	46	cpp-no-marked-occurrence=There is no occurrence to navigate to.
47		47

Lines 45-50 Link Here

(-)a/cnd.highlight/src/org/netbeans/modules/cnd/highlight/semantic/actions/GotoNextOccurrenceAction.java (-1 / +2 lines)
45		45
46	import java.awt.event.ActionEvent;	46	import java.awt.event.ActionEvent;
47	import javax.swing.text.JTextComponent;	47	import javax.swing.text.JTextComponent;
		48	import org.netbeans.api.editor.EditorActionNames;
48	import org.netbeans.editor.BaseAction;	49	import org.netbeans.editor.BaseAction;
49	import org.openide.util.NbBundle;	50	import org.openide.util.NbBundle;
50		51
Lines 56-62 Link Here
56	*/	57	*/
57	public final class GotoNextOccurrenceAction extends BaseAction {	58	public final class GotoNextOccurrenceAction extends BaseAction {
58		59
59	private static final String actionName = "cpp-next-marked-occurrence"; // NOI18N	60	private static final String actionName = EditorActionNames.gotoNextOccurrence; // NOI18N
60	private static GotoNextOccurrenceAction instance;	61	private static GotoNextOccurrenceAction instance;
61		62
62	public static synchronized GotoNextOccurrenceAction getInstance() {	63	public static synchronized GotoNextOccurrenceAction getInstance() {

Lines 45-50 Link Here

(-)a/cnd.highlight/src/org/netbeans/modules/cnd/highlight/semantic/actions/GotoPrevOccurrenceAction.java (-1 / +2 lines)
45		45
46	import java.awt.event.ActionEvent;	46	import java.awt.event.ActionEvent;
47	import javax.swing.text.JTextComponent;	47	import javax.swing.text.JTextComponent;
		48	import org.netbeans.api.editor.EditorActionNames;
48	import org.netbeans.editor.BaseAction;	49	import org.netbeans.editor.BaseAction;
49	import org.openide.util.NbBundle;	50	import org.openide.util.NbBundle;
50		51
Lines 56-62 Link Here
56	*/	57	*/
57	public final class GotoPrevOccurrenceAction extends BaseAction {	58	public final class GotoPrevOccurrenceAction extends BaseAction {
58		59
59	private static final String actionName = "cpp-prev-marked-occurrence"; // NOI18N	60	private static final String actionName = EditorActionNames.gotoPrevOccurrence;
60	private static GotoPrevOccurrenceAction instance;	61	private static GotoPrevOccurrenceAction instance;
61		62
62	public static synchronized GotoPrevOccurrenceAction getInstance() {	63	public static synchronized GotoPrevOccurrenceAction getInstance() {

Lines 169-175 Link Here

(-)a/csl.api/nbproject/project.xml (-1 / +1 lines)
169	<compile-dependency/>	169	<compile-dependency/>
170	<run-dependency>	170	<run-dependency>
171	<release-version>1</release-version>	171	<release-version>1</release-version>
172	<specification-version>2.0</specification-version>	172	<specification-version>2.3</specification-version>
173	</run-dependency>	173	</run-dependency>
174	</dependency>	174	</dependency>
175	<dependency>	175	<dependency>

Lines 14-19 Link Here

(-)a/csl.api/src/org/netbeans/modules/csl/api/Bundle.properties (+2 lines)
14	#GoToMarkOccurrencesAction	14	#GoToMarkOccurrencesAction
15	csl-next-marked-occurrence=Navigate to Next Occurrence	15	csl-next-marked-occurrence=Navigate to Next Occurrence
16	csl-prev-marked-occurrence=Navigate to Previous Occurrence	16	csl-prev-marked-occurrence=Navigate to Previous Occurrence
		17	next-marked-occurrence=Navigate to Next Occurrence
		18	prev-marked-occurrence=Navigate to Previous Occurrence
17	csl-no-marked-occurrence=There is no occurrence to navigate to.	19	csl-no-marked-occurrence=There is no occurrence to navigate to.
18		20
19	TXT_CalculatingDeclPos=Calculating declaration position	21	TXT_CalculatingDeclPos=Calculating declaration position

Lines 58-63 Link Here

(-)a/csl.api/src/org/netbeans/modules/csl/api/GoToMarkOccurrencesAction.java (-2 / +3 lines)
58	import java.awt.event.ActionEvent;	58	import java.awt.event.ActionEvent;
59	import javax.swing.text.Document;	59	import javax.swing.text.Document;
60	import javax.swing.text.JTextComponent;	60	import javax.swing.text.JTextComponent;
		61	import org.netbeans.api.editor.EditorActionNames;
61	import org.netbeans.editor.BaseAction;	62	import org.netbeans.editor.BaseAction;
62	import org.netbeans.modules.csl.editor.semantic.MarkOccurrencesHighlighter;	63	import org.netbeans.modules.csl.editor.semantic.MarkOccurrencesHighlighter;
63	import org.netbeans.spi.editor.highlighting.HighlightsSequence;	64	import org.netbeans.spi.editor.highlighting.HighlightsSequence;
Lines 82-89 Link Here
82	*/	83	*/
83	public final class GoToMarkOccurrencesAction extends BaseAction {	84	public final class GoToMarkOccurrencesAction extends BaseAction {
84		85
85	private static final String prevActionName = "csl-prev-marked-occurrence"; // NOI18N	86	private static final String prevActionName = EditorActionNames.gotoPrevOccurrence;
86	private static final String nextActionName = "csl-next-marked-occurrence"; // NOI18N	87	private static final String nextActionName = EditorActionNames.gotoNextOccurrence;
87		88
88	private final boolean next;	89	private final boolean next;
89		90




<?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>




<?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>




                </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">




    <!-- 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"/>

Lines 43-49 Link Here

(-)a/editor.lib2/nbproject/project.properties (-1 / +1 lines)
43	is.autoload=true	43	is.autoload=true
44	javac.source=1.7	44	javac.source=1.7
45	javac.compilerargs=-Xlint:unchecked	45	javac.compilerargs=-Xlint:unchecked
46	spec.version.base=2.2.0	46	spec.version.base=2.3.0
47		47
48	javadoc.arch=${basedir}/arch.xml	48	javadoc.arch=${basedir}/arch.xml
49	javadoc.apichanges=${basedir}/apichanges.xml	49	javadoc.apichanges=${basedir}/apichanges.xml




     * @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
}

Lines 131-134 Link Here

(-)a/editor/src/org/netbeans/modules/editor/resources/NetBeans-keybindings-mac.xml (+3 lines)
131	<!-- conflict with system zoom shortcut (Alt-mousewheel), see issue #212484, comment #12 -->	131	<!-- conflict with system zoom shortcut (Alt-mousewheel), see issue #212484, comment #12 -->
132	<bind actionName="zoom-text-in" key="A-MOUSE_WHEEL_UP"/>	132	<bind actionName="zoom-text-in" key="A-MOUSE_WHEEL_UP"/>
133	<bind actionName="zoom-text-out" key="A-MOUSE_WHEEL_DOWN"/>	133	<bind actionName="zoom-text-out" key="A-MOUSE_WHEEL_DOWN"/>
		134
		135	<bind actionName="next-marked-occurrence" key="A-DOWN"/>
		136	<bind actionName="prev-marked-occurrence" key="A-UP"/>
134	</bindings>	137	</bindings>

Lines 199-202 Link Here

(-)a/editor/src/org/netbeans/modules/editor/resources/NetBeans-keybindings.xml (+3 lines)
199	<bind actionName="word-match-prev" key="D-K"/>	199	<bind actionName="word-match-prev" key="D-K"/>
200	<bind actionName="zoom-text-in" key="O-MOUSE_WHEEL_UP"/>	200	<bind actionName="zoom-text-in" key="O-MOUSE_WHEEL_UP"/>
201	<bind actionName="zoom-text-out" key="O-MOUSE_WHEEL_DOWN"/>	201	<bind actionName="zoom-text-out" key="O-MOUSE_WHEEL_DOWN"/>
		202
		203	<bind actionName="prev-marked-occurrence" key="O-UP"/>
		204	<bind actionName="next-marked-occurrence" key="O-DOWN"/>
202	</bindings>	205	</bindings>

Lines 161-167 Link Here

(-)a/html.editor/nbproject/project.xml (-1 / +1 lines)
161	<compile-dependency/>	161	<compile-dependency/>
162	<run-dependency>	162	<run-dependency>
163	<release-version>1</release-version>	163	<release-version>1</release-version>
164	<specification-version>2.0</specification-version>	164	<specification-version>2.3</specification-version>
165	</run-dependency>	165	</run-dependency>
166	</dependency>	166	</dependency>
167	<dependency>	167	<dependency>




<?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>




                        <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">

Lines 187-193 Link Here

(-)a/java.editor/nbproject/project.xml (-1 / +1 lines)
187	<compile-dependency/>	187	<compile-dependency/>
188	<run-dependency>	188	<run-dependency>
189	<release-version>1</release-version>	189	<release-version>1</release-version>
190	<specification-version>2.0</specification-version>	190	<specification-version>2.3</specification-version>
191	</run-dependency>	191	</run-dependency>
192	</dependency>	192	</dependency>
193	<dependency>	193	<dependency>

Lines 59-65 Link Here

(-)a/java.editor/src/org/netbeans/modules/java/editor/resources/DefaultKeyBindings-Mac.xml (-3 lines)
59	<bind key="DOS-DOWN" actionName="select-element-previous"/>	59	<bind key="DOS-DOWN" actionName="select-element-previous"/>
60	<bind actionName="complete-line" key="D-SEMICOLON"/>	60	<bind actionName="complete-line" key="D-SEMICOLON"/>
61	<bind actionName="complete-line-newline" key="DS-SEMICOLON"/>	61	<bind actionName="complete-line-newline" key="DS-SEMICOLON"/>
62
63	<bind actionName="java-next-marked-occurrence" key="A-DOWN"/>
64	<bind actionName="java-prev-marked-occurrence" key="A-UP"/>
65	</bindings>	62	</bindings>

Lines 64-70 Link Here

(-)a/java.editor/src/org/netbeans/modules/java/editor/resources/DefaultKeyBindings.xml (-3 lines)
64	<bind actionName="select-element-previous" key="OS-COMMA"/>	64	<bind actionName="select-element-previous" key="OS-COMMA"/>
65	<bind actionName="complete-line" key="D-SEMICOLON"/>	65	<bind actionName="complete-line" key="D-SEMICOLON"/>
66	<bind actionName="complete-line-newline" key="DS-SEMICOLON"/>	66	<bind actionName="complete-line-newline" key="DS-SEMICOLON"/>
67
68	<bind actionName="java-next-marked-occurrence" key="O-DOWN"/>
69	<bind actionName="java-prev-marked-occurrence" key="O-UP"/>
70	</bindings>	67	</bindings>

Lines 57-63 Link Here

(-)a/java.editor/src/org/netbeans/modules/java/editor/semantic/Bundle.properties (-2 / +2 lines)
57		57
58	LBL_ES_TOOLTIP=Mark Occurrences	58	LBL_ES_TOOLTIP=Mark Occurrences
59		59
60	java-next-marked-occurrence=Navigate to Next Occurrence	60	next-marked-occurrence=Navigate to Next Occurrence
61	java-prev-marked-occurrence=Navigate to Previous Occurrence	61	prev-marked-occurrence=Navigate to Previous Occurrence
62	java-no-marked-occurrence=There is no occurrence to navigate to.	62	java-no-marked-occurrence=There is no occurrence to navigate to.
63		63




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;

 */
public class GoToMarkOccurrencesAction extends BaseAction {

    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;

Lines 52-57 Link Here

(-)a/javascript.editing/src/org/netbeans/modules/javascript/editing/DefaultKeyBindings.xml (-2 / +2 lines)
52		52
53	-->	53	-->
54	<bindings>	54	<bindings>
55	<bind actionName="csl-next-marked-occurrence" key="O-DOWN"/>	55	<!-- <bind actionName="csl-next-marked-occurrence" key="O-DOWN"/>
56	<bind actionName="csl-prev-marked-occurrence" key="O-UP"/>	56	<bind actionName="csl-prev-marked-occurrence" key="O-UP"/>-->
57	</bindings>	57	</bindings>

Lines 54-59 Link Here

(-)a/javascript2.editor/src/org/netbeans/modules/javascript2/editor/resources/DefaultKeyBindings-Mac.xml (-2 lines)
54	<bindings>	54	<bindings>
55	<bind actionName="complete-line" key="D-SEMICOLON"/>	55	<bind actionName="complete-line" key="D-SEMICOLON"/>
56	<bind actionName="complete-line-newline" key="DS-SEMICOLON"/>	56	<bind actionName="complete-line-newline" key="DS-SEMICOLON"/>
57	<bind actionName="csl-next-marked-occurrence" key="O-DOWN"/>
58	<bind actionName="csl-prev-marked-occurrence" key="O-UP"/>
59	</bindings>	57	</bindings>

Lines 54-59 Link Here

(-)a/javascript2.editor/src/org/netbeans/modules/javascript2/editor/resources/DefaultKeyBindings.xml (-2 lines)
54	<bindings>	54	<bindings>
55	<bind actionName="complete-line" key="D-SEMICOLON"/>	55	<bind actionName="complete-line" key="D-SEMICOLON"/>
56	<bind actionName="complete-line-newline" key="DS-SEMICOLON"/>	56	<bind actionName="complete-line-newline" key="DS-SEMICOLON"/>
57	<bind actionName="csl-prev-marked-occurrence" key="O-UP"/>
58	<bind actionName="csl-next-marked-occurrence" key="O-DOWN"/>
59	</bindings>	57	</bindings>

Return to bug 194356

Lines 107-112 Link Here

(-)a/editor.lib2/apichanges.xml (+15 lines)
107	<!-- ACTUAL CHANGES BEGIN HERE: -->	107	<!-- ACTUAL CHANGES BEGIN HERE: -->
108		108
109	<changes>	109	<changes>
		110	<change id="occurrences-names">
		111	<summary>Added IDs for goto prev/next occurrence actions</summary>
		112	<version major="2" minor="3"/>
		113	<date day="20" month="5" year="2015"/>
		114	<author login="sdedic"/>
		115	<compatibility binary="compatible" semantic="compatible" source="compatible" addition="yes"/>
		116	<description>
		117	<p>
		118	Many languages define their own actions and support for navigating between symbol occurrences.
		119	Common action name allows them to be presented and configured as one action in IDE configuration.
		120	</p>
		121	</description>
		122	<class name="EditorActionNames" package="org.netbeans.api.editor"/>
		123	<issue number="194356"/>
		124	</change>
110	<change id="editor-document-split">	125	<change id="editor-document-split">
111	<summary>Document handling split</summary>	126	<summary>Document handling split</summary>
112	<version major="2" minor="0"/>	127	<version major="2" minor="0"/>

Lines 230-242 Link Here

(-)a/html.editor/src/org/netbeans/modules/html/editor/resources/layer.xml (-7 lines)
230	<attr name="position" intvalue="4200"/>	230	<attr name="position" intvalue="4200"/>
231	</file>	231	</file>
232	</folder>	232	</folder>
233	<folder name="Keybindings">
234	<folder name="NetBeans">
235	<folder name="Defaults">
236	<file name="org-netbeans-modules-html-editor-keybindings.xml" url="DefaultKeyBindings.xml"/>
237	</folder>
238	</folder>
239	</folder>
240	<folder name="text">	233	<folder name="text">
241	<folder name="html">	234	<folder name="html">
242	<folder name="CodeTemplates">	235	<folder name="CodeTemplates">

Lines 1-51 Link Here

(-)a/cnd.highlight/src/org/netbeans/modules/cnd/highlight/resources/DefaultKeyBindings.xml (-51 lines)
1	<?xml version="1.0" encoding="UTF-8"?>
2	<!--
3	DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
4
5	Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
6
7	Oracle and Java are registered trademarks of Oracle and/or its affiliates.
8	Other names may be trademarks of their respective owners.
9
10
11	The contents of this file are subject to the terms of either the GNU
12	General Public License Version 2 only ("GPL") or the Common
13	Development and Distribution License("CDDL") (collectively, the
14	"License"). You may not use this file except in compliance with the
15	License. You can obtain a copy of the License at
16	http://www.netbeans.org/cddl-gplv2.html
17	or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the
18	specific language governing permissions and limitations under the
19	License. When distributing the software, include this License Header
20	Notice in each file and include the License file at
21	nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
22	particular file as subject to the "Classpath" exception as provided
23	by Oracle in the GPL Version 2 section of the License file that
24	accompanied this code. If applicable, add the following below the
25	License Header, with the fields enclosed by brackets [] replaced by
26	your own identifying information:
27	"Portions Copyrighted [year] [name of copyright owner]"
28
29	Contributor(s):
30
31	The Original Software is NetBeans. The Initial Developer of the Original
32	Software is Sun Microsystems, Inc. Portions Copyright 1997-2008 Sun
33	Microsystems, Inc. All Rights Reserved.
34
35	If you wish your version of this file to be governed by only the CDDL
36	or only the GPL Version 2, indicate your decision by adding
37	"[Contributor] elects to include this software in this distribution
38	under the [CDDL or GPL Version 2] license." If you do not indicate a
39	single choice of license, a recipient has the option to distribute
40	your version of this file under either the CDDL, the GPL Version 2 or
41	to extend the choice of license to its licensees as provided above.
42	However, if you add GPL Version 2 code and therefore, elected the GPL
43	Version 2 license, then the option applies only if the new code is
44	made subject to such option by the copyright holder.
45	-->
46	<!DOCTYPE bindings PUBLIC "-//NetBeans//DTD Editor KeyBindings settings 1.1//EN" "http://www.netbeans.org/dtds/EditorKeyBindings-1_1.dtd">
47
48	<bindings>
49	<bind actionName="cpp-next-marked-occurrence" key="O-DOWN"/>
50	<bind actionName="cpp-prev-marked-occurrence" key="O-UP"/>
51	</bindings>

Lines 53-65 Link Here

(-)a/cnd.highlight/src/org/netbeans/modules/cnd/highlight/resources/layer.xml (-7 lines)
53	<file name="org-netbeans-modules-cnd-highlight-error-CppUpToDateStatusProviderFactory.instance">	53	<file name="org-netbeans-modules-cnd-highlight-error-CppUpToDateStatusProviderFactory.instance">
54	</file>	54	</file>
55	</folder>	55	</folder>
56	<folder name="Keybindings">
57	<folder name="NetBeans">
58	<folder name="Defaults">
59	<file name="highlighting-keybindings.xml" url="DefaultKeyBindings.xml"/>
60	</folder>
61	</folder>
62	</folder>
63	<folder name="Actions">	56	<folder name="Actions">
64	<file name="org-netbeans-modules-cnd-highlight-semantic-actions-GotoNextOccurrenceAction.instance">	57	<file name="org-netbeans-modules-cnd-highlight-semantic-actions-GotoNextOccurrenceAction.instance">
65	<attr name="instanceOf" stringvalue="javax.swing.Action"/>	58	<attr name="instanceOf" stringvalue="javax.swing.Action"/>

Lines 136-139 Link Here

(-)a/editor.lib2/src/org/netbeans/api/editor/EditorActionNames.java (+14 lines)
136	* @since 1.64	136	* @since 1.64
137	*/	137	*/
138	public static final String organizeMembers = "organize-members"; // NOI18N	138	public static final String organizeMembers = "organize-members"; // NOI18N
		139
		140	/**
		141	* Navigates to the previous occurence of the symbol under the caret. The action
		142	* should be implemented by specific language EditorKit
		143	* @since 2.3
		144	*/
		145	public static final String gotoPrevOccurrence = "prev-marked-occurrence"; // NOI18N
		146
		147	/**
		148	* Navigates to the next occurence of the symbol under the caret. The action
		149	* should be implemented by specific language EditorKit
		150	* @since 2.3
		151	*/
		152	public static final String gotoNextOccurrence = "next-marked-occurrence"; // NOI18N
139	}	153	}