Attachment #84832 for bug #166027

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




<?xml version="1.0" encoding="UTF-8"?>
<!--
DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.

Copyright 1997-2007 Sun Microsystems, Inc. All rights reserved.


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.  Sun designates this
particular file as subject to the "Classpath" exception as provided
by Sun 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-2006 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.
-->

<project name="editor.actions" default="netbeans" basedir=".">
    <import file="../nbbuild/templates/projectized.xml"/>

</project>

Line 0 Link Here

(-)a/editor.actions/manifest.mf (+5 lines)
	1	Manifest-Version: 1.0
	2	OpenIDE-Module: org.netbeans.modules.editor.actions/1
	3	OpenIDE-Module-Localizing-Bundle: org/netbeans/modules/editor/actions/Bundle.properties
	4	AutoUpdate-Show-In-Client: false
	5	OpenIDE-Module-Provides: org.netbeans.modules.editor.actions




# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
#
# Copyright 1997-2007 Sun Microsystems, Inc. All rights reserved.
#
# 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.  Sun designates this
# particular file as subject to the "Classpath" exception as provided
# by Sun 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-2006 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.

javac.compilerargs=-Xlint:unchecked
javac.source=1.5
javadoc.title=Editor Actions
spec.version.base=1.0.0

#javadoc.arch=${basedir}/arch.xml
#javadoc.apichanges=${basedir}/apichanges.xml




<?xml version="1.0" encoding="UTF-8"?>
<!--
DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.

Copyright 1997-2007 Sun Microsystems, Inc. All rights reserved.


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.  Sun designates this
particular file as subject to the "Classpath" exception as provided
by Sun 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-2006 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.
-->
<project xmlns="http://www.netbeans.org/ns/project/1">
    <type>org.netbeans.modules.apisupport.project</type>
    <configuration>
        <data xmlns="http://www.netbeans.org/ns/nb-module-project/3">
            <code-name-base>org.netbeans.modules.editor.actions</code-name-base>
            <module-dependencies>
                <dependency>
                    <code-name-base>org.netbeans.modules.editor.lib</code-name-base>
                    <build-prerequisite/>
                    <compile-dependency/>
                    <run-dependency>
                        <release-version>1</release-version>
                        <specification-version>1.40</specification-version>
                    </run-dependency>
                </dependency>
                <dependency>
                    <code-name-base>org.netbeans.modules.editor.lib2</code-name-base>
                    <build-prerequisite/>
                    <compile-dependency/>
                    <run-dependency>
                        <release-version>1</release-version>
                        <implementation-version/>
                    </run-dependency>
                </dependency>
                <dependency>
                    <code-name-base>org.netbeans.modules.editor.mimelookup</code-name-base>
                    <build-prerequisite/>
                    <compile-dependency/>
                    <run-dependency>
                        <release-version>1</release-version>
                        <specification-version>1.12</specification-version>
                    </run-dependency>
                </dependency>
                <dependency>
                    <code-name-base>org.netbeans.modules.editor.settings</code-name-base>
                    <build-prerequisite/>
                    <compile-dependency/>
                    <run-dependency>
                        <release-version>1</release-version>
                        <specification-version>1.25</specification-version>
                    </run-dependency>
                </dependency>
                <dependency>
                    <code-name-base>org.openide.util</code-name-base>
                    <build-prerequisite/>
                    <compile-dependency/>
                    <run-dependency>
                        <specification-version>7.24</specification-version>
                    </run-dependency>
                </dependency>
            </module-dependencies>
            <test-dependencies/>
            <public-packages/>
        </data>
    </configuration>
</project>




# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
#
# Copyright 1997-2007 Sun Microsystems, Inc. All rights reserved.
#
# 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.  Sun designates this
# particular file as subject to the "Classpath" exception as provided
# by Sun 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-2006 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.

OpenIDE-Module-Name=Editor Actions
OpenIDE-Module-Display-Category=Editing
OpenIDE-Module-Short-Description=Contains editor actions implementations
OpenIDE-Module-Long-Description=Editor Actions module contains default editor actions implementations.

# Actions
toggle-toolbar=Toggle Toolbar
toggle-toolbar_menu_text=S&how Editor Toolbar
toggle-line-numbers=Toggle Line Numbers
toggle-line-numbers_menu_text=&Show Line Numbers
goto-declaration=Go to Declaration
goto-declaration_menu_text=Go to &Declaration




/*
 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
 *
 * Copyright 2008 Sun Microsystems, Inc. All rights reserved.
 *
 * 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.  Sun designates this
 * particular file as subject to the "Classpath" exception as provided
 * by Sun 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]"
 *
 * 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.
 *
 * Contributor(s):
 *
 * Portions Copyrighted 2008 Sun Microsystems, Inc.
 */

package org.netbeans.modules.editor.actions;

import org.netbeans.modules.editor.lib2.actions.AbstractEditorAction;
import java.awt.event.ActionEvent;
import java.util.logging.Logger;
import javax.swing.text.BadLocationException;
import javax.swing.text.Caret;
import javax.swing.text.JTextComponent;
import org.netbeans.api.editor.EditorActionRegistration;
import org.netbeans.api.editor.EditorActionRegistrations;
import org.netbeans.editor.BaseDocument;
import org.netbeans.editor.Utilities;
import org.netbeans.editor.ext.ExtSyntaxSupport;
import org.netbeans.modules.editor.lib2.actions.EditorActionNames;

/**
 * Toggle toolbar/lines visibility.
 *
 * @author Miloslav Metelka
 * @since 1.13
 */

@EditorActionRegistrations({
    @EditorActionRegistration(
        name = EditorActionNames.gotoDeclarationAction,
        menuPath = "GoTo",
        menuPosition = 900,
        menuText = "#" + EditorActionNames.gotoDeclarationAction + "_menu_text"
    )
})
public final class GotoAction extends AbstractEditorAction {

    // -J-Dorg.netbeans.modules.editor.actions.GotoAction.level=FINEST
    private static final Logger LOG = Logger.getLogger(GotoAction.class.getName());

    public void actionPerformed(ActionEvent evt, JTextComponent target) {
        String actionName = actionName();
        if (EditorActionNames.gotoDeclarationAction.equals(actionName)) {
            magicPositionReset(target);
            BaseDocument doc = Utilities.getDocument(target);
            if (doc != null) {
                try {
                    Caret caret = target.getCaret();
                    int dotPos = caret.getDot();
                    int[] idBlk = Utilities.getIdentifierBlock(doc, dotPos);
                    ExtSyntaxSupport extSup = (ExtSyntaxSupport)doc.getSyntaxSupport();
                    if (idBlk != null) {
                        int decPos = extSup.findDeclarationPosition(doc.getText(idBlk), idBlk[1]);
                        if (decPos >= 0) {
                            caret.setDot(decPos);
                        }
                    }
                } catch (BadLocationException e) {
                }
            }
        }
    }

}




/*
 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
 *
 * Copyright 2008 Sun Microsystems, Inc. All rights reserved.
 *
 * 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.  Sun designates this
 * particular file as subject to the "Classpath" exception as provided
 * by Sun 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]"
 *
 * 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.
 *
 * Contributor(s):
 *
 * Portions Copyrighted 2008 Sun Microsystems, Inc.
 */

package org.netbeans.modules.editor.actions;

import java.util.prefs.PreferenceChangeEvent;
import java.util.prefs.PreferenceChangeListener;
import org.netbeans.modules.editor.lib2.actions.AbstractEditorAction;
import java.awt.event.ActionEvent;
import java.util.Map;
import java.util.logging.Logger;
import java.util.prefs.Preferences;
import javax.swing.text.JTextComponent;
import org.netbeans.api.editor.EditorActionRegistration;
import org.netbeans.api.editor.EditorActionRegistrations;
import org.netbeans.api.editor.mimelookup.MimeLookup;
import org.netbeans.api.editor.mimelookup.MimePath;
import org.netbeans.api.editor.settings.SimpleValueNames;
import org.netbeans.modules.editor.lib2.EditorPreferencesDefaults;
import org.netbeans.modules.editor.lib2.actions.EditorActionNames;
import org.openide.util.Lookup;
import org.openide.util.LookupEvent;
import org.openide.util.LookupListener;

/**
 * Toggle toolbar/lines visibility.
 *
 * @author Miloslav Metelka
 * @since 1.13
 */
public final class ToggleAction extends AbstractEditorAction {

@EditorActionRegistrations({
    @EditorActionRegistration(
        name = EditorActionNames.toggleToolbarAction,
        menuPath = "View",
        menuPosition = 800,
        menuText = "#" + EditorActionNames.toggleToolbarAction + "_menu_text",
        presenterType = "CheckBox"
    ),
    @EditorActionRegistration(
        name = EditorActionNames.toggleLineNumbersAction,
        menuPath = "View",
        menuPosition = 850,
        menuText = "#" + EditorActionNames.toggleLineNumbersAction + "_menu_text",
        presenterType = "CheckBox"
    )
})
    public static ToggleAction create(Map<String,?> attrs) {
        return new ToggleAction(attrs);
    }

    // -J-Dorg.netbeans.modules.editor.actions.ToggleAction.level=FINEST
    private static final Logger LOG = Logger.getLogger(ToggleAction.class.getName());

    private String settingName;

    private Boolean defaultValue;

    private LookupListener lookupListener;

    private PreferenceChangeListener preferenceChangeListener;

    public ToggleAction(Map<String,?> attrs) {
        super(attrs);
    }

    @Override
    protected void actionNameUpdate(String actionName) {
        super.actionNameUpdate(actionName);

        if (EditorActionNames.toggleToolbarAction.equals(actionName)) {
            settingName = SimpleValueNames.TOOLBAR_VISIBLE_PROP;
            defaultValue = EditorPreferencesDefaults.defaultToolbarVisible;
        } else if (EditorActionNames.toggleLineNumbersAction.equals(actionName)) {
            settingName = SimpleValueNames.LINE_NUMBER_VISIBLE;
            defaultValue = EditorPreferencesDefaults.defaultLineNumberVisible;
        } else {
            throw new IllegalStateException("Unsupported actionName='" + actionName + "'"); // NOI18N
        }

        updateSelected();
    }

    public void actionPerformed(ActionEvent evt, JTextComponent target) {
        boolean newSelected = !isSelected();
        prefs().putBoolean(settingName, newSelected);
        updateSelected();
    }

    private boolean isSelected() {
        return prefs().getBoolean(settingName, defaultValue);
    }

    private void updateSelected() {
        System.err.println("action: " + actionName() + ", SELECTED_KEY: " + isSelected());
        putValue(AbstractEditorAction.SELECTED_KEY, isSelected());
    }

    private Preferences prefs() {
        Lookup globalMimeLookup = MimeLookup.getLookup(MimePath.EMPTY);
        Preferences prefs = globalMimeLookup.lookup(Preferences.class);
        if (lookupListener == null) {
            globalMimeLookup.lookupResult(Preferences.class).addLookupListener(lookupListener = new LookupListener() {
                public void resultChanged(LookupEvent evt) {
                    updateSelected();
                }
            });
        }
        if (preferenceChangeListener == null) {
            prefs.addPreferenceChangeListener(preferenceChangeListener = new PreferenceChangeListener() {
                public void preferenceChange(PreferenceChangeEvent evt) {
                    if (settingName.equals(evt.getKey())) {
                        updateSelected();
                    }
                }
            });
        }
        return prefs;
    }

}

Lines 65-70 Link Here

(-)a/editor.deprecated.pre61settings/nbproject/project.xml (+9 lines)
65	</run-dependency>	65	</run-dependency>
66	</dependency>	66	</dependency>
67	<dependency>	67	<dependency>
		68	<code-name-base>org.netbeans.modules.editor.lib2</code-name-base>
		69	<build-prerequisite/>
		70	<compile-dependency/>
		71	<run-dependency>
		72	<release-version>1</release-version>
		73	<implementation-version/>
		74	</run-dependency>
		75	</dependency>
		76	<dependency>
68	<code-name-base>org.netbeans.modules.editor.mimelookup</code-name-base>	77	<code-name-base>org.netbeans.modules.editor.mimelookup</code-name-base>
69	<build-prerequisite/>	78	<build-prerequisite/>
70	<compile-dependency/>	79	<compile-dependency/>

Lines 48-54 Link Here

(-)a/editor.deprecated.pre61settings/src/org/netbeans/editor/SettingsDefaults.java (-3 / +3 lines)
48	import javax.swing.UIManager;	48	import javax.swing.UIManager;
49	import java.util.Map;	49	import java.util.Map;
50	import java.util.HashMap;	50	import java.util.HashMap;
51	import org.netbeans.modules.editor.lib.EditorPreferencesDefaults;	51	import org.netbeans.modules.editor.lib2.EditorPreferencesDefaults;
52		52
53	/**	53	/**
54	* Default values for the settings. They are used	54	* Default values for the settings. They are used
Lines 156-163 Link Here
156	public static final Color defaultTextLimitLineColor = new Color(255, 235, 235);	156	public static final Color defaultTextLimitLineColor = new Color(255, 235, 235);
157	public static final Integer defaultTextLimitWidth = EditorPreferencesDefaults.defaultTextLimitWidth;	157	public static final Integer defaultTextLimitWidth = EditorPreferencesDefaults.defaultTextLimitWidth;
158		158
159	public static final Acceptor defaultIdentifierAcceptor = EditorPreferencesDefaults.defaultIdentifierAcceptor;	159	// public static final Acceptor defaultIdentifierAcceptor = EditorPreferencesDefaults.defaultIdentifierAcceptor;
160	public static final Acceptor defaultWhitespaceAcceptor = EditorPreferencesDefaults.defaultWhitespaceAcceptor;	160	// public static final Acceptor defaultWhitespaceAcceptor = EditorPreferencesDefaults.defaultWhitespaceAcceptor;
161		161
162	public static final Float defaultLineHeightCorrection = EditorPreferencesDefaults.defaultLineHeightCorrection;	162	public static final Float defaultLineHeightCorrection = EditorPreferencesDefaults.defaultLineHeightCorrection;
163		163

Lines 41-47 Link Here

(-)a/editor.deprecated.pre61settings/src/org/netbeans/editor/SettingsNames.java (-1 / +1 lines)
41		41
42	package org.netbeans.editor;	42	package org.netbeans.editor;
43		43
44	import org.netbeans.modules.editor.lib.EditorPreferencesKeys;	44	import org.netbeans.modules.editor.lib2.EditorPreferencesKeys;
45		45
46	/**	46	/**
47	* Names of the base settings defined in the editor. The other packages	47	* Names of the base settings defined in the editor. The other packages

Lines 42-48 Link Here

(-)a/editor.deprecated.pre61settings/src/org/netbeans/editor/ext/ExtSettingsNames.java (-1 / +1 lines)
42	package org.netbeans.editor.ext;	42	package org.netbeans.editor.ext;
43		43
44	import org.netbeans.editor.SettingsNames;	44	import org.netbeans.editor.SettingsNames;
45	import org.netbeans.modules.editor.lib.EditorPreferencesKeys;	45	import org.netbeans.modules.editor.lib2.EditorPreferencesKeys;
46		46
47	/**	47	/**
48	* Names of the extended editor settings.	48	* Names of the extended editor settings.

Lines 87-93 Link Here

(-)a/editor.lib/nbproject/project.xml (-1 / +1 lines)
87	<compile-dependency/>	87	<compile-dependency/>
88	<run-dependency>	88	<run-dependency>
89	<release-version>1</release-version>	89	<release-version>1</release-version>
90	<specification-version>1.25</specification-version>	90	<specification-version>1.30</specification-version>
91	</run-dependency>	91	</run-dependency>
92	</dependency>	92	</dependency>
93	<dependency>	93	<dependency>

Lines 51-57 Link Here

(-)a/editor.lib/src/org/netbeans/editor/Analyzer.java (-1 / +1 lines)
51	import javax.swing.text.Document;	51	import javax.swing.text.Document;
52	import javax.swing.text.Segment;	52	import javax.swing.text.Segment;
53	import org.netbeans.api.lexer.TokenHierarchy;	53	import org.netbeans.api.lexer.TokenHierarchy;
54	import org.netbeans.modules.editor.lib.EditorPreferencesKeys;	54	import org.netbeans.modules.editor.lib2.EditorPreferencesKeys;
55	import org.netbeans.spi.lexer.MutableTextInput;	55	import org.netbeans.spi.lexer.MutableTextInput;
56		56
57	/**	57	/**




import javax.swing.text.Caret;

/**
 * This is the parent of majority of the actions. It implements
 * the necessary resetting depending of what is required
 * by constructor of target action.
 * The other thing implemented here is macro recording.
 * <br/>
 * Property "noIconInMenu" can be set to inform menu items not to use action's icon.
 * <br/>
 *
 * @author Miloslav Metelka
 * @version 1.00
 */

