January 2011 - richfaces-svn-commits

JBoss Rich Faces SVN: r21125 - in trunk/ui/core/ui/src/main: resources/META-INF/cdk/attributes and 1 other directories.

by richfaces-svn-commits＠lists.jboss.org

Author: nbelaevski Date: 2011-01-20 11:17:43 -0500 (Thu, 20 Jan 2011) New Revision: 21125 Added: trunk/ui/core/ui/src/main/resources/META-INF/cdk/attributes/commandLink-target-prop.xml Modified: trunk/ui/core/ui/src/main/java/org/richfaces/component/AbstractCommandLink.java trunk/ui/core/ui/src/main/templates/org/ajax4jsf/renderkit/html/link.template.xml Log: https://issues.jboss.org/browse/RF-10222 Modified: trunk/ui/core/ui/src/main/java/org/richfaces/component/AbstractCommandLink.java =================================================================== --- trunk/ui/core/ui/src/main/java/org/richfaces/component/AbstractCommandLink.java 2011-01-20 16:14:42 UTC (rev 21124) +++ trunk/ui/core/ui/src/main/java/org/richfaces/component/AbstractCommandLink.java 2011-01-20 16:17:43 UTC (rev 21125) @@ -39,7 +39,7 @@ @JsfComponent ( renderer = @JsfRenderer(type = "org.richfaces.CommandLinkRenderer"), tag = @Tag(type = TagType.Facelets), - attributes = { "ajax-props.xml", "link-props.xml", "core-props.xml" } + attributes = {"commandLink-target-prop.xml", "ajax-props.xml", "link-props.xml", "core-props.xml"} ) public abstract class AbstractCommandLink extends AbstractActionComponent implements MetaComponentResolver { Added: trunk/ui/core/ui/src/main/resources/META-INF/cdk/attributes/commandLink-target-prop.xml =================================================================== --- trunk/ui/core/ui/src/main/resources/META-INF/cdk/attributes/commandLink-target-prop.xml (rev 0) +++ trunk/ui/core/ui/src/main/resources/META-INF/cdk/attributes/commandLink-target-prop.xml 2011-01-20 16:17:43 UTC (rev 21125) @@ -0,0 +1,27 @@ +<?xml version="1.0" encoding="UTF-8"?> + +<cdk:properties xmlns:xi="http://www.w3.org/2001/XInclude" + xmlns:cdk="http://jboss.org/schema/richfaces/cdk/extensions" + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://java.sun.com/xml/ns/javaee"> + + <property> + <property-name>target</property-name> + <property-class>java.lang.String</property-class> + <property-extension> + <cdk:hidden>true</cdk:hidden> + </property-extension> + </property> + +</cdk:properties> Modified: trunk/ui/core/ui/src/main/templates/org/ajax4jsf/renderkit/html/link.template.xml =================================================================== --- trunk/ui/core/ui/src/main/templates/org/ajax4jsf/renderkit/html/link.template.xml 2011-01-20 16:14:42 UTC (rev 21124) +++ trunk/ui/core/ui/src/main/templates/org/ajax4jsf/renderkit/html/link.template.xml 2011-01-20 16:17:43 UTC (rev 21125) @@ -16,7 +16,7 @@ <c:choose> <c:when test="#{not component.attributes['disabled']}"> <a id="#{clientId}" name="#{clientId}" - cdk:passThroughWithExclusions="value" onclick="#{this.getOnClick(facesContext, component)}" + cdk:passThroughWithExclusions="value target" onclick="#{this.getOnClick(facesContext, component)}" href="#"> #{component.attributes['value']} <cdk:call expression="renderChildren(facesContext, component)" />

13 years, 3 months

1
0
0 / 0

JBoss Rich Faces SVN: r21124 - in management/design-4x: showcase_markup and 1 other directories.

by richfaces-svn-commits＠lists.jboss.org

Author: Ochikvina Date: 2011-01-20 11:14:42 -0500 (Thu, 20 Jan 2011) New Revision: 21124 Added: management/design-4x/showcase_markup/ management/design-4x/showcase_markup/images/ management/design-4x/showcase_markup/images/body-bg.jpg management/design-4x/showcase_markup/images/footer.png management/design-4x/showcase_markup/images/header-bg.png management/design-4x/showcase_markup/images/page-bg.png management/design-4x/showcase_markup/images/rf-logo.png management/design-4x/showcase_markup/images/select-skin-button.png management/design-4x/showcase_markup/images/sep.gif management/design-4x/showcase_markup/index.html management/design-4x/showcase_markup/styles.css Log: Added RF Showcase markup. Added: management/design-4x/showcase_markup/images/body-bg.jpg =================================================================== (Binary files differ) Property changes on: management/design-4x/showcase_markup/images/body-bg.jpg ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: management/design-4x/showcase_markup/images/footer.png =================================================================== (Binary files differ) Property changes on: management/design-4x/showcase_markup/images/footer.png ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: management/design-4x/showcase_markup/images/header-bg.png =================================================================== (Binary files differ) Property changes on: management/design-4x/showcase_markup/images/header-bg.png ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: management/design-4x/showcase_markup/images/page-bg.png =================================================================== (Binary files differ) Property changes on: management/design-4x/showcase_markup/images/page-bg.png ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: management/design-4x/showcase_markup/images/rf-logo.png =================================================================== (Binary files differ) Property changes on: management/design-4x/showcase_markup/images/rf-logo.png ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: management/design-4x/showcase_markup/images/select-skin-button.png =================================================================== (Binary files differ) Property changes on: management/design-4x/showcase_markup/images/select-skin-button.png ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: management/design-4x/showcase_markup/images/sep.gif =================================================================== (Binary files differ) Property changes on: management/design-4x/showcase_markup/images/sep.gif ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: management/design-4x/showcase_markup/index.html =================================================================== --- management/design-4x/showcase_markup/index.html (rev 0) +++ management/design-4x/showcase_markup/index.html 2011-01-20 16:14:42 UTC (rev 21124) @@ -0,0 +1,67 @@ +<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd"> +<html> +<head> + <title>RichFaces Showcase</title> + <link rel="stylesheet" type="text/css" href="styles.css"/> + <script type="text/javascript"> + var currentSkin; + + function init(){ + currentSkin = document.getElementById('blueSky'); + } + window.onload = init; + + function skin(element){ + if(element.className != "current-skin"){ + element.className = ""; + } + } + + function selectSkin(element){ + currentSkin.className = ""; + currentSkin = element; + element.className = "current-skin"; + } + </script> +</head> +<body> + <div id="page"> + <div id="header"> + <a href="#" class="logo"><img src="images/rf-logo.png" alt="RF logo"/></a> + <div class="right-controls"> + <ul class="top-links"> + <li><a href="http://jboss.org/richfaces;jsessionid=bJJO_UTMPzC7DsTvo5vjKA" target="_blank">Project Site</a></li> + <li><a href="http://www.jboss.org/community/wiki/richfaceswikihomepage;jsessionid=bJJO..." target="_blank">Project Wiki</a></li> + <li><a href="http://community.jboss.org/community/richfaces;jsessionid=bJJO_UTMPzC7DsT..." target="_blank">RichFaces Community Space</a></li> + <li class="download-link"><a href="http://jboss.org/richfaces/download/milestones.html;jsessionid=bJJO_UTMPz..." target="_blank">Download</a></li> + <li class="last"><a href="http://anonsvn.jboss.org/repos/richfaces/trunk/examples/richfaces-showcas..." target="_blank">Sources</a></li> + </ul> + <ul id="skin-menu"> + <li id="wine" onclick="selectSkin(this)" onmouseout="skin(this)"><span>wine</span></li> + <li id="ruby" onclick="selectSkin(this)" onmouseout="skin(this)"><span>ruby</span></li> + <li id="japanCherry" onclick="selectSkin(this)" onmouseout="skin(this)"><span>japanCherry</span></li> + <li id="emeraldTown" onclick="selectSkin(this)" onmouseout="skin(this)"><span>emeraldTown</span></li> + <li id="deepMarine" onclick="selectSkin(this)" onmouseout="skin(this)"><span>deepMarine</span></li> + <li id="classic" onclick="selectSkin(this)" onmouseout="skin(this)"><span>classic</span></li> + <li id="blueSky" class="current-skin" onclick="selectSkin(this)" onmouseout="skin(this)"><span>blueSky</span></li> + <li class="label"><span>Select Skin:</span></li> + </ul> + </div> + </div> + <div id="page-content"> + <div class="left-menu"> + Panel Menu + </div> + <div class="content-container"> + <p>Welcome to the demo site for the <strong>RichFaces</strong> project!</p> + <p><strong>RichFaces</strong> is a component library for JSF and an advanced framework for easily integrating AJAX + capabilities into business applications. This demo is the reference for all <strong>RichFaces</strong> components with examples.</p> + <p>The project homepage is located at <a href="http://jboss.org/richfaces">http://jboss.org/richfaces</a>.</p> + </div> + </div> + <div id="footer"> + RichFaces Core Implementation by JBoss, a division of Red Hat, Inc., version v.4.0.0-SNAPSHOT SVN r.20520 + </div> + </div> +</body> +</html> Added: management/design-4x/showcase_markup/styles.css =================================================================== --- management/design-4x/showcase_markup/styles.css (rev 0) +++ management/design-4x/showcase_markup/styles.css 2011-01-20 16:14:42 UTC (rev 21124) @@ -0,0 +1,128 @@ +* { + margin:0; + padding:0; +} +html{ + height:100%; +} +body{ + background:#94aebc url(images/body-bg.jpg) left bottom repeat; + font:normal 12px "Lucida Sans Unicode","Lucida Grande",Geneva,Verdana,Arial,sans-serif; + height:100%; +} +ul{ + list-style:none; +} +a{ + color:#5a8eba; + outline:none; + text-decoration:none; +} +a:hover{ + text-decoration:underline; +} +p{ + margin:0; + padding:0 0 6px; +} +#page{ + margin:0 auto; + width:987px; +} +#header{ + background:url(images/header-bg.png) no-repeat top left; + height:90px; +} +#header .logo{ + float:left; + margin-left:7px; + text-decoration:none; +} +#header .logo img{ + border:none; +} +#header .right-controls{ + float:right; +} +#header ul.top-links{ + margin:5px 15px 0 0; + text-align:right; +} +#header ul.top-links li{ + display:inline; + font-size:11px; +} +#header ul.top-links li a{ + background:url(images/sep.gif) center right no-repeat; + color:#fff; + padding:0 8px 0 3px; +} +#header ul.top-links li.last a{ + background:none; + padding:0 0 0 3px; +} +#header ul.top-links li.download-link a{ + color:#eccb7b; +} +#header ul#skin-menu{ + color:#89a0be; + cursor:default; + font-weight:bold; + margin:38px 15px 0 0; + text-align:right; +} +#header ul#skin-menu li{ + cursor:pointer; + display:inline-block; + float:right; + height:25px; + margin-left:4px; + padding-left:5px; +} +#header ul#skin-menu li span{ + height:25px; + padding:3px 5px 0 0; + display:inline-block; +} +#header ul#skin-menu li span:hover{ + text-decoration:underline; +} +#header ul#skin-menu li.label{ + color:#999999; + cursor:default; + font-weight:normal; +} + +#header ul#skin-menu li.current-skin{ + background:url(images/select-skin-button.png) left -75px no-repeat; + color:#fff; +} +#header ul#skin-menu li.current-skin span{ + background:url(images/select-skin-button.png) right 0 repeat-x; +} +#header ul#skin-menu li.label span:hover, +#header ul#skin-menu li.current-skin span:hover{ + text-decoration:none; +} +#page-content{ + background:url(images/page-bg.png) 0 0 repeat-y; + height:100%; + min-height:520px; + padding:10px 20px 0; +} +#page-content .left-menu{ + float:left; + margin-right:10px; + min-height:450px; + width:210px; +} +#page-content .content-container{ + padding:10px; +} +#footer{ + background:url(images/footer.png) top left no-repeat; + color:#2d4351; + clear:both; + text-align:center; + padding:15px 20px 10px; +} \ No newline at end of file

