Author: abelevich Date: 2011-01-18 03:48:25 -0500 (Tue, 18 Jan 2011) New Revision: 21049 Added: trunk/ui/output/ui/src/test/java/org/richfaces/renderkit/html/DropDownMenuRendererTest.java Removed: trunk/ui/output/ui/src/test/java/org/richfaces/renderkit/html/DrowDownMenuRendererTest.java Modified: trunk/ui/output/ui/src/main/java/org/richfaces/component/AbstractDropDownMenu.java trunk/ui/output/ui/src/main/java/org/richfaces/component/AbstractMenuGroup.java trunk/ui/output/ui/src/main/java/org/richfaces/component/AbstractMenuItem.java trunk/ui/output/ui/src/main/java/org/richfaces/renderkit/html/DropDownMenuRendererBase.java trunk/ui/output/ui/src/main/java/org/richfaces/renderkit/html/MenuGroupRendererBase.java trunk/ui/output/ui/src/main/java/org/richfaces/renderkit/html/MenuItemRendererBase.java trunk/ui/output/ui/src/main/templates/dropdownmenu.template.xml trunk/ui/output/ui/src/test/resources/org/richfaces/renderkit/html/dropDownMenu_ajaxMode.xmlunit.xml trunk/ui/output/ui/src/test/resources/org/richfaces/renderkit/html/dropDownMenu_serverMode.xmlunit.xml Log: RF-10097 Inline default values: output components I Modified: trunk/ui/output/ui/src/main/java/org/richfaces/component/AbstractDropDownMenu.java =================================================================== --- trunk/ui/output/ui/src/main/java/org/richfaces/component/AbstractDropDownMenu.java 2011-01-17 22:49:07 UTC (rev 21048) +++ trunk/ui/output/ui/src/main/java/org/richfaces/component/AbstractDropDownMenu.java 2011-01-18 08:48:25 UTC (rev 21049) @@ -19,35 +19,35 @@ public static final String COMPONENT_FAMILY = "org.richfaces.DropDownMenu"; - @Attribute (defaultValue = "click") + @Attribute public abstract String getShowEvent(); - @Attribute(defaultValue = "server") - public abstract String getMode(); + @Attribute + public abstract Mode getMode(); @Attribute public abstract boolean isDisabled(); - @Attribute(defaultValue = "300") + @Attribute public abstract int getHideDelay(); - @Attribute(defaultValue = "50") + @Attribute public abstract int getShowDelay(); - @Attribute(defaultValue = "250") - public abstract int getPopupWith(); + @Attribute + public abstract int getPopupWidth(); - @Attribute(defaultValue = "0") + @Attribute public abstract int getHorizontalOffset(); - @Attribute(defaultValue = "0") + @Attribute public abstract int getVerticalOffset(); //TODO is it correct or cdk issue - @Attribute(defaultValue = "org.richfaces.component.Positioning.DEFAULT") + @Attribute public abstract Positioning getJointPoint(); - @Attribute(defaultValue = "org.richfaces.component.Positioning.DEFAULT") + @Attribute public abstract Positioning getDirection(); @Attribute(events = @EventName("groupshow")) Modified: trunk/ui/output/ui/src/main/java/org/richfaces/component/AbstractMenuGroup.java =================================================================== --- trunk/ui/output/ui/src/main/java/org/richfaces/component/AbstractMenuGroup.java 2011-01-17 22:49:07 UTC (rev 21048) +++ trunk/ui/output/ui/src/main/java/org/richfaces/component/AbstractMenuGroup.java 2011-01-18 08:48:25 UTC (rev 21049) @@ -41,17 +41,17 @@ @Attribute public abstract String getStyle(); - @Attribute(defaultValue = "org.richfaces.component.Positioning.DEFAULT") + @Attribute public abstract Positioning getDirection(); //TODO is it correct or cdk issue - @Attribute(defaultValue = "org.richfaces.component.Positioning.DEFAULT") + @Attribute public abstract Positioning getJointPoint(); - @Attribute(defaultValue = "0") + @Attribute public abstract String getVerticalOffset(); - @Attribute(defaultValue = "0") + @Attribute public abstract String getHorizontalOffset(); @Attribute(events = @EventName("show")) Modified: trunk/ui/output/ui/src/main/java/org/richfaces/component/AbstractMenuItem.java =================================================================== --- trunk/ui/output/ui/src/main/java/org/richfaces/component/AbstractMenuItem.java 2011-01-17 22:49:07 UTC (rev 21048) +++ trunk/ui/output/ui/src/main/java/org/richfaces/component/AbstractMenuItem.java 2011-01-18 08:48:25 UTC (rev 21049) @@ -17,7 +17,7 @@ public static final String COMPONENT_TYPE = "org.richfaces.MenuItem"; @Attribute - public abstract String getMode(); + public abstract Mode getMode(); @Attribute public abstract Object getLabel(); Modified: trunk/ui/output/ui/src/main/java/org/richfaces/renderkit/html/DropDownMenuRendererBase.java =================================================================== --- trunk/ui/output/ui/src/main/java/org/richfaces/renderkit/html/DropDownMenuRendererBase.java 2011-01-17 22:49:07 UTC (rev 21048) +++ trunk/ui/output/ui/src/main/java/org/richfaces/renderkit/html/DropDownMenuRendererBase.java 2011-01-18 08:48:25 UTC (rev 21049) @@ -15,6 +15,8 @@ import org.richfaces.component.AbstractMenuGroup; import org.richfaces.component.AbstractMenuItem; import org.richfaces.component.AbstractMenuSeparator; +import org.richfaces.component.Mode; +import org.richfaces.component.Positioning; import org.richfaces.renderkit.RenderKitUtils; import org.richfaces.renderkit.RenderKitUtils.ScriptHashVariableWrapper; import org.richfaces.renderkit.RendererBase; @@ -30,8 +32,7 @@ @ResourceDependency(library = "org.richfaces", name = "dropdownmenu.ecss", target="head"), @ResourceDependency(library = "org.richfaces", name = "menuKeyNavigation.js"), @ResourceDependency(library = "org.richfaces", name = "menu-base.js"), - @ResourceDependency(library = "org.richfaces", name = "menu.js"), - @ResourceDependency(library = "org.richfaces", name = "popupList.js")}) + @ResourceDependency(library = "org.richfaces", name = "menu.js")}) public abstract class DropDownMenuRendererBase extends RendererBase { public static final String RENDERER_TYPE = "org.richfaces.DropDownMenuRenderer"; @@ -90,15 +91,57 @@ RenderKitUtils.addToScriptHash(map, "onshow", group.getOnshow(), null, ScriptHashVariableWrapper.eventHandler); RenderKitUtils.addToScriptHash(map, "verticalOffset", group.getVerticalOffset(), "0"); RenderKitUtils.addToScriptHash(map, "horizontalOffset", group.getHorizontalOffset(), "0"); - RenderKitUtils.addToScriptHash(map, "jointPoint", group.getJointPoint(), org.richfaces.component.Positioning.DEFAULT); - RenderKitUtils.addToScriptHash(map, "direction", group.getDirection(), org.richfaces.component.Positioning.DEFAULT); + + Positioning jointPoint = group.getJointPoint(); + if (jointPoint == null) { + jointPoint = org.richfaces.component.Positioning.DEFAULT; + } + RenderKitUtils.addToScriptHash(map, "jointPoint", jointPoint, org.richfaces.component.Positioning.DEFAULT); + Positioning direction = group.getDirection(); + if (direction == null) { + direction = org.richfaces.component.Positioning.DEFAULT; + } + RenderKitUtils.addToScriptHash(map, "direction", direction, org.richfaces.component.Positioning.DEFAULT); + results.add(map); } } return results; } + + protected int getPopupWidth(UIComponent component) { + int width = ((AbstractDropDownMenu) component).getPopupWidth(); + if (width <= 0) { + width = DEFAULT_MIN_POPUP_WIDTH; + } + return width; + } + protected Mode getMode(UIComponent component) { + Mode mode = ((AbstractDropDownMenu) component).getMode(); + if (mode == null) { + mode = Mode.server; + } + return mode; + } + + protected Positioning getJointPoint(UIComponent component) { + Positioning jointPoint = ((AbstractDropDownMenu) component).getJointPoint(); + if (jointPoint == null) { + jointPoint = org.richfaces.component.Positioning.DEFAULT; + } + return jointPoint; + } + + protected Positioning getDirection(UIComponent component) { + Positioning direction = ((AbstractDropDownMenu) component).getDirection(); + if (direction == null) { + direction = org.richfaces.component.Positioning.DEFAULT; + } + return direction; + } + private void getMenuGroups(UIComponent component, List<AbstractMenuGroup> list) { if (component != null && list != null) { for (UIComponent c : component.getChildren()) { @@ -110,10 +153,11 @@ } } - protected int getMinPopupWidth(FacesContext facesContext, UIComponent component) { - if (component instanceof AbstractDropDownMenu) { - ((AbstractDropDownMenu) component).getPopupWith(); + protected String getShowEvent(UIComponent component) { + String value = ((AbstractDropDownMenu) component).getShowEvent(); + if (value == null || "".equals(value)) { + value = "click"; } - return DEFAULT_MIN_POPUP_WIDTH; + return value; } } Modified: trunk/ui/output/ui/src/main/java/org/richfaces/renderkit/html/MenuGroupRendererBase.java =================================================================== --- trunk/ui/output/ui/src/main/java/org/richfaces/renderkit/html/MenuGroupRendererBase.java 2011-01-17 22:49:07 UTC (rev 21048) +++ trunk/ui/output/ui/src/main/java/org/richfaces/renderkit/html/MenuGroupRendererBase.java 2011-01-18 08:48:25 UTC (rev 21049) @@ -86,10 +86,14 @@ protected int getMinPopupWidth(FacesContext facesContext, UIComponent component) { UIComponent parent = getDDMenu(facesContext, component); + int width = 0; if (parent != null) { - return ((AbstractDropDownMenu) parent).getPopupWith(); + width = ((AbstractDropDownMenu) parent).getPopupWidth(); + if (width <= 0) { + width = DEFAULT_MIN_POPUP_WIDTH; + } } - return DEFAULT_MIN_POPUP_WIDTH; + return width; } /** Modified: trunk/ui/output/ui/src/main/java/org/richfaces/renderkit/html/MenuItemRendererBase.java =================================================================== --- trunk/ui/output/ui/src/main/java/org/richfaces/renderkit/html/MenuItemRendererBase.java 2011-01-17 22:49:07 UTC (rev 21048) +++ trunk/ui/output/ui/src/main/java/org/richfaces/renderkit/html/MenuItemRendererBase.java 2011-01-18 08:48:25 UTC (rev 21049) @@ -56,7 +56,6 @@ @Override public void doDecode(FacesContext context, UIComponent component) { AbstractMenuItem menuItem = (AbstractMenuItem) component; - if (menuItem != null) { Mode mode = resolveSubmitMode(menuItem); if (!Mode.client.equals(mode)) { @@ -111,13 +110,13 @@ } protected Mode resolveSubmitMode(AbstractMenuItem menuItem) { - String submitMode = menuItem.getMode(); + Mode submitMode = menuItem.getMode(); if (null != submitMode) { - return Mode.valueOf(submitMode); + return submitMode; } AbstractDropDownMenu parent = getDDMenu(menuItem); if (parent != null) { - return Mode.valueOf(parent.getMode()); + return parent.getMode(); } return Mode.server; } @@ -135,7 +134,13 @@ return concatClasses(styleClass, component.getAttributes().get(menuItemStyle)); } - + + /** + * Finds a parent of given UI <code>component</code>. + * @param component <code>UIComponent</code> + * @param parentClass <code>Class</code> of desired parent + * @return <code>UIComponent</code> + */ private UIComponent getParent(UIComponent component, Class<?> parentClass) { if (component != null && parentClass != null) { UIComponent parent = component.getParent(); Modified: trunk/ui/output/ui/src/main/templates/dropdownmenu.template.xml =================================================================== --- trunk/ui/output/ui/src/main/templates/dropdownmenu.template.xml 2011-01-17 22:49:07 UTC (rev 21048) +++ trunk/ui/output/ui/src/main/templates/dropdownmenu.template.xml 2011-01-18 08:48:25 UTC (rev 21049) @@ -41,7 +41,7 @@ <c:if test="#{not isDisabled(facesContext, component)}"> <div class="rf-ddm-pos"> - <div id="#{clientId}_list" class="rf-ddm-lst" style="display:none;min-width:#{getMinPopupWidth(facesContext, component)}px;"> + <div id="#{clientId}_list" class="rf-ddm-lst" style="display:none;min-width:#{getPopupWidth(component)}px;"> <div class="rf-ddm-lst-bg"> <cdk:call expression="renderChildren(facesContext, component)" /> </div> @@ -50,9 +50,11 @@ <script type="text/javascript"> <cdk:scriptObject name="options"> - <cdk:call expression='addToScriptHash(options, "direction", ((org.richfaces.component.Positioning)component.getAttributes().get("direction")).getValue())' /> - <cdk:call expression='addToScriptHash(options, "jointPoint", ((org.richfaces.component.Positioning)component.getAttributes().get("jointPoint")).getValue())' /> - <cdk:scriptOption attributes="hideDelay showEvent showDelay popupWith mode horizontalOffset verticalOffset" /> + <cdk:scriptOption name="direction" value="#{getDirection(component)}"/> + <cdk:scriptOption name="jointPoint" value="#{getJointPoint(component)}"/> + <cdk:scriptOption name="showEvent" value="#{getShowEvent(component)}"/> + <cdk:scriptOption name="mode" value="#{getMode(component)}"/> + <cdk:scriptOption attributes="hideDelay showEvent showDelay horizontalOffset verticalOffset" /> <cdk:scriptOption attributes="onshow onhide ongroupshow ongrouphide onitemclick" wrapper="eventHandler"/> </cdk:scriptObject> Added: 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 (rev 0) +++ trunk/ui/output/ui/src/test/java/org/richfaces/renderkit/html/DropDownMenuRendererTest.java 2011-01-18 08:48:25 UTC (rev 21049) @@ -0,0 +1,84 @@ +/* + * JBoss, Home of Professional Open Source + * Copyright ${year}, Red Hat, Inc. and individual contributors + * by the @authors tag. See the copyright.txt in the distribution for a + * full listing of individual contributors. + * + * This is free software; you can redistribute it and/or modify it + * under the terms of the GNU Lesser General Public License as + * published by the Free Software Foundation; either version 2.1 of + * the License, or (at your option) any later version. + * + * This software is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this software; if not, write to the Free + * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA + * 02110-1301 USA, or see the FSF site: http://www.fsf.org. + */ +package org.richfaces.renderkit.html; + +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertNotNull; + +import java.io.File; +import java.io.IOException; +import java.net.URISyntaxException; + +import org.jboss.test.faces.htmlunit.HtmlUnitEnvironment; +import org.junit.Test; +import org.richfaces.component.DropDownMenuBean; +import org.xml.sax.SAXException; + +import com.gargoylesoftware.htmlunit.html.HtmlDivision; +import com.gargoylesoftware.htmlunit.html.HtmlPage; + +public class DropDownMenuRendererTest extends RendererTestBase { + + @Override + public void setUp() throws URISyntaxException { + environment = new HtmlUnitEnvironment(); + environment.withWebRoot(new File(this.getClass().getResource(".").toURI())); + environment.withResource("/WEB-INF/faces-config.xml", "org/richfaces/component/faces-config.xml"); + environment.start(); + } + + @Test + public void testDoEncodeServerMode() throws IOException, SAXException { + doTest("dropDownMenu_serverMode", "form:ddmenu"); + } + + @Test + public void testDoEncodeAjaxMode() throws IOException, SAXException { + doTest("dropDownMenu_ajaxMode", "form:ddmenu"); + } + + @Test + public void testServerClick() throws IOException, SAXException { + HtmlPage page = environment.getPage("/dropDownMenu_serverMode.jsf"); + HtmlDivision item = (HtmlDivision) page.getElementById("form:saveAll"); + assertNotNull(item); + DropDownMenuBean.setCurrent("none"); + item.click(); + + item = (HtmlDivision) page.getElementById("form:saveAll"); + assertNotNull(item); + assertEquals("action", DropDownMenuBean.getCurrent()); + } + + @Test + public void testAjaxClick() throws IOException, SAXException { + HtmlPage page = environment.getPage("/dropDownMenu_ajaxMode.jsf"); + HtmlDivision item = (HtmlDivision) page.getElementById("form:saveAll"); + assertNotNull(item); + DropDownMenuBean.setCurrent("none"); + item.click(); + + item = (HtmlDivision) page.getElementById("form:saveAll"); + assertNotNull(item); + assertEquals("action", DropDownMenuBean.getCurrent()); + } +} Deleted: trunk/ui/output/ui/src/test/java/org/richfaces/renderkit/html/DrowDownMenuRendererTest.java =================================================================== --- trunk/ui/output/ui/src/test/java/org/richfaces/renderkit/html/DrowDownMenuRendererTest.java 2011-01-17 22:49:07 UTC (rev 21048) +++ trunk/ui/output/ui/src/test/java/org/richfaces/renderkit/html/DrowDownMenuRendererTest.java 2011-01-18 08:48:25 UTC (rev 21049) @@ -1,85 +0,0 @@ -/* - * JBoss, Home of Professional Open Source - * Copyright ${year}, Red Hat, Inc. and individual contributors - * by the @authors tag. See the copyright.txt in the distribution for a - * full listing of individual contributors. - * - * This is free software; you can redistribute it and/or modify it - * under the terms of the GNU Lesser General Public License as - * published by the Free Software Foundation; either version 2.1 of - * the License, or (at your option) any later version. - * - * This software is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this software; if not, write to the Free - * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA - * 02110-1301 USA, or see the FSF site: http://www.fsf.org. - */ -package org.richfaces.renderkit.html; - -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertNotNull; - -import java.io.File; -import java.io.IOException; -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; - -import com.gargoylesoftware.htmlunit.html.HtmlDivision; -import com.gargoylesoftware.htmlunit.html.HtmlPage; - -public class DrowDownMenuRendererTest extends RendererTestBase { - - @Override - public void setUp() throws URISyntaxException { - environment = new HtmlUnitEnvironment(); - environment.withWebRoot(new File(this.getClass().getResource(".").toURI())); - environment.withResource("/WEB-INF/faces-config.xml", "org/richfaces/component/faces-config.xml"); - environment.start(); - } - - @Test - public void testDoEncodeServerMode() throws IOException, SAXException { - doTest("dropDownMenu_serverMode", "form:ddmenu"); - } - - @Test - public void testDoEncodeAjaxMode() throws IOException, SAXException { - doTest("dropDownMenu_ajaxMode", "form:ddmenu"); - } - - @Test - public void testServerClick() throws IOException, SAXException { - HtmlPage page = environment.getPage("/dropDownMenu_serverMode.jsf"); - HtmlDivision item = (HtmlDivision) page.getElementById("form:saveAll"); - assertNotNull(item); - DropDownMenuBean.setCurrent("none"); - item.click(); - - item = (HtmlDivision) page.getElementById("form:saveAll"); - assertNotNull(item); - assertEquals("action", DropDownMenuBean.getCurrent()); - } - - @Test - public void testAjaxClick() throws IOException, SAXException { - HtmlPage page = environment.getPage("/dropDownMenu_ajaxMode.jsf"); - HtmlDivision item = (HtmlDivision) page.getElementById("form:saveAll"); - assertNotNull(item); - DropDownMenuBean.setCurrent("none"); - item.click(); - - item = (HtmlDivision) page.getElementById("form:saveAll"); - assertNotNull(item); - assertEquals("action", DropDownMenuBean.getCurrent()); - } -} Modified: trunk/ui/output/ui/src/test/resources/org/richfaces/renderkit/html/dropDownMenu_ajaxMode.xmlunit.xml =================================================================== --- trunk/ui/output/ui/src/test/resources/org/richfaces/renderkit/html/dropDownMenu_ajaxMode.xmlunit.xml 2011-01-17 22:49:07 UTC (rev 21048) +++ trunk/ui/output/ui/src/test/resources/org/richfaces/renderkit/html/dropDownMenu_ajaxMode.xmlunit.xml 2011-01-18 08:48:25 UTC (rev 21049) @@ -41,7 +41,7 @@ </span> <script type="text/javascript"> //<![CDATA[ -new RichFaces.ui.MenuItem("form:save",{"submitFunction":function(event){RichFaces.ajax("form:save",event,{"incId":"1"} );return false;}} ); +new RichFaces.ui.MenuItem("form:save",{"submitFunction":function(event){RichFaces.ajax("form:save",event,{"incId":"1"});return false;}}); //]]> </script> </div> @@ -60,7 +60,7 @@ <script type="text/javascript"> //<![CDATA[ -new RichFaces.ui.MenuItem("form:saveAll",{"submitFunction":function(event){RichFaces.ajax("form:saveAll",event,{"incId":"1"} );return false;}} ); +new RichFaces.ui.MenuItem("form:saveAll",{"submitFunction":function(event){RichFaces.ajax("form:saveAll",event,{"incId":"1"});return false;}}); //]]> </script> </div> @@ -73,7 +73,7 @@ </div> <script type="text/javascript"> //<![CDATA[ -new RichFaces.ui.Menu("form:ddmenu",{"direction":"AA","jointPoint":"AA","mode":"ajax"} ).initiateGroups([{"id":"form:group"} ] ); +new RichFaces.ui.Menu("form:ddmenu",{"direction":"auto","jointPoint":"auto","showEvent":"click","mode":"ajax"}).initiateGroups([{"id":"form:group"} ] ); //]]> </script> </div> \ No newline at end of file Modified: trunk/ui/output/ui/src/test/resources/org/richfaces/renderkit/html/dropDownMenu_serverMode.xmlunit.xml =================================================================== --- trunk/ui/output/ui/src/test/resources/org/richfaces/renderkit/html/dropDownMenu_serverMode.xmlunit.xml 2011-01-17 22:49:07 UTC (rev 21048) +++ trunk/ui/output/ui/src/test/resources/org/richfaces/renderkit/html/dropDownMenu_serverMode.xmlunit.xml 2011-01-18 08:48:25 UTC (rev 21049) @@ -16,7 +16,7 @@ </span> <script type="text/javascript"> //<![CDATA[ -new RichFaces.ui.MenuItem("form:open", {"submitFunction": function(event){RichFaces.submitForm("form", {"form:open":"form:open"})}}); +new RichFaces.ui.MenuItem("form:open",{"submitFunction":function(event){RichFaces.submitForm("form",{"form:open":"form:open"} )}} ); //]]> </script> </div> @@ -72,7 +72,7 @@ </div> <script type="text/javascript"> //<![CDATA[ -new RichFaces.ui.Menu("form:ddmenu", {"direction":"AA","jointPoint":"AA"}).initiateGroups([{"id":"form:group"} ] ); +new RichFaces.ui.Menu("form:ddmenu",{"direction":"auto","jointPoint":"auto","showEvent":"click","mode":"server"} ).initiateGroups([{"id":"form:group"} ] ); //]]> </script> </div> \ No newline at end of file