public abstract class BaseAction extends TextAction {


    * the action's real task is invoked.
    */
    protected int updateMask;

    private static boolean recording;
    private static StringBuffer macroBuffer = new StringBuffer();
    private static StringBuffer textBuffer = new StringBuffer();




import org.netbeans.api.editor.settings.FontColorSettings;
import org.netbeans.api.editor.settings.SimpleValueNames;
import org.netbeans.lib.editor.util.swing.DocumentListenerPriority;
import org.netbeans.modules.editor.lib2.EditorPreferencesDefaults;
import org.netbeans.modules.editor.lib.SettingsConversions;
import org.openide.util.WeakListeners;


AtomicLockListener, FoldHierarchyListener {

    /** Caret type representing block covering current character */
    public static final String BLOCK_CARET = EditorPreferencesDefaults.BLOCK_CARET; // NOI18N

    /** Default caret type */
    public static final String LINE_CARET = EditorPreferencesDefaults.LINE_CARET; // NOI18N

    /** One dot thin line compatible with Swing default caret */
    public static final String THIN_LINE_CARET = "thin-line-caret"; // NOI18N

Lines 92-99 Link Here

(-)a/editor.lib/src/org/netbeans/editor/BaseDocument.java (-2 / +2 lines)
92	import org.netbeans.lib.editor.util.ListenerList;	92	import org.netbeans.lib.editor.util.ListenerList;
93	import org.netbeans.lib.editor.util.swing.DocumentListenerPriority;	93	import org.netbeans.lib.editor.util.swing.DocumentListenerPriority;
94	import org.netbeans.modules.editor.lib.EditorPackageAccessor;	94	import org.netbeans.modules.editor.lib.EditorPackageAccessor;
95	import org.netbeans.modules.editor.lib.EditorPreferencesDefaults;	95	import org.netbeans.modules.editor.lib2.EditorPreferencesDefaults;
96	import org.netbeans.modules.editor.lib.EditorPreferencesKeys;	96	import org.netbeans.modules.editor.lib2.EditorPreferencesKeys;
97	import org.netbeans.modules.editor.lib.FormatterOverride;	97	import org.netbeans.modules.editor.lib.FormatterOverride;
98	import org.netbeans.modules.editor.lib.TrailingWhitespaceRemove;	98	import org.netbeans.modules.editor.lib.TrailingWhitespaceRemove;
99	import org.netbeans.modules.editor.lib.SettingsConversions;	99	import org.netbeans.modules.editor.lib.SettingsConversions;

Lines 65-70 Link Here

(-)a/editor.lib/src/org/netbeans/editor/BaseKit.java (-17 / +97 lines)
65	import javax.swing.text.Caret;	65	import javax.swing.text.Caret;
66	import javax.swing.text.JTextComponent;	66	import javax.swing.text.JTextComponent;
67	import java.io.CharArrayWriter;	67	import java.io.CharArrayWriter;
		68	import java.lang.ref.WeakReference;
68	import java.lang.reflect.Method;	69	import java.lang.reflect.Method;
69	import java.util.Set;	70	import java.util.Set;
70	import java.util.Vector;	71	import java.util.Vector;
Lines 74-79 Link Here
74	import java.util.prefs.PreferenceChangeListener;	75	import java.util.prefs.PreferenceChangeListener;
75	import java.util.prefs.Preferences;	76	import java.util.prefs.Preferences;
76	import javax.swing.KeyStroke;	77	import javax.swing.KeyStroke;
		78	import javax.swing.event.ChangeEvent;
		79	import javax.swing.event.ChangeListener;
77	import javax.swing.text.AbstractDocument;	80	import javax.swing.text.AbstractDocument;
78	import javax.swing.text.EditorKit;	81	import javax.swing.text.EditorKit;
79	import javax.swing.text.Position;	82	import javax.swing.text.Position;
Lines 82-90 Link Here
82	import org.netbeans.api.editor.mimelookup.MimeLookup;	85	import org.netbeans.api.editor.mimelookup.MimeLookup;
83	import org.netbeans.api.editor.mimelookup.MimePath;	86	import org.netbeans.api.editor.mimelookup.MimePath;
84	import org.netbeans.api.editor.settings.KeyBindingSettings;	87	import org.netbeans.api.editor.settings.KeyBindingSettings;
		88	import org.netbeans.lib.editor.util.ListenerList;
85	import org.netbeans.lib.editor.util.swing.DocumentUtilities;	89	import org.netbeans.lib.editor.util.swing.DocumentUtilities;
86	import org.netbeans.modules.editor.lib.EditorPreferencesDefaults;	90	import org.netbeans.modules.editor.lib2.EditorPreferencesDefaults;
87	import org.netbeans.modules.editor.lib.EditorPreferencesKeys;	91	import org.netbeans.modules.editor.lib2.EditorPreferencesKeys;
88	import org.netbeans.modules.editor.lib.KitsTracker;	92	import org.netbeans.modules.editor.lib.KitsTracker;
89	import org.netbeans.modules.editor.lib.NavigationHistory;	93	import org.netbeans.modules.editor.lib.NavigationHistory;
90	import org.netbeans.modules.editor.lib.SettingsConversions;	94	import org.netbeans.modules.editor.lib.SettingsConversions;
Lines 113-118 Link Here
113	*/	117	*/
114	static ThreadLocal<Boolean> IN_PASTE = new ThreadLocal<Boolean>();	118	static ThreadLocal<Boolean> IN_PASTE = new ThreadLocal<Boolean>();
115		119
		120	// -J-Dorg.netbeans.editor.BaseKit.level=FINEST
116	private static final Logger LOG = Logger.getLogger(BaseKit.class.getName());	121	private static final Logger LOG = Logger.getLogger(BaseKit.class.getName());
117		122
118	/** split the current line at cursor position */	123	/** split the current line at cursor position */
Lines 352-357 Link Here
352		357
353	public static final int MAGIC_POSITION_MAX = Integer.MAX_VALUE - 1;	358	public static final int MAGIC_POSITION_MAX = Integer.MAX_VALUE - 1;
354		359
		360	private final SearchableKit searchableKit;
		361
355	// static SettingsChangeListener settingsListener = new SettingsChangeListener() {	362	// static SettingsChangeListener settingsListener = new SettingsChangeListener() {
356	// public void settingsChange(SettingsChangeEvent evt) {	363	// public void settingsChange(SettingsChangeEvent evt) {
357	// String settingName = (evt != null) ? evt.getSettingName() : null;	364	// String settingName = (evt != null) ? evt.getSettingName() : null;
Lines 534-539 Link Here
534	kits.put(this.getClass(), this); // register itself	541	kits.put(this.getClass(), this); // register itself
535	}	542	}
536	}	543	}
		544	// Directly implementing searchable editor kit would require module dependency changes
		545	// of any modules using BaseKit reference so make a wrapper instead
		546	org.netbeans.modules.editor.lib2.actions.EditorActionUtilities.registerSearchableKit(this,
		547	searchableKit = new SearchableKit(this));