13 years, 3 months

1
0
0 / 0

JBoss Rich Faces SVN: r21123 - trunk/ui/iteration/ui/src/main/java/org/richfaces/renderkit.

by richfaces-svn-commits＠lists.jboss.org

Author: abelevich Date: 2011-01-20 10:54:34 -0500 (Thu, 20 Jan 2011) New Revision: 21123 Modified: trunk/ui/iteration/ui/src/main/java/org/richfaces/renderkit/CollapsibleSubTableTogglerRendererBase.java Log: RF-9725 Sub table toggle control: attributes collapseIcon and expandIcon don't work Modified: trunk/ui/iteration/ui/src/main/java/org/richfaces/renderkit/CollapsibleSubTableTogglerRendererBase.java =================================================================== --- trunk/ui/iteration/ui/src/main/java/org/richfaces/renderkit/CollapsibleSubTableTogglerRendererBase.java 2011-01-20 15:54:21 UTC (rev 21122) +++ trunk/ui/iteration/ui/src/main/java/org/richfaces/renderkit/CollapsibleSubTableTogglerRendererBase.java 2011-01-20 15:54:34 UTC (rev 21123) @@ -135,6 +135,7 @@ && (expandIcon.trim().length() > 0 && collapseIcon.trim().length() > 0)) { String image = expanded ? expandIcon : collapseIcon; + image = RenderKitUtils.getResourceURL(image, context); if (image != null && image.trim().length() > 0) { writer.startElement(HtmlConstants.IMG_ELEMENT, control); writer.writeAttribute(HtmlConstants.SRC_ATTRIBUTE, image, null);

13 years, 3 months

1
0
0 / 0

JBoss Rich Faces SVN: r21122 - trunk/ui/output/ui/src/test/java/org/richfaces/renderkit/html.

by richfaces-svn-commits＠lists.jboss.org

Author: abelevich Date: 2011-01-20 10:54:21 -0500 (Thu, 20 Jan 2011) New Revision: 21122 Modified: trunk/ui/output/ui/src/test/java/org/richfaces/renderkit/html/DropDownMenuRendererTest.java trunk/ui/output/ui/src/test/java/org/richfaces/renderkit/html/MenuItemRendererTest.java Log: Ignore ajaxClick test for MenuItem Modified: trunk/ui/output/ui/src/test/java/org/richfaces/renderkit/html/DropDownMenuRendererTest.java =================================================================== --- trunk/ui/output/ui/src/test/java/org/richfaces/renderkit/html/DropDownMenuRendererTest.java 2011-01-20 15:39:14 UTC (rev 21121) +++ trunk/ui/output/ui/src/test/java/org/richfaces/renderkit/html/DropDownMenuRendererTest.java 2011-01-20 15:54:21 UTC (rev 21122) @@ -29,6 +29,7 @@ import java.net.URISyntaxException; import org.jboss.test.faces.htmlunit.HtmlUnitEnvironment; +import org.junit.Ignore; import org.junit.Test; import org.richfaces.component.DropDownMenuBean; import org.xml.sax.SAXException; @@ -68,10 +69,11 @@ assertNotNull(item); assertEquals("action", DropDownMenuBean.getCurrent()); } - + @Ignore @Test public void testAjaxClick() throws IOException, SAXException { HtmlPage page = environment.getPage("/dropDownMenu_ajaxMode.jsf"); + System.out.print(page.asXml()); HtmlDivision item = (HtmlDivision) page.getElementById("form:saveAll"); assertNotNull(item); DropDownMenuBean.setCurrent("none"); Modified: trunk/ui/output/ui/src/test/java/org/richfaces/renderkit/html/MenuItemRendererTest.java =================================================================== --- trunk/ui/output/ui/src/test/java/org/richfaces/renderkit/html/MenuItemRendererTest.java 2011-01-20 15:39:14 UTC (rev 21121) +++ trunk/ui/output/ui/src/test/java/org/richfaces/renderkit/html/MenuItemRendererTest.java 2011-01-20 15:54:21 UTC (rev 21122) @@ -71,15 +71,19 @@ doTest("menuItem_ajaxMode", "form:menuItem"); } + @Ignore @Test public void testAjaxClick() throws IOException, SAXException { HtmlPage page = environment.getPage("/menuItem_ajaxMode.jsf"); + System.out.print(page.asXml()); HtmlDivision item = (HtmlDivision) page.getElementById("form:menuItem"); + System.out.print("item.asXml()"+item.asXml()); assertNotNull(item); DropDownMenuBean.setCurrent("none"); item.click(); - + System.out.print(item.asXml()); item = (HtmlDivision) page.getElementById("form:menuItem"); + System.out.print(item.asXml()); assertNotNull(item); assertEquals("action", DropDownMenuBean.getCurrent()); }

13 years, 3 months

1
0
0 / 0

JBoss Rich Faces SVN: r21121 - in trunk/ui/core/ui/src/main: resources/META-INF and 2 other directories.

by richfaces-svn-commits＠lists.jboss.org

Author: nbelaevski Date: 2011-01-20 10:39:14 -0500 (Thu, 20 Jan 2011) New Revision: 21121 Added: trunk/ui/core/ui/src/main/resources/META-INF/cdk/ trunk/ui/core/ui/src/main/resources/META-INF/cdk/attributes/ trunk/ui/core/ui/src/main/resources/META-INF/cdk/attributes/param-assignTo-prop.xml Modified: trunk/ui/core/ui/src/main/java/org/richfaces/component/AbstractParameter.java Log: https://issues.jboss.org/browse/RF-10183 Modified: trunk/ui/core/ui/src/main/java/org/richfaces/component/AbstractParameter.java =================================================================== --- trunk/ui/core/ui/src/main/java/org/richfaces/component/AbstractParameter.java 2011-01-20 15:19:26 UTC (rev 21120) +++ trunk/ui/core/ui/src/main/java/org/richfaces/component/AbstractParameter.java 2011-01-20 15:39:14 UTC (rev 21121) @@ -34,6 +34,7 @@ import org.ajax4jsf.Messages; import org.ajax4jsf.component.JavaScriptParameter; +import org.richfaces.cdk.annotations.Attribute; import org.richfaces.cdk.annotations.JsfComponent; import org.richfaces.cdk.annotations.Tag; import org.richfaces.cdk.annotations.TagType; @@ -43,7 +44,8 @@ * @author shura (latest modification by $Author: alexsmirnov $) * @version $Revision: 1.1.2.2 $ $Date: 2007/02/01 15:31:55 $ */ -@JsfComponent(tag = @Tag(name = "param", handler = "org.richfaces.view.facelets.html.ParameterHandler", generate = false, type = TagType.Facelets)) +@JsfComponent(tag = @Tag(name = "param", handler = "org.richfaces.view.facelets.html.ParameterHandler", generate = false, + type = TagType.Facelets), attributes = "param-assignTo-prop.xml") public abstract class AbstractParameter extends UIParameter implements ActionListener, JavaScriptParameter { public static final String COMPONENT_TYPE = "org.richfaces.Parameter"; @@ -61,7 +63,9 @@ /** ********************************************************* */ + @Attribute public abstract boolean isNoEscape(); + public abstract void setNoEscape(boolean noEscape); public void setAssignToExpression(ValueExpression ve) { Added: trunk/ui/core/ui/src/main/resources/META-INF/cdk/attributes/param-assignTo-prop.xml =================================================================== --- trunk/ui/core/ui/src/main/resources/META-INF/cdk/attributes/param-assignTo-prop.xml (rev 0) +++ trunk/ui/core/ui/src/main/resources/META-INF/cdk/attributes/param-assignTo-prop.xml 2011-01-20 15:39:14 UTC (rev 21121) @@ -0,0 +1,27 @@ +<?xml version="1.0" encoding="UTF-8"?> + +<cdk:properties xmlns:xi="http://www.w3.org/2001/XInclude" + xmlns:cdk="http://jboss.org/schema/richfaces/cdk/extensions" + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://java.sun.com/xml/ns/javaee"> + + <property> + <property-name>assignTo</property-name> + <property-class>java.lang.Object</property-class> + <property-extension> + <cdk:generate>false</cdk:generate> + </property-extension> + </property> + +</cdk:properties>

13 years, 3 months

1
0
0 / 0

JBoss Rich Faces SVN: r21120 - trunk/ui/iteration/ui/src/main/resources/META-INF/resources/org.richfaces.

by richfaces-svn-commits＠lists.jboss.org

