Attachment #107808 for bug #197789

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




<apidef name="awt">AWT API</apidef>
</apidefs>
<changes>
    <change id="ActionRegistration.menuOrPopupText">
        <api name="awt"/>
        <summary>New attributes (popupText, menuText) in @ActionRegistration annotation</summary>
        <version major="7" minor="29"/>
        <date day="7" month="4" year="2011"/>
        <author login="tstupka"/>
        <compatibility addition="yes" binary="compatible" deletion="no" semantic="compatible"/>
        <description>
            <p>
                New attributes (popupText, menuText) in @ActionRegistration annotation to provide 
                text for menu items or popup menu items according to the
                <a href="@TOP@/org/openide/awt/Actions.html#connect(javax.swing.JMenuItem,%20javax.swing.Action,%20boolean)">Actions.connect</a>
                method. 
            </p>
        </description>
        <class package="org.openide.awt" name="ActionRegistration"/>
        <issue number="197789"/>
    </change>
    <change id="ActionReference">
        <api name="awt"/>
        <summary>New @ActionReference annotations</summary>




            File f = layer(e).file("Actions/" + aid.category() + "/" + id + ".instance");
            f.bundlevalue("displayName", ar.displayName());
            
            String menuText = ar.menuText();
            if(!menuText.isEmpty()) {
                f.bundlevalue("menuText", menuText);
            }

            String popupText = ar.popupText();
            if (!popupText.isEmpty()) {
                f.bundlevalue("popupText", popupText);
            }
            
            String key;
            boolean createDelegate = true;
            if (e.getKind() == ElementKind.FIELD) {




     * @return display name for the action
     */
    String displayName();
    
    /** 
     * Provides the text if one wants to use other text in a JMenuItem than 
     * the name of the action taken from Action.NAME. Takes precedence 
     * over standard Action.NAME.
     * 
     * @return display name for the action
     * 
     * @see Actions#connect(javax.swing.JMenuItem, javax.swing.Action, boolean) 
     * @since 7.29
     */    
    String menuText() default "";
    
    /** 
     * Provides the text if one wants to use other text in a JMenuItem popup 
     * than the name of the action taken from Action.NAME. 
     * 
     * @return display name for the action in a popup menu
     * 
     * @see Actions#connect(javax.swing.JMenuItem, javax.swing.Action, boolean) 
     * @since 7.29
     */
    String popupText() default "";
    
    /** Path to image representing the action's icon.
     * @return "org/myproject/mypkg/Icon.png"
     */




import javax.swing.AbstractAction;
import javax.swing.Action;
import javax.swing.ActionMap;
import javax.swing.JButton;
import javax.swing.JSeparator;
import org.netbeans.junit.NbTestCase;
import org.openide.awt.ActionReference;
import org.openide.awt.ActionReferences;
import org.openide.awt.ActionRegistration;
import org.openide.awt.Actions;
import org.openide.awt.DynamicMenuContent;
import org.openide.filesystems.FileObject;
import org.openide.filesystems.FileUtil;

            return null;
        }
    }
    
    @ActionID(category="menutext", id="namedaction")
    @ActionRegistration(displayName="This is an Action", menuText="This is a Menu Action", popupText="This is a Popup Action")
    public static class NamedAction extends AbstractAction {
        public NamedAction() { }
        @Override
        public void actionPerformed(ActionEvent e) { }
    }

    public void testPopupText() throws Exception {
        FileObject fo = FileUtil.getConfigFile("Actions/menutext/namedaction.instance");
        assertNotNull("Instance found", fo);
        Object obj = fo.getAttribute("instanceCreate");
        assertNotNull("Action created", obj);
        
        JMenuItem item = new JMenuItem();
        Actions.connect(item, (Action) obj, true );
        assertEquals("This is an Action", ((Action) obj).getValue(Action.NAME));
        assertEquals("This is a Popup Action", item.getText());
    }
    
    public void testMenuText() throws Exception {
        FileObject fo = FileUtil.getConfigFile("Actions/menutext/namedaction.instance");
        assertNotNull("Instance found", fo);
        Object obj = fo.getAttribute("instanceCreate");
        assertNotNull("Action created", obj);
        
        JMenuItem item = new JMenuItem();
        Actions.connect(item, (Action) obj, false );
        assertEquals("This is an Action", ((Action) obj).getValue(Action.NAME));
        assertEquals("This is a Menu Action", item.getText());
    }
    
    public void testDirectInstanceIfImplementsMenuPresenter() throws Exception {
        FileObject fo = FileUtil.getConfigFile("Actions/eager/direct-one.instance");
        assertNotNull("Instance found", fo);

Return to bug 197789

Lines 50-55 Link Here

(-)openide.awt/apichanges.xml (+18 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="ActionRegistration.menuOrPopupText">
		54	<api name="awt"/>
		55	<summary>New attributes (popupText, menuText) in @ActionRegistration annotation</summary>
		56	<version major="7" minor="29"/>
		57	<date day="7" month="4" year="2011"/>
		58	<author login="tstupka"/>
		59	<compatibility addition="yes" binary="compatible" deletion="no" semantic="compatible"/>
		60	<description>
		61	<p>
		62	New attributes (popupText, menuText) in @ActionRegistration annotation to provide
		63	text for menu items or popup menu items according to the
		64	<a href="@TOP@/org/openide/awt/Actions.html#connect(javax.swing.JMenuItem,%20javax.swing.Action,%20boolean)">Actions.connect</a>
		65	method.
		66	</p>
		67	</description>
		68	<class package="org.openide.awt" name="ActionRegistration"/>
		69	<issue number="197789"/>
		70	</change>
53	<change id="ActionReference">	71	<change id="ActionReference">
54	<api name="awt"/>	72	<api name="awt"/>
55	<summary>New @ActionReference annotations</summary>	73	<summary>New @ActionReference annotations</summary>

Lines 191-196 Link Here

(-)openide.awt/src/org/netbeans/modules/openide/awt/ActionProcessor.java (+10 lines)
191	File f = layer(e).file("Actions/" + aid.category() + "/" + id + ".instance");	191	File f = layer(e).file("Actions/" + aid.category() + "/" + id + ".instance");
192	f.bundlevalue("displayName", ar.displayName());	192	f.bundlevalue("displayName", ar.displayName());
193		193
		194	String menuText = ar.menuText();
		195	if(!menuText.isEmpty()) {
		196	f.bundlevalue("menuText", menuText);
		197	}
		198
		199	String popupText = ar.popupText();
		200	if (!popupText.isEmpty()) {
		201	f.bundlevalue("popupText", popupText);
		202	}
		203
194	String key;	204	String key;
195	boolean createDelegate = true;	205	boolean createDelegate = true;
196	if (e.getKind() == ElementKind.FIELD) {	206	if (e.getKind() == ElementKind.FIELD) {

Lines 65-70 Link Here

(-)openide.awt/src/org/openide/awt/ActionRegistration.java (+24 lines)
65	* @return display name for the action	65	* @return display name for the action
66	*/	66	*/
67	String displayName();	67	String displayName();
		68
		69	/**
		70	* Provides the text if one wants to use other text in a JMenuItem than
		71	* the name of the action taken from Action.NAME. Takes precedence
		72	* over standard Action.NAME.
		73	*
		74	* @return display name for the action
		75	*
		76	* @see Actions#connect(javax.swing.JMenuItem, javax.swing.Action, boolean)
		77	* @since 7.29
		78	*/
		79	String menuText() default "";
		80
		81	/**
		82	* Provides the text if one wants to use other text in a JMenuItem popup
		83	* than the name of the action taken from Action.NAME.
		84	*
		85	* @return display name for the action in a popup menu
		86	*
		87	* @see Actions#connect(javax.swing.JMenuItem, javax.swing.Action, boolean)
		88	* @since 7.29
		89	*/
		90	String popupText() default "";
		91
68	/** Path to image representing the action's icon.	92	/** Path to image representing the action's icon.
69	* @return "org/myproject/mypkg/Icon.png"	93	* @return "org/myproject/mypkg/Icon.png"
70	*/	94	*/

Lines 58-68 Link Here

(-)openide.awt/test/unit/src/org/netbeans/modules/openide/awt/ActionProcessorTest.java (+35 lines)
58	import javax.swing.AbstractAction;	58	import javax.swing.AbstractAction;
59	import javax.swing.Action;	59	import javax.swing.Action;
60	import javax.swing.ActionMap;	60	import javax.swing.ActionMap;
		61	import javax.swing.JButton;
61	import javax.swing.JSeparator;	62	import javax.swing.JSeparator;
62	import org.netbeans.junit.NbTestCase;	63	import org.netbeans.junit.NbTestCase;
63	import org.openide.awt.ActionReference;	64	import org.openide.awt.ActionReference;
64	import org.openide.awt.ActionReferences;	65	import org.openide.awt.ActionReferences;
65	import org.openide.awt.ActionRegistration;	66	import org.openide.awt.ActionRegistration;
		67	import org.openide.awt.Actions;
66	import org.openide.awt.DynamicMenuContent;	68	import org.openide.awt.DynamicMenuContent;
67	import org.openide.filesystems.FileObject;	69	import org.openide.filesystems.FileObject;
68	import org.openide.filesystems.FileUtil;	70	import org.openide.filesystems.FileUtil;
Lines 594-599 Link Here
594	return null;	596	return null;
595	}	597	}
596	}	598	}
		599
		600	@ActionID(category="menutext", id="namedaction")
		601	@ActionRegistration(displayName="This is an Action", menuText="This is a Menu Action", popupText="This is a Popup Action")
		602	public static class NamedAction extends AbstractAction {
		603	public NamedAction() { }
		604	@Override
		605	public void actionPerformed(ActionEvent e) { }
		606	}
		607
		608	public void testPopupText() throws Exception {
		609	FileObject fo = FileUtil.getConfigFile("Actions/menutext/namedaction.instance");
		610	assertNotNull("Instance found", fo);
		611	Object obj = fo.getAttribute("instanceCreate");
		612	assertNotNull("Action created", obj);
		613
		614	JMenuItem item = new JMenuItem();
		615	Actions.connect(item, (Action) obj, true );
		616	assertEquals("This is an Action", ((Action) obj).getValue(Action.NAME));
		617	assertEquals("This is a Popup Action", item.getText());
		618	}
		619
		620	public void testMenuText() throws Exception {
		621	FileObject fo = FileUtil.getConfigFile("Actions/menutext/namedaction.instance");
		622	assertNotNull("Instance found", fo);
		623	Object obj = fo.getAttribute("instanceCreate");
		624	assertNotNull("Action created", obj);
		625
		626	JMenuItem item = new JMenuItem();
		627	Actions.connect(item, (Action) obj, false );
		628	assertEquals("This is an Action", ((Action) obj).getValue(Action.NAME));
		629	assertEquals("This is a Menu Action", item.getText());
		630	}
		631
597	public void testDirectInstanceIfImplementsMenuPresenter() throws Exception {	632	public void testDirectInstanceIfImplementsMenuPresenter() throws Exception {
598	FileObject fo = FileUtil.getConfigFile("Actions/eager/direct-one.instance");	633	FileObject fo = FileUtil.getConfigFile("Actions/eager/direct-one.instance");
599	assertNotNull("Instance found", fo);	634	assertNotNull("Instance found", fo);