537	}	548	}
538		549
539	/** Clone this editor kit */	550	/** Clone this editor kit */
Lines 691-711 Link Here
691	/** Creates map with [name, action] pairs from the given	702	/** Creates map with [name, action] pairs from the given
692	* array of actions.	703	* array of actions.
693	*/	704	*/
694	public static Map<String, Action> actionsToMap(Action[] actions) {	705	public static void addActionsToMap(Map<String, Action> map, Action[] actions, String logActionsType) {
695	Map<String, Action> map = new HashMap<String, Action>();	706	boolean fineLoggable = LOG.isLoggable(Level.FINE);
		707	if (fineLoggable) {
		708	LOG.fine(logActionsType + " start --------------------\n");
		709	}
696	for (int i = 0; i < actions.length; i++) {	710	for (int i = 0; i < actions.length; i++) {
697	Action a = actions[i];	711	Action a = actions[i];
698	if (a == null) {	712	if (a == null) {
699	throw new IllegalStateException("actions[] contains null at index " + i +	713	LOG.info("actions[] contains null at index " + i +
700	((i > 0) ? ". Preceding action is " + actions[i - 1] : ""));	714	((i > 0) ? ". Preceding action is " + actions[i - 1] : "."));
		715	continue;
701	}	716	}
702	String name = (String) a.getValue(Action.NAME);	717	String name = (String) a.getValue(Action.NAME);
703	if (name == null) {	718	if (name == null) {
704	throw new IllegalStateException("Null Action.NAME property of action " + a);	719	LOG.info("Null Action.NAME property of action " + a);
		720	continue;
705	}	721	}
		722
		723	if (fineLoggable) {
		724	String overriding = map.containsKey(name) ? " OVERRIDING\n" : "\n"; // NOI18N
		725	LOG.fine(" " + name + ": " + a + overriding); // NOI18N
		726	}
		727
706	map.put(name, a); // NOI18N	728	map.put(name, a); // NOI18N
707	}	729	}
708	return map;	730	if (fineLoggable) {
		731	LOG.fine(logActionsType + " end ----------------------\n");
		732	}
709	}	733	}
710		734
711	/** Converts map with [name, action] back	735	/** Converts map with [name, action] back
Lines 848-854 Link Here
848	removeSelectionActionDef,	872	removeSelectionActionDef,
849	undoActionDef,	873	undoActionDef,
850	redoActionDef,	874	redoActionDef,
851	new ActionFactory.ToggleLineNumbersAction(),	875	//new ActionFactory.ToggleLineNumbersAction(),
852	new NextWordAction(nextWordAction),	876	new NextWordAction(nextWordAction),
853	new NextWordAction(selectionNextWordAction),	877	new NextWordAction(selectionNextWordAction),
854	new PreviousWordAction(previousWordAction),	878	new PreviousWordAction(previousWordAction),
Lines 895-925 Link Here
895	* to get basic list and then customActions are added.	919	* to get basic list and then customActions are added.
896	*/	920	*/
897	public @Override final Action[] getActions() {	921	public @Override final Action[] getActions() {
898	return (Action []) getActionsAndMap()[0];	922	return (Action []) addActionsToMap()[0];
899	}	923	}
900		924
901	/* package */ Map<String, Action> getActionMap() {	925	/* package */ Map<String, Action> getActionMap() {
902	return (Map<String, Action>) getActionsAndMap()[1];	926	return (Map<String, Action>) addActionsToMap()[1];
903	}	927	}
904		928
905	private Object[] getActionsAndMap() {	929	private Object[] addActionsToMap() {
906	synchronized (KEYMAPS_AND_ACTIONS_LOCK) {	930	synchronized (KEYMAPS_AND_ACTIONS_LOCK) {
907	MimePath mimePath = MimePath.parse(getContentType());	931	MimePath mimePath = MimePath.parse(getContentType());
908	Action[] actions = kitActions.get(mimePath);	932	Action[] actions = kitActions.get(mimePath);
909	Map<String, Action> actionMap = kitActionMaps.get(mimePath);	933	Map<String, Action> actionMap = kitActionMaps.get(mimePath);
910		934
911	if (actions == null \|\| actionMap == null) {	935	if (actions == null \|\| actionMap == null) {
912	// create map of actions	936	// Initialize actions - use the following actions:
913	actions = createActions();	937	// 1. Declared "global" actions (declared in the xml layer under "Editors/Actions")
914	actionMap = actionsToMap(actions);	938	// 2. Declared "mime-type actions (declared in the xml layer under "Editors/content-type/Actions")
		939	// 3. Result of createActions()
		940	// 4. Custom actions (EditorPreferencesKeys.CUSTOM_ACTION_LIST)
		941	// Higher levels override actions with same Action.NAME
		942	actions = getDeclaredActions(); // non-null
		943	actionMap = new HashMap<String, Action>(actions.length << 1);
		944	addActionsToMap(actionMap, actions, "Declared actions"); // NOI18N
		945
		946	Action[] createActionsMethodResult = createActions();
		947	if (createActionsMethodResult != null) {
		948	addActionsToMap(actionMap, createActionsMethodResult, "Actions from createActions()"); // NOI18N
		949	}
915		950
916	// add custom actions	951	// add custom actions
917	Action[] customActions = getCustomActions();	952	Action[] customActions = getCustomActions();
918	if (customActions != null) {	953	if (customActions != null) {
919	actionMap.putAll(actionsToMap(customActions));	954	addActionsToMap(actionMap, customActions, "Custom actions"); // NOI18N
920	actions = actionMap.values().toArray(new Action[actionMap.values().size()]);
921	}	955	}
922		956
		957	actions = actionMap.values().toArray(new Action[actionMap.values().size()]);
		958
923	kitActions.put(mimePath, actions);	959	kitActions.put(mimePath, actions);
924	kitActionMaps.put(mimePath, actionMap);	960	kitActionMaps.put(mimePath, actionMap);
925		961
Lines 932-937 Link Here
932	return new Object [] { actions, actionMap };	968	return new Object [] { actions, actionMap };
933	}	969	}
934	}	970	}
		971
		972	/**
		973	* Get actions declared in the xml layer. They may be overriden by result
		974	* of <code>createActions()</code> and finally by result of <code>getCustomActions()</code>.
		975	*
		976	* @return non-null list of declared actions.
		977	*/
		978	protected Action[] getDeclaredActions() {
		979	return new Action[0];
		980	}
935		981
936	/** Update the actions right after their creation was finished.	982	/** Update the actions right after their creation was finished.
937	* The <code>getActions()</code> and <code>getActionByName()</code>	983	* The <code>getActions()</code> and <code>getActionByName()</code>
Lines 2725-2731 Link Here
2725	for(JTextComponent c : arr) {	2771	for(JTextComponent c : arr) {
2726	c.setKeymap(keymap);	2772	c.setKeymap(keymap);
2727	}	2773	}
		2774
		2775	searchableKit.fireActionsChange();
2728	}	2776	}
2729		2777
2730	} // End of KeymapTracker class	2778	} // End of KeymapTracker class
		2779
		2780	private static final class SearchableKit implements org.netbeans.modules.editor.lib2.actions.SearchableEditorKit {
		2781
		2782	private final BaseKit baseKit;
		2783
		2784	private final ListenerList<ChangeListener> actionsListenerList = new ListenerList<ChangeListener>();
		2785
		2786	SearchableKit(BaseKit baseKit) {
		2787	this.baseKit = baseKit;
		2788	}
		2789
		2790	public Action getAction(String actionName) {
		2791	return baseKit.getActionByName(actionName);
		2792	}
		2793
		2794	public void addActionsChangeListener(ChangeListener listener) {
		2795	actionsListenerList.add(listener);
		2796	}
		2797
		2798	public void removeActionsChangeListener(ChangeListener listener) {
		2799	actionsListenerList.remove(listener);
		2800	}
		2801
		2802	void fireActionsChange() {
		2803	ChangeEvent evt = new ChangeEvent(this);
		2804	for (ChangeListener listener : actionsListenerList.getListeners()) {
		2805	listener.stateChanged(evt);
		2806	}
		2807	}
		2808
		2809	}
		2810
2731	}	2811	}

Lines 66-73 Link Here

(-)a/editor.lib/src/org/netbeans/editor/BaseTextUI.java (-2 / +2 lines)
66	import org.netbeans.api.editor.settings.SimpleValueNames;	66	import org.netbeans.api.editor.settings.SimpleValueNames;
67	import org.netbeans.modules.editor.lib2.EditorApiPackageAccessor;	67	import org.netbeans.modules.editor.lib2.EditorApiPackageAccessor;
68	import org.netbeans.editor.view.spi.LockView;	68	import org.netbeans.editor.view.spi.LockView;
69	import org.netbeans.modules.editor.lib.EditorPreferencesDefaults;	69	import org.netbeans.modules.editor.lib2.EditorPreferencesDefaults;
70	import org.netbeans.modules.editor.lib.EditorPreferencesKeys;	70	import org.netbeans.modules.editor.lib2.EditorPreferencesKeys;
71	import org.netbeans.modules.editor.lib.SettingsConversions;	71	import org.netbeans.modules.editor.lib.SettingsConversions;
72	import org.openide.util.WeakListeners;	72	import org.openide.util.WeakListeners;
73		73

Lines 84-90 Link Here

(-)a/editor.lib/src/org/netbeans/editor/CodeFoldingSideBar.java (-1 / +1 lines)
84	import org.netbeans.api.editor.settings.FontColorSettings;	84	import org.netbeans.api.editor.settings.FontColorSettings;
85	import org.netbeans.api.editor.settings.SimpleValueNames;	85	import org.netbeans.api.editor.settings.SimpleValueNames;
86	import org.netbeans.editor.CodeFoldingSideBar.PaintInfo;	86	import org.netbeans.editor.CodeFoldingSideBar.PaintInfo;
87	import org.netbeans.modules.editor.lib.EditorPreferencesDefaults;	87	import org.netbeans.modules.editor.lib2.EditorPreferencesDefaults;
88	import org.netbeans.modules.editor.lib.SettingsConversions;	88	import org.netbeans.modules.editor.lib.SettingsConversions;
89	import org.openide.util.Lookup;	89	import org.openide.util.Lookup;
90	import org.openide.util.LookupEvent;	90	import org.openide.util.LookupEvent;

Lines 86-93 Link Here

(-)a/editor.lib/src/org/netbeans/editor/EditorUI.java (-2 / +2 lines)
86	import org.netbeans.editor.ext.ExtKit;	86	import org.netbeans.editor.ext.ExtKit;
87	import org.netbeans.editor.ext.ToolTipSupport;	87	import org.netbeans.editor.ext.ToolTipSupport;
88	import org.netbeans.modules.editor.lib.ColoringMap;	88	import org.netbeans.modules.editor.lib.ColoringMap;
89	import org.netbeans.modules.editor.lib.EditorPreferencesDefaults;	89	import org.netbeans.modules.editor.lib2.EditorPreferencesDefaults;
90	import org.netbeans.modules.editor.lib.EditorPreferencesKeys;	90	import org.netbeans.modules.editor.lib2.EditorPreferencesKeys;
91	import org.netbeans.modules.editor.lib.KitsTracker;	91	import org.netbeans.modules.editor.lib.KitsTracker;
92	import org.netbeans.modules.editor.lib.SettingsConversions;	92	import org.netbeans.modules.editor.lib.SettingsConversions;
93	import org.openide.util.WeakListeners;	93	import org.openide.util.WeakListeners;

Lines 61-67 Link Here

(-)a/editor.lib/src/org/netbeans/editor/Formatter.java (-1 / +1 lines)
61	import org.netbeans.api.editor.settings.SimpleValueNames;	61	import org.netbeans.api.editor.settings.SimpleValueNames;
62	import org.netbeans.lib.editor.util.CharSequenceUtilities;	62	import org.netbeans.lib.editor.util.CharSequenceUtilities;
63	import org.netbeans.lib.editor.util.swing.DocumentUtilities;	63	import org.netbeans.lib.editor.util.swing.DocumentUtilities;
64	import org.netbeans.modules.editor.lib.EditorPreferencesDefaults;	64	import org.netbeans.modules.editor.lib2.EditorPreferencesDefaults;
65	import org.netbeans.modules.editor.lib.KitsTracker;	65	import org.netbeans.modules.editor.lib.KitsTracker;
66	import org.netbeans.modules.editor.lib.SettingsConversions;	66	import org.netbeans.modules.editor.lib.SettingsConversions;
67	import org.openide.util.Lookup;	67	import org.openide.util.Lookup;

Lines 86-92 Link Here

(-)a/editor.lib/src/org/netbeans/editor/StatusBar.java (-1 / +1 lines)
86	import org.netbeans.api.editor.settings.FontColorNames;	86	import org.netbeans.api.editor.settings.FontColorNames;
87	import org.netbeans.api.editor.settings.FontColorSettings;	87	import org.netbeans.api.editor.settings.FontColorSettings;
88	import org.netbeans.api.editor.settings.SimpleValueNames;	88	import org.netbeans.api.editor.settings.SimpleValueNames;
89	import org.netbeans.modules.editor.lib.EditorPreferencesDefaults;	89	import org.netbeans.modules.editor.lib2.EditorPreferencesDefaults;
90	import org.openide.util.NbBundle;	90	import org.openide.util.NbBundle;
91	import org.openide.util.WeakListeners;	91	import org.openide.util.WeakListeners;
92		92

Lines 61-67 Link Here

(-)a/editor.lib/src/org/netbeans/editor/Utilities.java (-1 / +1 lines)
61	import javax.swing.text.View;	61	import javax.swing.text.View;
62	import org.netbeans.lib.editor.util.CharSequenceUtilities;	62	import org.netbeans.lib.editor.util.CharSequenceUtilities;
63	import org.netbeans.lib.editor.util.swing.DocumentUtilities;	63	import org.netbeans.lib.editor.util.swing.DocumentUtilities;
64	import org.netbeans.modules.editor.lib.EditorPreferencesKeys;	64	import org.netbeans.modules.editor.lib2.EditorPreferencesKeys;
65	import org.openide.util.NbBundle;	65	import org.openide.util.NbBundle;
66		66
67	/**	67	/**

Lines 52-59 Link Here

(-)a/editor.lib/src/org/netbeans/editor/WordMatch.java (-2 / +2 lines)
52	import javax.swing.text.BadLocationException;	52	import javax.swing.text.BadLocationException;
53	import javax.swing.text.JTextComponent;	53	import javax.swing.text.JTextComponent;
54	import org.netbeans.api.editor.mimelookup.MimeLookup;	54	import org.netbeans.api.editor.mimelookup.MimeLookup;
55	import org.netbeans.modules.editor.lib.EditorPreferencesDefaults;	55	import org.netbeans.modules.editor.lib2.EditorPreferencesDefaults;
56	import org.netbeans.modules.editor.lib.EditorPreferencesKeys;	56	import org.netbeans.modules.editor.lib2.EditorPreferencesKeys;
57	import org.openide.util.WeakListeners;	57	import org.openide.util.WeakListeners;
58		58
59	/** Word matching support enables to fill in the rest of the word	59	/** Word matching support enables to fill in the rest of the word

Lines 65-71 Link Here

(-)a/editor.lib/src/org/netbeans/editor/ext/ExtFormatter.java (-1 / +1 lines)
65	import org.netbeans.editor.AcceptorFactory;	65	import org.netbeans.editor.AcceptorFactory;
66	import org.netbeans.editor.BaseKit;	66	import org.netbeans.editor.BaseKit;
67	import org.netbeans.editor.Syntax;	67	import org.netbeans.editor.Syntax;
68	import org.netbeans.modules.editor.lib.EditorPreferencesKeys;	68	import org.netbeans.modules.editor.lib2.EditorPreferencesKeys;
69	import org.netbeans.modules.editor.lib.SettingsConversions;	69	import org.netbeans.modules.editor.lib.SettingsConversions;
70	import org.openide.util.Lookup;	70	import org.openide.util.Lookup;
71	import org.openide.util.WeakListeners;	71	import org.openide.util.WeakListeners;

Lines 40-45 Link Here

(-)a/editor.lib/src/org/netbeans/modules/editor/lib/ColoringMap.java (+1 lines)
40	*/	40	*/
41	package org.netbeans.modules.editor.lib;	41	package org.netbeans.modules.editor.lib;
42		42
		43	import org.netbeans.modules.editor.lib2.EditorPreferencesKeys;
43	import java.beans.PropertyChangeListener;	44	import java.beans.PropertyChangeListener;
44	import java.beans.PropertyChangeSupport;	45	import java.beans.PropertyChangeSupport;
45	import java.lang.reflect.Field;	46	import java.lang.reflect.Field;

Lines 52-57 Link Here

(-)a/editor.lib/src/org/netbeans/modules/editor/lib/SettingsConversions.java (-1 / +2 lines)
52	import java.util.logging.Logger;	52	import java.util.logging.Logger;
53	import java.util.prefs.Preferences;	53	import java.util.prefs.Preferences;
54	import org.netbeans.api.editor.mimelookup.MimePath;	54	import org.netbeans.api.editor.mimelookup.MimePath;
		55	import org.netbeans.editor.Acceptor;
55	import org.openide.util.Lookup;	56	import org.openide.util.Lookup;
56		57
57	/**	58	/**
Lines 259-265 Link Here
259	}	260	}
260	}	261	}
261	}	262	}
262		263
263	private SettingsConversions() {	264	private SettingsConversions() {
264		265
265	}	266	}

Lines 3-5 Link Here

(-)a/editor.lib2/manifest.mf (+1 lines)
3	OpenIDE-Module-Implementation-Version: 2	3	OpenIDE-Module-Implementation-Version: 2
4	OpenIDE-Module-Localizing-Bundle: org/netbeans/modules/editor/lib2/Bundle.properties	4	OpenIDE-Module-Localizing-Bundle: org/netbeans/modules/editor/lib2/Bundle.properties
5	OpenIDE-Module-Layer: org/netbeans/modules/editor/lib2/resources/layer.xml	5	OpenIDE-Module-Layer: org/netbeans/modules/editor/lib2/resources/layer.xml
		6	OpenIDE-Module-Needs: org.netbeans.modules.editor.actions




     */
    String popupText() default "";

    /**
     * Path of this action in main menu e.g. "Edit".
     */
    String menuPath() default "";

    /**
     * Integer position of the main menu item among the other menu items.
     * <br/>
     * The default Integer.MAX_VALUE value means no menu representation.
     */
    int menuPosition() default Integer.MAX_VALUE;

    /**
     * Path of this action in popup menu e.g. "" for appearance right in the context menu
     * or a corresponding path for nested submenu appearance.
     */
    String popupPath() default "";

    /**
     * Integer position of the popup menu item among the other popup menu (or submenu) items.
     * <br/>
     * The default Integer.MAX_VALUE value means no popup menu representation.
     */
    int popupPosition() default Integer.MAX_VALUE;

    /**
     * Integer position of this action in editor toolbar.
     * <br/>
     * The default Integer.MAX_VALUE value means no toolbar representation.
     */
    int toolBarPosition() default Integer.MAX_VALUE;

    /**
     * Get type of the presenter used in menu (and toolbar).
     * <br/>
     * Currently supported types are default "" and "CheckBox".
     * <br/>
     * The value will be present in the action in "PresenterType" property.
     */
    String presenterType() default "";

}




/*
 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
 *
 * Copyright 1997-2007 Sun Microsystems, Inc. All rights reserved.
 *
 * 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.  Sun designates this
 * particular file as subject to the "Classpath" exception as provided
 * by Sun 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-2006 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.
 */

package org.netbeans.api.editor;

import javax.swing.Action;
import javax.swing.text.EditorKit;
import org.netbeans.modules.editor.lib2.actions.EditorActionUtilities;


/**
 * Various utility methods related to editor.
 *
 * @author Miloslav Metelka
 * @since 1.13
 */

public final class EditorUtilities {

    private EditorUtilities() {
        // No instances
    }

    /**
     * Find an action with the given name in the editor kit.
     *
     * @param editorKit non-null editor kit in which search is performed.
     * @param actionName non-null action name to search for.
     * @return action instance with the given name or null if action not found.
     */
    public static Action getAction(EditorKit editorKit, String actionName) {
        return EditorActionUtilities.getAction(editorKit, actionName);
    }

}





package org.netbeans.modules.editor.lib2;

import java.util.List;
import org.netbeans.modules.editor.lib2.actions.EditorActionUtilities;
import org.netbeans.modules.editor.lib2.actions.PresenterEditorAction;
import java.util.ResourceBundle;
import java.util.Set;
import javax.annotation.processing.Filer;
import javax.annotation.processing.ProcessingEnvironment;
import javax.annotation.processing.Processor;
import javax.annotation.processing.RoundEnvironment;
import javax.annotation.processing.SupportedAnnotationTypes;

import javax.lang.model.element.ExecutableElement;
import javax.lang.model.element.Modifier;
import javax.lang.model.element.TypeElement;
import javax.lang.model.element.VariableElement;
import javax.lang.model.type.TypeMirror;
import javax.lang.model.util.ElementFilter;
import javax.swing.Action;
import javax.tools.StandardLocation;
import org.netbeans.api.editor.EditorActionRegistration;
import org.netbeans.api.editor.EditorActionRegistrations;
import org.openide.filesystems.annotations.LayerBuilder;

import org.openide.util.lookup.ServiceProvider;

/**
 * Annotation processor for {@link EditorActionRegistration}
 * and {@link EditorActionRegistrations}.
 */
@ServiceProvider(service=Processor.class)
@SupportedSourceVersion(SourceVersion.RELEASE_6)

        String methodName;
        TypeMirror swingActionType = processingEnv.getTypeUtils().getDeclaredType(
                processingEnv.getElementUtils().getTypeElement("javax.swing.Action"));
        TypeMirror utilMapType = processingEnv.getTypeUtils().getDeclaredType(
                processingEnv.getElementUtils().getTypeElement("java.util.Map"));
        boolean directActionCreation = false; // Whether construct AlwaysEnabledAction or annotated action directly
        switch (e.getKind()) {
            case CLASS:
                className = processingEnv.getElementUtils().getBinaryName((TypeElement)e).toString();

                if (!e.getModifiers().contains(Modifier.PUBLIC)) {
                    throw new LayerGenerationException(className + " is not public", e);
                }
                ExecutableElement defaultCtor = null;
                ExecutableElement mapCtor = null;
                for (ExecutableElement constructor : ElementFilter.constructorsIn(e.getEnclosedElements())) {
                    List<? extends VariableElement> params = constructor.getParameters();
                    if (params.isEmpty()) {
                        defaultCtor = constructor;

                    } else if (params.size() == 1 &&
                        processingEnv.getTypeUtils().isAssignable(params.get(0).asType(), utilMapType))
                    {
                        mapCtor = constructor;
                    }
                }
                String msgBase = "No-argument (or single-argument \"Map<String,?> attrs\") constructor";
                if (defaultCtor == null && mapCtor == null) {
                    throw new LayerGenerationException(msgBase + " not present in " + className, e);
                }
                boolean defaultCtorPublic = (defaultCtor != null && defaultCtor.getModifiers().contains(Modifier.PUBLIC));
                boolean mapCtorPublic = (mapCtor != null && mapCtor.getModifiers().contains(Modifier.PUBLIC));
                if (!defaultCtorPublic && !mapCtorPublic) {
                    throw new LayerGenerationException(msgBase + " not public in " + className, e);
                }

                if (!processingEnv.getTypeUtils().isAssignable(e.asType(), swingActionType)) {
                    throw new LayerGenerationException(className + " is not assignable to javax.swing.Action", e);
                }
                if (mapCtorPublic) {
                    directActionCreation = true;
                }
                methodName = null;
                break;


                className = processingEnv.getElementUtils().getBinaryName((TypeElement) e.getEnclosingElement()).toString();
                methodName = e.getSimpleName().toString();
                if (!e.getModifiers().contains(Modifier.STATIC)) {
                    throw new LayerGenerationException(className + "." + methodName + " must be static", e); // NOI18N
                }
                // It appears that actually even non-public method registration works - so commented following
//                    if (!e.getModifiers().contains(Modifier.PUBLIC)) {
//                        throw new LayerGenerationException(className + "." + methodName + " must be public", e);
//                    }
                List<? extends VariableElement> params = ((ExecutableElement)e).getParameters();
                boolean emptyParams = params.isEmpty();
                boolean mapParam = (params.size() == 1 && processingEnv.getTypeUtils().isAssignable(
                        params.get(0).asType(), utilMapType));
                if (!emptyParams && !mapParam)
                {
                    throw new LayerGenerationException(className + "." + methodName +
                            " must not take arguments (or have a single-argument \"Map<String,?> attrs\")", e); // NOI18N
                }
                TypeMirror returnType = ((ExecutableElement)e).getReturnType();
                if (swingActionType != null && !processingEnv.getTypeUtils().isAssignable(returnType, swingActionType)) {
                    throw new LayerGenerationException(className + "." + methodName + " is not assignable to javax.swing.Action", e);
                }
                if (mapParam) {
                    directActionCreation = true;
                }
                break;

            default:

            filePath.append("/").append(annotation.mimeType());
        }
        filePath.append("/Actions/").append(actionName).append(".instance");
        LayerBuilder layer = layer(e);
        LayerBuilder.File file = layer.file(filePath.toString());
        file.stringvalue("displayName", actionName);

        // Resolve icon resource
        String iconResource = annotation.iconResource();

            file.bundlevalue("popupText", popupText);
        }

        // Check presenters
        String presenterActionName = null;
        String presenterType = annotation.presenterType();
        if (presenterType.length() > 0) { // Non-default presenter type
            directActionCreation = true;
        }

        // Check menu path
        String menuPath = annotation.menuPath();
        int menuPosition = annotation.menuPosition();
        if (menuPosition != Integer.MAX_VALUE) {
            StringBuilder presenterFilePath = new StringBuilder(50);
            presenterFilePath.append("Menu/");
            if (menuPath.length() > 0) {
                presenterFilePath.append(menuPath).append('/');
            }
            presenterFilePath.append(actionName).append(".shadow");
            LayerBuilder.File presenterShadowFile = layer.file(presenterFilePath.toString());
            if (presenterActionName == null) {
                presenterActionName = generatePresenterAction(layer, actionName, presenterType);
            }
            presenterShadowFile.stringvalue("originalFile", presenterActionName);
            presenterShadowFile.intvalue("position", menuPosition);
            presenterShadowFile.write();
        }

        // Check popup path
        String popupPath = annotation.popupPath();
        int popupPosition = annotation.popupPosition();
        if (popupPosition != Integer.MAX_VALUE) {
            StringBuilder presenterFilePath = new StringBuilder(50);
            presenterFilePath.append("Editors");
            if (annotation.mimeType().length() > 0) {
                filePath.append("/").append(annotation.mimeType());
            }
            if (popupPath.length() > 0) {
                presenterFilePath.append(popupPath).append('/');
            }
            presenterFilePath.append(actionName).append(".shadow");
            LayerBuilder.File presenterShadowFile = layer.file(presenterFilePath.toString());
            if (presenterActionName == null) {
                presenterActionName = generatePresenterAction(layer, actionName, presenterType);
            }
            presenterShadowFile.stringvalue("originalFile", presenterActionName);
            presenterShadowFile.intvalue("position", popupPosition);
            presenterShadowFile.write();
        }
        
        int toolBarPosition = annotation.toolBarPosition();
        if (toolBarPosition != Integer.MAX_VALUE) {
            StringBuilder presenterFilePath = new StringBuilder(50);
            presenterFilePath.append("/Editors/Toolbar/");
            if (popupPath.length() > 0) {
                presenterFilePath.append(popupPath).append('/');
            }
            presenterFilePath.append(actionName).append(".shadow");
            LayerBuilder.File presenterShadowFile = layer.file(presenterFilePath.toString());
            if (presenterActionName == null) {
                presenterActionName = generatePresenterAction(layer, actionName, presenterType);
            }
            presenterShadowFile.stringvalue("originalFile", presenterActionName);
            presenterShadowFile.intvalue("position", toolBarPosition);
            presenterShadowFile.write();
        }

        // Deafult helpID is action's name
        file.stringvalue("helpID", actionName);

        // Resolve accelerator through method
        file.methodvalue(Action.ACCELERATOR_KEY, EditorActionUtilities.class.getName(), "getAccelerator");

        // Always generate Action.NAME since although AlwaysEnabledAction tweaks its retrieval to "displayName"
        // some tools may query FO's properties and expect it there.
        file.stringvalue(Action.NAME, actionName);

        if (directActionCreation) {
            if (methodName != null) {
                file.methodvalue("instanceCreate", className, methodName);
            } else {
                file.newvalue("instanceCreate", className);
            }

        } else { // Create always enabled action
            file.methodvalue("instanceCreate", "org.openide.awt.Actions", "alwaysEnabled");
            file.stringvalue("displayName", actionName);

            if (methodName != null) {
                file.methodvalue("delegate", className, methodName);
            } else {
                file.newvalue("delegate", className);
            }
        }
        file.write();
    }

    private String generatePresenterAction(LayerBuilder layer, String actionName, String presenterType) {
        String presenterActionName = "Editors/ActionPresenters/" + actionName + ".instance";
        LayerBuilder.File presenterActionFile = layer.file(presenterActionName);
        presenterActionFile.methodvalue("instanceCreate", PresenterEditorAction.class.getName(), "create");
        presenterActionFile.stringvalue(Action.NAME, actionName);
        presenterActionFile.stringvalue("PresenterType", presenterType);
        presenterActionFile.write();
        return presenterActionName;
    }

}




 * made subject to such option by the copyright holder.
 */