Author: konstantin.mishin Date: 2011-01-20 10:19:26 -0500 (Thu, 20 Jan 2011) New Revision: 21120 Modified: trunk/ui/iteration/ui/src/main/resources/META-INF/resources/org.richfaces/extendedDataTable.js Log: RF-10256 Modified: trunk/ui/iteration/ui/src/main/resources/META-INF/resources/org.richfaces/extendedDataTable.js =================================================================== --- trunk/ui/iteration/ui/src/main/resources/META-INF/resources/org.richfaces/extendedDataTable.js 2011-01-20 15:05:41 UTC (rev 21119) +++ trunk/ui/iteration/ui/src/main/resources/META-INF/resources/org.richfaces/extendedDataTable.js 2011-01-20 15:19:26 UTC (rev 21120) @@ -607,7 +607,7 @@ if ("u" == this.shiftIndex) { range = [0, index]; } else if ("d" == this.shiftIndex) { - range = [index, rows - 1]; + range = [index, this.rows - 1]; } else if (index >= this.shiftIndex) { range = [this.shiftIndex, index]; } else {

13 years, 3 months

1
0
0 / 0

JBoss Rich Faces SVN: r21119 - modules/tests/metamer/trunk/application/src/main/webapp/components/richPanelMenu and 6 other directories.

by richfaces-svn-commits＠lists.jboss.org

Author: Alex.Kolonitsky Date: 2011-01-20 10:05:41 -0500 (Thu, 20 Jan 2011) New Revision: 21119 Modified: modules/tests/metamer/trunk/application/src/main/java/org/richfaces/tests/metamer/bean/RichPanelMenuBean.java modules/tests/metamer/trunk/application/src/main/webapp/components/richPanelMenu/simple.xhtml trunk/examples/output-demo/src/main/webapp/qunit/panelMenu.xhtml trunk/examples/richfaces-showcase/src/main/webapp/richfaces/panelMenu/samples/panelMenu-sample.xhtml trunk/ui/output/ui/src/main/java/org/richfaces/component/AbstractCollapsiblePanel.java trunk/ui/output/ui/src/main/java/org/richfaces/component/AbstractPanelMenu.java trunk/ui/output/ui/src/main/java/org/richfaces/component/AbstractPanelMenuGroup.java trunk/ui/output/ui/src/main/java/org/richfaces/component/AbstractPanelMenuItem.java trunk/ui/output/ui/src/main/java/org/richfaces/renderkit/html/AccordionItemHeaderRenderer.java trunk/ui/output/ui/src/main/java/org/richfaces/renderkit/html/CollapsiblePanelRenderer.java trunk/ui/output/ui/src/main/java/org/richfaces/renderkit/html/PanelMenuGroupHeaderRenderer.java trunk/ui/output/ui/src/main/java/org/richfaces/renderkit/html/PanelMenuItemRenderer.java trunk/ui/output/ui/src/main/java/org/richfaces/renderkit/html/TableIconsRendererHelper.java trunk/ui/output/ui/src/main/resources/META-INF/resources/org.richfaces/panelMenuItem.js trunk/ui/output/ui/src/test/resources/org/richfaces/renderkit/html/panelMenu-icons-inheritance-topGroupDis.xmlunit.xml trunk/ui/output/ui/src/test/resources/org/richfaces/renderkit/html/panelMenu-icons-inheritance-topItemDis.xmlunit.xml trunk/ui/output/ui/src/test/resources/org/richfaces/renderkit/html/panelMenu-icons-inheritance.xhtml Log: RF-9924 Panel menu: rename icon attributes Modified: modules/tests/metamer/trunk/application/src/main/java/org/richfaces/tests/metamer/bean/RichPanelMenuBean.java =================================================================== --- modules/tests/metamer/trunk/application/src/main/java/org/richfaces/tests/metamer/bean/RichPanelMenuBean.java 2011-01-20 14:48:14 UTC (rev 21118) +++ modules/tests/metamer/trunk/application/src/main/java/org/richfaces/tests/metamer/bean/RichPanelMenuBean.java 2011-01-20 15:05:41 UTC (rev 21119) @@ -58,8 +58,16 @@ // loading from Class to work around RF-10161 attributes = Attributes.getComponentAttributesFromFacesConfig(UIPanelMenu.class, getClass()); + attributes.setAttribute("groupLeftIconCollapsed", "disc"); + attributes.setAttribute("groupRightIconCollapsed", "chevronDown"); + attributes.setAttribute("groupLeftIconExpanded", "disc"); + attributes.setAttribute("groupRightIconExpanded", "chevronUp"); attributes.setAttribute("rendered", true); attributes.setAttribute("style", "width: 200px;"); + attributes.setAttribute("topGroupLeftIconCollapsed", "disc"); + attributes.setAttribute("topGroupRightIconCollapsed", "chevronDown"); + attributes.setAttribute("topGroupLeftIconExpanded", "disc"); + attributes.setAttribute("topGroupRightIconExpanded", "chevronUp"); // will be tested in another way attributes.remove("itemChangeListener"); Modified: modules/tests/metamer/trunk/application/src/main/webapp/components/richPanelMenu/simple.xhtml =================================================================== --- modules/tests/metamer/trunk/application/src/main/webapp/components/richPanelMenu/simple.xhtml 2011-01-20 14:48:14 UTC (rev 21118) +++ modules/tests/metamer/trunk/application/src/main/webapp/components/richPanelMenu/simple.xhtml 2011-01-20 15:05:41 UTC (rev 21119) @@ -55,21 +55,21 @@ expandEvent="#{richPanelMenuBean.attributes['expandEvent'].value}" expandSingle="#{richPanelMenuBean.attributes['expandSingle'].value}" groupClass="#{richPanelMenuBean.attributes['groupClass'].value}" - groupCollapseIconLeft="#{richPanelMenuBean.attributes['groupCollapseIconLeft'].value}" - groupCollapseIconRight="#{richPanelMenuBean.attributes['groupCollapseIconRight'].value}" + groupLeftIconCollapsed="#{richPanelMenuBean.attributes['groupLeftIconCollapsed'].value}" + groupRightIconCollapsed="#{richPanelMenuBean.attributes['groupRightIconCollapsed'].value}" groupDisableClass="#{richPanelMenuBean.attributes['groupDisableClass'].value}" - groupDisableIconLeft="#{richPanelMenuBean.attributes['groupDisableIconLeft'].value}" - groupDisableIconRight="#{richPanelMenuBean.attributes['groupDisableIconRight'].value}" - groupExpandIconLeft="#{richPanelMenuBean.attributes['groupExpandIconLeft'].value}" - groupExpandIconRight="#{richPanelMenuBean.attributes['groupExpandIconRight'].value}" + groupLeftIconDisabled="#{richPanelMenuBean.attributes['groupLeftIconDisabled'].value}" + groupRightIconDisabled="#{richPanelMenuBean.attributes['groupRightIconDisabled'].value}" + groupLeftIconExpanded="#{richPanelMenuBean.attributes['groupLeftIconExpanded'].value}" + groupRightIconExpanded="#{richPanelMenuBean.attributes['groupRightIconExpanded'].value}" groupMode="#{richPanelMenuBean.attributes['groupMode'].value}" immediate="#{richPanelMenuBean.attributes['immediate'].value}" itemClass="#{richPanelMenuBean.attributes['topItemClass'].value}" - itemDisableClass="#{richPanelMenuBean.attributes['topItemDisableClass'].value}" - itemDisableIconLeft="#{richPanelMenuBean.attributes['topItemDisableIconLeft'].value}" - itemDisableIconRight="#{richPanelMenuBean.attributes['topItemDisableIconRight'].value}" - itemIconLeft="#{richPanelMenuBean.attributes['topItemDisableIconLeft'].value}" - itemIconRight="#{richPanelMenuBean.attributes['topItemDisableIconRight'].value}" + itemDisableClass="#{richPanelMenuBean.attributes['topItemClassDisabled'].value}" + itemLeftIconDisabled="#{richPanelMenuBean.attributes['topItemLeftIconDisabled'].value}" + itemRightIconDisabled="#{richPanelMenuBean.attributes['topItemRightIconDisabled'].value}" + itemLeftIcon="#{richPanelMenuBean.attributes['topItemLeftIconDisabled'].value}" + itemRightIcon="#{richPanelMenuBean.attributes['topItemRightIconDisabled'].value}" itemMode="#{richPanelMenuBean.attributes['itemMode'].value}" limitRender="#{richPanelMenuBean.attributes['limitRender'].value}" onclick="#{richPanelMenuBean.attributes['onclick'].value}" @@ -85,19 +85,19 @@ style="#{richPanelMenuBean.attributes['style'].value}" styleClass="#{richPanelMenuBean.attributes['styleClass'].value}" topGroupClass="#{richPanelMenuBean.attributes['topGroupClass'].value}" - topGroupCollapseIconLeft="#{richPanelMenuBean.attributes['topGroupCollapseIconLeft'].value}" - topGroupCollapseIconRight="#{richPanelMenuBean.attributes['topGroupCollapseIconRight'].value}" - topGroupDisableClass="#{richPanelMenuBean.attributes['topGroupDisableClass'].value}" - topGroupDisableIconLeft="#{richPanelMenuBean.attributes['topGroupDisableIconLeft'].value}" - topGroupDisableIconRight="#{richPanelMenuBean.attributes['topGroupDisableIconRight'].value}" - topGroupExpandIconLeft="#{richPanelMenuBean.attributes['topGroupExpandIconLeft'].value}" - topGroupExpandIconRight="#{richPanelMenuBean.attributes['topGroupExpandIconRight'].value}" + topGroupLeftIconCollapsed="#{richPanelMenuBean.attributes['topGroupLeftIconCollapsed'].value}" + topGroupRightIconCollapsed="#{richPanelMenuBean.attributes['topGroupRightIconCollapsed'].value}" + topGroupClassDisabled="#{richPanelMenuBean.attributes['topGroupClassDisabled'].value}" + topGroupLeftIconDisabled="#{richPanelMenuBean.attributes['topGroupLeftIconDisabled'].value}" + topGroupRightIconDisabled="#{richPanelMenuBean.attributes['topGroupRightIconDisabled'].value}" + topGroupLeftIconExpanded="#{richPanelMenuBean.attributes['topGroupLeftIconExpanded'].value}" + topGroupRightIconExpanded="#{richPanelMenuBean.attributes['topGroupRightIconExpanded'].value}" topItemClass="#{richPanelMenuBean.attributes['topItemClass'].value}" - topItemDisableClass="#{richPanelMenuBean.attributes['topItemDisableClass'].value}" - topItemDisableIconLeft="#{richPanelMenuBean.attributes['topItemDisableIconLeft'].value}" - topItemDisableIconRight="#{richPanelMenuBean.attributes['topItemDisableIconRight'].value}" - topItemIconLeft="#{richPanelMenuBean.attributes['topItemDisableIconLeft'].value}" - topItemIconRight="#{richPanelMenuBean.attributes['topItemDisableIconRight'].value}" + topItemClassDisabled="#{richPanelMenuBean.attributes['topItemClassDisabled'].value}" + topItemLeftIconDisabled="#{richPanelMenuBean.attributes['topItemLeftIconDisabled'].value}" + topItemRightIconDisabled="#{richPanelMenuBean.attributes['topItemRightIconDisabled'].value}" + topItemLeftIcon="#{richPanelMenuBean.attributes['topItemLeftIconDisabled'].value}" + topItemRightIcon="#{richPanelMenuBean.attributes['topItemRightIconDisabled'].value}" width="#{richPanelMenuBean.attributes['width'].value}" > Modified: trunk/examples/output-demo/src/main/webapp/qunit/panelMenu.xhtml =================================================================== --- trunk/examples/output-demo/src/main/webapp/qunit/panelMenu.xhtml 2011-01-20 14:48:14 UTC (rev 21118) +++ trunk/examples/output-demo/src/main/webapp/qunit/panelMenu.xhtml 2011-01-20 15:05:41 UTC (rev 21119) @@ -52,10 +52,10 @@ itemMode="server" groupMode="server" activeItem="myFavariteIten" - itemDisableIconLeft="disc" - groupDisableIconLeft="disc" - topItemDisableIconLeft="disc" - topGroupDisableIconLeft="disc" + itemLeftIconDisabled="disc" + groupLeftIconDisabled="disc" + topItemLeftIconDisabled="disc" + topGroupLeftIconDisabled="disc" itemChangeListener="#{modalPanel.itemChangeEventListener}" expandEvent="dblclick" collapseEvent="dblclick" @@ -68,13 +68,13 @@ </pn:panelMenuGroup> <pn:panelMenuGroup label="Group 2" - iconLeftCollapsed="triangle" - iconLeftExpanded="triangleDown"> + leftIconCollapsed="triangle" + leftIconExpanded="triangleDown"> <pn:panelMenuItem label="Item 2.1" /> <pn:panelMenuGroup label="Group 2.2" - iconLeftCollapsed="chevron" - iconLeftExpanded="chevronDown"> + leftIconCollapsed="chevron" + leftIconExpanded="chevronDown"> <pn:panelMenuItem label="Item 2.2.1" action="#{modalPanel.action}"/> <pn:panelMenuItem label="Item 2.2.2" name="myFavariteIten" /> <pn:panelMenuItem label="Item 2.2.3"/> Modified: trunk/examples/richfaces-showcase/src/main/webapp/richfaces/panelMenu/samples/panelMenu-sample.xhtml =================================================================== --- trunk/examples/richfaces-showcase/src/main/webapp/richfaces/panelMenu/samples/panelMenu-sample.xhtml 2011-01-20 14:48:14 UTC (rev 21118) +++ trunk/examples/richfaces-showcase/src/main/webapp/richfaces/panelMenu/samples/panelMenu-sample.xhtml 2011-01-20 15:05:41 UTC (rev 21119) @@ -13,10 +13,10 @@ <h:form id="form"> <h:panelGrid columns="2" columnClasses="cols,cols" width="400"> <rich:panelMenu style="width:200px" mode="ajax" groupMode="ajax" - groupExpandIconLeft="triangleUp" - groupCollapseIconLeft="triangleDown" - topGroupExpandIconRight="chevronUp" - topGroupCollapseIconRight="chevronDown" itemIconLeft="disc" + groupLeftIconExpanded="triangleUp" + groupLeftIconCollapsed="triangleDown" + topGroupRightIconExpanded="chevronUp" + topGroupRightIconCollapsed="chevronDown" itemLeftIcon="disc" itemChangeListener="#{panelMenuBean.updateCurrent}"> <rich:panelMenuGroup label="Group 1"> <rich:panelMenuItem label="Item 1.1" name="Item_1_1" /> Modified: trunk/ui/output/ui/src/main/java/org/richfaces/component/AbstractCollapsiblePanel.java =================================================================== --- trunk/ui/output/ui/src/main/java/org/richfaces/component/AbstractCollapsiblePanel.java 2011-01-20 14:48:14 UTC (rev 21118) +++ trunk/ui/output/ui/src/main/java/org/richfaces/component/AbstractCollapsiblePanel.java 2011-01-20 15:05:41 UTC (rev 21119) @@ -116,16 +116,16 @@ // ------------------------------------------------ Html Attributes @Attribute - public abstract String getLeftCollapsedIcon(); + public abstract String getLeftIconCollapsed(); @Attribute - public abstract String getLeftExpandedIcon(); + public abstract String getLeftIconExpanded(); @Attribute - public abstract String getRightCollapsedIcon(); + public abstract String getRightIconCollapsed(); @Attribute - public abstract String getRightExpandedIcon(); + public abstract String getRightIconExpanded(); @Attribute public abstract String getBodyClass(); Modified: trunk/ui/output/ui/src/main/java/org/richfaces/component/AbstractPanelMenu.java =================================================================== --- trunk/ui/output/ui/src/main/java/org/richfaces/component/AbstractPanelMenu.java 2011-01-20 14:48:14 UTC (rev 21118) +++ trunk/ui/output/ui/src/main/java/org/richfaces/component/AbstractPanelMenu.java 2011-01-20 15:05:41 UTC (rev 21119) @@ -215,7 +215,7 @@ // ------------------------------------------------ Html Attributes enum Properties { - itemIconRight, itemDisableIconLeft, itemDisableIconRight, topItemIconLeft, topItemIconRight, topItemDisableIconLeft, topItemDisableIconRight, groupExpandIconLeft, groupExpandIconRight, groupCollapseIconLeft, groupCollapseIconRight, groupDisableIconLeft, groupDisableIconRight, topGroupExpandIconLeft, topGroupExpandIconRight, topGroupCollapseIconLeft, topGroupCollapseIconRight, topGroupDisableIconLeft, topGroupDisableIconRight, itemIconLeft + itemRightIcon, itemLeftIconDisabled, itemRightIconDisabled, topItemLeftIcon, topItemRightIcon, topItemLeftIconDisabled, topItemRightIconDisabled, groupLeftIconExpanded, groupRightIconExpanded, groupLeftIconCollapsed, groupRightIconCollapsed, groupLeftIconDisabled, groupRightIconDisabled, topGroupLeftIconExpanded, topGroupRightIconExpanded, topGroupLeftIconCollapsed, topGroupRightIconCollapsed, topGroupLeftIconDisabled, topGroupRightIconDisabled, itemLeftIcon } @@ -235,81 +235,81 @@ public abstract String getItemDisableClass(); @Attribute(generate = false) - public String getItemIconLeft() { - return (String) getStateHelper().eval(Properties.itemIconLeft, PanelIcons.DEFAULT.toString()); + public String getItemLeftIcon() { + return (String) getStateHelper().eval(Properties.itemLeftIcon, PanelIcons.DEFAULT.toString()); } - public void setItemIconLeft(String itemIconLeft) { - getStateHelper().put(Properties.itemIconLeft, itemIconLeft); + public void setItemLeftIcon(String itemLeftIcon) { + getStateHelper().put(Properties.itemLeftIcon, itemLeftIcon); } @Attribute(generate = false) - public String getItemIconRight() { - return (String) getStateHelper().eval(Properties.itemIconRight, PanelIcons.DEFAULT.toString()); + public String getItemRightIcon() { + return (String) getStateHelper().eval(Properties.itemRightIcon, PanelIcons.DEFAULT.toString()); } - public void setItemIconRight(String itemIconRight) { - getStateHelper().put(Properties.itemIconRight, itemIconRight); + public void setItemRightIcon(String itemRightIcon) { + getStateHelper().put(Properties.itemRightIcon, itemRightIcon); } @Attribute(generate = false) - public String getItemDisableIconLeft() { - return (String) getStateHelper().eval(Properties.itemDisableIconLeft, PanelIcons.DEFAULT.toString()); + public String getItemLeftIconDisabled() { + return (String) getStateHelper().eval(Properties.itemLeftIconDisabled, PanelIcons.DEFAULT.toString()); } - public void setItemDisableIconLeft(String itemDisableIconLeft) { - getStateHelper().put(Properties.itemDisableIconLeft, itemDisableIconLeft); + public void setItemLeftIconDisabled(String itemLeftIconDisabled) { + getStateHelper().put(Properties.itemLeftIconDisabled, itemLeftIconDisabled); } @Attribute(generate = false) - public String getItemDisableIconRight() { - return (String) getStateHelper().eval(Properties.itemDisableIconRight, PanelIcons.DEFAULT.toString()); + public String getItemRightIconDisabled() { + return (String) getStateHelper().eval(Properties.itemRightIconDisabled, PanelIcons.DEFAULT.toString()); } - public void setItemDisableIconRight(String itemDisableIconRight) { - getStateHelper().put(Properties.itemDisableIconRight, itemDisableIconRight); + public void setItemRightIconDisabled(String itemRightIconDisabled) { + getStateHelper().put(Properties.itemRightIconDisabled, itemRightIconDisabled); } @Attribute public abstract String getTopItemClass(); @Attribute - public abstract String getTopItemDisableClass(); + public abstract String getTopItemClassDisabled(); @Attribute(generate = false) - public String getTopItemIconLeft() { - return (String) getStateHelper().eval(Properties.topItemIconLeft, PanelIcons.DEFAULT.toString()); + public String getTopItemLeftIcon() { + return (String) getStateHelper().eval(Properties.topItemLeftIcon, PanelIcons.DEFAULT.toString()); } - public void setTopItemIconLeft(String topItemIconLeft) { - getStateHelper().put(Properties.topItemIconLeft, topItemIconLeft); + public void setTopItemLeftIcon(String topItemLeftIcon) { + getStateHelper().put(Properties.topItemLeftIcon, topItemLeftIcon); } @Attribute(generate = false) - public String getTopItemIconRight() { - return (String) getStateHelper().eval(Properties.topItemIconRight, PanelIcons.DEFAULT.toString()); + public String getTopItemRightIcon() { + return (String) getStateHelper().eval(Properties.topItemRightIcon, PanelIcons.DEFAULT.toString()); } - public void setTopItemIconRight(String topItemIconRight) { - getStateHelper().put(Properties.topItemIconRight, topItemIconRight); + public void setTopItemRightIcon(String topItemRightIcon) { + getStateHelper().put(Properties.topItemRightIcon, topItemRightIcon); } @Attribute(generate = false) - public String getTopItemDisableIconLeft() { - return (String) getStateHelper().eval(Properties.topItemDisableIconLeft, PanelIcons.DEFAULT.toString()); + public String getTopItemLeftIconDisabled() { + return (String) getStateHelper().eval(Properties.topItemLeftIconDisabled, PanelIcons.DEFAULT.toString()); } - public void setTopItemDisableIconLeft(String topItemDisableIconLeft) { - getStateHelper().put(Properties.topItemDisableIconLeft, topItemDisableIconLeft); + public void setTopItemLeftIconDisabled(String topItemLeftIconDisabled) { + getStateHelper().put(Properties.topItemLeftIconDisabled, topItemLeftIconDisabled); } @Attribute(generate = false) - public String getTopItemDisableIconRight() { - return (String) getStateHelper().eval(Properties.topItemDisableIconRight, PanelIcons.DEFAULT.toString()); + public String getTopItemRightIconDisabled() { + return (String) getStateHelper().eval(Properties.topItemRightIconDisabled, PanelIcons.DEFAULT.toString()); } - public void setTopItemDisableIconRight(String topItemDisableIconRight) { - getStateHelper().put(Properties.topItemDisableIconRight, topItemDisableIconRight); + public void setTopItemRightIconDisabled(String topItemRightIconDisabled) { + getStateHelper().put(Properties.topItemRightIconDisabled, topItemRightIconDisabled); } @Attribute @@ -319,117 +319,117 @@ public abstract String getGroupDisableClass(); @Attribute(generate = false) - public String getGroupExpandIconLeft() { - return (String) getStateHelper().eval(Properties.groupExpandIconLeft, PanelIcons.DEFAULT.toString()); + public String getGroupLeftIconExpanded() { + return (String) getStateHelper().eval(Properties.groupLeftIconExpanded, PanelIcons.DEFAULT.toString()); } - public void setGroupExpandIconLeft(String groupExpandIconLeft) { - getStateHelper().put(Properties.groupExpandIconLeft, groupExpandIconLeft); + public void setGroupLeftIconExpanded(String groupLeftIconExpanded) { + getStateHelper().put(Properties.groupLeftIconExpanded, groupLeftIconExpanded); } @Attribute(generate = false) - public String getGroupExpandIconRight() { - return (String) getStateHelper().eval(Properties.groupExpandIconRight, PanelIcons.DEFAULT.toString()); + public String getGroupRightIconExpanded() { + return (String) getStateHelper().eval(Properties.groupRightIconExpanded, PanelIcons.DEFAULT.toString()); } - public void setGroupExpandIconRight(String groupExpandIconRight) { - getStateHelper().put(Properties.groupExpandIconRight, groupExpandIconRight); + public void setGroupRightIconExpanded(String groupRightIconExpanded) { + getStateHelper().put(Properties.groupRightIconExpanded, groupRightIconExpanded); } @Attribute(generate = false) - public String getGroupCollapseIconLeft() { - return (String) getStateHelper().eval(Properties.groupCollapseIconLeft, PanelIcons.DEFAULT.toString()); + public String getGroupLeftIconCollapsed() { + return (String) getStateHelper().eval(Properties.groupLeftIconCollapsed, PanelIcons.DEFAULT.toString()); } - public void setGroupCollapseIconLeft(String groupCollapseIconLeft) { - getStateHelper().put(Properties.groupCollapseIconLeft, groupCollapseIconLeft); + public void setGroupLeftIconCollapsed(String groupLeftIconCollapsed) { + getStateHelper().put(Properties.groupLeftIconCollapsed, groupLeftIconCollapsed); } @Attribute(generate = false) - public String getGroupCollapseIconRight() { - return (String) getStateHelper().eval(Properties.groupCollapseIconRight, PanelIcons.DEFAULT.toString()); + public String getGroupRightIconCollapsed() { + return (String) getStateHelper().eval(Properties.groupRightIconCollapsed, PanelIcons.DEFAULT.toString()); } - public void setGroupCollapseIconRight(String groupCollapseIconRight) { - getStateHelper().put(Properties.groupCollapseIconRight, groupCollapseIconRight); + public void setGroupRightIconCollapsed(String groupRightIconCollapsed) { + getStateHelper().put(Properties.groupRightIconCollapsed, groupRightIconCollapsed); } @Attribute(generate = false) - public String getGroupDisableIconLeft() { - return (String) getStateHelper().eval(Properties.groupDisableIconLeft, PanelIcons.DEFAULT.toString()); + public String getGroupLeftIconDisabled() { + return (String) getStateHelper().eval(Properties.groupLeftIconDisabled, PanelIcons.DEFAULT.toString()); } - public void setGroupDisableIconLeft(String groupDisableIconLeft) { - getStateHelper().put(Properties.groupDisableIconLeft, groupDisableIconLeft); + public void setGroupLeftIconDisabled(String groupLeftIconDisabled) { + getStateHelper().put(Properties.groupLeftIconDisabled, groupLeftIconDisabled); } @Attribute(generate = false) - public String getGroupDisableIconRight() { - return (String) getStateHelper().eval(Properties.groupDisableIconRight, PanelIcons.DEFAULT.toString()); + public String getGroupRightIconDisabled() { + return (String) getStateHelper().eval(Properties.groupRightIconDisabled, PanelIcons.DEFAULT.toString()); } - public void setGroupDisableIconRight(String groupDisableIconRight) { - getStateHelper().put(Properties.groupDisableIconRight, groupDisableIconRight); + public void setGroupRightIconDisabled(String groupRightIconDisabled) { + getStateHelper().put(Properties.groupRightIconDisabled, groupRightIconDisabled); } @Attribute public abstract String getTopGroupClass(); @Attribute - public abstract String getTopGroupDisableClass(); + public abstract String getTopGroupClassDisabled(); @Attribute(generate = false) - public String getTopGroupExpandIconLeft() { - return (String) getStateHelper().eval(Properties.topGroupExpandIconLeft, PanelIcons.DEFAULT.toString()); + public String getTopGroupLeftIconExpanded() { + return (String) getStateHelper().eval(Properties.topGroupLeftIconExpanded, PanelIcons.DEFAULT.toString()); } - public void setTopGroupExpandIconLeft(String topGroupExpandIconLeft) { - getStateHelper().put(Properties.topGroupExpandIconLeft, topGroupExpandIconLeft); + public void setTopGroupLeftIconExpanded(String topGroupLeftIconExpanded) { + getStateHelper().put(Properties.topGroupLeftIconExpanded, topGroupLeftIconExpanded); } @Attribute(generate = false) - public String getTopGroupExpandIconRight() { - return (String) getStateHelper().eval(Properties.topGroupExpandIconRight, PanelIcons.DEFAULT.toString()); + public String getTopGroupRightIconExpanded() { + return (String) getStateHelper().eval(Properties.topGroupRightIconExpanded, PanelIcons.DEFAULT.toString()); } - public void setTopGroupExpandIconRight(String topGroupExpandIconRight) { - getStateHelper().put(Properties.topGroupExpandIconRight, topGroupExpandIconRight); + public void setTopGroupRightIconExpanded(String topGroupRightIconExpanded) { + getStateHelper().put(Properties.topGroupRightIconExpanded, topGroupRightIconExpanded); } @Attribute(generate = false) - public String getTopGroupCollapseIconLeft() { - return (String) getStateHelper().eval(Properties.topGroupCollapseIconLeft, PanelIcons.DEFAULT.toString()); + public String getTopGroupLeftIconCollapsed() { + return (String) getStateHelper().eval(Properties.topGroupLeftIconCollapsed, PanelIcons.DEFAULT.toString()); } - public void setTopGroupCollapseIconLeft(String topGroupCollapseIconLeft) { - getStateHelper().put(Properties.topGroupCollapseIconLeft, topGroupCollapseIconLeft); + public void setTopGroupLeftIconCollapsed(String topGroupLeftIconCollapsed) { + getStateHelper().put(Properties.topGroupLeftIconCollapsed, topGroupLeftIconCollapsed); } @Attribute(generate = false) - public String getTopGroupCollapseIconRight() { - return (String) getStateHelper().eval(Properties.topGroupCollapseIconRight, PanelIcons.DEFAULT.toString()); + public String getTopGroupRightIconCollapsed() { + return (String) getStateHelper().eval(Properties.topGroupRightIconCollapsed, PanelIcons.DEFAULT.toString()); } - public void setTopGroupCollapseIconRight(String topGroupCollapseIconRight) { - getStateHelper().put(Properties.topGroupCollapseIconRight, topGroupCollapseIconRight); + public void setTopGroupRightIconCollapsed(String topGroupRightIconCollapsed) { + getStateHelper().put(Properties.topGroupRightIconCollapsed, topGroupRightIconCollapsed); } @Attribute(generate = false) - public String getTopGroupDisableIconLeft() { - return (String) getStateHelper().eval(Properties.topGroupDisableIconLeft, PanelIcons.DEFAULT.toString()); + public String getTopGroupLeftIconDisabled() { + return (String) getStateHelper().eval(Properties.topGroupLeftIconDisabled, PanelIcons.DEFAULT.toString()); } - public void setTopGroupDisableIconLeft(String topGroupDisableIconLeft) { - getStateHelper().put(Properties.topGroupDisableIconLeft, topGroupDisableIconLeft); + public void setTopGroupLeftIconDisabled(String topGroupLeftIconDisabled) { + getStateHelper().put(Properties.topGroupLeftIconDisabled, topGroupLeftIconDisabled); } @Attribute(generate = false) - public String getTopGroupDisableIconRight() { - return (String) getStateHelper().eval(Properties.topGroupDisableIconRight, PanelIcons.DEFAULT.toString()); + public String getTopGroupRightIconDisabled() { + return (String) getStateHelper().eval(Properties.topGroupRightIconDisabled, PanelIcons.DEFAULT.toString()); } - public void setTopGroupDisableIconRight(String topGroupDisableIconRight) { - getStateHelper().put(Properties.topGroupDisableIconRight, topGroupDisableIconRight); + public void setTopGroupRightIconDisabled(String topGroupRightIconDisabled) { + getStateHelper().put(Properties.topGroupRightIconDisabled, topGroupRightIconDisabled); } @Attribute(events = @EventName("click")) Modified: trunk/ui/output/ui/src/main/java/org/richfaces/component/AbstractPanelMenuGroup.java =================================================================== --- trunk/ui/output/ui/src/main/java/org/richfaces/component/AbstractPanelMenuGroup.java 2011-01-20 14:48:14 UTC (rev 21118) +++ trunk/ui/output/ui/src/main/java/org/richfaces/component/AbstractPanelMenuGroup.java 2011-01-20 15:05:41 UTC (rev 21119) @@ -199,68 +199,68 @@ // ------------------------------------------------ Html Attributes enum Properties { - iconLeftDisabled, iconLeftExpanded, iconRightCollapsed, iconRightDisabled, iconRightExpanded, disabledClass, styleClass, expandEvent, collapseEvent, iconLeftCollapsed + leftIconDisabled, leftIconExpanded, rightIconCollapsed, rightIconDisabled, rightIconExpanded, disabledClass, styleClass, expandEvent, collapseEvent, leftIconCollapsed } @Attribute(generate = false) - public String getIconLeftCollapsed() { - return (String) getStateHelper().eval(Properties.iconLeftCollapsed, - isTopItem() ? getPanelMenu().getTopGroupCollapseIconLeft() : getPanelMenu().getGroupCollapseIconLeft()); + public String getLeftIconCollapsed() { + return (String) getStateHelper().eval(Properties.leftIconCollapsed, + isTopItem() ? getPanelMenu().getTopGroupLeftIconCollapsed() : getPanelMenu().getGroupLeftIconCollapsed()); } - public void setIconLeftCollapsed(String iconLeftCollapsed) { - getStateHelper().put(Properties.iconLeftCollapsed, iconLeftCollapsed); + public void setLeftIconCollapsed(String leftIconCollapsed) { + getStateHelper().put(Properties.leftIconCollapsed, leftIconCollapsed); } @Attribute(generate = false) - public String getIconLeftDisabled() { - return (String) getStateHelper().eval(Properties.iconLeftDisabled, - isTopItem() ? getPanelMenu().getTopGroupDisableIconLeft() : getPanelMenu().getGroupDisableIconLeft()); + public String getLeftIconDisabled() { + return (String) getStateHelper().eval(Properties.leftIconDisabled, + isTopItem() ? getPanelMenu().getTopGroupLeftIconDisabled() : getPanelMenu().getGroupLeftIconDisabled()); } - public void setIconLeftDisabled(String iconLeftDisabled) { - getStateHelper().put(Properties.iconLeftDisabled, iconLeftDisabled); + public void setLeftIconDisabled(String leftIconDisabled) { + getStateHelper().put(Properties.leftIconDisabled, leftIconDisabled); } @Attribute(generate = false) - public String getIconLeftExpanded() { - return (String) getStateHelper().eval(Properties.iconLeftExpanded, - isTopItem() ? getPanelMenu().getTopGroupExpandIconLeft() : getPanelMenu().getGroupExpandIconLeft()); + public String getLeftIconExpanded() { + return (String) getStateHelper().eval(Properties.leftIconExpanded, + isTopItem() ? getPanelMenu().getTopGroupLeftIconExpanded() : getPanelMenu().getGroupLeftIconExpanded()); } - public void setIconLeftExpanded(String iconLeftExpanded) { - getStateHelper().put(Properties.iconLeftExpanded, iconLeftExpanded); + public void setLeftIconExpanded(String leftIconExpanded) { + getStateHelper().put(Properties.leftIconExpanded, leftIconExpanded); } @Attribute(generate = false) - public String getIconRightCollapsed() { - return (String) getStateHelper().eval(Properties.iconRightCollapsed, - isTopItem() ? getPanelMenu().getTopGroupCollapseIconRight() : getPanelMenu().getGroupCollapseIconRight()); + public String getRightIconCollapsed() { + return (String) getStateHelper().eval(Properties.rightIconCollapsed, + isTopItem() ? getPanelMenu().getTopGroupRightIconCollapsed() : getPanelMenu().getGroupRightIconCollapsed()); } - public void setIconRightCollapsed(String iconRightCollapsed) { - getStateHelper().put(Properties.iconRightCollapsed, iconRightCollapsed); + public void setRightIconCollapsed(String rightIconCollapsed) { + getStateHelper().put(Properties.rightIconCollapsed, rightIconCollapsed); } @Attribute(generate = false) - public String getIconRightDisabled() { - return (String) getStateHelper().eval(Properties.iconRightDisabled, - isTopItem() ? getPanelMenu().getTopGroupDisableIconRight() : getPanelMenu().getGroupDisableIconRight()); + public String getRightIconDisabled() { + return (String) getStateHelper().eval(Properties.rightIconDisabled, + isTopItem() ? getPanelMenu().getTopGroupRightIconDisabled() : getPanelMenu().getGroupRightIconDisabled()); } - public void setIconRightDisabled(String iconRightDisabled) { - getStateHelper().put(Properties.iconRightDisabled, iconRightDisabled); + public void setRightIconDisabled(String rightIconDisabled) { + getStateHelper().put(Properties.rightIconDisabled, rightIconDisabled); } @Attribute(generate = false) - public String getIconRightExpanded() { - return (String) getStateHelper().eval(Properties.iconRightExpanded, - isTopItem() ? getPanelMenu().getTopGroupExpandIconRight() : getPanelMenu().getGroupExpandIconRight()); + public String getRightIconExpanded() { + return (String) getStateHelper().eval(Properties.rightIconExpanded, + isTopItem() ? getPanelMenu().getTopGroupRightIconExpanded() : getPanelMenu().getGroupRightIconExpanded()); } - public void setIconRightExpanded(String iconRightExpanded) { - getStateHelper().put(Properties.iconRightExpanded, iconRightExpanded); + public void setRightIconExpanded(String rightIconExpanded) { + getStateHelper().put(Properties.rightIconExpanded, rightIconExpanded); } @Attribute(events = @EventName("collapse")) @@ -284,7 +284,7 @@ @Attribute(generate = false) public String getDisabledClass() { return (String) getStateHelper().eval(Properties.disabledClass, - isTopItem() ? getPanelMenu().getTopGroupDisableClass() : getPanelMenu().getGroupDisableClass()); + isTopItem() ? getPanelMenu().getTopGroupClassDisabled() : getPanelMenu().getGroupDisableClass()); } public void setDisabledClass(String disabledClass) { @@ -293,9 +293,9 @@ public abstract String getHoverClass(); - public abstract String getIconLeftClass(); + public abstract String getLeftIconClass(); - public abstract String getIconRightClass(); + public abstract String getRightIconClass(); public abstract String getStyle(); Modified: trunk/ui/output/ui/src/main/java/org/richfaces/component/AbstractPanelMenuItem.java =================================================================== --- trunk/ui/output/ui/src/main/java/org/richfaces/component/AbstractPanelMenuItem.java 2011-01-20 14:48:14 UTC (rev 21118) +++ trunk/ui/output/ui/src/main/java/org/richfaces/component/AbstractPanelMenuItem.java 2011-01-20 15:05:41 UTC (rev 21119) @@ -124,14 +124,14 @@ // ------------------------------------------------ Html Attributes enum Properties { - iconLeft, iconLeftDisabled, iconRight, iconRightDisabled, styleClass, disabledClass, name + leftIcon, leftIconDisabled, iconRight, rightIconDisabled, styleClass, disabledClass, name } @Attribute(generate = false) public String getDisabledClass() { return (String) getStateHelper().eval(Properties.disabledClass, - isTopItem() ? getPanelMenu().getTopItemDisableClass() : getPanelMenu().getItemDisableClass()); + isTopItem() ? getPanelMenu().getTopItemClassDisabled() : getPanelMenu().getItemDisableClass()); } public void setDisabledClass(String disabledClass) { @@ -142,49 +142,49 @@ public abstract String getHoverClass(); @Attribute(generate = false) - public String getIconLeft() { - return (String) getStateHelper().eval(Properties.iconLeft, - isTopItem() ? getPanelMenu().getTopItemIconLeft() : getPanelMenu().getItemIconLeft()); + public String getLeftIcon() { + return (String) getStateHelper().eval(Properties.leftIcon, + isTopItem() ? getPanelMenu().getTopItemLeftIcon() : getPanelMenu().getItemLeftIcon()); } - public void setIconLeft(String iconLeft) { - getStateHelper().put(Properties.iconLeft, iconLeft); + public void setLeftIcon(String leftIcon) { + getStateHelper().put(Properties.leftIcon, leftIcon); } @Attribute - public abstract String getIconLeftClass(); + public abstract String getLeftIconClass(); @Attribute(generate = false) - public String getIconLeftDisabled() { - return (String) getStateHelper().eval(Properties.iconLeftDisabled, - isTopItem() ? getPanelMenu().getTopItemDisableIconLeft() : getPanelMenu().getItemDisableIconLeft()); + public String getLeftIconDisabled() { + return (String) getStateHelper().eval(Properties.leftIconDisabled, + isTopItem() ? getPanelMenu().getTopItemLeftIconDisabled() : getPanelMenu().getItemLeftIconDisabled()); } - public void setIconLeftDisabled(String iconLeftDisabled) { - getStateHelper().put(Properties.iconLeftDisabled, iconLeftDisabled); + public void setLeftIconDisabled(String leftIconDisabled) { + getStateHelper().put(Properties.leftIconDisabled, leftIconDisabled); } @Attribute(generate = false) - public String getIconRight() { + public String getRightIcon() { return (String) getStateHelper().eval(Properties.iconRight, - isTopItem() ? getPanelMenu().getTopItemIconRight() : getPanelMenu().getItemIconRight()); + isTopItem() ? getPanelMenu().getTopItemRightIcon() : getPanelMenu().getItemRightIcon()); } - public void setIconRight(String iconRight) { + public void setRightIcon(String iconRight) { getStateHelper().put(Properties.iconRight, iconRight); } @Attribute - public abstract String getIconRightClass(); + public abstract String getRightIconClass(); @Attribute(generate = false) - public String getIconRightDisabled() { - return (String) getStateHelper().eval(Properties.iconRightDisabled, - isTopItem() ? getPanelMenu().getTopItemDisableIconRight() : getPanelMenu().getItemDisableIconRight()); + public String getRightIconDisabled() { + return (String) getStateHelper().eval(Properties.rightIconDisabled, + isTopItem() ? getPanelMenu().getTopItemRightIconDisabled() : getPanelMenu().getItemRightIconDisabled()); } - public void setIconRightDisabled(String iconRightDisabled) { - getStateHelper().put(Properties.iconRightDisabled, iconRightDisabled); + public void setRightIconDisabled(String rightIconDisabled) { + getStateHelper().put(Properties.rightIconDisabled, rightIconDisabled); } @Attribute Modified: trunk/ui/output/ui/src/main/java/org/richfaces/renderkit/html/AccordionItemHeaderRenderer.java =================================================================== --- trunk/ui/output/ui/src/main/java/org/richfaces/renderkit/html/AccordionItemHeaderRenderer.java 2011-01-20 14:48:14 UTC (rev 21118) +++ trunk/ui/output/ui/src/main/java/org/richfaces/renderkit/html/AccordionItemHeaderRenderer.java 2011-01-20 15:05:41 UTC (rev 21119) @@ -20,14 +20,14 @@ super("header", "rf-ac-itm"); } - protected void encodeHeaderIconLeft(ResponseWriter writer, FacesContext context, AbstractAccordionItem panel) throws IOException { + protected void encodeHeaderLeftIcon(ResponseWriter writer, FacesContext context, AbstractAccordionItem panel) throws IOException { String iconInactive = panel.isDisabled() ? panel.getLeftIconDisabled() : panel.getLeftIconInactive(); String iconActive = panel.isDisabled() ? panel.getLeftIconDisabled() : panel.getLeftIconActive(); encodeTdIcon(writer, context, cssClassPrefix + "-ico", iconInactive, iconActive); } - protected void encodeHeaderIconRight(ResponseWriter writer, FacesContext context, AbstractAccordionItem panel) throws IOException { + protected void encodeHeaderRightIcon(ResponseWriter writer, FacesContext context, AbstractAccordionItem panel) throws IOException { String iconInactive = panel.isDisabled() ? panel.getRightIconDisabled() : panel.getRightIconInactive(); String iconActive = panel.isDisabled() ? panel.getRightIconDisabled() : panel.getRightIconActive(); Modified: trunk/ui/output/ui/src/main/java/org/richfaces/renderkit/html/CollapsiblePanelRenderer.java =================================================================== --- trunk/ui/output/ui/src/main/java/org/richfaces/renderkit/html/CollapsiblePanelRenderer.java 2011-01-20 14:48:14 UTC (rev 21118) +++ trunk/ui/output/ui/src/main/java/org/richfaces/renderkit/html/CollapsiblePanelRenderer.java 2011-01-20 15:05:41 UTC (rev 21119) @@ -66,15 +66,15 @@ private final TableIconsRendererHelper<AbstractCollapsiblePanel> headerRenderer = new TableIconsRendererHelper<AbstractCollapsiblePanel>("header", "rf-cp") { - protected void encodeHeaderIconLeft(ResponseWriter writer, FacesContext context, AbstractCollapsiblePanel panel) throws IOException { + protected void encodeHeaderLeftIcon(ResponseWriter writer, FacesContext context, AbstractCollapsiblePanel panel) throws IOException { encodeTdIcon(writer, context, cssClassPrefix + "-ico", - panel.getLeftCollapsedIcon(), panel.getLeftExpandedIcon()); + panel.getLeftIconCollapsed(), panel.getLeftIconExpanded()); } - protected void encodeHeaderIconRight(ResponseWriter writer, FacesContext context, AbstractCollapsiblePanel panel) throws IOException { + protected void encodeHeaderRightIcon(ResponseWriter writer, FacesContext context, AbstractCollapsiblePanel panel) throws IOException { //TODO nick - should this be "-ico-exp"? also why expanded icon state is connected with right icon alignment? encodeTdIcon(writer, context, cssClassPrefix + "-exp-ico", - panel.getRightCollapsedIcon(), panel.getRightExpandedIcon()); + panel.getRightIconCollapsed(), panel.getRightIconExpanded()); } @Override Modified: trunk/ui/output/ui/src/main/java/org/richfaces/renderkit/html/PanelMenuGroupHeaderRenderer.java =================================================================== --- trunk/ui/output/ui/src/main/java/org/richfaces/renderkit/html/PanelMenuGroupHeaderRenderer.java 2011-01-20 14:48:14 UTC (rev 21118) +++ trunk/ui/output/ui/src/main/java/org/richfaces/renderkit/html/PanelMenuGroupHeaderRenderer.java 2011-01-20 15:05:41 UTC (rev 21119) @@ -12,16 +12,16 @@ super("label", cssClassPrefix, "rf-pm-ico"); } - protected void encodeHeaderIconLeft(ResponseWriter writer, FacesContext context, AbstractPanelMenuGroup group) throws IOException { - String iconCollapsed = group.isDisabled() ? group.getIconLeftDisabled() : group.getIconLeftCollapsed(); - String iconExpanded = group.isDisabled() ? group.getIconLeftDisabled() : group.getIconLeftExpanded(); + protected void encodeHeaderLeftIcon(ResponseWriter writer, FacesContext context, AbstractPanelMenuGroup group) throws IOException { + String iconCollapsed = group.isDisabled() ? group.getLeftIconDisabled() : group.getLeftIconCollapsed(); + String iconExpanded = group.isDisabled() ? group.getLeftIconDisabled() : group.getLeftIconExpanded(); encodeTdIcon(writer, context, cssClassPrefix + "-ico", iconCollapsed, iconExpanded); } - protected void encodeHeaderIconRight(ResponseWriter writer, FacesContext context, AbstractPanelMenuGroup group) throws IOException { - String iconCollapsed = group.isDisabled() ? group.getIconRightDisabled() : group.getIconRightCollapsed(); - String iconExpanded = group.isDisabled() ? group.getIconRightDisabled() : group.getIconRightExpanded(); + protected void encodeHeaderRightIcon(ResponseWriter writer, FacesContext context, AbstractPanelMenuGroup group) throws IOException { + String iconCollapsed = group.isDisabled() ? group.getRightIconDisabled() : group.getRightIconCollapsed(); + String iconExpanded = group.isDisabled() ? group.getRightIconDisabled() : group.getRightIconExpanded(); //TODO nick - should this be "-ico-exp"? also why expanded icon state is connected with right icon alignment? encodeTdIcon(writer, context, cssClassPrefix + "-exp-ico", iconCollapsed, iconExpanded); Modified: trunk/ui/output/ui/src/main/java/org/richfaces/renderkit/html/PanelMenuItemRenderer.java =================================================================== --- trunk/ui/output/ui/src/main/java/org/richfaces/renderkit/html/PanelMenuItemRenderer.java 2011-01-20 14:48:14 UTC (rev 21118) +++ trunk/ui/output/ui/src/main/java/org/richfaces/renderkit/html/PanelMenuItemRenderer.java 2011-01-20 15:05:41 UTC (rev 21119) @@ -95,15 +95,15 @@ } private void encodeHeaderGroupRightIcon(ResponseWriter writer, FacesContext context, AbstractPanelMenuItem menuItem, String classPrefix) throws IOException { - String icon = menuItem.isDisabled() ? menuItem.getIconRightDisabled() : menuItem.getIconRight(); - String cssClasses = concatClasses(classPrefix + "-exp-ico", menuItem.getIconLeftClass()); + String icon = menuItem.isDisabled() ? menuItem.getRightIconDisabled() : menuItem.getRightIcon(); + String cssClasses = concatClasses(classPrefix + "-exp-ico", menuItem.getLeftIconClass()); encodeTdIcon(writer, context, cssClasses, icon); } private void encodeHeaderGroupLeftIcon(ResponseWriter writer, FacesContext context, AbstractPanelMenuItem menuItem, String classPrefix) throws IOException { - String icon = menuItem.isDisabled() ? menuItem.getIconLeftDisabled() : menuItem.getIconLeft(); - String cssClasses = concatClasses(classPrefix + "-ico", menuItem.getIconLeftClass()); + String icon = menuItem.isDisabled() ? menuItem.getLeftIconDisabled() : menuItem.getLeftIcon(); + String cssClasses = concatClasses(classPrefix + "-ico", menuItem.getLeftIconClass()); encodeTdIcon(writer, context, cssClasses, icon); } Modified: trunk/ui/output/ui/src/main/java/org/richfaces/renderkit/html/TableIconsRendererHelper.java =================================================================== --- trunk/ui/output/ui/src/main/java/org/richfaces/renderkit/html/TableIconsRendererHelper.java 2011-01-20 14:48:14 UTC (rev 21118) +++ trunk/ui/output/ui/src/main/java/org/richfaces/renderkit/html/TableIconsRendererHelper.java 2011-01-20 15:05:41 UTC (rev 21119) @@ -33,9 +33,9 @@ writer.startElement(TBODY_ELEMENT, null); writer.startElement(TR_ELEMENT, null); - encodeHeaderIconLeft(writer, context, component); + encodeHeaderLeftIcon(writer, context, component); encodeHeaderText(writer, context, component); - encodeHeaderIconRight(writer, context, component); + encodeHeaderRightIcon(writer, context, component); writer.endElement(TR_ELEMENT); writer.endElement(TBODY_ELEMENT); @@ -70,9 +70,9 @@ } } - protected abstract void encodeHeaderIconLeft(ResponseWriter writer, FacesContext context, T component) throws IOException; + protected abstract void encodeHeaderLeftIcon(ResponseWriter writer, FacesContext context, T component) throws IOException; - protected abstract void encodeHeaderIconRight(ResponseWriter writer, FacesContext context, T menuItem) throws IOException; + protected abstract void encodeHeaderRightIcon(ResponseWriter writer, FacesContext context, T menuItem) throws IOException; protected void encodeTdIcon(ResponseWriter writer, FacesContext context, String cssClass, String attrIconCollapsedValue, String attrIconExpandedValue) throws IOException { writer.startElement(TD_ELEM, null); Modified: trunk/ui/output/ui/src/main/resources/META-INF/resources/org.richfaces/panelMenuItem.js =================================================================== --- trunk/ui/output/ui/src/main/resources/META-INF/resources/org.richfaces/panelMenuItem.js 2011-01-20 14:48:14 UTC (rev 21118) +++ trunk/ui/output/ui/src/main/resources/META-INF/resources/org.richfaces/panelMenuItem.js 2011-01-20 15:05:41 UTC (rev 21119) @@ -314,7 +314,7 @@ destroy: function () { var panelMenu = this.__rfPanelMenu(); - if (panelMenu.getItems && panelMenu.getItems()[this.itemName]) { + if (panelMenu && panelMenu.getItems && panelMenu.getItems()[this.itemName]) { delete panelMenu.getItems()[this.itemName]; } Modified: trunk/ui/output/ui/src/test/resources/org/richfaces/renderkit/html/panelMenu-icons-inheritance-topGroupDis.xmlunit.xml =================================================================== --- trunk/ui/output/ui/src/test/resources/org/richfaces/renderkit/html/panelMenu-icons-inheritance-topGroupDis.xmlunit.xml 2011-01-20 14:48:14 UTC (rev 21118) +++ trunk/ui/output/ui/src/test/resources/org/richfaces/renderkit/html/panelMenu-icons-inheritance-topGroupDis.xmlunit.xml 2011-01-20 15:05:41 UTC (rev 21119) @@ -1,4 +1,4 @@ -<div id="f:panelMenuGroup-topDis" class="rf-pm-top-gr topGroupClass rf-pm-top-gr-dis topGroupDisableClass"> +<div id="f:panelMenuGroup-topDis" class="rf-pm-top-gr topGroupClass rf-pm-top-gr-dis topGroupClassDisabled"> <input id="f:panelMenuGroup-topDis:expanded" name="f:panelMenuGroup-topDis:expanded" type="hidden" value="false"/> <div id="f:panelMenuGroup-topDis:hdr" class="rf-pm-top-gr-hdr rf-pm-hdr-colps"> <table class="rf-pm-top-gr-gr"> Modified: trunk/ui/output/ui/src/test/resources/org/richfaces/renderkit/html/panelMenu-icons-inheritance-topItemDis.xmlunit.xml =================================================================== --- trunk/ui/output/ui/src/test/resources/org/richfaces/renderkit/html/panelMenu-icons-inheritance-topItemDis.xmlunit.xml 2011-01-20 14:48:14 UTC (rev 21118) +++ trunk/ui/output/ui/src/test/resources/org/richfaces/renderkit/html/panelMenu-icons-inheritance-topItemDis.xmlunit.xml 2011-01-20 15:05:41 UTC (rev 21119) @@ -1,4 +1,4 @@ -<div id="f:panelMenuItem-topDis" class="rf-pm-top-itm topItemClass rf-pm-top-itm-dis topItemDisableClass"> +<div id="f:panelMenuItem-topDis" class="rf-pm-top-itm topItemClass rf-pm-top-itm-dis topItemClassDisabled"> <table class="rf-pm-top-itm-gr"> <tbody> <tr> Modified: trunk/ui/output/ui/src/test/resources/org/richfaces/renderkit/html/panelMenu-icons-inheritance.xhtml =================================================================== --- trunk/ui/output/ui/src/test/resources/org/richfaces/renderkit/html/panelMenu-icons-inheritance.xhtml 2011-01-20 14:48:14 UTC (rev 21118) +++ trunk/ui/output/ui/src/test/resources/org/richfaces/renderkit/html/panelMenu-icons-inheritance.xhtml 2011-01-20 15:05:41 UTC (rev 21119) @@ -38,41 +38,41 @@ <h:body> <h:form id="f"> <pn:panelMenu - itemIconRight="triangleUp" - itemIconLeft="triangleDown" + itemRightIcon="triangleUp" + itemLeftIcon="triangleDown" itemClass="itemClass" - itemDisableIconRight="chevronUp" - itemDisableIconLeft="chevronDown" + itemRightIconDisabled="chevronUp" + itemLeftIconDisabled="chevronDown" itemDisableClass="itemDisableClass" - topItemIconRight="triangle" - topItemIconLeft="triangle" + topItemRightIcon="triangle" + topItemLeftIcon="triangle" topItemClass="topItemClass" - topItemDisableIconRight="chevron" - topItemDisableIconLeft="chevron" - topItemDisableClass="topItemDisableClass" + topItemRightIconDisabled="chevron" + topItemLeftIconDisabled="chevron" + topItemClassDisabled="topItemClassDisabled" - groupCollapseIconRight="triangleUp" - groupExpandIconRight="disc" - groupCollapseIconLeft="triangleDown" - groupExpandIconLeft="disc" + groupRightIconCollapsed="triangleUp" + groupRightIconExpanded="disc" + groupLeftIconCollapsed="triangleDown" + groupLeftIconExpanded="disc" groupClass="groupClass" - groupDisableIconRight="chevronUp" - groupDisableIconLeft="chevronDown" + groupRightIconDisabled="chevronUp" + groupLeftIconDisabled="chevronDown" groupDisableClass="groupDisableClass" - topGroupCollapseIconRight="triangle" - topGroupExpandIconRight="disc" - topGroupCollapseIconLeft="triangle" - topGroupExpandIconLeft="disc" + topGroupRightIconCollapsed="triangle" + topGroupRightIconExpanded="disc" + topGroupLeftIconCollapsed="triangle" + topGroupLeftIconExpanded="disc" topGroupClass="topGroupClass" - topGroupDisableIconRight="chevron" - topGroupDisableIconLeft="chevron" - topGroupDisableClass="topGroupDisableClass" + topGroupRightIconDisabled="chevron" + topGroupLeftIconDisabled="chevron" + topGroupClassDisabled="topGroupClassDisabled" > <pn:panelMenuGroup id="panelMenuGroup-top"></pn:panelMenuGroup>

13 years, 3 months

1
0
0 / 0

JBoss Rich Faces SVN: r21118 - trunk/ui/iteration/ui/src/main/java/org/richfaces/model.

by richfaces-svn-commits＠lists.jboss.org

Author: konstantin.mishin Date: 2011-01-20 09:48:14 -0500 (Thu, 20 Jan 2011) New Revision: 21118 Modified: trunk/ui/iteration/ui/src/main/java/org/richfaces/model/ArrangeableModel.java Log: RF-10189 Modified: trunk/ui/iteration/ui/src/main/java/org/richfaces/model/ArrangeableModel.java =================================================================== --- trunk/ui/iteration/ui/src/main/java/org/richfaces/model/ArrangeableModel.java 2011-01-20 14:48:06 UTC (rev 21117) +++ trunk/ui/iteration/ui/src/main/java/org/richfaces/model/ArrangeableModel.java 2011-01-20 14:48:14 UTC (rev 21118) @@ -324,12 +324,12 @@ stringComparator = createStringComparator(context); } result = stringComparator.compare(((String) value1).trim(), ((String) value2).trim()); - } else if (value1 instanceof Comparable<?>) { - result = ((Comparable) value1).compareTo(value2); } else if (value1 == null && value2 != null) { result = -1; } else if (value2 == null && value1 != null) { result = 1; + } else if (value1 instanceof Comparable<?>) { + result = ((Comparable) value1).compareTo(value2); } return result; }

