Attachment #124161 for bug #217978

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

Lines 38-44 Link Here

(-)a/editor.breadcrumbs/nbproject/project.xml (-1 / +1 lines)
38	<compile-dependency/>	38	<compile-dependency/>
39	<run-dependency>	39	<run-dependency>
40	<release-version>1</release-version>	40	<release-version>1</release-version>
41	<specification-version>1.64</specification-version>	41	<specification-version>1.67</specification-version>
42	</run-dependency>	42	</run-dependency>
43	</dependency>	43	</dependency>
44	<dependency>	44	<dependency>

Lines 52-58 Link Here

(-)a/editor.breadcrumbs/src/org/netbeans/modules/editor/breadcrumbs/MenuAction.java (-1 / +2 lines)
52	@EditorActionRegistration(name="toggle-breadcrumbs-view",	52	@EditorActionRegistration(name="toggle-breadcrumbs-view",
53	menuPath="View",	53	menuPath="View",
54	menuPosition=887,	54	menuPosition=887,
55	preferencesKey=SideBarFactoryImpl.KEY_BREADCRUMBS)	55	preferencesKey=SideBarFactoryImpl.KEY_BREADCRUMBS,
		56	preferencesDefault=true)
56	public class MenuAction extends AbstractAction {	57	public class MenuAction extends AbstractAction {
57		58
58	@Override	59	@Override




    <!-- ACTUAL CHANGES BEGIN HERE: -->

    <changes>
        <change id="Actions.checkbox.default">
            <summary>EditorActionRegistration has preferencesDefault</summary>
            <version major="1" minor="67"/>
            <date day="18" month="9" year="2012"/>
            <author login="jlahoda"/>
            <compatibility binary="compatible" source="compatible" semantic="compatible" addition="yes"/>
            <description>
                <p>
                    EditorActionRegistration has preferencesDefault to specify the default for the preferences value.
                </p>
            </description>
            <issue number="217978"/>
        </change>

        <change id="UndoableEditWrapper">
            <summary>UndoableEditWrapper interface added</summary>
            <version major="1" minor="60"/>

Lines 1-6 Link Here

(-)a/editor.lib2/manifest.mf (-1 / +1 lines)
1	Manifest-Version: 1.0	1	Manifest-Version: 1.0
2	OpenIDE-Module: org.netbeans.modules.editor.lib2/1	2	OpenIDE-Module: org.netbeans.modules.editor.lib2/1
3	OpenIDE-Module-Implementation-Version: 33	3	OpenIDE-Module-Implementation-Version: 34
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	6	OpenIDE-Module-Needs: org.netbeans.modules.editor.actions

Lines 43-49 Link Here

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

Lines 99-105 Link Here

(-)a/editor.lib2/nbproject/project.xml (-1 / +1 lines)
99	<build-prerequisite/>	99	<build-prerequisite/>
100	<compile-dependency/>	100	<compile-dependency/>
101	<run-dependency>	101	<run-dependency>
102	<specification-version>7.17</specification-version>	102	<specification-version>7.53</specification-version>
103	</run-dependency>	103	</run-dependency>
104	</dependency>	104	</dependency>
105	<dependency>	105	<dependency>




    String preferencesKey() default "";
    
    /**
     * Whether or not the action should be in checked state by default.
     * <br/>
     * If the preference should default to true or to false. Only valid in conjunction
     * with {@link #preferencesKey() }.
     * 
     * @since 1.67
     */
    boolean preferencesDefault() default false;
    
    /**
     * Allows to make an override of an action by adding a "weight" attribute
     * into a generated file object in the system filesystem
     * - see {@link org.openide.filesystems.MultiFileSystem}.

Lines 302-307 Link Here

(-)a/editor.lib2/src/org/netbeans/modules/editor/lib2/EditorActionRegistrationProcessor.java (+1 lines)
302	if (preferencesKey.length() > 0) {	302	if (preferencesKey.length() > 0) {
303	file.stringvalue("preferencesKey", preferencesKey);	303	file.stringvalue("preferencesKey", preferencesKey);
304	file.methodvalue("preferencesNode", EditorActionUtilities.class.getName(), "getGlobalPreferences");	304	file.methodvalue("preferencesNode", EditorActionUtilities.class.getName(), "getGlobalPreferences");
		305	file.boolvalue("preferencesDefault", annotation.preferencesDefault());
305	}	306	}
306		307
307	// Deafult helpID is action's name	308	// Deafult helpID is action's name




<apidef name="awt">AWT API</apidef>
</apidefs>
<changes>
    <change id="Actions.checkbox.default">
        <api name="awt"/>
        <summary>The value in Preferences for Actions.checkbox can have a default</summary>
        <version major="7" minor="53"/>
        <date day="18" month="9" year="2012"/>
        <author login="jlahoda"/>
        <compatibility addition="yes" binary="compatible" semantic="compatible" deprecation="no" deletion="no" modification="no"/>
        <description>
            A default value can be specified for a preference value for Actions.checkbox.
        </description>
        <class package="org.openide.awt" name="Actions"/>
        <issue number="217978"/>
    </change>
    <change id="BrowserExtensions">
      <api name="awt"/>
      <summary>Minor API extensions to allow better integration of embedded browsers.</summary>

Lines 2-6 Link Here

(-)a/openide.awt/manifest.mf (-1 / +1 lines)
2	OpenIDE-Module: org.openide.awt	2	OpenIDE-Module: org.openide.awt
3	OpenIDE-Module-Localizing-Bundle: org/openide/awt/Bundle.properties	3	OpenIDE-Module-Localizing-Bundle: org/openide/awt/Bundle.properties
4	AutoUpdate-Essential-Module: true	4	AutoUpdate-Essential-Module: true
5	OpenIDE-Module-Specification-Version: 7.52	5	OpenIDE-Module-Specification-Version: 7.53
6		6

Lines 91-96 Link Here

(-)a/openide.awt/src/org/openide/awt/AlwaysEnabledAction.java (-1 / +3 lines)
91	private static final String PREFERENCES_NODE = "preferencesNode"; // NOI18N	91	private static final String PREFERENCES_NODE = "preferencesNode"; // NOI18N
92		92
93	private static final String PREFERENCES_KEY = "preferencesKey"; // NOI18N	93	private static final String PREFERENCES_KEY = "preferencesKey"; // NOI18N
		94	private static final String PREFERENCES_DEFAULT = "preferencesDefault"; // NOI18N
94		95
95	static AlwaysEnabledAction create(Map m) {	96	static AlwaysEnabledAction create(Map m) {
96	return (m.containsKey(PREFERENCES_KEY)) ? new CheckBox(m) : new AlwaysEnabledAction(m);	97	return (m.containsKey(PREFERENCES_KEY)) ? new CheckBox(m) : new AlwaysEnabledAction(m);
Lines 403-409 Link Here
403	Preferences prefs = prefs();	404	Preferences prefs = prefs();
404	boolean value;	405	boolean value;
405	if (key != null && prefs != null) {	406	if (key != null && prefs != null) {
406	value = prefs.getBoolean(key, false);	407	Object defaultValue = getValue(PREFERENCES_DEFAULT);
		408	value = prefs.getBoolean(key, defaultValue instanceof Boolean ? (Boolean) defaultValue : false);
407	synchronized (this) {	409	synchronized (this) {
408	if (!prefsListening) {	410	if (!prefsListening) {
409	prefsListening = true;	411	prefsListening = true;




        checkPreferencesAction("testNbPreferences.instance", "", NbPreferences.root());
        checkPreferencesAction("testCustomPreferences.instance", "user:", Preferences.userRoot()); // customPreferences() uses "myNode" subnode
    }
    
    public void testPreferencesDefaultAction() throws Exception {
        Action a = readAction("testPreferencesDefault.instance");
        assertNotNull(a);
        Preferences prefsNode = Preferences.userRoot().node("myNode");
        prefsNode.remove("myKey");
        assertNull("Expected null as preference value", prefsNode.get("myKey", null));
        JMenuItem item = ((Presenter.Menu) a).getMenuPresenter();
        TestCase.assertTrue("Expected to be selected", item.isSelected());
    }

    private void checkPreferencesAction(String actionFileName, String preferencesNodePrefix, Preferences prefsRoot) throws Exception {
        Action a = readAction(actionFileName);

Lines 113-118 Link Here

(-)a/openide.awt/test/unit/src/org/openide/awt/test-layer.xml (+7 lines)
113	<attr name='preferencesKey' stringvalue='myKey'/>	113	<attr name='preferencesKey' stringvalue='myKey'/>
114	<attr name='preferencesNode' stringvalue='user:/myNode'/>	114	<attr name='preferencesNode' stringvalue='user:/myNode'/>
115	</file>	115	</file>
		116	<file name="testPreferencesDefault.instance">
		117	<attr name='instanceCreate' methodvalue='org.openide.awt.Actions.checkbox'/>
		118	<attr name='delegate' methodvalue='org.openide.awt.AlwaysEnabledActionTest.preferencesAction'/>
		119	<attr name='preferencesKey' stringvalue='myKey'/>
		120	<attr name='preferencesNode' stringvalue='user:/myNode'/>
		121	<attr name='preferencesDefault' boolvalue='true'/>
		122	</file>
116	<file name="testNbPreferences.instance">	123	<file name="testNbPreferences.instance">
117	<attr name='instanceCreate' methodvalue='org.openide.awt.Actions.checkbox'/>	124	<attr name='instanceCreate' methodvalue='org.openide.awt.Actions.checkbox'/>
118	<attr name='delegate' methodvalue='org.openide.awt.AlwaysEnabledActionTest.preferencesAction'/>	125	<attr name='delegate' methodvalue='org.openide.awt.AlwaysEnabledActionTest.preferencesAction'/>

Return to bug 217978

Lines 179-184 Link Here

(-)a/editor.lib2/src/org/netbeans/api/editor/EditorActionRegistration.java (+10 lines)
179	String preferencesKey() default "";	179	String preferencesKey() default "";
180		180
181	/**	181	/**
		182	* Whether or not the action should be in checked state by default.
		183	* <br/>
		184	* If the preference should default to true or to false. Only valid in conjunction
		185	* with {@link #preferencesKey() }.
		186	*
		187	* @since 1.67
		188	*/
		189	boolean preferencesDefault() default false;
		190
		191	/**
182	* Allows to make an override of an action by adding a "weight" attribute	192	* Allows to make an override of an action by adding a "weight" attribute
183	* into a generated file object in the system filesystem	193	* into a generated file object in the system filesystem
184	* - see {@link org.openide.filesystems.MultiFileSystem}.	194	* - see {@link org.openide.filesystems.MultiFileSystem}.

Lines 413-418 Link Here

(-)a/openide.awt/test/unit/src/org/openide/awt/AlwaysEnabledActionTest.java (+10 lines)
413	checkPreferencesAction("testNbPreferences.instance", "", NbPreferences.root());	413	checkPreferencesAction("testNbPreferences.instance", "", NbPreferences.root());
414	checkPreferencesAction("testCustomPreferences.instance", "user:", Preferences.userRoot()); // customPreferences() uses "myNode" subnode	414	checkPreferencesAction("testCustomPreferences.instance", "user:", Preferences.userRoot()); // customPreferences() uses "myNode" subnode
415	}	415	}
		416
		417	public void testPreferencesDefaultAction() throws Exception {
		418	Action a = readAction("testPreferencesDefault.instance");
		419	assertNotNull(a);
		420	Preferences prefsNode = Preferences.userRoot().node("myNode");
		421	prefsNode.remove("myKey");
		422	assertNull("Expected null as preference value", prefsNode.get("myKey", null));
		423	JMenuItem item = ((Presenter.Menu) a).getMenuPresenter();
		424	TestCase.assertTrue("Expected to be selected", item.isSelected());
		425	}
416		426
417	private void checkPreferencesAction(String actionFileName, String preferencesNodePrefix, Preferences prefsRoot) throws Exception {	427	private void checkPreferencesAction(String actionFileName, String preferencesNodePrefix, Preferences prefsRoot) throws Exception {
418	Action a = readAction(actionFileName);	428	Action a = readAction(actionFileName);

Lines 107-112 Link Here

(-)a/editor.lib2/apichanges.xml (+14 lines)
107	<!-- ACTUAL CHANGES BEGIN HERE: -->	107	<!-- ACTUAL CHANGES BEGIN HERE: -->
108		108
109	<changes>	109	<changes>
		110	<change id="Actions.checkbox.default">
		111	<summary>EditorActionRegistration has preferencesDefault</summary>
		112	<version major="1" minor="67"/>
		113	<date day="18" month="9" year="2012"/>
		114	<author login="jlahoda"/>
		115	<compatibility binary="compatible" source="compatible" semantic="compatible" addition="yes"/>
		116	<description>
		117	<p>
		118	EditorActionRegistration has preferencesDefault to specify the default for the preferences value.
		119	</p>
		120	</description>
		121	<issue number="217978"/>
		122	</change>
		123
110	<change id="UndoableEditWrapper">	124	<change id="UndoableEditWrapper">
111	<summary>UndoableEditWrapper interface added</summary>	125	<summary>UndoableEditWrapper interface added</summary>
112	<version major="1" minor="60"/>	126	<version major="1" minor="60"/>

Lines 50-55 Link Here

(-)a/openide.awt/apichanges.xml (+13 lines)
50	<apidef name="awt">AWT API</apidef>	50	<apidef name="awt">AWT API</apidef>
51	</apidefs>	51	</apidefs>
52	<changes>	52	<changes>
		53	<change id="Actions.checkbox.default">
		54	<api name="awt"/>
		55	<summary>The value in Preferences for Actions.checkbox can have a default</summary>
		56	<version major="7" minor="53"/>
		57	<date day="18" month="9" year="2012"/>
		58	<author login="jlahoda"/>
		59	<compatibility addition="yes" binary="compatible" semantic="compatible" deprecation="no" deletion="no" modification="no"/>
		60	<description>
		61	A default value can be specified for a preference value for Actions.checkbox.
		62	</description>
		63	<class package="org.openide.awt" name="Actions"/>
		64	<issue number="217978"/>
		65	</change>
53	<change id="BrowserExtensions">	66	<change id="BrowserExtensions">
54	<api name="awt"/>	67	<api name="awt"/>
55	<summary>Minor API extensions to allow better integration of embedded browsers.</summary>	68	<summary>Minor API extensions to allow better integration of embedded browsers.</summary>