package org.netbeans.modules.editor.lib2;

import java.awt.Insets;
import java.awt.Dimension;
import org.netbeans.editor.Acceptor;
import org.netbeans.editor.AcceptorFactory;
import org.netbeans.editor.BaseCaret;

/**
 * This class contains settings default values copied over from SettingsDefaults and ExtSettingsDefaults.

    private EditorPreferencesDefaults() {
        // no-op
    }

    public static final String LINE_CARET = "line-caret";
    public static final String BLOCK_CARET = "block-caret";
    
    // not in SettingsDefaults not ExtSettingsDefaults
    public static final boolean defaultToolbarVisible = true;


    public static final boolean defaultExpandTabs = true;

    public static final String defaultCaretTypeInsertMode = LINE_CARET;
    public static final String defaultCaretTypeOverwriteMode = BLOCK_CARET;
    public static final boolean defaultCaretItalicInsertMode = false;
    public static final boolean defaultCaretItalicOverwriteMode = false;
    /** @since 1.23 */

Lines 39-45 Link Here

(-)a/editor.lib/src/org/netbeans/modules/editor/lib/EditorPreferencesKeys.java (-1 / +1 lines)
39	* made subject to such option by the copyright holder.	39	* made subject to such option by the copyright holder.
40	*/	40	*/
41		41
42	package org.netbeans.modules.editor.lib;	42	package org.netbeans.modules.editor.lib2;
43		43
44	import org.netbeans.api.editor.settings.SimpleValueNames;	44	import org.netbeans.api.editor.settings.SimpleValueNames;
45		45




/*
 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
 *
 * Copyright 2008 Sun Microsystems, Inc. All rights reserved.
 *
 * 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.  Sun designates this
 * particular file as subject to the "Classpath" exception as provided
 * by Sun 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]"
 *
 * 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.
 *
 * Contributor(s):
 *
 * Portions Copyrighted 2008 Sun Microsystems, Inc.
 */

package org.netbeans.modules.editor.lib2.actions;

import java.awt.event.ActionEvent;
import java.util.Map;
import java.util.logging.Level;
import java.util.logging.LogRecord;
import java.util.logging.Logger;
import javax.swing.Action;
import javax.swing.text.Caret;
import javax.swing.text.JTextComponent;
import javax.swing.text.TextAction;
import org.openide.util.NbBundle;
import org.openide.util.RequestProcessor;

/**
 * Base class for editor actions.
 *
 * @author Miloslav Metelka
 * @since 1.13
 */
public abstract class AbstractEditorAction extends TextAction {

    /**
     * Boolean action property displayed by the checkbox menu item.
     */
    public static final String SELECTED_KEY = "SwingSelectedKey"; // [TODO] Replace with Action.SELECTED_KEY on 1.6

    /** Logger for reporting invoked actions */
    private static Logger UILOG = Logger.getLogger("org.netbeans.ui.actions.editor"); // NOI18N

    private final Map<String,?> attrs;

    public AbstractEditorAction(Map<String,?> attrs) {
        super(null);
        this.attrs = attrs;

        String actionName = (String)attrs.get(Action.NAME);
        if (actionName == null) {
            throw new IllegalArgumentException("Null Action.NAME attribute for action " + this.getClass()); // NOI18N
        }
        putValue(Action.NAME, actionName);
    }

    public AbstractEditorAction() {
        super(null);
        this.attrs = null;
    }

    public abstract void actionPerformed(ActionEvent evt, JTextComponent component);

    /**
     * Called by {@link #putValue(String,String)} when {@link Action#NAME} property
     * is set to a non-null String value. This allows a "polymorphic" action (with
     * Action.NAME-specific behavior) to update certain properties (e.g. an icon)
     * according to the name that was set.
     *
     * @param actionName non-null action's name (value of Action.NAME property).
     * @since 1.34
     */
    protected void actionNameUpdate(String actionName) {
    }

    public final void actionPerformed(final ActionEvent evt) {
        final JTextComponent target = getTextComponent(evt);
        MacroRecording.get().recordAction(this, evt); // Possibly record action in a currently recorded macro

        if (UILOG.isLoggable(Level.FINE)) {
            // TODO [Mila] - Set action's property to disable UI logging
            String actionNameLowerCase = actionName();
            if (actionNameLowerCase != null &&
                !"default-typed".equals(actionNameLowerCase) && //NOI18N
                -1 == actionNameLowerCase.indexOf("caret") && //NOI18N
                -1 == actionNameLowerCase.indexOf("delete") && //NOI18N
                -1 == actionNameLowerCase.indexOf("selection") && //NOI18N
                -1 == actionNameLowerCase.indexOf("build-tool-tip") &&//NOI18N
                -1 == actionNameLowerCase.indexOf("build-popup-menu") &&//NOI18N
                -1 == actionNameLowerCase.indexOf("page-up") &&//NOI18N
                -1 == actionNameLowerCase.indexOf("page-down") &&//NOI18N
                -1 == actionNameLowerCase.indexOf("-kit-install") //NOI18N
            ) {
                LogRecord r = new LogRecord(Level.FINE, "UI_ACTION_EDITOR"); // NOI18N
                r.setResourceBundle(NbBundle.getBundle(AbstractEditorAction.class));
                if (evt != null) {
                    r.setParameters(new Object[] { evt, evt.toString(), this, toString(), getValue(NAME) });
                } else {
                    r.setParameters(new Object[] { "no-ActionEvent", "no-ActionEvent", this, toString(), getValue(NAME) }); //NOI18N
                }
                r.setLoggerName(UILOG.getName());
                UILOG.log(r);
            }
        }

        if (asynchronous()) {
            RequestProcessor.getDefault().post(new Runnable () {
                public void run() {
                    actionPerformed(evt, target);
                }
            });
        } else {
            actionPerformed(evt, target);
        }
    }

    @Override
    public Object getValue(String key) {
        Object value = super.getValue(key);
        if (value == null && attrs != null) {
            if (!"instanceCreate".equals(key)) { // Return null for this key
                value = attrs.get(key);
            }
        }
        return value;
    }

    @Override
    public void putValue(String key, Object value) {
        super.putValue(key, value);
        if (Action.NAME.equals(key) && value instanceof String) {
            actionNameUpdate((String)value);
        }
    }


    protected boolean asynchronous() {
        return false;
    }

    protected final String actionName() {
        return (String) getValue(Action.NAME);
    }

    protected final void magicPositionReset(JTextComponent target) {
        Caret caret = target.getCaret();
        if (caret != null) {
            caret.setMagicCaretPosition(null);
        }
    }

}




# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
#
# Copyright 1997-2007 Sun Microsystems, Inc. All rights reserved.
#
# 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.  Sun designates this
# particular file as subject to the "Classpath" exception as provided
# by Sun 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-2006 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.

#
# UI Logging
#
# UI logging of button press
# {0} instance of the button
# {1} class of the button
# {2} instance of the action
# {3} class of the action
# {4} display name of the action
UI_ACTION_EDITOR=Invoking {4} implemented as {3} thru {1}
UI_ACTION_EDITOR_ICON_BASE=org/netbeans/modules/editor/lib2/resources/defaultglyph.gif





/*
 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
 *
 * Copyright 2008 Sun Microsystems, Inc. All rights reserved.
 *
 * 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.  Sun designates this
 * particular file as subject to the "Classpath" exception as provided
 * by Sun 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]"
 *
 * 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.
 *
 * Contributor(s):
 *
 * Portions Copyrighted 2008 Sun Microsystems, Inc.
 */

package org.netbeans.modules.editor.lib2.actions;

/**
 * Names of basic editor actions.
 *
 * @author Miloslav Metelka
 * @since 1.13
 */
public final class EditorActionNames {

    /** Toggle the visibility of the editor toolbar */
    public static final String toggleToolbarAction = "toggle-toolbar"; // NOI18N

    /** Toggle visibility of line numbers*/
    public static final String toggleLineNumbersAction = "toggle-line-numbers"; // NOI18N

    /** Goto declaration depending on the context under the caret */
    public static final String gotoDeclarationAction = "goto-declaration"; // NOI18N

}




/*
 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
 *
 * Copyright 2008 Sun Microsystems, Inc. All rights reserved.
 *
 * 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.  Sun designates this
 * particular file as subject to the "Classpath" exception as provided
 * by Sun 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]"
 *
 * 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.
 *
 * Contributor(s):
 *
 * Portions Copyrighted 2008 Sun Microsystems, Inc.
 */

package org.netbeans.modules.editor.lib2.actions;

import java.lang.ref.Reference;
import java.lang.ref.WeakReference;
import java.util.Collection;
import java.util.HashMap;
import java.util.Iterator;
import java.util.Map;
import java.util.WeakHashMap;
import java.util.logging.Level;
import java.util.logging.Logger;
import javax.swing.Action;
import javax.swing.KeyStroke;
import javax.swing.event.ChangeListener;
import javax.swing.text.EditorKit;
import org.netbeans.api.editor.mimelookup.MimeLookup;
import org.netbeans.api.editor.mimelookup.MimePath;
import org.netbeans.api.editor.settings.KeyBindingSettings;
import org.netbeans.api.editor.settings.MultiKeyBinding;
import org.openide.filesystems.FileObject;
import org.openide.util.Lookup;
import org.openide.util.LookupEvent;
import org.openide.util.LookupListener;
import org.openide.util.lookup.Lookups;


/**
 * Various utility methods for declarative editor action registrations.
 */
public final class EditorActionUtilities {

    // -J-Dorg.netbeans.modules.editor.lib2.actions.EditorActionUtilities.level=FINEST
    private static final Logger LOG = Logger.getLogger(EditorActionUtilities.class.getName());

    private static Map<String,Map<String,KeyStroke>> mimeType2actionName2KeyStroke;

    private static Map<String,Boolean> mimeType2ListenerPresent = new HashMap<String, Boolean>();

    private static Reference<EditorKit> globalKitRef;

    private static LookupListener globalKitListener;

    private static final Map<EditorKit,SearchableEditorKit> kit2searchable = new WeakHashMap<EditorKit,SearchableEditorKit>();

    private EditorActionUtilities() {
        // No instances
    }

    public static EditorKit getGlobalKit() {
        synchronized (kit2searchable) {
            EditorKit globalKit = (globalKitRef != null) ? globalKitRef.get() : null;
            if (globalKit == null) {
                Lookup.Result<EditorKit> result = MimeLookup.getLookup("").lookupResult(EditorKit.class);
                Iterator<? extends EditorKit> instancesIterator = result.allInstances().iterator();
                globalKit = instancesIterator.hasNext() ? instancesIterator.next() : null;
                if (globalKit != null) {
                    globalKitRef = new WeakReference<EditorKit>(globalKit);
                }
                if (globalKitListener == null) {
                    globalKitListener = new LookupListener() {
                        public void resultChanged(LookupEvent evt) {
                            synchronized (kit2searchable) {
                                globalKitRef = null;
                            }
                        }
                    };
                    result.addLookupListener(globalKitListener);
                }
            }
            return globalKit;
        }
    }

    public static EditorKit getKit(String mimeType) {
        Lookup.Result<EditorKit> result = MimeLookup.getLookup(mimeType).lookupResult(EditorKit.class);
        Iterator<? extends EditorKit> instancesIterator = result.allInstances().iterator();
        EditorKit kit = instancesIterator.hasNext() ? instancesIterator.next() : null;
        return kit;
    }

    public static void registerSearchableKit(EditorKit kit, SearchableEditorKit searchableKit) {
        synchronized (kit2searchable) {
            kit2searchable.put(kit, searchableKit);
        }
    }

    /**
     * Get an editor action in a constant time (wrap a kit with a SearchableEditorKit if necessary).
     *
     * @param kit non-null kit.
     * @param actionName non-null action name.
     * @return action's instance or null.
     */
    public static Action getAction(EditorKit kit, String actionName) {
        return getSearchableKit(kit).getAction(actionName);
    }

    /**
     * Get searchable editor kit for the given kit.
     * @param kit non-null kit.
     * @return non-null searchable kit.
     */
    public static SearchableEditorKit getSearchableKit(EditorKit kit) {
        SearchableEditorKit searchableKit;
        if (kit instanceof SearchableEditorKit) {
            searchableKit = ((SearchableEditorKit)kit);
        } else {
            synchronized (kit2searchable) {
                searchableKit = kit2searchable.get(kit);
                if (searchableKit == null) {
                    searchableKit = new DefaultSearchableKit(kit);
                    registerSearchableKit(kit, searchableKit);
                }
            }
        }
        return searchableKit;
    }

