You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@myfaces.apache.org by lo...@apache.org on 2009/12/08 16:19:28 UTC
svn commit: r888438 - in /myfaces/tobago/trunk:
core/src/main/java/org/apache/myfaces/tobago/taglib/component/
example/addressbook/lib/src/main/resources/META-INF/resources/addressbook/layout/
example/demo/src/main/webapp/ example/demo/src/main/webapp/...
Author: lofwyr
Date: Tue Dec 8 15:19:26 2009
New Revision: 888438
URL: http://svn.apache.org/viewvc?rev=888438&view=rev
Log:
TOBAGO-832: Reimplementation of the menu
rename tc:menuItem to tc:menuCommand
Modified:
myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/taglib/component/MenuItemTagDeclaration.java
myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/taglib/component/ToolBarTagDeclaration.java
myfaces/tobago/trunk/example/addressbook/lib/src/main/resources/META-INF/resources/addressbook/layout/basic.xhtml
myfaces/tobago/trunk/example/demo/src/main/webapp/menu.jsp
myfaces/tobago/trunk/example/demo/src/main/webapp/menu.xhtml
myfaces/tobago/trunk/example/demo/src/main/webapp/overview/toolbar.xhtml
myfaces/tobago/trunk/example/demo/src/main/webapp/reference/menu.jsp
myfaces/tobago/trunk/example/demo/src/main/webapp/reference/popup.jsp
myfaces/tobago/trunk/extension/facelets/src/main/resources/META-INF/menuCheckbox.xml
myfaces/tobago/trunk/extension/facelets/src/main/resources/META-INF/menuRadio.xml
myfaces/tobago/trunk/src/docbook/tobago-tutorial.xml
myfaces/tobago/trunk/src/site/apt/guide.apt
myfaces/tobago/trunk/src/site/apt/migration-1.5.apt
Modified: myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/taglib/component/MenuItemTagDeclaration.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/taglib/component/MenuItemTagDeclaration.java?rev=888438&r1=888437&r2=888438&view=diff
==============================================================================
--- myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/taglib/component/MenuItemTagDeclaration.java (original)
+++ myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/taglib/component/MenuItemTagDeclaration.java Tue Dec 8 15:19:26 2009
@@ -30,8 +30,8 @@
@Tag(name = "menuItem",
tagExtraInfoClassName = "org.apache.myfaces.tobago.taglib.component.CommandTagExtraInfo")
@UIComponentTag(
- uiComponent = "org.apache.myfaces.tobago.component.UIMenuCommand",
- uiComponentBaseClass = "org.apache.myfaces.tobago.component.UICommand",
+ uiComponent = "org.apache.myfaces.tobago.component.UIMenuItem",
+ uiComponentBaseClass = "org.apache.myfaces.tobago.component.UIMenuCommand",
rendererType = RendererTypes.MENU_COMMAND,
allowedChildComponenents = "NONE")
@Deprecated
Modified: myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/taglib/component/ToolBarTagDeclaration.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/taglib/component/ToolBarTagDeclaration.java?rev=888438&r1=888437&r2=888438&view=diff
==============================================================================
--- myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/taglib/component/ToolBarTagDeclaration.java (original)
+++ myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/taglib/component/ToolBarTagDeclaration.java Tue Dec 8 15:19:26 2009
@@ -47,9 +47,9 @@
* label="Alert 0" >
* <f:facet name="menupopup">
* <tc:menu>
- * <tc:menuItem onclick="alert('test 1')" label="Alert 1"/>
- * <tc:menuItem onclick="alert('test 2')" label="Alert 2"/>
- * <tc:menuItem onclick="alert('test 3')" label="Alert 3"/>
+ * <tc:menuCommand onclick="alert('test 1')" label="Alert 1"/>
+ * <tc:menuCommand onclick="alert('test 2')" label="Alert 2"/>
+ * <tc:menuCommand onclick="alert('test 3')" label="Alert 3"/>
* </tc:menu>
* </f:facet>
* </tc:button>
Modified: myfaces/tobago/trunk/example/addressbook/lib/src/main/resources/META-INF/resources/addressbook/layout/basic.xhtml
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/example/addressbook/lib/src/main/resources/META-INF/resources/addressbook/layout/basic.xhtml?rev=888438&r1=888437&r2=888438&view=diff
==============================================================================
--- myfaces/tobago/trunk/example/addressbook/lib/src/main/resources/META-INF/resources/addressbook/layout/basic.xhtml (original)
+++ myfaces/tobago/trunk/example/addressbook/lib/src/main/resources/META-INF/resources/addressbook/layout/basic.xhtml Tue Dec 8 15:19:26 2009
@@ -30,14 +30,14 @@
<tc:menuBar>
<tc:form>
<tc:menu label="#{bundle.menuFile}">
- <tc:menuItem label="#{bundle.menuFileNew}" action="#{controller.createAddress}" immediate="true"
+ <tc:menuCommand label="#{bundle.menuFileNew}" action="#{controller.createAddress}" immediate="true"
image="image/org/tango-project/tango-icon-theme/16x16/actions/contact-new.png"/>
- <tc:menuItem label="Add Dummy Addresses" action="#{controller.addDummyAddresses}" immediate="true"/>
+ <tc:menuCommand label="Add Dummy Addresses" action="#{controller.addDummyAddresses}" immediate="true"/>
<tc:menuSeparator/>
- <tc:menuItem label="#{bundle.admin}" action="#{admin.admin}"
+ <tc:menuCommand label="#{bundle.admin}" action="#{admin.admin}"
image="image/org/tango-project/tango-icon-theme/16x16/categories/preferences-system.png"/>
<tc:menuSeparator/>
- <tc:menuItem label="Logout" action="#{controller.logout}"
+ <tc:menuCommand label="Logout" action="#{controller.logout}"
image="image/org/tango-project/tango-icon-theme/16x16/actions/system-log-out.png"/>
</tc:menu>
@@ -58,10 +58,10 @@
</tc:menu>
<tc:menu label="#{bundle.menuHelp}">
- <tc:menuItem label="#{bundle.menuHelpAbout}"
+ <tc:menuCommand label="#{bundle.menuHelpAbout}"
image="image/org/tango-project/tango-icon-theme/16x16/apps/help-browser.png">
<tc:popupReference for=":page:about"/>
- </tc:menuItem>
+ </tc:menuCommand>
</tc:menu>
</tc:form>
</tc:menuBar>
Modified: myfaces/tobago/trunk/example/demo/src/main/webapp/menu.jsp
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/example/demo/src/main/webapp/menu.jsp?rev=888438&r1=888437&r2=888438&view=diff
==============================================================================
--- myfaces/tobago/trunk/example/demo/src/main/webapp/menu.jsp (original)
+++ myfaces/tobago/trunk/example/demo/src/main/webapp/menu.jsp Tue Dec 8 15:19:26 2009
@@ -22,13 +22,13 @@
<tc:menuBar >
<tc:menu label="#{overviewBundle.menu_config}" >
<tc:menu label="#{overviewBundle.menu_themes}" >
- <tc:menuItem action="#{clientConfigController.submit}">
+ <tc:menuCommand action="#{clientConfigController.submit}">
<f:facet name="items">
<tc:selectOneRadio value="#{clientConfigController.theme}" >
<f:selectItems value="#{clientConfigController.themeItems}" />
</tc:selectOneRadio>
</f:facet>
- </tc:menuItem>
+ </tc:menuCommand>
</tc:menu>
<tc:menu label="#{overviewBundle.menu_locale}">
<tx:menuRadio action="#{clientConfigController.submit}"
@@ -40,16 +40,16 @@
<tx:menuCheckbox action="#{clientConfigController.submit}"
label="#{overviewBundle.menu_debug}"
value="#{clientConfigController.debugMode}"/>
- <tc:menuItem action="#{demo.resetSession}" label="Reset" />
+ <tc:menuCommand action="#{demo.resetSession}" label="Reset" />
</tc:menu>
<tc:menu label="#{overviewBundle.menu_help}">
- <tc:menuItem onclick="alert('#{overviewBundle.pageTitle}' + String.fromCharCode(10) + '#{info.version}' + String.fromCharCode(10) + '#{overviewBundle.tobago_url}' + String.fromCharCode(10))"
+ <tc:menuCommand onclick="alert('#{overviewBundle.pageTitle}' + String.fromCharCode(10) + '#{info.version}' + String.fromCharCode(10) + '#{overviewBundle.tobago_url}' + String.fromCharCode(10))"
label="#{overviewBundle.menu_about}" />
- <tc:menuItem onclick="LOG.show();"
+ <tc:menuCommand onclick="LOG.show();"
label="#{overviewBundle.menu_showLog}"
rendered="#{clientConfigController.debugMode}"/>
- <tc:menuItem action="server-info" immediate="true"
+ <tc:menuCommand action="server-info" immediate="true"
label="Server Info"
disabled="#{! info.enabled}"/>
</tc:menu>
Modified: myfaces/tobago/trunk/example/demo/src/main/webapp/menu.xhtml
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/example/demo/src/main/webapp/menu.xhtml?rev=888438&r1=888437&r2=888438&view=diff
==============================================================================
--- myfaces/tobago/trunk/example/demo/src/main/webapp/menu.xhtml (original)
+++ myfaces/tobago/trunk/example/demo/src/main/webapp/menu.xhtml Tue Dec 8 15:19:26 2009
@@ -38,17 +38,17 @@
<tx:menuCheckbox action="#{clientConfigController.submit}"
label="#{overviewBundle.menu_debug}"
value="#{clientConfigController.debugMode}"/>
- <tc:menuItem action="#{demo.resetSession}" label="Reset"/>
+ <tc:menuCommand action="#{demo.resetSession}" label="Reset"/>
</tc:menu>
<tc:menu label="#{overviewBundle.menu_help}">
- <tc:menuItem
+ <tc:menuCommand
onclick="alert('#{overviewBundle.pageTitle}' + String.fromCharCode(10) + '#{info.version}' + String.fromCharCode(10) + '#{overviewBundle.tobago_url}' + String.fromCharCode(10))"
label="#{overviewBundle.menu_about}"/>
- <tc:menuItem onclick="LOG.show();"
+ <tc:menuCommand onclick="LOG.show();"
label="#{overviewBundle.menu_showLog}"
rendered="#{clientConfigController.debugMode}"/>
- <tc:menuItem action="server-info" immediate="true"
+ <tc:menuCommand action="server-info" immediate="true"
label="Server Info"
disabled="#{! info.enabled}"/>
<tc:menu label="Hilfe 1">
Modified: myfaces/tobago/trunk/example/demo/src/main/webapp/overview/toolbar.xhtml
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/example/demo/src/main/webapp/overview/toolbar.xhtml?rev=888438&r1=888437&r2=888438&view=diff
==============================================================================
--- myfaces/tobago/trunk/example/demo/src/main/webapp/overview/toolbar.xhtml (original)
+++ myfaces/tobago/trunk/example/demo/src/main/webapp/overview/toolbar.xhtml Tue Dec 8 15:19:26 2009
@@ -75,9 +75,9 @@
label="#{overviewBundle.toolbar_dropDownAction}">
<f:facet name="menupopup">
<tc:menu>
- <tc:menuItem onclick="alert('test 1')" label="Alert 1"/>
- <tc:menuItem onclick="alert('test 2')" label="Alert 2"/>
- <tc:menuItem action="#{overviewController.ping}" id="dropdown3"
+ <tc:menuCommand onclick="alert('test 1')" label="Alert 1"/>
+ <tc:menuCommand onclick="alert('test 2')" label="Alert 2"/>
+ <tc:menuCommand action="#{overviewController.ping}" id="dropdown3"
actionListener="#{overviewController.click}" label="Action 3"/>
</tc:menu>
</f:facet>
@@ -127,9 +127,9 @@
label="#{overviewBundle.toolbar_dropDownAction}">
<f:facet name="menupopup">
<tc:menu>
- <tc:menuItem onclick="alert('test 1')" label="Alert 1"/>
- <tc:menuItem onclick="alert('test 2')" label="Alert 2"/>
- <tc:menuItem id="dropdown3_2" actionListener="#{overviewController.click}" label="Action 3"/>
+ <tc:menuCommand onclick="alert('test 1')" label="Alert 1"/>
+ <tc:menuCommand onclick="alert('test 2')" label="Alert 2"/>
+ <tc:menuCommand id="dropdown3_2" actionListener="#{overviewController.click}" label="Action 3"/>
</tc:menu>
</f:facet>
</tc:toolBarCommand>
@@ -163,31 +163,31 @@
<tc:menu label="Menu 1">
- <tc:menuItem onclick="alert('action 1')" label="alert 1"/>
+ <tc:menuCommand onclick="alert('action 1')" label="alert 1"/>
- <tc:menuItem action="/" type="navigate" label="#{overviewBundle.toolbar_linkClickme}"
+ <tc:menuCommand action="/" type="navigate" label="#{overviewBundle.toolbar_linkClickme}"
image="image/config.gif">
<f:facet name="confirmation"><tc:out value="Do you really want leave this demo?"/></f:facet>
- </tc:menuItem>
+ </tc:menuCommand>
- <tc:menuItem link="http://www.atanion.com" disabled="true" label="disabled"/>
+ <tc:menuCommand link="http://www.atanion.com" disabled="true" label="disabled"/>
<tx:menuCheckbox action="#{demo.clickButton}" label="#{overviewBundle.toolbar_linkClickme}"
value="#{demo.boolTest}"/>
</tc:menu>
<tc:menu label="Menu 2">
- <tc:menuItem onclick="alert('action 1')" label="alert 1"/>
+ <tc:menuCommand onclick="alert('action 1')" label="alert 1"/>
<tc:menu label="Menu 3">
- <tc:menuItem onclick="alert('action 1')" label="alert 1" image="image/date.gif"/>
+ <tc:menuCommand onclick="alert('action 1')" label="alert 1" image="image/date.gif"/>
- <tc:menuItem link="/" label="#{overviewBundle.toolbar_linkClickme}" image="image/config.gif">
+ <tc:menuCommand link="/" label="#{overviewBundle.toolbar_linkClickme}" image="image/config.gif">
<f:facet name="confirmation"><tc:out value="Do you really want leave this demo?"/></f:facet>
- </tc:menuItem>
+ </tc:menuCommand>
- <tc:menuItem link="http://www.atanion.com" disabled="true" label="#{overviewBundle.toolbar_linkClickme}"
+ <tc:menuCommand link="http://www.atanion.com" disabled="true" label="#{overviewBundle.toolbar_linkClickme}"
image="image/remove.gif"/>
<tc:menu label="#{overviewBundle.toolbar_selectSingleselect}">
@@ -198,16 +198,16 @@
</tc:menu>
- <tc:menuItem action="#{demo.clickButton}" label="#{overviewBundle.toolbar_linkClickme}"/>
+ <tc:menuCommand action="#{demo.clickButton}" label="#{overviewBundle.toolbar_linkClickme}"/>
</tc:menu>
<tc:menuSeparator/>
- <tc:menuItem label="#{overviewBundle.toolbar_linkClickme}">
+ <tc:menuCommand label="#{overviewBundle.toolbar_linkClickme}">
<f:facet name="items">
<tc:selectBooleanCheckbox value="#{demo.bool[0]}"/>
</f:facet>
- </tc:menuItem>
+ </tc:menuCommand>
<tx:menuCheckbox label="#{overviewBundle.toolbar_linkClickme}" value="#{demo.bool[1]}"/>
<tx:menuCheckbox label="#{overviewBundle.toolbar_linkClickme}" value="#{demo.bool[2]}"/>
Modified: myfaces/tobago/trunk/example/demo/src/main/webapp/reference/menu.jsp
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/example/demo/src/main/webapp/reference/menu.jsp?rev=888438&r1=888437&r2=888438&view=diff
==============================================================================
--- myfaces/tobago/trunk/example/demo/src/main/webapp/reference/menu.jsp (original)
+++ myfaces/tobago/trunk/example/demo/src/main/webapp/reference/menu.jsp Tue Dec 8 15:19:26 2009
@@ -28,39 +28,39 @@
<%-- code-sniplet-start id="menuBar" --%>
<tc:menuBar>
<tc:menu label="_File">
- <tc:menuItem label="New File"/>
- <tc:menuItem label="Open File"/>
- <tc:menuItem label="Save"/>
- <tc:menuItem label="Print"/>
+ <tc:menuCommand label="New File"/>
+ <tc:menuCommand label="Open File"/>
+ <tc:menuCommand label="Save"/>
+ <tc:menuCommand label="Print"/>
<tc:menuSeparator/>
- <tc:menuItem label="Exit">
+ <tc:menuCommand label="Exit">
<f:facet name="confirmation">
<tc:out value="Are you sure?"/>
</f:facet>
- </tc:menuItem>
+ </tc:menuCommand>
<%--<tx:menuCheckbox action="none" label="Administration Mode"/>--%>
</tc:menu>
<%-- code-sniplet-start id="menu" --%>
<tc:menu label="_Edit">
- <tc:menuItem label="Copy"/>
- <tc:menuItem label="Cut"/>
- <tc:menuItem label="Paste"/>
+ <tc:menuCommand label="Copy"/>
+ <tc:menuCommand label="Cut"/>
+ <tc:menuCommand label="Paste"/>
<%-- code-sniplet-start id="menuItem" --%>
- <tc:menuItem label="Delete"/>
+ <tc:menuCommand label="Delete"/>
<%-- code-sniplet-end id="menuItem" --%>
<tc:menuSeparator/>
<tc:menu label="_Delete">
- <tc:menuItem label="As Spam"/>
- <tc:menuItem label="As Newsletter"/>
- <tc:menuItem label="As Uninteresting"/>
+ <tc:menuCommand label="As Spam"/>
+ <tc:menuCommand label="As Newsletter"/>
+ <tc:menuCommand label="As Uninteresting"/>
</tc:menu>
</tc:menu>
<%-- code-sniplet-end id="menu" --%>
<tc:menu label="_View">
- <tc:menuItem label="Snap to Grid"/>
- <tc:menuItem label="Show Rulers"/>
+ <tc:menuCommand label="Snap to Grid"/>
+ <tc:menuCommand label="Show Rulers"/>
</tc:menu>
</tc:menuBar>
<%-- code-sniplet-end id="menuBar" --%>
Modified: myfaces/tobago/trunk/example/demo/src/main/webapp/reference/popup.jsp
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/example/demo/src/main/webapp/reference/popup.jsp?rev=888438&r1=888437&r2=888438&view=diff
==============================================================================
--- myfaces/tobago/trunk/example/demo/src/main/webapp/reference/popup.jsp (original)
+++ myfaces/tobago/trunk/example/demo/src/main/webapp/reference/popup.jsp Tue Dec 8 15:19:26 2009
@@ -29,9 +29,9 @@
<tc:menuBar>
<tc:menu label="Menu">
- <tc:menuItem label="Open Popup">
+ <tc:menuCommand label="Open Popup">
<tc:popupReference for=":page:popup"/>
- </tc:menuItem>
+ </tc:menuCommand>
</tc:menu>
</tc:menuBar>
Modified: myfaces/tobago/trunk/extension/facelets/src/main/resources/META-INF/menuCheckbox.xml
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/extension/facelets/src/main/resources/META-INF/menuCheckbox.xml?rev=888438&r1=888437&r2=888438&view=diff
==============================================================================
--- myfaces/tobago/trunk/extension/facelets/src/main/resources/META-INF/menuCheckbox.xml (original)
+++ myfaces/tobago/trunk/extension/facelets/src/main/resources/META-INF/menuCheckbox.xml Tue Dec 8 15:19:26 2009
@@ -24,7 +24,7 @@
<c:if test="${empty rendered}">
<c:set var="rendered" value="true"/>
</c:if>
- <tc:menuItem rendered="${rendered}" >
+ <tc:menuCommand rendered="${rendered}" >
<tc:attribute name="action" value="${action}" />
<tc:attribute name="actionListener" value="${actionListener}" />
<f:facet name="items">
@@ -32,5 +32,5 @@
<ui:insert/>
</tc:selectBooleanCheckbox>
</f:facet>
- </tc:menuItem>
+ </tc:menuCommand>
</ui:composition>
\ No newline at end of file
Modified: myfaces/tobago/trunk/extension/facelets/src/main/resources/META-INF/menuRadio.xml
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/extension/facelets/src/main/resources/META-INF/menuRadio.xml?rev=888438&r1=888437&r2=888438&view=diff
==============================================================================
--- myfaces/tobago/trunk/extension/facelets/src/main/resources/META-INF/menuRadio.xml (original)
+++ myfaces/tobago/trunk/extension/facelets/src/main/resources/META-INF/menuRadio.xml Tue Dec 8 15:19:26 2009
@@ -24,7 +24,7 @@
<c:if test="${empty rendered}">
<c:set var="rendered" value="true"/>
</c:if>
- <tc:menuItem rendered="${rendered}" >
+ <tc:menuCommand rendered="${rendered}" >
<tc:attribute name="action" value="${action}" />
<tc:attribute name="actionListener" value="${actionListener}" />
<f:facet name="items">
@@ -32,5 +32,5 @@
<ui:insert/>
</tc:selectOneRadio>
</f:facet>
- </tc:menuItem>
+ </tc:menuCommand>
</ui:composition>
Modified: myfaces/tobago/trunk/src/docbook/tobago-tutorial.xml
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/src/docbook/tobago-tutorial.xml?rev=888438&r1=888437&r2=888438&view=diff
==============================================================================
--- myfaces/tobago/trunk/src/docbook/tobago-tutorial.xml (original)
+++ myfaces/tobago/trunk/src/docbook/tobago-tutorial.xml Tue Dec 8 15:19:26 2009
@@ -516,7 +516,7 @@
<literal><tc:menuBar></literal> tag inside the <literal>menuBar</literal> facet of the <literal><tc:page></literal>.
A menu bar can contain <literal><tc:menu></literal> tags, which can be nested to
produce sub menus. Actions can be bound with method bindings to
- <literal><tc:menuItem></literal> tags. A menu item can be disabled and can
+ <literal><tc:menuCommand></literal> tags. A menu item can be disabled and can
encapsulate icons. An underscore in the label marks the following
character as an access key, which can be activated together with the <keycap>Alt</keycap> key.</para>
@@ -528,12 +528,12 @@
<programlisting role="XML"><tc:menuBar id="menuBar">
<tc:menu label="_File">
- <tc:menuItem label="_New" action="#{controller.createAddress}" image
+ <tc:menuCommand label="_New" action="#{controller.createAddress}" image
="image/org/tango-project/tango-icon-theme/16x16/actions/contact-new.png"/>
- <tc:menuItem label="_Add Dummy Addresses"
+ <tc:menuCommand label="_Add Dummy Addresses"
action="#{controller.addDummyAddresses}"/>
<tc:menuSeparator/>
- <tc:menuItem label="_Logout" image
+ <tc:menuCommand label="_Logout" image
="image/org/tango-project/tango-icon-theme/16x16/actions/system-log-out.png"/>
</tc:menu>
Modified: myfaces/tobago/trunk/src/site/apt/guide.apt
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/src/site/apt/guide.apt?rev=888438&r1=888437&r2=888438&view=diff
==============================================================================
--- myfaces/tobago/trunk/src/site/apt/guide.apt (original)
+++ myfaces/tobago/trunk/src/site/apt/guide.apt Tue Dec 8 15:19:26 2009
@@ -330,14 +330,14 @@
+------------------------------------------+
<tc:menuBar>
<tc:menu label="#{bundle.menuFile}">
- <tc:menuItem label="#{bundle.menuFileNew}" action="#{controller.createAddress}" immediate="true"
+ <tc:menuCommand label="#{bundle.menuFileNew}" action="#{controller.createAddress}" immediate="true"
image="image/org/tango-project/tango-icon-theme/16x16/actions/contact-new.png"/>
- <tc:menuItem label="Add Dummy Addresses" action="#{controller.addDummyAddresses}" immediate="true"/>
+ <tc:menuCommand label="Add Dummy Addresses" action="#{controller.addDummyAddresses}" immediate="true"/>
<tc:menuSeparator/>
- <tc:menuItem label="#{bundle.admin}" action="#{admin.admin}"
+ <tc:menuCommand label="#{bundle.admin}" action="#{admin.admin}"
image="image/org/tango-project/tango-icon-theme/16x16/categories/preferences-system.png"/>
<tc:menuSeparator/>
- <tc:menuItem label="Logout" action="#{controller.logout}"
+ <tc:menuCommand label="Logout" action="#{controller.logout}"
image="image/org/tango-project/tango-icon-theme/16x16/actions/system-log-out.png"/>
</tc:menu>
Modified: myfaces/tobago/trunk/src/site/apt/migration-1.5.apt
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/src/site/apt/migration-1.5.apt?rev=888438&r1=888437&r2=888438&view=diff
==============================================================================
--- myfaces/tobago/trunk/src/site/apt/migration-1.5.apt (original)
+++ myfaces/tobago/trunk/src/site/apt/migration-1.5.apt Tue Dec 8 15:19:26 2009
@@ -41,6 +41,8 @@
*--+--+--+--+
| tc:menuCheckbox | tx:menuCheckbox |
*--+--+--+--+
+| tc:menuItem | tc:menuCommand |
+*--+--+--+--+
UIComponent Classes