13 years, 3 months

1
0
0 / 0

JBoss Rich Faces SVN: r21117 - modules/tests/metamer/trunk/application/src/main/webapp/templates.

by richfaces-svn-commits＠lists.jboss.org

Author: lfryc(a)redhat.com Date: 2011-01-20 09:48:06 -0500 (Thu, 20 Jan 2011) New Revision: 21117 Modified: modules/tests/metamer/trunk/application/src/main/webapp/templates/header.xhtml Log: forgotten rich: xmlns Modified: modules/tests/metamer/trunk/application/src/main/webapp/templates/header.xhtml =================================================================== --- modules/tests/metamer/trunk/application/src/main/webapp/templates/header.xhtml 2011-01-20 14:21:27 UTC (rev 21116) +++ modules/tests/metamer/trunk/application/src/main/webapp/templates/header.xhtml 2011-01-20 14:48:06 UTC (rev 21117) @@ -1,7 +1,8 @@ <?xml version="1.0" encoding="UTF-8" ?> <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> <html xmlns="http://www.w3.org/1999/xhtml" xmlns:h="http://java.sun.com/jsf/html" xmlns:f="http://java.sun.com/jsf/core" - xmlns:ui="http://java.sun.com/jsf/facelets" xmlns:a4j="http://richfaces.org/a4j"> + xmlns:ui="http://java.sun.com/jsf/facelets" xmlns:a4j="http://richfaces.org/a4j" + xmlns:rich="http://richfaces.org/rich"> <!-- JBoss, Home of Professional Open Source