    public static Lookup.Result<Action> createActionsLookupResult(String mimeType) {
        if (!MimePath.validate(mimeType)) {
            throw new IllegalArgumentException("Ïnvalid mimeType=\"" + mimeType + "\"");
        }
        Lookup lookup = Lookups.forPath(getPath(mimeType, "Actions"));
        return lookup.lookupResult(Action.class);
    }

    private static String getPath(String mimeType, String subFolder) {
        StringBuilder path = new StringBuilder(50);
        path.append("Editors/");
        if (mimeType.length() > 0) {
            path.append('/').append(mimeType);
        }
        if (subFolder.length() > 0) {
            path.append('/').append(subFolder);
        }
        return path.toString();
    }

    /**
     * Get single-key accelerator for a given declared action.
     * Only a single-key accelerators are supported.
     */
    public static KeyStroke getAccelerator(FileObject fo) {
        if (fo == null) {
            throw new IllegalArgumentException("Must be called with non-null fileObject"); // NOI18N
        }
        boolean fineLoggable = LOG.isLoggable(Level.FINE);
        String path = fo.getParent().getPath();
        String actionName = (String) fo.getAttribute(Action.NAME);
        KeyStroke ks = null;
        if (path.startsWith("Editors/")) {
            path = path.substring(7); // Leave ending '/' to support "Editors/Actions"
            if (path.endsWith("/Actions")) {
                path = path.substring(0, path.length() - 8);
                if (path.startsWith("/")) {
                    path = path.substring(1);
                }
                String mimeType = path;
                if (!MimePath.validate(mimeType)) {
                    LOG.info("Invalid mime-type='" + mimeType + "' of action's fileObject=" + fo); // NOI18N
                }
                ks = getAccelerator(mimeType, actionName);
            } else if (fineLoggable) {
                LOG.fine("No \"/Actions\" at end of mime-type='" + path +
                    "' of action's fileObject=" + fo); // NOI18N
            }
        } else if (fineLoggable) {
            LOG.fine("No \"Editors/\" at begining of mime-type='" + path + // NOI18N
                    "' of action's fileObject=" + fo); // NOI18N
        }

        if (LOG.isLoggable(Level.FINER)) {
            LOG.finer("Accelerator for action \"" + actionName + "\" is " + ks);
        }
        return ks;
    }

    /**
     * Get single-key accelerator for a given declared action.
     * <br/>
     * Unfortunately currently there's no easy way to display multi-keybinding in menu-item
     * (there's just JMenuItem.setAccelerator() and its impl is L&F-based)
     * so just display single-keystroke accelerators.
     */
    public static KeyStroke getAccelerator(String mimeType, String actionName) {
        KeyStroke ks = null;
        if (actionName != null) {
            synchronized (EditorActionUtilities.class) {
                if (mimeType2actionName2KeyStroke == null) {
                    mimeType2actionName2KeyStroke = new HashMap<String,Map<String,KeyStroke>>();
                }
                Map<String,KeyStroke> actionName2KeyStrokeList = mimeType2actionName2KeyStroke.get(mimeType);
                if (actionName2KeyStrokeList == null) {
                    actionName2KeyStrokeList = new HashMap<String,KeyStroke>();
                    Lookup.Result<KeyBindingSettings> result = MimeLookup.getLookup(mimeType).lookupResult(
                            KeyBindingSettings.class);
                    Collection<? extends KeyBindingSettings> instances = result.allInstances();
                    if (!instances.isEmpty()) {
                        KeyBindingSettings kbs = instances.iterator().next();
                        for (MultiKeyBinding kb : kbs.getKeyBindings()) {
                            if (!actionName2KeyStrokeList.containsKey(kb.getActionName())
                                && kb.getKeyStrokeCount() == 1)
                            {
                                actionName2KeyStrokeList.put(kb.getActionName(), kb.getKeyStroke(0));
                            }
                        }
                    }
                    mimeType2actionName2KeyStroke.put(mimeType, actionName2KeyStrokeList);
                    // Ensure listening on changes in keybinding settings
                    if (!Boolean.TRUE.equals(mimeType2ListenerPresent.get(mimeType))) {
                        mimeType2ListenerPresent.put(mimeType, true);
                        result.addLookupListener(KeyBindingSettingsListener.INSTANCE);
                    }
                }
                ks = actionName2KeyStrokeList.get(actionName);
            }
        }
        return ks;
    }

    private static final class KeyBindingSettingsListener implements LookupListener {
        
        static final KeyBindingSettingsListener INSTANCE = new KeyBindingSettingsListener();

        private KeyBindingSettingsListener() {
        }

        public void resultChanged(LookupEvent ev) {
            synchronized (EditorActionUtilities.class) {
                mimeType2actionName2KeyStroke = null;
                LOG.fine("mimeType2actionName2KeyStroke cleared."); // NOI18N
            }
        }

    }

    private static final class DefaultSearchableKit implements SearchableEditorKit {
        
        private final Map<String,Reference<Action>> name2actionRef = new WeakHashMap<String,Reference<Action>>();

        DefaultSearchableKit(EditorKit kit) {
            for (Action action : kit.getActions()) {
                if (action != null) {
                    name2actionRef.put((String)action.getValue(Action.NAME), new WeakReference<Action>(action));
                }
            }
        }

        public Action getAction(String actionName) {
            Reference<Action> actionRef = name2actionRef.get(actionName);
            return (actionRef != null) ? actionRef.get() : null;
        }

        public void addActionsChangeListener(ChangeListener listener) {
        }

        public void removeActionsChangeListener(ChangeListener listener) {
        }


    }

}




/*
 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
 *
 * Copyright 1997-2007 Sun Microsystems, Inc. All rights reserved.
 *
 * 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.  Sun designates this
 * particular file as subject to the "Classpath" exception as provided
 * by Sun 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-2006 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.
 */

package org.netbeans.modules.editor.lib2.actions;

import java.util.List;
import javax.swing.Action;

/**
 * Abstract class implemented by editor module providing editor actions.
 *
 * @author Vita Stejskal
 * @since 1.39
 */
public interface EditorActionsProvider {

    List<Action> getActionsOnly();

    List<Object> getAllInstances();

}




/*
 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
 *
 * Copyright 2008 Sun Microsystems, Inc. All rights reserved.
 *
 * 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.  Sun designates this
 * particular file as subject to the "Classpath" exception as provided
 * by Sun 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]"
 *
 * 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.
 *
 * Contributor(s):
 *
 * Portions Copyrighted 2008 Sun Microsystems, Inc.
 */

package org.netbeans.modules.editor.lib2.actions;

import java.awt.event.ActionEvent;
import javax.swing.Action;
import javax.swing.text.DefaultEditorKit;

/**
 * Class handling macro recording of editor actions.
 *
 * @author Miloslav Metelka
 * @since 1.13
 */
public final class MacroRecording {

    /** Action's property for disabling recording of the action as part of a macro. */
    public static final String NO_MACRO_RECORDING_PROPERTY = "NoMacroRecording";
    
    private static final MacroRecording INSTANCE = new MacroRecording();

    public static MacroRecording get() {
        return INSTANCE;
    }

    private StringBuilder macroBuffer;

    private StringBuilder textBuffer;

    private MacroRecording() {
    }

    /**
     * Start recording a macro.
     *
     * @return true if macro recording started successfully or false otherwise.
     */
    public synchronized boolean startRecording() {
        if (isRecording()) {
            return false;
        }
        macroBuffer = new StringBuilder(100);
        textBuffer = new StringBuilder(20);
        return true;
    }

    /**
     * Stop macro recording.
     *
     * @return string describing the macro or null if no recording takes place currently.
     */
    public synchronized String stopRecording() {
        if (!isRecording()) {
            return null;
        }
        if (textBuffer.length() > 0) {
            if (macroBuffer.length() > 0) {
                macroBuffer.append( ' ' );
            }
            appendEncodedText(macroBuffer, textBuffer);
        }
        String completeMacroText = macroBuffer.toString();
        textBuffer = null;
        macroBuffer = null;
        return completeMacroText;
    }

    /**
     * Record given action into a macro buffer.
     *
     * @param action non-null action to record
     * @param evt non-null evt used when recording typed text of default key-typed action.
     */
    public synchronized void recordAction(Action action, ActionEvent evt) {
        if (isRecording() && !Boolean.TRUE.equals(action.getValue(NO_MACRO_RECORDING_PROPERTY))) {
            String actionName = actionName(action);
            if (DefaultEditorKit.defaultKeyTypedAction.equals(actionName)) {
                textBuffer.append(getFilteredActionCommand(evt.getActionCommand()));
            } else {
                if (textBuffer.length() > 0) {
                    if (macroBuffer.length() > 0) {
                        macroBuffer.append( ' ' );
                    }
                    appendEncodedText(macroBuffer, textBuffer);
                    textBuffer.setLength(0);
                }
                if (macroBuffer.length() > 0) {
                    macroBuffer.append(' ');
                }
                // Append encoded action name
                for (int i = 0; i < actionName.length(); i++) {
                    char c = actionName.charAt(i);
                    if (Character.isWhitespace(c) || c == '\\') {
                        macroBuffer.append('\\');
                    }
                    macroBuffer.append(c);
                }
            }
        }
    }

    private boolean isRecording() {
        return (macroBuffer != null);
    }

    private static String actionName(Action action) {
        return (String) action.getValue(Action.NAME);
    }

    private static String getFilteredActionCommand(String cmd) {
        if (cmd == null || cmd.length() == 0) {
            return "";
        }
        char ch = cmd.charAt(0);
        if ((ch >= 0x20) && (ch != 0x7F)) {
            return cmd;
        } else {
            return "";
        }
    }

    private static void appendEncodedText(StringBuilder sb, StringBuilder text) {
        sb.append('"');
        for (int i = 0; i < text.length(); i++) {
            char c = text.charAt(i);
            if (c == '"' || c == '\\') {
                sb.append('\\');
            }
            sb.append(c);
        }
        sb.append('"');
    }

}




/*
 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
 *
 * Copyright 2008 Sun Microsystems, Inc. All rights reserved.
 *
 * 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.  Sun designates this
 * particular file as subject to the "Classpath" exception as provided
 * by Sun 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]"
 *
 * 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.
 *
 * Contributor(s):
 *
 * Portions Copyrighted 2008 Sun Microsystems, Inc.
 */

package org.netbeans.modules.editor.lib2.actions;

import java.awt.Component;
import java.awt.event.ActionEvent;
import java.awt.event.ItemEvent;
import java.awt.event.ItemListener;
import java.beans.PropertyChangeEvent;
import java.beans.PropertyChangeListener;
import java.lang.ref.Reference;
import java.lang.ref.WeakReference;
import java.util.Map;
import java.util.WeakHashMap;
import java.util.logging.Level;
import java.util.logging.Logger;
import javax.swing.Action;
import javax.swing.JButton;
import javax.swing.JCheckBoxMenuItem;
import javax.swing.JMenuItem;
import javax.swing.event.ChangeEvent;
import javax.swing.event.ChangeListener;
import javax.swing.plaf.TextUI;
import javax.swing.text.EditorKit;
import javax.swing.text.JTextComponent;
import javax.swing.text.TextAction;
import org.netbeans.api.editor.EditorRegistry;
import org.netbeans.api.editor.EditorUtilities;
import org.openide.awt.Actions;
import org.openide.util.actions.Presenter;

/**
 * Action that represents a named editor action in main menu, popup menu
 * and editor toolbar.
 * <br/>
 * The actions are registered into "Editors/ActionPresenters" regardless
 * of the mime-type for which the actions get created.
 */
public final class PresenterEditorAction extends TextAction
        implements Presenter.Menu, Presenter.Popup, Presenter.Toolbar, PropertyChangeListener, ChangeListener
{

    // -J-Dorg.netbeans.modules.editor.lib2.actions.PresenterEditorAction.level=FINEST
    private static final Logger LOG = Logger.getLogger(PresenterEditorAction.class.getName());

    private static final Map<PresenterEditorAction,String> presenterAction2Name
            = new WeakHashMap<PresenterEditorAction,String>();

    /**
     * Currently active editor component's editor kit reference.
     */
    private static Reference<SearchableEditorKit> activeEditorKitRef;

    private static ChangeListener kitChangeListener = new ChangeListener() {
        public void stateChanged(ChangeEvent evt) {
            updateActions(null);
        }
    };

    private static SearchableEditorKit activeKit() {
        synchronized (PresenterEditorAction.class) {
            return (activeEditorKitRef != null) ? activeEditorKitRef.get() : null;
        }
    }

    private static void updateActions(SearchableEditorKit kit) {
        boolean changed = (activeEditorKitRef == null || kit != activeEditorKitRef.get());
        if (changed) {
            activeEditorKitRef = new WeakReference<SearchableEditorKit>(kit);
            for (Map.Entry<PresenterEditorAction, String> actionAndName : presenterAction2Name.entrySet()) {
                PresenterEditorAction presenterAction = actionAndName.getKey();
                String actionName = actionAndName.getValue();
                // Clear ref to old action
                presenterAction.clearDelegateActionRef();
                // Update to current delegate action (by using the given kit)
                presenterAction.delegateAction(kit, actionName);
            }
        }
    }

    private static final Action NULL_ACTION = new TextAction("null") {
        public void actionPerformed(ActionEvent evt) {
        }
    };

    private static final Reference<Action> NULL_ACTION_REF = new WeakReference<Action>(NULL_ACTION);

    static {
        EditorRegistry.addPropertyChangeListener(new PropertyChangeListener() {
            public void propertyChange(PropertyChangeEvent evt) {
                if (EditorRegistry.FOCUS_GAINED_PROPERTY.equals(evt.getPropertyName())) {
                    JTextComponent focusedTextComponent = (JTextComponent) evt.getNewValue();
                    TextUI ui = (focusedTextComponent != null) ? focusedTextComponent.getUI() : null;
                    EditorKit kit = (ui != null)
                            ? ui.getEditorKit(focusedTextComponent)
                            : EditorActionUtilities.getGlobalKit();
                    if (kit != null) {
                        SearchableEditorKit searchableKit = EditorActionUtilities.getSearchableKit(kit);
                        updateActions(searchableKit);
                    }
                }
            }
        });
    }

    public static Action create(Map<String,?> attrs) {
        String actionName = (String)attrs.get(Action.NAME);
        if (actionName == null) {
            throw new IllegalArgumentException("Null Action.NAME attribute for attrs: " + attrs); // NOI18N
        }
        return new PresenterEditorAction(actionName, attrs);
    }

    /**
     * Corresponding action's reference.
     */
    private Reference<Action> delegateActionRef;

    private JMenuItem menuPresenter;

    private JMenuItem popupPresenter;

    private Component toolBarPresenter;

    private Map<String,?> attrs;

    public PresenterEditorAction(String actionName, Map<String,?> attrs) {
        super(actionName);
        this.attrs = attrs;
        presenterAction2Name.put(this, actionName);
    }

    public void actionPerformed(ActionEvent evt) {
        // Find the right action for the corresponding editor kit
        JTextComponent component = getTextComponent(evt);
        if (component != null) {
            TextUI ui = component.getUI();
            if (ui != null) {
                EditorKit kit = ui.getEditorKit(component);
                if (kit != null) {
                    String actionName = actionName();
                    Action action = EditorUtilities.getAction(kit, actionName);
                    if (action != null) {
                        action.actionPerformed(evt);
                    } else {
                        if (LOG.isLoggable(Level.FINE)) {
                            LOG.fine("Action '" + actionName + "' not found in editor kit " + kit + '\n'); // NOI18N
                        }
                    }
                }
            }
        }
    }

    public JMenuItem getMenuPresenter() {
        if (menuPresenter == null) {
            menuPresenter = createMenuItem(false);
        }
        if (LOG.isLoggable(Level.FINE)) {
            LOG.fine("getMenuPresenter() for action=" + actionName() + " returns " + menuPresenter); // NOI18N
        }
        return menuPresenter;
    }

    public JMenuItem getPopupPresenter() {
        if (popupPresenter == null) {
            popupPresenter = createMenuItem(true);
        }
        if (LOG.isLoggable(Level.FINE)) {
            LOG.fine("getPopupPresenter() for action=" + actionName() + " returns " + popupPresenter); // NOI18N
        }
        return popupPresenter;
    }

    public Component getToolbarPresenter() {
        if (toolBarPresenter == null) {
            toolBarPresenter = new JButton(this);
        }
        if (LOG.isLoggable(Level.FINE)) {
            LOG.fine("getToolbarPresenter() for action=" + actionName() + " returns " + toolBarPresenter); // NOI18N
        }
        return toolBarPresenter;
    }

    @Override
    public Object getValue(String key) {
        Object value = super.getValue(key);
        if (value == null) {
            if (!"instanceCreate".equals(key)) { // Return null for this key
                value = attrs.get(key);
                if (value == null) {
                    Action delegateAction = delegateAction();
                    if (delegateAction != null) {
                        value = delegateAction.getValue(key);
                    }
                }
            }
        }
        return value;
    }

    public void propertyChange(PropertyChangeEvent evt) {
        String propertyName = evt.getPropertyName();
        if (AbstractEditorAction.SELECTED_KEY.equals(propertyName)) {
            if (LOG.isLoggable(Level.FINE)) {
                LOG.fine("propertyChange() of SELECTED_KEY for action " + actionName());
            }
            updateSelected();
        }
    }

    private void updateSelected() {
        if (isCheckBox()) {
            boolean selected = isSelected();
            if (menuPresenter instanceof JCheckBoxMenuItem) {
                ((JCheckBoxMenuItem)menuPresenter).setSelected(selected);
            }
            if (popupPresenter instanceof JCheckBoxMenuItem) {
                ((JCheckBoxMenuItem)popupPresenter).setSelected(selected);
            }
        }
    }

    public void stateChanged(ChangeEvent evt) {
        clearDelegateActionRef();
    }

    private boolean isSelected() {
        Action action = delegateAction();
        boolean selected = (action != null) && Boolean.TRUE.equals(action.getValue(
                AbstractEditorAction.SELECTED_KEY));
        return selected;
    }

    private JMenuItem createMenuItem(boolean isPopup) {
        final JMenuItem menuItem;
        if (isCheckBox()) {
            menuItem = new JCheckBoxMenuItem();
            if (LOG.isLoggable(Level.FINE)) {
                LOG.fine("Create checkbox menu item for action " + actionName() + ", selected=" + isSelected());
            }
            menuItem.setSelected(isSelected());
            menuItem.addItemListener(new ItemListener() {
                public void itemStateChanged(ItemEvent evt) {
                    boolean checkboxSelected = ((JCheckBoxMenuItem)evt.getSource()).isSelected();
                    boolean actionSelected = isSelected();
                    if (checkboxSelected != actionSelected) {
                        Action delegateAction = delegateAction();
                        if (delegateAction != null) {
                            delegateAction.putValue(AbstractEditorAction.SELECTED_KEY, checkboxSelected);
                        }
                    }
                }
            });

        } else { // Regular menu item
            menuItem = new JMenuItem();
        }
        Actions.connect(menuItem, this, isPopup);
        return menuItem;
    }

    private boolean isCheckBox() {
        String presenterType = (String) getValue("PresenterType");
        return "CheckBox".equals(presenterType);
    }

    String actionName() {
        return (String) getValue(Action.NAME); // should be non-null (check by constructor)
    }

    Action delegateAction() {
        return delegateAction(null, null);
    }

    Action delegateAction(SearchableEditorKit searchableKit, String actionName) {
        synchronized (this) {
            if (delegateActionRef == null) {
                if (actionName == null) {
                    actionName = actionName();
                }
                if (searchableKit == null) {
                    EditorKit globalKit = EditorActionUtilities.getGlobalKit();
                    searchableKit = (globalKit != null) ? EditorActionUtilities.getSearchableKit(globalKit) : null;
                    if (searchableKit == null) {
                        return null;
                    }
                }
                Action delegateAction = searchableKit.getAction(actionName);
                if (delegateAction != null) {
                    delegateActionRef = new WeakReference<Action>(delegateAction);
                    delegateAction.addPropertyChangeListener(this);
                    setEnabled(delegateAction.isEnabled());
                } else {
                    delegateActionRef = NULL_ACTION_REF;
                    setEnabled(false);
                    if (LOG.isLoggable(Level.FINE)) {
                        LOG.fine("Action '" + actionName + "' not found in global editor kit " + searchableKit + '\n'); // NOI18N
                    }
                }
                updateSelected();
            }
            return (delegateActionRef != NULL_ACTION_REF)
                    ? delegateActionRef.get()
                    : null;
        }
    }

    private void clearDelegateActionRef() {
        synchronized (this) {
            if (delegateActionRef != null && delegateActionRef != NULL_ACTION_REF) {
                Action oldDelegateAction = delegateActionRef.get();
                if (oldDelegateAction != null) {
                    oldDelegateAction.removePropertyChangeListener(this);
                }
            }
            delegateActionRef = null;
        }
        
    }

}




/*
 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
 *
 * Copyright 1997-2007 Sun Microsystems, Inc. All rights reserved.
 *
 * 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.  Sun designates this
 * particular file as subject to the "Classpath" exception as provided
 * by Sun 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-2006 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.
 */

package org.netbeans.modules.editor.lib2.actions;

import javax.swing.Action;
import javax.swing.event.ChangeListener;

/**
 * This interface should be implemented by editor kits that hold their actions
 * in a map. They may also notify
 *
 * @since 1.13
 */
public interface SearchableEditorKit {

    /**
     * Find action with the given name.
     *
     * @param actionName non-null action's name.
     * @return action's instance or null if an action with the given name does not exist.
     */
    Action getAction(String actionName);

    /**
     * Add listener for notifications about any change in a set of actions
     * maintained by this editor kit.
     *
     * @param listener non-null listener to be added.
     */
    void addActionsChangeListener(ChangeListener listener);

    void removeActionsChangeListener(ChangeListener listener);

}




/*
 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
 *
 * Copyright 1997-2007 Sun Microsystems, Inc. All rights reserved.
 *
 * 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.  Sun designates this
 * particular file as subject to the "Classpath" exception as provided
 * by Sun 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-2006 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.
 */

package org.netbeans.modules.editor.lib2.actions;

import java.util.Collection;
import java.util.HashMap;
import java.util.Map;
import java.util.logging.Level;
import java.util.logging.Logger;
import javax.swing.Action;
import javax.swing.event.ChangeEvent;
import javax.swing.event.ChangeListener;
import javax.swing.text.DefaultEditorKit;
import javax.swing.text.EditorKit;
import org.netbeans.lib.editor.util.ListenerList;
import org.openide.util.Lookup;
import org.openide.util.LookupEvent;
import org.openide.util.LookupListener;

/**
 * This interface should be implemented by editor kits that hold their actions
 * in a map. They may also notify
 *
 * @since 1.13
 */
public final class SearchableEditorKitImpl extends DefaultEditorKit implements SearchableEditorKit {

    // -J-Dorg.netbeans.modules.editor.lib2.actions.SearchableEditorKitImpl.level=FINEST
    private static final Logger LOG = Logger.getLogger(SearchableEditorKitImpl.class.getName());

    public static EditorKit createGlobalKit() {
        return new SearchableEditorKitImpl("");
    }

    private final String mimeType;

    private final Map<String,Action> name2Action = new HashMap<String,Action>();

    private Action[] actions;
    
    private LookupListener actionsListener;

    private ListenerList<ChangeListener> listenerList = new ListenerList<ChangeListener>();

    private SearchableEditorKitImpl(String mimeType) {
        this.mimeType = mimeType;
        if (LOG.isLoggable(Level.FINE)) {
            LOG.fine("SearchableEditorKitImpl created for \"" + mimeType + "\"\n"); // NOI18N
        }
        updateActions();
    }

    public Action getAction(String actionName) {
        synchronized (name2Action) {
            return name2Action.get(actionName);
        }
    }

    private void updateActions() {
        synchronized (name2Action) {
            // Fill up the actions from layer
            Lookup.Result<Action> actionsResult = EditorActionUtilities.createActionsLookupResult(mimeType);
            Collection<? extends Action> actionColl = actionsResult.allInstances();
            actions = new Action[actionColl.size()];
            actionColl.toArray(actions);
            name2Action.clear();
            for (Action action : actions) {
                String actionName;
                if (action != null && (actionName = (String) action.getValue(Action.NAME)) != null) {
                    name2Action.put(actionName, action);
                    if (LOG.isLoggable(Level.FINER)) {
                        LOG.finer("Mime-type: \"" + mimeType + "\", registerAction(\"" + actionName + // NOI18N
                                "\", " + action + ")\n"); // NOI18N
                    }
                }
            }

            if (actionsListener == null) {
                actionsListener = new LookupListener() {
                    public void resultChanged(LookupEvent ev) {
                        updateActions();
                    }
                };
                actionsResult.addLookupListener(actionsListener);
            }
        }

        // Fire change listeners
        fireActionsChange();
    }

    @Override
    public String getContentType() {
        return mimeType;
    }

    public void addActionsChangeListener(ChangeListener listener) {
        listenerList.add(listener);
    }

    public void removeActionsChangeListener(ChangeListener listener) {
        listenerList.remove(listener);
    }

    private void fireActionsChange() {
        ChangeEvent evt = new ChangeEvent(this);
        for (ChangeListener listener : listenerList.getListeners()) {
            listener.stateChanged(evt);
        }
    }

}

Lines 46-51 Link Here

(-)a/editor.lib2/src/org/netbeans/modules/editor/lib2/resources/layer.xml (+4 lines)
46	<filesystem>	46	<filesystem>
47	<folder name="Editors">	47	<folder name="Editors">
48	<file name="org-netbeans-modules-editor-lib2-highlighting-Factory.instance" />	48	<file name="org-netbeans-modules-editor-lib2-highlighting-Factory.instance" />
		49	<file name="EditorKit.instance">
		50	<attr name="instanceCreate" methodvalue="org.netbeans.modules.editor.lib2.actions.SearchableEditorKitImpl.createGlobalKit"/>
		51	</file>
		52
49	<folder name="text">	53	<folder name="text">
50	<folder name="x-dialog-binding">	54	<folder name="x-dialog-binding">
51	<file name="language.instance">	55	<file name="language.instance">




/*
 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
 *
 * Copyright 2009 Sun Microsystems, Inc. All rights reserved.
 *
 * 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.  Sun designates this
 * particular file as subject to the "Classpath" exception as provided
 * by Sun 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]"
 *
 * 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.
 *
 * Contributor(s):
 *
 * Portions Copyrighted 2009 Sun Microsystems, Inc.
 */

package org.netbeans.api.editor;

import javax.swing.Action;
import javax.swing.text.DefaultEditorKit;
import javax.swing.text.EditorKit;
import org.junit.Test;
import static org.junit.Assert.*;

/**
 *
 * @author mmetelka
 */
public class EditorUtilitiesTest {

    public EditorUtilitiesTest() {
    }

    @Test
    public void testGetAction() throws Exception {
        EditorKit editorKit = new DefaultEditorKit();
        String actionName = DefaultEditorKit.backwardAction;
        Action result = EditorUtilities.getAction(editorKit, actionName);
        for (Action expected : editorKit.getActions()) {
            if (actionName.equals(expected.getValue(Action.NAME))) {
                assertEquals(expected, result);
                return;
            }
        }
        fail("Action " + actionName + " not found.");
    }

}




/*
 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
 *
 * Copyright 2009 Sun Microsystems, Inc. All rights reserved.
 *
 * 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.  Sun designates this
 * particular file as subject to the "Classpath" exception as provided
 * by Sun 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]"
 *
 * 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.
 *
 * Contributor(s):
 *
 * Portions Copyrighted 2009 Sun Microsystems, Inc.
 */

package org.netbeans.modules.editor.lib2.actions;

import java.awt.event.ActionEvent;
import javax.swing.Action;
import javax.swing.JEditorPane;
import javax.swing.text.TextAction;
import org.junit.After;
import org.junit.Before;
import org.junit.Test;
import static org.junit.Assert.*;

/**
 *
 * @author mmetelka
 */
public class MacroRecordingTest {

    static final String TEST_ACTION_NAME = "test-action";

    public MacroRecordingTest() {
    }

    @Before
    public void setUp() {
    }

    @After
    public void tearDown() {
    }

    @Test
    public void testGet() {
        MacroRecording macroRecording = MacroRecording.get();
        assertNotNull(macroRecording);
    }

    @Test
    public void testRecording() {
        MacroRecording macroRecording = MacroRecording.get();
        assertNotNull(macroRecording.startRecording());
        macroRecording.recordAction(new MacroRecordingTestAction(), new ActionEvent(new JEditorPane(), 0, ""));
        String text = macroRecording.stopRecording();
        assertEquals(TEST_ACTION_NAME, text);
    }

    @Test
    public void testStopRecording() {
        MacroRecording macroRecording = MacroRecording.get();
        assertNull(macroRecording.stopRecording());
    }

    private static final class MacroRecordingTestAction extends TextAction {

        MacroRecordingTestAction() {
            super(TEST_ACTION_NAME);
        }

        public void actionPerformed(ActionEvent arg0) {
            // do nothing
        }

    }

}

Lines 73-79 Link Here