13 years, 3 months

1
0
0 / 0

JBoss Rich Faces SVN: r21116 - trunk/ui/input/ui/src/main/java/org/richfaces/renderkit.

by richfaces-svn-commits＠lists.jboss.org

Author: abelevich Date: 2011-01-20 09:21:27 -0500 (Thu, 20 Jan 2011) New Revision: 21116 Modified: trunk/ui/input/ui/src/main/java/org/richfaces/renderkit/CalendarRendererBase.java Log: RF-10172 r:calendar : use logical "javax.faces.DateTime" as default converter Modified: trunk/ui/input/ui/src/main/java/org/richfaces/renderkit/CalendarRendererBase.java =================================================================== --- trunk/ui/input/ui/src/main/java/org/richfaces/renderkit/CalendarRendererBase.java 2011-01-20 13:48:30 UTC (rev 21115) +++ trunk/ui/input/ui/src/main/java/org/richfaces/renderkit/CalendarRendererBase.java 2011-01-20 14:21:27 UTC (rev 21116) @@ -202,7 +202,7 @@ // in case the converter hasn't been set, try to use default // DateTimeConverter if (converter == null) { - converter = createDefaultConverter(); + converter = createDefaultConverter(facesContext); } setupConverter(facesContext, converter, calendar); @@ -222,7 +222,7 @@ Converter converter = SelectUtils.findConverter(facesContext, calendar, "value"); if (converter == null) { - converter = createDefaultConverter(); + converter = createDefaultConverter(facesContext); } setupConverter(facesContext, converter, calendar); @@ -535,8 +535,11 @@ return (label == null || ((String)label).trim().length() == 0); } - protected Converter createDefaultConverter() { - return new DateTimeConverter(); + protected Converter createDefaultConverter(FacesContext facesContext) { + if (facesContext == null) { + return null; + } + return facesContext.getApplication().createConverter(DateTimeConverter.CONVERTER_ID); } protected Converter setupConverter(FacesContext facesContext, Converter converter, AbstractCalendar calendar) {

13 years, 3 months

1
0
0 / 0

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

richfaces-svn-commits January 2011