(-)a/editor/src/org/netbeans/modules/editor/ExportHtmlAction.java (-1 / +1 lines)
73	import org.netbeans.api.editor.settings.FontColorNames;	73	import org.netbeans.api.editor.settings.FontColorNames;
74	import org.netbeans.api.editor.settings.FontColorSettings;	74	import org.netbeans.api.editor.settings.FontColorSettings;
75	import org.netbeans.api.editor.settings.SimpleValueNames;	75	import org.netbeans.api.editor.settings.SimpleValueNames;
76	import org.netbeans.modules.editor.lib.EditorPreferencesDefaults;	76	import org.netbeans.modules.editor.lib2.EditorPreferencesDefaults;
77	import org.openide.awt.Mnemonics;	77	import org.openide.awt.Mnemonics;
78		78
79	public class ExportHtmlAction extends CookieAction {	79	public class ExportHtmlAction extends CookieAction {

Lines 64-70 Link Here

(-)a/editor/src/org/netbeans/modules/editor/MainMenuAction.java (-1 / +1 lines)
64	import org.netbeans.editor.Utilities;	64	import org.netbeans.editor.Utilities;
65	import org.netbeans.editor.ext.ExtKit;	65	import org.netbeans.editor.ext.ExtKit;
66	import org.netbeans.lib.editor.util.swing.DocumentUtilities;	66	import org.netbeans.lib.editor.util.swing.DocumentUtilities;
67	import org.netbeans.modules.editor.lib.EditorPreferencesDefaults;	67	import org.netbeans.modules.editor.lib2.EditorPreferencesDefaults;
68	import org.openide.awt.Mnemonics;	68	import org.openide.awt.Mnemonics;
69	import org.openide.util.HelpCtx;	69	import org.openide.util.HelpCtx;
70	import org.openide.util.ImageUtilities;	70	import org.openide.util.ImageUtilities;

Lines 58-64 Link Here

(-)a/editor/src/org/netbeans/modules/editor/NbCodeFoldingAction.java (-1 / +1 lines)
58	import org.netbeans.editor.BaseKit;	58	import org.netbeans.editor.BaseKit;
59	import org.netbeans.editor.Utilities;	59	import org.netbeans.editor.Utilities;
60	import org.netbeans.lib.editor.util.swing.DocumentUtilities;	60	import org.netbeans.lib.editor.util.swing.DocumentUtilities;
61	import org.netbeans.modules.editor.lib.EditorPreferencesDefaults;	61	import org.netbeans.modules.editor.lib2.EditorPreferencesDefaults;
62	import org.openide.util.HelpCtx;	62	import org.openide.util.HelpCtx;
63	import org.openide.util.NbBundle;	63	import org.openide.util.NbBundle;
64	import org.openide.awt.DynamicMenuContent;	64	import org.openide.awt.DynamicMenuContent;




import org.netbeans.modules.editor.impl.ToolbarActionsProvider;
import org.netbeans.modules.editor.impl.actions.NavigationHistoryBackAction;
import org.netbeans.modules.editor.impl.actions.NavigationHistoryForwardAction;
import org.netbeans.modules.editor.lib2.EditorPreferencesDefaults;
import org.netbeans.modules.editor.options.AnnotationTypesFolder;
import org.openide.awt.Mnemonics;
import org.openide.filesystems.FileObject;

                                       new NavigationHistoryForwardAction(),
                                       new SearchBar.IncrementalSearchForwardAction(),
                                       new SearchBar.IncrementalSearchBackwardAction(),
//                                       new ToggleToolbarAction(),
//                                       new NbToggleLineNumbersAction(),
                                       new NbGenerateGoToPopupAction(),
                                   };
        return TextAction.augmentList(super.createActions(), nbEditorActions);
    }

    @Override
    protected Action[] getDeclaredActions() {
        List<Action> declaredActionList = EditorActionsProvider.getEditorActions(getContentType());
        Action[] declaredActions = new Action[declaredActionList.size()];
        declaredActionList.toArray(declaredActions);
        return declaredActions;
                LOG.fine("    " + a); //NOI18N
            }
            LOG.fine("} End of custom layer actions for '" + getContentType() + "'"); //NOI18N
        }
        
        if (!actions.isEmpty()) {
            Action [] superActions = super.getCustomActions();
            if (superActions == null || superActions.length == 0) {
                return actions.toArray(new Action[actions.size()]);
            } else {
                return TextAction.augmentList(superActions, actions.toArray(new Action[actions.size()]));
            }
        } else {
            return super.getCustomActions();
        }
    }


    protected void addSystemActionMapping(String editorActionName, Class systemActionClass) {
        Action a = getActionByName(editorActionName);
        if (a != null) {

    /** Switch visibility of line numbers in editor */
    //@EditorActionRegistration(name = BaseKit.toggleLineNumbersAction)
    // Registration in createActions() due to getPopupMenuItem() in predecessor
    public static final class NbToggleLineNumbersAction extends ActionFactory.ToggleLineNumbersAction {

        public NbToggleLineNumbersAction() {
        }

Lines 90-96 Link Here

(-)a/editor/src/org/netbeans/modules/editor/NbEditorToolBar.java (-1 / +1 lines)
90	import org.netbeans.editor.Utilities;	90	import org.netbeans.editor.Utilities;
91	import org.netbeans.lib.editor.util.swing.DocumentUtilities;	91	import org.netbeans.lib.editor.util.swing.DocumentUtilities;
92	import org.netbeans.modules.editor.impl.ToolbarActionsProvider;	92	import org.netbeans.modules.editor.impl.ToolbarActionsProvider;
93	import org.netbeans.modules.editor.lib.EditorPreferencesDefaults;	93	import org.netbeans.modules.editor.lib2.EditorPreferencesDefaults;
94	import org.openide.filesystems.FileChangeAdapter;	94	import org.openide.filesystems.FileChangeAdapter;
95	import org.openide.filesystems.FileChangeListener;	95	import org.openide.filesystems.FileChangeListener;
96	import org.openide.filesystems.FileEvent;	96	import org.openide.filesystems.FileEvent;

Lines 86-92 Link Here

(-)a/editor/src/org/netbeans/modules/editor/NbEditorUI.java (-1 / +1 lines)
86	import org.netbeans.modules.editor.impl.SearchBar;	86	import org.netbeans.modules.editor.impl.SearchBar;
87	import org.netbeans.modules.editor.impl.StatusLineFactories;	87	import org.netbeans.modules.editor.impl.StatusLineFactories;
88	import org.netbeans.modules.editor.indent.spi.CodeStylePreferences;	88	import org.netbeans.modules.editor.indent.spi.CodeStylePreferences;
89	import org.netbeans.modules.editor.lib.EditorPreferencesDefaults;	89	import org.netbeans.modules.editor.lib2.EditorPreferencesDefaults;
90	import org.openide.text.CloneableEditorSupport;	90	import org.openide.text.CloneableEditorSupport;
91	import org.openide.util.ContextAwareAction;	91	import org.openide.util.ContextAwareAction;
92	import org.openide.util.Lookup;	92	import org.openide.util.Lookup;




            <file name="org-netbeans-modules-editor-NbCodeFoldingAction.instance">
                <attr name="position" intvalue="200"/>
            </file>
            <file name="org-netbeans-modules-editor-MainMenuAction$ShowToolBarAction.instance">
                <attr name="position" intvalue="800"/>
            </file>
            <file name="org-netbeans-modules-editor-MainMenuAction$ShowLineNumbersAction.instance">
                <attr name="position" intvalue="850"/>
            </file>
            </folder>
        
        <folder name="GoTo">

                <attr name="position" intvalue="800"/>
            </file>
            
            <file name="org-netbeans-modules-editor-MainMenuAction$GoToDeclarationAction.instance">
                <attr name="position" intvalue="900"/>
            </file>                        
            
            <file name="org-netbeans-modules-editor-MainMenuAction$GoToSuperAction.instance">
                <attr name="position" intvalue="1000"/>
            </file>

Lines 53-59 Link Here

(-)a/editor/test/qa-functional/src/org/netbeans/test/editor/popup/MainMenuTest.java (-1 / +1 lines)
53	import org.netbeans.jemmy.operators.JEditorPaneOperator;	53	import org.netbeans.jemmy.operators.JEditorPaneOperator;
54	import org.netbeans.jemmy.operators.JTextComponentOperator;	54	import org.netbeans.jemmy.operators.JTextComponentOperator;
55	import org.netbeans.junit.NbModuleSuite;	55	import org.netbeans.junit.NbModuleSuite;
56	import org.netbeans.modules.editor.lib.EditorPreferencesDefaults;	56	import org.netbeans.modules.editor.lib2.EditorPreferencesDefaults;
57		57
58	/**	58	/**
59	* Test behavior of main menus - Edit, View	59	* Test behavior of main menus - Edit, View

Lines 177-187 Link Here

(-)a/openide.awt/src/org/openide/awt/AlwaysEnabledAction.java (-4 / +8 lines)
177	return fo == null ? null : fo.get("noIconInMenu"); // NOI18N	177	return fo == null ? null : fo.get("noIconInMenu"); // NOI18N
178	}	178	}
179	if (Action.ACCELERATOR_KEY.equals(name)) {	179	if (Action.ACCELERATOR_KEY.equals(name)) {
180	Keymap map = Lookup.getDefault().lookup(Keymap.class);	180	Object value = fo.get(Action.ACCELERATOR_KEY);
181	if (map != null) {	181	if (value == null) {
182	KeyStroke[] arr = map.getKeyStrokesForAction(action);	182	Keymap map = Lookup.getDefault().lookup(Keymap.class);
183	return arr.length > 0 ? arr[0] : null;	183	if (map != null) {
		184	KeyStroke[] arr = map.getKeyStrokesForAction(action);
		185	value = arr.length > 0 ? arr[0] : null;
		186	}
184	}	187	}
		188	return value;
185	}	189	}
186	// Delegate query to other properties to "fo" ignoring special properties	190	// Delegate query to other properties to "fo" ignoring special properties
187	if (!"delegate".equals(name) && !"instanceCreate".equals(name)) {	191	if (!"delegate".equals(name) && !"instanceCreate".equals(name)) {

Return to bug 166027

Lines 98-104 Link Here

(-)a/editor/src/org/netbeans/modules/editor/NbEditorKit.java (-26 / +12 lines)
98	import org.netbeans.modules.editor.impl.ToolbarActionsProvider;	98	import org.netbeans.modules.editor.impl.ToolbarActionsProvider;
99	import org.netbeans.modules.editor.impl.actions.NavigationHistoryBackAction;	99	import org.netbeans.modules.editor.impl.actions.NavigationHistoryBackAction;
100	import org.netbeans.modules.editor.impl.actions.NavigationHistoryForwardAction;	100	import org.netbeans.modules.editor.impl.actions.NavigationHistoryForwardAction;
101	import org.netbeans.modules.editor.lib.EditorPreferencesDefaults;	101	import org.netbeans.modules.editor.lib2.EditorPreferencesDefaults;
102	import org.netbeans.modules.editor.options.AnnotationTypesFolder;	102	import org.netbeans.modules.editor.options.AnnotationTypesFolder;
103	import org.openide.awt.Mnemonics;	103	import org.openide.awt.Mnemonics;
104	import org.openide.filesystems.FileObject;	104	import org.openide.filesystems.FileObject;
Lines 192-227 Link Here
192	new NavigationHistoryForwardAction(),	192	new NavigationHistoryForwardAction(),
193	new SearchBar.IncrementalSearchForwardAction(),	193	new SearchBar.IncrementalSearchForwardAction(),
194	new SearchBar.IncrementalSearchBackwardAction(),	194	new SearchBar.IncrementalSearchBackwardAction(),
195	new ToggleToolbarAction(),	195	// new ToggleToolbarAction(),
196	new NbToggleLineNumbersAction(),	196	// new NbToggleLineNumbersAction(),
197	new NbGenerateGoToPopupAction(),	197	new NbGenerateGoToPopupAction(),
198	};	198	};
199	return TextAction.augmentList(super.createActions(), nbEditorActions);	199	return TextAction.augmentList(super.createActions(), nbEditorActions);
200	}	200	}
201		201
202	protected @Override Action[] getCustomActions() {	202	@Override
203	List<Action> actions = EditorActionsProvider.getEditorActions(getContentType());	203	protected Action[] getDeclaredActions() {
204		204	List<Action> declaredActionList = EditorActionsProvider.getEditorActions(getContentType());
205	if (LOG.isLoggable(Level.FINE)) {	205	Action[] declaredActions = new Action[declaredActionList.size()];
206	LOG.fine("Custom layer actions for '" + getContentType() + "' {"); //NOI18N	206	declaredActionList.toArray(declaredActions);
207	for(Action a : actions) {	207	return declaredActions;
208	LOG.fine(" " + a); //NOI18N
209	}
210	LOG.fine("} End of custom layer actions for '" + getContentType() + "'"); //NOI18N
211	}
212
213	if (!actions.isEmpty()) {
214	Action [] superActions = super.getCustomActions();
215	if (superActions == null \|\| superActions.length == 0) {
216	return actions.toArray(new Action[actions.size()]);
217	} else {
218	return TextAction.augmentList(superActions, actions.toArray(new Action[actions.size()]));
219	}
220	} else {
221	return super.getCustomActions();
222	}
223	}	208	}
224		209
		210
225	protected void addSystemActionMapping(String editorActionName, Class systemActionClass) {	211	protected void addSystemActionMapping(String editorActionName, Class systemActionClass) {
226	Action a = getActionByName(editorActionName);	212	Action a = getActionByName(editorActionName);
227	if (a != null) {	213	if (a != null) {
Lines 571-577 Link Here
571	/** Switch visibility of line numbers in editor */	557	/** Switch visibility of line numbers in editor */
572	//@EditorActionRegistration(name = BaseKit.toggleLineNumbersAction)	558	//@EditorActionRegistration(name = BaseKit.toggleLineNumbersAction)
573	// Registration in createActions() due to getPopupMenuItem() in predecessor	559	// Registration in createActions() due to getPopupMenuItem() in predecessor
574	public static class NbToggleLineNumbersAction extends ActionFactory.ToggleLineNumbersAction {	560	public static final class NbToggleLineNumbersAction extends ActionFactory.ToggleLineNumbersAction {
575		561
576	public NbToggleLineNumbersAction() {	562	public NbToggleLineNumbersAction() {
577	}	563	}

Line 0 Link Here

(-)a/editor.actions/build.xml (+47 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-2007 Sun Microsystems, Inc. All rights reserved.
	6
	7
	8	The contents of this file are subject to the terms of either the GNU
	9	General Public License Version 2 only ("GPL") or the Common
	10	Development and Distribution License("CDDL") (collectively, the
	11	"License"). You may not use this file except in compliance with the
	12	License. You can obtain a copy of the License at
	13	http://www.netbeans.org/cddl-gplv2.html
	14	or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the
	15	specific language governing permissions and limitations under the
	16	License. When distributing the software, include this License Header
	17	Notice in each file and include the License file at
	18	nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
	19	particular file as subject to the "Classpath" exception as provided
	20	by Sun in the GPL Version 2 section of the License file that
	21	accompanied this code. If applicable, add the following below the
	22	License Header, with the fields enclosed by brackets [] replaced by
	23	your own identifying information:
	24	"Portions Copyrighted [year] [name of copyright owner]"
	25
	26	Contributor(s):
	27
	28	The Original Software is NetBeans. The Initial Developer of the Original
	29	Software is Sun Microsystems, Inc. Portions Copyright 1997-2006 Sun
	30	Microsystems, Inc. All Rights Reserved.
	31
	32	If you wish your version of this file to be governed by only the CDDL
	33	or only the GPL Version 2, indicate your decision by adding
	34	"[Contributor] elects to include this software in this distribution
	35	under the [CDDL or GPL Version 2] license." If you do not indicate a
	36	single choice of license, a recipient has the option to distribute
	37	your version of this file under either the CDDL, the GPL Version 2 or
	38	to extend the choice of license to its licensees as provided above.
	39	However, if you add GPL Version 2 code and therefore, elected the GPL
	40	Version 2 license, then the option applies only if the new code is
	41	made subject to such option by the copyright holder.
	42	-->
	43
	44	<project name="editor.actions" default="netbeans" basedir=".">
	45	<import file="../nbbuild/templates/projectized.xml"/>
	46
	47	</project>

Line 0 Link Here

(-)a/editor.actions/nbproject/project.properties (+46 lines)
	1	# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
	2	#
	3	# Copyright 1997-2007 Sun Microsystems, Inc. All rights reserved.
	4	#
	5	# The contents of this file are subject to the terms of either the GNU
	6	# General Public License Version 2 only ("GPL") or the Common
	7	# Development and Distribution License("CDDL") (collectively, the
	8	# "License"). You may not use this file except in compliance with the
	9	# License. You can obtain a copy of the License at
	10	# http://www.netbeans.org/cddl-gplv2.html
	11	# or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the
	12	# specific language governing permissions and limitations under the
	13	# License. When distributing the software, include this License Header
	14	# Notice in each file and include the License file at
	15	# nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
	16	# particular file as subject to the "Classpath" exception as provided
	17	# by Sun in the GPL Version 2 section of the License file that
	18	# accompanied this code. If applicable, add the following below the
	19	# License Header, with the fields enclosed by brackets [] replaced by
	20	# your own identifying information:
	21	# "Portions Copyrighted [year] [name of copyright owner]"
	22	#
	23	# Contributor(s):
	24	#
	25	# The Original Software is NetBeans. The Initial Developer of the Original
	26	# Software is Sun Microsystems, Inc. Portions Copyright 1997-2006 Sun
	27	# Microsystems, Inc. All Rights Reserved.
	28	#
	29	# If you wish your version of this file to be governed by only the CDDL
	30	# or only the GPL Version 2, indicate your decision by adding
	31	# "[Contributor] elects to include this software in this distribution
	32	# under the [CDDL or GPL Version 2] license." If you do not indicate a
	33	# single choice of license, a recipient has the option to distribute
	34	# your version of this file under either the CDDL, the GPL Version 2 or
	35	# to extend the choice of license to its licensees as provided above.
	36	# However, if you add GPL Version 2 code and therefore, elected the GPL
	37	# Version 2 license, then the option applies only if the new code is
	38	# made subject to such option by the copyright holder.
	39
	40	javac.compilerargs=-Xlint:unchecked
	41	javac.source=1.5
	42	javadoc.title=Editor Actions
	43	spec.version.base=1.0.0
	44
	45	#javadoc.arch=${basedir}/arch.xml
	46	#javadoc.apichanges=${basedir}/apichanges.xml

Line 0 Link Here

(-)a/editor.actions/nbproject/project.xml (+98 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-2007 Sun Microsystems, Inc. All rights reserved.
		6
		7
		8	The contents of this file are subject to the terms of either the GNU
		9	General Public License Version 2 only ("GPL") or the Common
		10	Development and Distribution License("CDDL") (collectively, the
		11	"License"). You may not use this file except in compliance with the
		12	License. You can obtain a copy of the License at
		13	http://www.netbeans.org/cddl-gplv2.html
		14	or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the
		15	specific language governing permissions and limitations under the
		16	License. When distributing the software, include this License Header
		17	Notice in each file and include the License file at
		18	nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
		19	particular file as subject to the "Classpath" exception as provided
		20	by Sun in the GPL Version 2 section of the License file that
		21	accompanied this code. If applicable, add the following below the
		22	License Header, with the fields enclosed by brackets [] replaced by
		23	your own identifying information:
		24	"Portions Copyrighted [year] [name of copyright owner]"
		25
		26	Contributor(s):
		27
		28	The Original Software is NetBeans. The Initial Developer of the Original
		29	Software is Sun Microsystems, Inc. Portions Copyright 1997-2006 Sun
		30	Microsystems, Inc. All Rights Reserved.
		31
		32	If you wish your version of this file to be governed by only the CDDL
		33	or only the GPL Version 2, indicate your decision by adding
		34	"[Contributor] elects to include this software in this distribution
		35	under the [CDDL or GPL Version 2] license." If you do not indicate a
		36	single choice of license, a recipient has the option to distribute
		37	your version of this file under either the CDDL, the GPL Version 2 or
		38	to extend the choice of license to its licensees as provided above.
		39	However, if you add GPL Version 2 code and therefore, elected the GPL
		40	Version 2 license, then the option applies only if the new code is
		41	made subject to such option by the copyright holder.
		42	-->
		43	<project xmlns="http://www.netbeans.org/ns/project/1">
		44	<type>org.netbeans.modules.apisupport.project</type>
		45	<configuration>
		46	<data xmlns="http://www.netbeans.org/ns/nb-module-project/3">
		47	<code-name-base>org.netbeans.modules.editor.actions</code-name-base>
		48	<module-dependencies>
		49	<dependency>
		50	<code-name-base>org.netbeans.modules.editor.lib</code-name-base>
		51	<build-prerequisite/>
		52	<compile-dependency/>
		53	<run-dependency>
		54	<release-version>1</release-version>
		55	<specification-version>1.40</specification-version>
		56	</run-dependency>
		57	</dependency>
		58	<dependency>
		59	<code-name-base>org.netbeans.modules.editor.lib2</code-name-base>
		60	<build-prerequisite/>
		61	<compile-dependency/>
		62	<run-dependency>
		63	<release-version>1</release-version>
		64	<implementation-version/>
65	</run-dependency>
66	</dependency>
67	<dependency>
68	<code-name-base>org.netbeans.modules.editor.mimelookup</code-name-base>
69	<build-prerequisite/>
70	<compile-dependency/>
71	<run-dependency>
72	<release-version>1</release-version>
73	<specification-version>1.12</specification-version>
74	</run-dependency>
75	</dependency>
76	<dependency>
77	<code-name-base>org.netbeans.modules.editor.settings</code-name-base>
78	<build-prerequisite/>
79	<compile-dependency/>
80	<run-dependency>
81	<release-version>1</release-version>
82	<specification-version>1.25</specification-version>
83	</run-dependency>
84	</dependency>
85	<dependency>
86	<code-name-base>org.openide.util</code-name-base>
87	<build-prerequisite/>
88	<compile-dependency/>
89	<run-dependency>
90	<specification-version>7.24</specification-version>
91	</run-dependency>
92	</dependency>
93	</module-dependencies>
94	<test-dependencies/>
95	<public-packages/>
96	</data>
97	</configuration>
98	</project>

Line 0 Link Here

(-)a/editor.actions/src/org/netbeans/modules/editor/actions/Bundle.properties (+51 lines)
	1	# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
	2	#
	3	# Copyright 1997-2007 Sun Microsystems, Inc. All rights reserved.
	4	#
	5	# The contents of this file are subject to the terms of either the GNU
	6	# General Public License Version 2 only ("GPL") or the Common
	7	# Development and Distribution License("CDDL") (collectively, the
	8	# "License"). You may not use this file except in compliance with the
	9	# License. You can obtain a copy of the License at
	10	# http://www.netbeans.org/cddl-gplv2.html
	11	# or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the
	12	# specific language governing permissions and limitations under the
	13	# License. When distributing the software, include this License Header
	14	# Notice in each file and include the License file at
	15	# nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
	16	# particular file as subject to the "Classpath" exception as provided
	17	# by Sun in the GPL Version 2 section of the License file that
	18	# accompanied this code. If applicable, add the following below the
	19	# License Header, with the fields enclosed by brackets [] replaced by
	20	# your own identifying information:
	21	# "Portions Copyrighted [year] [name of copyright owner]"
	22	#
	23	# Contributor(s):
	24	#
	25	# The Original Software is NetBeans. The Initial Developer of the Original
	26	# Software is Sun Microsystems, Inc. Portions Copyright 1997-2006 Sun
	27	# Microsystems, Inc. All Rights Reserved.
	28	#
	29	# If you wish your version of this file to be governed by only the CDDL
	30	# or only the GPL Version 2, indicate your decision by adding
	31	# "[Contributor] elects to include this software in this distribution
	32	# under the [CDDL or GPL Version 2] license." If you do not indicate a
	33	# single choice of license, a recipient has the option to distribute
	34	# your version of this file under either the CDDL, the GPL Version 2 or
	35	# to extend the choice of license to its licensees as provided above.
	36	# However, if you add GPL Version 2 code and therefore, elected the GPL
	37	# Version 2 license, then the option applies only if the new code is
	38	# made subject to such option by the copyright holder.
	39
	40	OpenIDE-Module-Name=Editor Actions
	41	OpenIDE-Module-Display-Category=Editing
	42	OpenIDE-Module-Short-Description=Contains editor actions implementations
	43	OpenIDE-Module-Long-Description=Editor Actions module contains default editor actions implementations.
	44
	45	# Actions
	46	toggle-toolbar=Toggle Toolbar
	47	toggle-toolbar_menu_text=S&how Editor Toolbar
	48	toggle-line-numbers=Toggle Line Numbers
	49	toggle-line-numbers_menu_text=&Show Line Numbers
	50	goto-declaration=Go to Declaration
	51	goto-declaration_menu_text=Go to &Declaration

Line 0 Link Here

(-)a/editor.actions/src/org/netbeans/modules/editor/actions/GotoAction.java (+98 lines)
		1	/*
		2	* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
		3	*
		4	* Copyright 2008 Sun Microsystems, Inc. All rights reserved.
		5	*
		6	* The contents of this file are subject to the terms of either the GNU
		7	* General Public License Version 2 only ("GPL") or the Common
		8	* Development and Distribution License("CDDL") (collectively, the
		9	* "License"). You may not use this file except in compliance with the
		10	* License. You can obtain a copy of the License at
		11	* http://www.netbeans.org/cddl-gplv2.html
		12	* or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the
		13	* specific language governing permissions and limitations under the
		14	* License. When distributing the software, include this License Header
		15	* Notice in each file and include the License file at
		16	* nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
		17	* particular file as subject to the "Classpath" exception as provided
		18	* by Sun in the GPL Version 2 section of the License file that
		19	* accompanied this code. If applicable, add the following below the
		20	* License Header, with the fields enclosed by brackets [] replaced by
		21	* your own identifying information:
		22	* "Portions Copyrighted [year] [name of copyright owner]"
		23	*
		24	* If you wish your version of this file to be governed by only the CDDL
		25	* or only the GPL Version 2, indicate your decision by adding
		26	* "[Contributor] elects to include this software in this distribution
		27	* under the [CDDL or GPL Version 2] license." If you do not indicate a
		28	* single choice of license, a recipient has the option to distribute
		29	* your version of this file under either the CDDL, the GPL Version 2 or
		30	* to extend the choice of license to its licensees as provided above.
		31	* However, if you add GPL Version 2 code and therefore, elected the GPL
		32	* Version 2 license, then the option applies only if the new code is
		33	* made subject to such option by the copyright holder.
		34	*
		35	* Contributor(s):
		36	*
		37	* Portions Copyrighted 2008 Sun Microsystems, Inc.
		38	*/
		39
		40	package org.netbeans.modules.editor.actions;
		41
		42	import org.netbeans.modules.editor.lib2.actions.AbstractEditorAction;
		43	import java.awt.event.ActionEvent;
		44	import java.util.logging.Logger;
		45	import javax.swing.text.BadLocationException;
		46	import javax.swing.text.Caret;
		47	import javax.swing.text.JTextComponent;
		48	import org.netbeans.api.editor.EditorActionRegistration;
		49	import org.netbeans.api.editor.EditorActionRegistrations;
		50	import org.netbeans.editor.BaseDocument;
		51	import org.netbeans.editor.Utilities;
		52	import org.netbeans.editor.ext.ExtSyntaxSupport;
		53	import org.netbeans.modules.editor.lib2.actions.EditorActionNames;
		54
		55	/**
		56	* Toggle toolbar/lines visibility.
		57	*
		58	* @author Miloslav Metelka
		59	* @since 1.13
		60	*/
		61
		62	@EditorActionRegistrations({
		63	@EditorActionRegistration(
		64	name = EditorActionNames.gotoDeclarationAction,
65	menuPath = "GoTo",
66	menuPosition = 900,
67	menuText = "#" + EditorActionNames.gotoDeclarationAction + "_menu_text"
68	)
69	})
70	public final class GotoAction extends AbstractEditorAction {
71
72	// -J-Dorg.netbeans.modules.editor.actions.GotoAction.level=FINEST
73	private static final Logger LOG = Logger.getLogger(GotoAction.class.getName());
74
75	public void actionPerformed(ActionEvent evt, JTextComponent target) {
76	String actionName = actionName();
77	if (EditorActionNames.gotoDeclarationAction.equals(actionName)) {
78	magicPositionReset(target);
79	BaseDocument doc = Utilities.getDocument(target);
80	if (doc != null) {
81	try {
82	Caret caret = target.getCaret();
83	int dotPos = caret.getDot();
84	int[] idBlk = Utilities.getIdentifierBlock(doc, dotPos);
85	ExtSyntaxSupport extSup = (ExtSyntaxSupport)doc.getSyntaxSupport();
86	if (idBlk != null) {
87	int decPos = extSup.findDeclarationPosition(doc.getText(idBlk), idBlk[1]);
88	if (decPos >= 0) {
89	caret.setDot(decPos);
90	}
91	}
92	} catch (BadLocationException e) {
93	}
94	}
95	}
96	}
97
98	}

Lines 134-137 Link Here

(-)a/editor.lib2/src/org/netbeans/api/editor/EditorActionRegistration.java (+41 lines)
134	*/	134	*/
135	String popupText() default "";	135	String popupText() default "";
136		136
		137	/**
		138	* Path of this action in main menu e.g. "Edit".
		139	*/
		140	String menuPath() default "";
		141
		142	/**
		143	* Integer position of the main menu item among the other menu items.
		144	* <br/>
		145	* The default Integer.MAX_VALUE value means no menu representation.
		146	*/
		147	int menuPosition() default Integer.MAX_VALUE;
		148
		149	/**
		150	* Path of this action in popup menu e.g. "" for appearance right in the context menu
		151	* or a corresponding path for nested submenu appearance.
		152	*/
		153	String popupPath() default "";
		154
		155	/**
		156	* Integer position of the popup menu item among the other popup menu (or submenu) items.
		157	* <br/>
		158	* The default Integer.MAX_VALUE value means no popup menu representation.
		159	*/
		160	int popupPosition() default Integer.MAX_VALUE;
		161
		162	/**
		163	* Integer position of this action in editor toolbar.
		164	* <br/>
		165	* The default Integer.MAX_VALUE value means no toolbar representation.
		166	*/
		167	int toolBarPosition() default Integer.MAX_VALUE;
		168
		169	/**
		170	* Get type of the presenter used in menu (and toolbar).
		171	* <br/>
		172	* Currently supported types are default "" and "CheckBox".
		173	* <br/>
		174	* The value will be present in the action in "PresenterType" property.
		175	*/
		176	String presenterType() default "";
		177
137	}	178	}

Line 0 Link Here

(-)a/editor.lib2/src/org/netbeans/api/editor/EditorUtilities.java (+73 lines)
		1	/*
		2	* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
		3	*
		4	* Copyright 1997-2007 Sun Microsystems, Inc. All rights reserved.
		5	*
		6	* The contents of this file are subject to the terms of either the GNU
		7	* General Public License Version 2 only ("GPL") or the Common
		8	* Development and Distribution License("CDDL") (collectively, the
		9	* "License"). You may not use this file except in compliance with the
		10	* License. You can obtain a copy of the License at
		11	* http://www.netbeans.org/cddl-gplv2.html
		12	* or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the
		13	* specific language governing permissions and limitations under the
		14	* License. When distributing the software, include this License Header
		15	* Notice in each file and include the License file at
		16	* nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
		17	* particular file as subject to the "Classpath" exception as provided
		18	* by Sun in the GPL Version 2 section of the License file that
		19	* accompanied this code. If applicable, add the following below the
		20	* License Header, with the fields enclosed by brackets [] replaced by
		21	* your own identifying information:
		22	* "Portions Copyrighted [year] [name of copyright owner]"
		23	*
		24	* Contributor(s):
		25	*
		26	* The Original Software is NetBeans. The Initial Developer of the Original
		27	* Software is Sun Microsystems, Inc. Portions Copyright 1997-2006 Sun
		28	* Microsystems, Inc. All Rights Reserved.
		29	*
		30	* If you wish your version of this file to be governed by only the CDDL
		31	* or only the GPL Version 2, indicate your decision by adding
		32	* "[Contributor] elects to include this software in this distribution
		33	* under the [CDDL or GPL Version 2] license." If you do not indicate a
		34	* single choice of license, a recipient has the option to distribute
		35	* your version of this file under either the CDDL, the GPL Version 2 or
		36	* to extend the choice of license to its licensees as provided above.
		37	* However, if you add GPL Version 2 code and therefore, elected the GPL
		38	* Version 2 license, then the option applies only if the new code is
		39	* made subject to such option by the copyright holder.
		40	*/
		41
		42	package org.netbeans.api.editor;
		43
		44	import javax.swing.Action;
		45	import javax.swing.text.EditorKit;
		46	import org.netbeans.modules.editor.lib2.actions.EditorActionUtilities;
		47
		48
		49	/**
		50	* Various utility methods related to editor.
		51	*
		52	* @author Miloslav Metelka
		53	* @since 1.13
		54	*/
		55
		56	public final class EditorUtilities {
		57
		58	private EditorUtilities() {
		59	// No instances
		60	}
		61
		62	/**
		63	* Find an action with the given name in the editor kit.
		64	*
65	* @param editorKit non-null editor kit in which search is performed.
66	* @param actionName non-null action name to search for.
67	* @return action instance with the given name or null if action not found.
68	*/
69	public static Action getAction(EditorKit editorKit, String actionName) {
70	return EditorActionUtilities.getAction(editorKit, actionName);
71	}
72
73	}

Line 0 Link Here

(-)a/editor.lib2/test/unit/src/org/netbeans/api/editor/EditorUtilitiesTest.java (+71 lines)
		1	/*
		2	* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
		3	*
		4	* Copyright 2009 Sun Microsystems, Inc. All rights reserved.
		5	*
		6	* The contents of this file are subject to the terms of either the GNU
		7	* General Public License Version 2 only ("GPL") or the Common
		8	* Development and Distribution License("CDDL") (collectively, the
		9	* "License"). You may not use this file except in compliance with the
		10	* License. You can obtain a copy of the License at
		11	* http://www.netbeans.org/cddl-gplv2.html
		12	* or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the
		13	* specific language governing permissions and limitations under the
		14	* License. When distributing the software, include this License Header
		15	* Notice in each file and include the License file at
		16	* nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
		17	* particular file as subject to the "Classpath" exception as provided
		18	* by Sun in the GPL Version 2 section of the License file that
		19	* accompanied this code. If applicable, add the following below the
		20	* License Header, with the fields enclosed by brackets [] replaced by
		21	* your own identifying information:
		22	* "Portions Copyrighted [year] [name of copyright owner]"
		23	*
		24	* If you wish your version of this file to be governed by only the CDDL
		25	* or only the GPL Version 2, indicate your decision by adding
		26	* "[Contributor] elects to include this software in this distribution
		27	* under the [CDDL or GPL Version 2] license." If you do not indicate a
		28	* single choice of license, a recipient has the option to distribute
		29	* your version of this file under either the CDDL, the GPL Version 2 or
		30	* to extend the choice of license to its licensees as provided above.
		31	* However, if you add GPL Version 2 code and therefore, elected the GPL
		32	* Version 2 license, then the option applies only if the new code is
		33	* made subject to such option by the copyright holder.
		34	*
		35	* Contributor(s):
		36	*
		37	* Portions Copyrighted 2009 Sun Microsystems, Inc.
		38	*/
		39
		40	package org.netbeans.api.editor;
		41
		42	import javax.swing.Action;
		43	import javax.swing.text.DefaultEditorKit;
		44	import javax.swing.text.EditorKit;
		45	import org.junit.Test;
		46	import static org.junit.Assert.*;
		47
		48	/**
		49	*
		50	* @author mmetelka
		51	*/
		52	public class EditorUtilitiesTest {
		53
		54	public EditorUtilitiesTest() {
		55	}
		56
		57	@Test
		58	public void testGetAction() throws Exception {
		59	EditorKit editorKit = new DefaultEditorKit();
		60	String actionName = DefaultEditorKit.backwardAction;
		61	Action result = EditorUtilities.getAction(editorKit, actionName);
		62	for (Action expected : editorKit.getActions()) {
		63	if (actionName.equals(expected.getValue(Action.NAME))) {
		64	assertEquals(expected, result);
65	return;
66	}
67	}
68	fail("Action " + actionName + " not found.");
69	}
70
71	}