January 2011 - richfaces-svn-commits

JBoss Rich Faces SVN: r21325 - in trunk/ui/output/ui/src/main/resources/META-INF: richfaces and 1 other directory.

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

Author: abelevich Date: 2011-01-31 09:45:02 -0500 (Mon, 31 Jan 2011) New Revision: 21325 Modified: trunk/ui/output/ui/src/main/resources/META-INF/resources/org.richfaces/panelMenu.ecss trunk/ui/output/ui/src/main/resources/META-INF/richfaces/resource-mappings.properties Log: RF-10353 Panels: update disabled items styling Modified: trunk/ui/output/ui/src/main/resources/META-INF/resources/org.richfaces/panelMenu.ecss =================================================================== --- trunk/ui/output/ui/src/main/resources/META-INF/resources/org.richfaces/panelMenu.ecss 2011-01-31 14:40:12 UTC (rev 21324) +++ trunk/ui/output/ui/src/main/resources/META-INF/resources/org.richfaces/panelMenu.ecss 2011-01-31 14:45:02 UTC (rev 21325) @@ -180,6 +180,8 @@ border-width: 1px; border-style: solid; border-color: '#{richSkin.panelBorderColor}'; + margin-bottom: 3px; + padding: 1px; } .rf-pm-top-gr-hov { @@ -209,7 +211,22 @@ font-weight: bold; } -.rf-pm-top-gr-hdr-dis, .rf-pm-gr-hdr-dis, .rf-pm-itm-dis, .rf-pm-top-itm-dis { +.rf-pm-top-gr-hdr-dis { + color: '#{richSkin.tabDisabledTextColor}'; + padding: 2px 1px 2px 2px; + cursor: default; + padding-top: 2px; + cursor: pointer; + white-space: nowrap; + + background-image: "url(#{resource['org.richfaces.images:pmenu_bg_dis.png']})"; + background-position: top left; + background-repeat: repeat-x; + background-color: '#{richSkin.additionalBackgroundColor}'; + font-weight: bold; +} + +.rf-pm-gr-hdr-dis, .rf-pm-itm-dis, .rf-pm-top-itm-dis { color: '#{richSkin.tabDisabledTextColor}'; cursor: default; } Modified: trunk/ui/output/ui/src/main/resources/META-INF/richfaces/resource-mappings.properties =================================================================== --- trunk/ui/output/ui/src/main/resources/META-INF/richfaces/resource-mappings.properties 2011-01-31 14:40:12 UTC (rev 21324) +++ trunk/ui/output/ui/src/main/resources/META-INF/richfaces/resource-mappings.properties 2011-01-31 14:45:02 UTC (rev 21325) @@ -9,6 +9,9 @@ org.richfaces.images\:pmenu_bg.png=org.richfaces.renderkit.html.BaseGradient\ {width=5, height=26, baseColorParam=headerGradientColor, gradientColorParam=headerBackgroundColor} + +org.richfaces.images\:pmenu_bg_dis.png=org.richfaces.renderkit.html.BaseGradient\ + {width=2, height=27, baseColorParam=additionalBackgroundColor, gradientColorParam=headerGradientColor} org.richfaces.images\:actLeftTabBg.png=org.richfaces.renderkit.html.BaseGradient\ {width=26, height=5, baseColorParam=tabBackgroundColor, gradientColorParam=generalBackgroundColor, horizontal=true}

13 years, 10 months

1
0
0 / 0

JBoss Rich Faces SVN: r21324 - in modules/tests/metamer/trunk: ftest-source/src/main/java/org/richfaces/tests/metamer/ftest and 1 other directories.

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

Author: ppitonak(a)redhat.com Date: 2011-01-31 09:40:12 -0500 (Mon, 31 Jan 2011) New Revision: 21324 Added: modules/tests/metamer/trunk/application/src/main/resources/org/richfaces/tests/metamer/bean/RichFileUploadBean.properties modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/richFileUpload/ modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/richFileUpload/TestRichFileUpload.java Log: https://issues.jboss.org/browse/RFPL-949 * added 18 tests for rich:fileUpload Added: modules/tests/metamer/trunk/application/src/main/resources/org/richfaces/tests/metamer/bean/RichFileUploadBean.properties =================================================================== --- modules/tests/metamer/trunk/application/src/main/resources/org/richfaces/tests/metamer/bean/RichFileUploadBean.properties (rev 0) +++ modules/tests/metamer/trunk/application/src/main/resources/org/richfaces/tests/metamer/bean/RichFileUploadBean.properties 2011-01-31 14:40:12 UTC (rev 21324) @@ -0,0 +1,4 @@ +attr.dir.ltr=ltr +attr.dir.rtl=rtl +attr.dir.null= + Added: modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/richFileUpload/TestRichFileUpload.java =================================================================== --- modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/richFileUpload/TestRichFileUpload.java (rev 0) +++ modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/richFileUpload/TestRichFileUpload.java 2011-01-31 14:40:12 UTC (rev 21324) @@ -0,0 +1,163 @@ +/******************************************************************************* + * JBoss, Home of Professional Open Source + * Copyright 2010-2011, 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.tests.metamer.ftest.richFileUpload; + +import static org.jboss.test.selenium.utils.URLUtils.buildUrl; +import static org.testng.Assert.assertFalse; +import static org.testng.Assert.assertTrue; + +import java.net.URL; + +import org.jboss.test.selenium.dom.Event; +import org.jboss.test.selenium.locator.JQueryLocator; +import org.richfaces.tests.metamer.ftest.AbstractMetamerTest; +import org.testng.annotations.Test; + +/** + * Test case for page faces/components/richFileUpload/simple.xhtml. + * + * @author <a href="mailto:ppitonak@redhat.com">Pavol Pitonak</a> + * @version $Revision$ + */ +public class TestRichFileUpload extends AbstractMetamerTest { + + private JQueryLocator fileUpload = pjq("div[id$=fileUpload]"); + private JQueryLocator input = pjq("input.rf-fu-inp:nth-child({0})"); + private JQueryLocator addButton = pjq("span.rf-fu-btn-add"); + private JQueryLocator addButtonDisabled = pjq("span.rf-fu-btn-add-dis"); + private JQueryLocator uploadButton = pjq("span.rf-fu-btn-upl"); + private JQueryLocator clearAllButton = pjq("span.rf-fu-btn-clr"); + private JQueryLocator list = pjq("div.rf-fu-lst"); + private JQueryLocator item = pjq("div.rf-fu-itm:nth-child({0})"); + private JQueryLocator itemLabel = pjq("div.rf-fu-itm:nth-child({0}) .rf-fu-itm-lbl"); + private JQueryLocator itemStatus = pjq("div.rf-fu-itm:nth-child({0}) .rf-fu-itm-st"); + private JQueryLocator itemClear = pjq("div.rf-fu-itm:nth-child({0}) .rf-fu-itm-rgh a"); + + @Override + public URL getTestUrl() { + return buildUrl(contextPath, "faces/components/richFileUpload/simple.xhtml"); + } + + @Test + public void testInit() { + assertTrue(selenium.isElementPresent(fileUpload), "File upload is not on the page."); + assertTrue(selenium.isVisible(addButton), "Add button should be on the page."); + assertFalse(selenium.isElementPresent(addButtonDisabled), "Disabled add button should not be on the page."); + assertFalse(selenium.isVisible(uploadButton), "Upload button should not be on the page."); + assertFalse(selenium.isVisible(clearAllButton), "Clear all button should not be on the page."); + } + + @Test + public void testDir() { + testDir(fileUpload); + } + + @Test + public void testDisabled() { + selenium.click(pjq("input[type=radio][name$=disabledInput][value=true]")); + selenium.waitForPageToLoad(); + + assertTrue(selenium.isElementPresent(fileUpload), "File upload is not on the page."); + assertFalse(selenium.isElementPresent(addButton), "Add button should not be on the page."); + assertTrue(selenium.isVisible(addButtonDisabled), "Disabled add button should be on the page."); + assertFalse(selenium.isElementPresent(uploadButton), "Upload button should not be on the page."); + assertFalse(selenium.isElementPresent(clearAllButton), "Clear all button should not be on the page."); + } + + @Test + public void testLang() { + testLang(fileUpload); + } + + @Test + public void testOnclick() { + testFireEvent(Event.CLICK, fileUpload); + } + + @Test + public void testOndblclick() { + testFireEvent(Event.DBLCLICK, fileUpload); + } + + @Test + public void testOnkeydown() { + testFireEvent(Event.KEYDOWN, fileUpload); + } + + @Test + public void testOnkeypress() { + testFireEvent(Event.KEYPRESS, fileUpload); + } + + @Test + public void testOnkeyup() { + testFireEvent(Event.KEYUP, fileUpload); + } + + @Test + public void testOnmousedown() { + testFireEvent(Event.MOUSEDOWN, fileUpload); + } + + @Test + public void testOnmousemove() { + testFireEvent(Event.MOUSEMOVE, fileUpload); + } + + @Test + public void testOnmouseout() { + testFireEvent(Event.MOUSEOUT, fileUpload); + } + + @Test + public void testOnmouseover() { + testFireEvent(Event.MOUSEOVER, fileUpload); + } + + @Test + public void testOnmouseup() { + testFireEvent(Event.MOUSEUP, fileUpload); + } + + @Test + public void testRendered() { + selenium.click(pjq("input[type=radio][name$=renderedInput][value=false]")); + selenium.waitForPageToLoad(); + + assertFalse(selenium.isElementPresent(fileUpload), "Component should not be rendered when rendered=false."); + } + + @Test + public void testStyle() { + testStyle(fileUpload, "style"); + } + + @Test + public void testStyleClass() { + testStyleClass(fileUpload, "styleClass"); + } + + @Test + public void testTitle() { + testTitle(fileUpload); + } +} Property changes on: modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/richFileUpload/TestRichFileUpload.java ___________________________________________________________________ Name: svn:keywords + Revision

13 years, 10 months

1
0
0 / 0

JBoss Rich Faces SVN: r21323 - trunk/ui/core/ui/src/main/java/org/richfaces/renderkit/html.

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

Author: nbelaevski Date: 2011-01-31 09:34:56 -0500 (Mon, 31 Jan 2011) New Revision: 21323 Modified: trunk/ui/core/ui/src/main/java/org/richfaces/renderkit/html/AjaxPollRenderer.java Log: https://issues.jboss.org/browse/RF-10361 Modified: trunk/ui/core/ui/src/main/java/org/richfaces/renderkit/html/AjaxPollRenderer.java =================================================================== --- trunk/ui/core/ui/src/main/java/org/richfaces/renderkit/html/AjaxPollRenderer.java 2011-01-31 13:42:56 UTC (rev 21322) +++ trunk/ui/core/ui/src/main/java/org/richfaces/renderkit/html/AjaxPollRenderer.java 2011-01-31 14:34:56 UTC (rev 21323) @@ -98,10 +98,6 @@ handlersChain.addBehaviors(AbstractPoll.TIMER); handlersChain.addInlineHandlerFromAttribute(AbstractPoll.ON_BEGIN); handlersChain.addBehaviors(AbstractPoll.BEGIN); - handlersChain.addInlineHandlerFromAttribute(AbstractPoll.ON_COMPLETE); - handlersChain.addBehaviors(AbstractPoll.COMPLETE); - handlersChain.addInlineHandlerFromAttribute(AbstractPoll.ON_BEFOREDOMUPDATE); - handlersChain.addBehaviors(AbstractPoll.BEFOREDOMUPDATE); handlersChain.addAjaxSubmitFunction(); String handler = handlersChain.toScript();

13 years, 10 months

1
0
0 / 0

JBoss Rich Faces SVN: r21322 - in modules/tests/metamer/trunk: application/src/main/resources/org/richfaces/tests/metamer/bean and 10 other directories.

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

Author: ppitonak(a)redhat.com Date: 2011-01-31 08:42:56 -0500 (Mon, 31 Jan 2011) New Revision: 21322 Modified: modules/tests/metamer/trunk/application/src/main/java/org/richfaces/tests/metamer/bean/RichFileUploadBean.java modules/tests/metamer/trunk/application/src/main/java/org/richfaces/tests/metamer/bean/RichTabBean.java modules/tests/metamer/trunk/application/src/main/resources/org/richfaces/tests/metamer/bean/RichAccordionBean.properties modules/tests/metamer/trunk/application/src/main/resources/org/richfaces/tests/metamer/bean/RichAccordionItemBean.properties modules/tests/metamer/trunk/application/src/main/resources/org/richfaces/tests/metamer/bean/RichCollapsiblePanelBean.properties modules/tests/metamer/trunk/application/src/main/webapp/components/richAccordion/simple.xhtml modules/tests/metamer/trunk/application/src/main/webapp/components/richAccordionItem/simple.xhtml modules/tests/metamer/trunk/application/src/main/webapp/components/richCollapsiblePanel/facets.xhtml modules/tests/metamer/trunk/application/src/main/webapp/components/richCollapsiblePanel/simple.xhtml modules/tests/metamer/trunk/application/src/main/webapp/components/richFileUpload/simple.xhtml modules/tests/metamer/trunk/application/src/main/webapp/components/richTab/simple.xhtml modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/richAccordion/TestRichAccordion.java modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/richAccordionItem/TestRichAccordionItem.java modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/richCollapsiblePanel/TestRichCollapsiblePanel.java modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/richTab/TestRichTab.java modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/richTabPanel/TestRichTabPanel.java Log: * tests and samples fixed because of renamed class and icon attributes Modified: modules/tests/metamer/trunk/application/src/main/java/org/richfaces/tests/metamer/bean/RichFileUploadBean.java =================================================================== --- modules/tests/metamer/trunk/application/src/main/java/org/richfaces/tests/metamer/bean/RichFileUploadBean.java 2011-01-31 13:40:36 UTC (rev 21321) +++ modules/tests/metamer/trunk/application/src/main/java/org/richfaces/tests/metamer/bean/RichFileUploadBean.java 2011-01-31 13:42:56 UTC (rev 21322) @@ -62,7 +62,6 @@ attributes = Attributes.getComponentAttributesFromFacesConfig(UIFileUpload.class, getClass()); - attributes.setAttribute("enabled", true); attributes.setAttribute("noDuplicate", false); attributes.setAttribute("rendered", true); Modified: modules/tests/metamer/trunk/application/src/main/java/org/richfaces/tests/metamer/bean/RichTabBean.java =================================================================== --- modules/tests/metamer/trunk/application/src/main/java/org/richfaces/tests/metamer/bean/RichTabBean.java 2011-01-31 13:40:36 UTC (rev 21321) +++ modules/tests/metamer/trunk/application/src/main/java/org/richfaces/tests/metamer/bean/RichTabBean.java 2011-01-31 13:42:56 UTC (rev 21322) @@ -59,6 +59,9 @@ attributes.setAttribute("header", "tab1 header"); attributes.setAttribute("name", "tab1"); attributes.setAttribute("rendered", true); + + // will be tested in another way + attributes.remove("converter"); } public Attributes getAttributes() { Modified: modules/tests/metamer/trunk/application/src/main/resources/org/richfaces/tests/metamer/bean/RichAccordionBean.properties =================================================================== --- modules/tests/metamer/trunk/application/src/main/resources/org/richfaces/tests/metamer/bean/RichAccordionBean.properties 2011-01-31 13:40:36 UTC (rev 21321) +++ modules/tests/metamer/trunk/application/src/main/resources/org/richfaces/tests/metamer/bean/RichAccordionBean.properties 2011-01-31 13:42:56 UTC (rev 21322) @@ -7,75 +7,75 @@ attr.switchType.ajax=ajax attr.switchType.null= -attr.itemLeftIconActive.none=none -attr.itemLeftIconActive.grid=grid -attr.itemLeftIconActive.disc=disc -attr.itemLeftIconActive.chevronUp=chevronUp -attr.itemLeftIconActive.chevronDown=chevronDown -attr.itemLeftIconActive.triangle=triangle -attr.itemLeftIconActive.triangleUp=triangleUp -attr.itemLeftIconActive.triangleDown=triangleDown -attr.itemLeftIconActive.star=/resources/images/star.png -attr.itemLeftIconActive.nonexisting=nonexisting -attr.itemLeftIconActive.null= +attr.itemActiveLeftIcon.none=none +attr.itemActiveLeftIcon.grid=grid +attr.itemActiveLeftIcon.disc=disc +attr.itemActiveLeftIcon.chevronUp=chevronUp +attr.itemActiveLeftIcon.chevronDown=chevronDown +attr.itemActiveLeftIcon.triangle=triangle +attr.itemActiveLeftIcon.triangleUp=triangleUp +attr.itemActiveLeftIcon.triangleDown=triangleDown +attr.itemActiveLeftIcon.star=/resources/images/star.png +attr.itemActiveLeftIcon.nonexisting=nonexisting +attr.itemActiveLeftIcon.null= -attr.itemLeftIconDisabled.none=none -attr.itemLeftIconDisabled.grid=grid -attr.itemLeftIconDisabled.disc=disc -attr.itemLeftIconDisabled.chevronUp=chevronUp -attr.itemLeftIconDisabled.chevronDown=chevronDown -attr.itemLeftIconDisabled.triangle=triangle -attr.itemLeftIconDisabled.triangleUp=triangleUp -attr.itemLeftIconDisabled.triangleDown=triangleDown -attr.itemLeftIconDisabled.star=/resources/images/star.png -attr.itemLeftIconDisabled.nonexisting=nonexisting -attr.itemLeftIconDisabled.null= +attr.itemDisabledLeftIcon.none=none +attr.itemDisabledLeftIcon.grid=grid +attr.itemDisabledLeftIcon.disc=disc +attr.itemDisabledLeftIcon.chevronUp=chevronUp +attr.itemDisabledLeftIcon.chevronDown=chevronDown +attr.itemDisabledLeftIcon.triangle=triangle +attr.itemDisabledLeftIcon.triangleUp=triangleUp +attr.itemDisabledLeftIcon.triangleDown=triangleDown +attr.itemDisabledLeftIcon.star=/resources/images/star.png +attr.itemDisabledLeftIcon.nonexisting=nonexisting +attr.itemDisabledLeftIcon.null= -attr.itemLeftIconInactive.none=none -attr.itemLeftIconInactive.grid=grid -attr.itemLeftIconInactive.disc=disc -attr.itemLeftIconInactive.chevronUp=chevronUp -attr.itemLeftIconInactive.chevronDown=chevronDown -attr.itemLeftIconInactive.triangle=triangle -attr.itemLeftIconInactive.triangleUp=triangleUp -attr.itemLeftIconInactive.triangleDown=triangleDown -attr.itemLeftIconInactive.star=/resources/images/star.png -attr.itemLeftIconInactive.nonexisting=nonexisting -attr.itemLeftIconInactive.null= +attr.itemInactiveLeftIcon.none=none +attr.itemInactiveLeftIcon.grid=grid +attr.itemInactiveLeftIcon.disc=disc +attr.itemInactiveLeftIcon.chevronUp=chevronUp +attr.itemInactiveLeftIcon.chevronDown=chevronDown +attr.itemInactiveLeftIcon.triangle=triangle +attr.itemInactiveLeftIcon.triangleUp=triangleUp +attr.itemInactiveLeftIcon.triangleDown=triangleDown +attr.itemInactiveLeftIcon.star=/resources/images/star.png +attr.itemInactiveLeftIcon.nonexisting=nonexisting +attr.itemInactiveLeftIcon.null= -attr.itemRightIconActive.none=none -attr.itemRightIconActive.grid=grid -attr.itemRightIconActive.disc=disc -attr.itemRightIconActive.chevronUp=chevronUp -attr.itemRightIconActive.chevronDown=chevronDown -attr.itemRightIconActive.triangle=triangle -attr.itemRightIconActive.triangleUp=triangleUp -attr.itemRightIconActive.triangleDown=triangleDown -attr.itemRightIconActive.star=/resources/images/star.png -attr.itemRightIconActive.nonexisting=nonexisting -attr.itemRightIconActive.null= +attr.itemActiveRightIcon.none=none +attr.itemActiveRightIcon.grid=grid +attr.itemActiveRightIcon.disc=disc +attr.itemActiveRightIcon.chevronUp=chevronUp +attr.itemActiveRightIcon.chevronDown=chevronDown +attr.itemActiveRightIcon.triangle=triangle +attr.itemActiveRightIcon.triangleUp=triangleUp +attr.itemActiveRightIcon.triangleDown=triangleDown +attr.itemActiveRightIcon.star=/resources/images/star.png +attr.itemActiveRightIcon.nonexisting=nonexisting +attr.itemActiveRightIcon.null= -attr.itemRightIconDisabled.none=none -attr.itemRightIconDisabled.grid=grid -attr.itemRightIconDisabled.disc=disc -attr.itemRightIconDisabled.chevronUp=chevronUp -attr.itemRightIconDisabled.chevronDown=chevronDown -attr.itemRightIconDisabled.triangle=triangle -attr.itemRightIconDisabled.triangleUp=triangleUp -attr.itemRightIconDisabled.triangleDown=triangleDown -attr.itemRightIconDisabled.star=/resources/images/star.png -attr.itemRightIconDisabled.nonexisting=nonexisting -attr.itemRightIconDisabled.null= +attr.itemDisabledRightIcon.none=none +attr.itemDisabledRightIcon.grid=grid +attr.itemDisabledRightIcon.disc=disc +attr.itemDisabledRightIcon.chevronUp=chevronUp +attr.itemDisabledRightIcon.chevronDown=chevronDown +attr.itemDisabledRightIcon.triangle=triangle +attr.itemDisabledRightIcon.triangleUp=triangleUp +attr.itemDisabledRightIcon.triangleDown=triangleDown +attr.itemDisabledRightIcon.star=/resources/images/star.png +attr.itemDisabledRightIcon.nonexisting=nonexisting +attr.itemDisabledRightIcon.null= -attr.itemRightIconInactive.none=none -attr.itemRightIconInactive.grid=grid -attr.itemRightIconInactive.disc=disc -attr.itemRightIconInactive.chevronUp=chevronUp -attr.itemRightIconInactive.chevronDown=chevronDown -attr.itemRightIconInactive.triangle=triangle -attr.itemRightIconInactive.triangleUp=triangleUp -attr.itemRightIconInactive.triangleDown=triangleDown -attr.itemRightIconInactive.star=/resources/images/star.png -attr.itemRightIconInactive.nonexisting=nonexisting -attr.itemRightIconInactive.null= +attr.itemInactiveRightIcon.none=none +attr.itemInactiveRightIcon.grid=grid +attr.itemInactiveRightIcon.disc=disc +attr.itemInactiveRightIcon.chevronUp=chevronUp +attr.itemInactiveRightIcon.chevronDown=chevronDown +attr.itemInactiveRightIcon.triangle=triangle +attr.itemInactiveRightIcon.triangleUp=triangleUp +attr.itemInactiveRightIcon.triangleDown=triangleDown +attr.itemInactiveRightIcon.star=/resources/images/star.png +attr.itemInactiveRightIcon.nonexisting=nonexisting +attr.itemInactiveRightIcon.null= Modified: modules/tests/metamer/trunk/application/src/main/resources/org/richfaces/tests/metamer/bean/RichAccordionItemBean.properties =================================================================== --- modules/tests/metamer/trunk/application/src/main/resources/org/richfaces/tests/metamer/bean/RichAccordionItemBean.properties 2011-01-31 13:40:36 UTC (rev 21321) +++ modules/tests/metamer/trunk/application/src/main/resources/org/richfaces/tests/metamer/bean/RichAccordionItemBean.properties 2011-01-31 13:42:56 UTC (rev 21322) @@ -7,74 +7,74 @@ attr.switchType.ajax=ajax attr.switchType.null= -attr.leftIconActive.none=none -attr.leftIconActive.grid=grid -attr.leftIconActive.disc=disc -attr.leftIconActive.chevronUp=chevronUp -attr.leftIconActive.chevronDown=chevronDown -attr.leftIconActive.triangle=triangle -attr.leftIconActive.triangleUp=triangleUp -attr.leftIconActive.triangleDown=triangleDown -attr.leftIconActive.star=/resources/images/star.png -attr.leftIconActive.nonexisting=nonexisting -attr.leftIconActive.null= +attr.leftActiveIcon.none=none +attr.leftActiveIcon.grid=grid +attr.leftActiveIcon.disc=disc +attr.leftActiveIcon.chevronUp=chevronUp +attr.leftActiveIcon.chevronDown=chevronDown +attr.leftActiveIcon.triangle=triangle +attr.leftActiveIcon.triangleUp=triangleUp +attr.leftActiveIcon.triangleDown=triangleDown +attr.leftActiveIcon.star=/resources/images/star.png +attr.leftActiveIcon.nonexisting=nonexisting +attr.leftActiveIcon.null= -attr.leftIconDisabled.none=none -attr.leftIconDisabled.grid=grid -attr.leftIconDisabled.disc=disc -attr.leftIconDisabled.chevronUp=chevronUp -attr.leftIconDisabled.chevronDown=chevronDown -attr.leftIconDisabled.triangle=triangle -attr.leftIconDisabled.triangleUp=triangleUp -attr.leftIconDisabled.triangleDown=triangleDown -attr.leftIconDisabled.star=/resources/images/star.png -attr.leftIconDisabled.nonexisting=nonexisting -attr.leftIconDisabled.null= +attr.leftDisabledIcon.none=none +attr.leftDisabledIcon.grid=grid +attr.leftDisabledIcon.disc=disc +attr.leftDisabledIcon.chevronUp=chevronUp +attr.leftDisabledIcon.chevronDown=chevronDown +attr.leftDisabledIcon.triangle=triangle +attr.leftDisabledIcon.triangleUp=triangleUp +attr.leftDisabledIcon.triangleDown=triangleDown +attr.leftDisabledIcon.star=/resources/images/star.png +attr.leftDisabledIcon.nonexisting=nonexisting +attr.leftDisabledIcon.null= -attr.leftIconInactive.none=none -attr.leftIconInactive.grid=grid -attr.leftIconInactive.disc=disc -attr.leftIconInactive.chevronUp=chevronUp -attr.leftIconInactive.chevronDown=chevronDown -attr.leftIconInactive.triangle=triangle -attr.leftIconInactive.triangleUp=triangleUp -attr.leftIconInactive.triangleDown=triangleDown -attr.leftIconInactive.star=/resources/images/star.png -attr.leftIconInactive.nonexisting=nonexisting -attr.leftIconInactive.null= +attr.leftInactiveIcon.none=none +attr.leftInactiveIcon.grid=grid +attr.leftInactiveIcon.disc=disc +attr.leftInactiveIcon.chevronUp=chevronUp +attr.leftInactiveIcon.chevronDown=chevronDown +attr.leftInactiveIcon.triangle=triangle +attr.leftInactiveIcon.triangleUp=triangleUp +attr.leftInactiveIcon.triangleDown=triangleDown +attr.leftInactiveIcon.star=/resources/images/star.png +attr.leftInactiveIcon.nonexisting=nonexisting +attr.leftInactiveIcon.null= -attr.rightIconActive.none=none -attr.rightIconActive.grid=grid -attr.rightIconActive.disc=disc -attr.rightIconActive.chevronUp=chevronUp -attr.rightIconActive.chevronDown=chevronDown -attr.rightIconActive.triangle=triangle -attr.rightIconActive.triangleUp=triangleUp -attr.rightIconActive.triangleDown=triangleDown -attr.rightIconActive.star=/resources/images/star.png -attr.rightIconActive.nonexisting=nonexisting -attr.rightIconActive.null= +attr.rightActiveIcon.none=none +attr.rightActiveIcon.grid=grid +attr.rightActiveIcon.disc=disc +attr.rightActiveIcon.chevronUp=chevronUp +attr.rightActiveIcon.chevronDown=chevronDown +attr.rightActiveIcon.triangle=triangle +attr.rightActiveIcon.triangleUp=triangleUp +attr.rightActiveIcon.triangleDown=triangleDown +attr.rightActiveIcon.star=/resources/images/star.png +attr.rightActiveIcon.nonexisting=nonexisting +attr.rightActiveIcon.null= -attr.rightIconDisabled.none=none -attr.rightIconDisabled.grid=grid -attr.rightIconDisabled.disc=disc -attr.rightIconDisabled.chevronUp=chevronUp -attr.rightIconDisabled.chevronDown=chevronDown -attr.rightIconDisabled.triangle=triangle -attr.rightIconDisabled.triangleUp=triangleUp -attr.rightIconDisabled.triangleDown=triangleDown -attr.rightIconDisabled.star=/resources/images/star.png -attr.rightIconDisabled.nonexisting=nonexisting -attr.rightIconDisabled.null= +attr.rightDisabledIcon.none=none +attr.rightDisabledIcon.grid=grid +attr.rightDisabledIcon.disc=disc +attr.rightDisabledIcon.chevronUp=chevronUp +attr.rightDisabledIcon.chevronDown=chevronDown +attr.rightDisabledIcon.triangle=triangle +attr.rightDisabledIcon.triangleUp=triangleUp +attr.rightDisabledIcon.triangleDown=triangleDown +attr.rightDisabledIcon.star=/resources/images/star.png +attr.rightDisabledIcon.nonexisting=nonexisting +attr.rightDisabledIcon.null= -attr.rightIconInactive.none=none -attr.rightIconInactive.grid=grid -attr.rightIconInactive.disc=disc -attr.rightIconInactive.chevronUp=chevronUp -attr.rightIconInactive.chevronDown=chevronDown -attr.rightIconInactive.triangle=triangle -attr.rightIconInactive.triangleUp=triangleUp -attr.rightIconInactive.triangleDown=triangleDown -attr.rightIconInactive.star=/resources/images/star.png -attr.rightIconInactive.nonexisting=nonexisting -attr.rightIconInactive.null= +attr.rightInactiveIcon.none=none +attr.rightInactiveIcon.grid=grid +attr.rightInactiveIcon.disc=disc +attr.rightInactiveIcon.chevronUp=chevronUp +attr.rightInactiveIcon.chevronDown=chevronDown +attr.rightInactiveIcon.triangle=triangle +attr.rightInactiveIcon.triangleUp=triangleUp +attr.rightInactiveIcon.triangleDown=triangleDown +attr.rightInactiveIcon.star=/resources/images/star.png +attr.rightInactiveIcon.nonexisting=nonexisting +attr.rightInactiveIcon.null= Modified: modules/tests/metamer/trunk/application/src/main/resources/org/richfaces/tests/metamer/bean/RichCollapsiblePanelBean.properties =================================================================== --- modules/tests/metamer/trunk/application/src/main/resources/org/richfaces/tests/metamer/bean/RichCollapsiblePanelBean.properties 2011-01-31 13:40:36 UTC (rev 21321) +++ modules/tests/metamer/trunk/application/src/main/resources/org/richfaces/tests/metamer/bean/RichCollapsiblePanelBean.properties 2011-01-31 13:42:56 UTC (rev 21322) @@ -2,55 +2,55 @@ attr.dir.rtl=rtl attr.dir.null= -attr.leftIconCollapsed.none=none -attr.leftIconCollapsed.grid=grid -attr.leftIconCollapsed.disc=disc -attr.leftIconCollapsed.chevronUp=chevronUp -attr.leftIconCollapsed.chevronDown=chevronDown -attr.leftIconCollapsed.triangle=triangle -attr.leftIconCollapsed.triangleUp=triangleUp -attr.leftIconCollapsed.triangleDown=triangleDown -attr.leftIconCollapsed.star=/resources/images/star.png -attr.leftIconCollapsed.nonexisting=nonexisting -attr.leftIconCollapsed.null= +attr.leftCollapsedIcon.none=none +attr.leftCollapsedIcon.grid=grid +attr.leftCollapsedIcon.disc=disc +attr.leftCollapsedIcon.chevronUp=chevronUp +attr.leftCollapsedIcon.chevronDown=chevronDown +attr.leftCollapsedIcon.triangle=triangle +attr.leftCollapsedIcon.triangleUp=triangleUp +attr.leftCollapsedIcon.triangleDown=triangleDown +attr.leftCollapsedIcon.star=/resources/images/star.png +attr.leftCollapsedIcon.nonexisting=nonexisting +attr.leftCollapsedIcon.null= -attr.leftIconExpanded.none=none -attr.leftIconExpanded.grid=grid -attr.leftIconExpanded.disc=disc -attr.leftIconExpanded.chevronUp=chevronUp -attr.leftIconExpanded.chevronDown=chevronDown -attr.leftIconExpanded.triangle=triangle -attr.leftIconExpanded.triangleUp=triangleUp -attr.leftIconExpanded.triangleDown=triangleDown -attr.leftIconExpanded.star=/resources/images/star.png -attr.leftIconExpanded.nonexisting=nonexisting -attr.leftIconExpanded.null= +attr.leftExpandedIcon.none=none +attr.leftExpandedIcon.grid=grid +attr.leftExpandedIcon.disc=disc +attr.leftExpandedIcon.chevronUp=chevronUp +attr.leftExpandedIcon.chevronDown=chevronDown +attr.leftExpandedIcon.triangle=triangle +attr.leftExpandedIcon.triangleUp=triangleUp +attr.leftExpandedIcon.triangleDown=triangleDown +attr.leftExpandedIcon.star=/resources/images/star.png +attr.leftExpandedIcon.nonexisting=nonexisting +attr.leftExpandedIcon.null= -attr.rightIconCollapsed.none=none -attr.rightIconCollapsed.grid=grid -attr.rightIconCollapsed.disc=disc -attr.rightIconCollapsed.chevronUp=chevronUp -attr.rightIconCollapsed.chevronDown=chevronDown -attr.rightIconCollapsed.triangle=triangle -attr.rightIconCollapsed.triangleUp=triangleUp -attr.rightIconCollapsed.triangleDown=triangleDown -attr.rightIconCollapsed.star=/resources/images/star.png -attr.rightIconCollapsed.nonexisting=nonexisting -attr.rightIconCollapsed.null= +attr.rightCollapsedIcon.none=none +attr.rightCollapsedIcon.grid=grid +attr.rightCollapsedIcon.disc=disc +attr.rightCollapsedIcon.chevronUp=chevronUp +attr.rightCollapsedIcon.chevronDown=chevronDown +attr.rightCollapsedIcon.triangle=triangle +attr.rightCollapsedIcon.triangleUp=triangleUp +attr.rightCollapsedIcon.triangleDown=triangleDown +attr.rightCollapsedIcon.star=/resources/images/star.png +attr.rightCollapsedIcon.nonexisting=nonexisting +attr.rightCollapsedIcon.null= -attr.rightIconExpanded.none=none -attr.rightIconExpanded.grid=grid -attr.rightIconExpanded.disc=disc -attr.rightIconExpanded.chevronUp=chevronUp -attr.rightIconExpanded.chevronDown=chevronDown -attr.rightIconExpanded.triangle=triangle -attr.rightIconExpanded.triangleUp=triangleUp -attr.rightIconExpanded.triangleDown=triangleDown -attr.rightIconExpanded.star=/resources/images/star.png -attr.rightIconExpanded.nonexisting=nonexisting -attr.rightIconExpanded.null= +attr.rightExpandedIcon.none=none +attr.rightExpandedIcon.grid=grid +attr.rightExpandedIcon.disc=disc +attr.rightExpandedIcon.chevronUp=chevronUp +attr.rightExpandedIcon.chevronDown=chevronDown +attr.rightExpandedIcon.triangle=triangle +attr.rightExpandedIcon.triangleUp=triangleUp +attr.rightExpandedIcon.triangleDown=triangleDown +attr.rightExpandedIcon.star=/resources/images/star.png +attr.rightExpandedIcon.nonexisting=nonexisting +attr.rightExpandedIcon.null= attr.switchType.client=client attr.switchType.server=server attr.switchType.ajax=ajax -attr.switchType.none= \ No newline at end of file +attr.switchType.none= Modified: modules/tests/metamer/trunk/application/src/main/webapp/components/richAccordion/simple.xhtml =================================================================== --- modules/tests/metamer/trunk/application/src/main/webapp/components/richAccordion/simple.xhtml 2011-01-31 13:40:36 UTC (rev 21321) +++ modules/tests/metamer/trunk/application/src/main/webapp/components/richAccordion/simple.xhtml 2011-01-31 13:42:56 UTC (rev 21322) @@ -50,17 +50,17 @@ height="#{richAccordionBean.attributes['height'].value}" immediate="#{richAccordionBean.attributes['immediate'].value}" itemChangeListener="#{richBean.itemChangeListener}" + itemActiveHeaderClass="#{richAccordionBean.attributes['itemActiveHeaderClass'].value}" + itemActiveLeftIcon="#{richAccordionBean.attributes['itemActiveLeftIcon'].value}" + itemActiveRightIcon="#{richAccordionBean.attributes['itemActiveRightIcon'].value}" itemContentClass="#{richAccordionBean.attributes['itemContentClass'].value}" + itemDisabledHeaderClass="#{richAccordionBean.attributes['itemDisabledHeaderClass'].value}" + itemDisabledLeftIcon="#{richAccordionBean.attributes['itemDisabledLeftIcon'].value}" + itemDisabledRightIcon="#{richAccordionBean.attributes['itemDisabledRightIcon'].value}" itemHeaderClass="#{richAccordionBean.attributes['itemHeaderClass'].value}" - itemHeaderClassActive="#{richAccordionBean.attributes['itemHeaderClassActive'].value}" - itemHeaderClassDisabled="#{richAccordionBean.attributes['itemHeaderClassDisabled'].value}" - itemHeaderClassInactive="#{richAccordionBean.attributes['itemHeaderClassInactive'].value}" - itemLeftIconActive="#{richAccordionBean.attributes['itemLeftIconActive'].value}" - itemLeftIconDisabled="#{richAccordionBean.attributes['itemLeftIconDisabled'].value}" - itemLeftIconInactive="#{richAccordionBean.attributes['itemLeftIconInactive'].value}" - itemRightIconActive="#{richAccordionBean.attributes['itemRightIconActive'].value}" - itemRightIconDisabled="#{richAccordionBean.attributes['itemRightIconDisabled'].value}" - itemRightIconInactive="#{richAccordionBean.attributes['itemRightIconInactive'].value}" + itemInactiveHeaderClass="#{richAccordionBean.attributes['itemInactiveHeaderClass'].value}" + itemInactiveLeftIcon="#{richAccordionBean.attributes['itemInactiveLeftIcon'].value}" + itemInactiveRightIcon="#{richAccordionBean.attributes['itemInactiveRightIcon'].value}" lang="#{richAccordionBean.attributes['lang'].value}" limitRender="#{richAccordionBean.attributes['limitRender'].value}" onbeforedomupdate="#{richAccordionBean.attributes['onbeforedomupdate'].value}" Modified: modules/tests/metamer/trunk/application/src/main/webapp/components/richAccordionItem/simple.xhtml =================================================================== --- modules/tests/metamer/trunk/application/src/main/webapp/components/richAccordionItem/simple.xhtml 2011-01-31 13:40:36 UTC (rev 21321) +++ modules/tests/metamer/trunk/application/src/main/webapp/components/richAccordionItem/simple.xhtml 2011-01-31 13:42:56 UTC (rev 21322) @@ -46,15 +46,15 @@ dir="#{richAccordionItemBean.attributes['dir'].value}" disabled="#{richAccordionItemBean.attributes['disabled'].value}" header="#{richAccordionItemBean.attributes['header'].value}" + headerActiveClass="#{richAccordionItemBean.attributes['headerActiveClass'].value}" headerClass="#{richAccordionItemBean.attributes['headerClass'].value}" - headerClassActive="#{richAccordionItemBean.attributes['headerClassActive'].value}" - headerClassDisabled="#{richAccordionItemBean.attributes['headerClassDisabled'].value}" - headerClassInactive="#{richAccordionItemBean.attributes['headerClassInactive'].value}" + headerDisabledClass="#{richAccordionItemBean.attributes['headerDisabledClass'].value}" + headerInactiveClass="#{richAccordionItemBean.attributes['headerInactiveClass'].value}" headerStyle="#{richAccordionItemBean.attributes['headerStyle'].value}" lang="#{richAccordionItemBean.attributes['lang'].value}" - leftIconActive="#{richAccordionItemBean.attributes['leftIconActive'].value}" - leftIconDisabled="#{richAccordionItemBean.attributes['leftIconDisabled'].value}" - leftIconInactive="#{richAccordionItemBean.attributes['leftIconInactive'].value}" + leftActiveIcon="#{richAccordionItemBean.attributes['leftActiveIcon'].value}" + leftDisabledIcon="#{richAccordionItemBean.attributes['leftDisabledIcon'].value}" + leftInactiveIcon="#{richAccordionItemBean.attributes['leftInactiveIcon'].value}" name="#{richAccordionItemBean.attributes['name'].value}" onclick="#{richAccordionItemBean.attributes['onclick'].value}" ondblclick="#{richAccordionItemBean.attributes['ondblclick'].value}" @@ -71,9 +71,9 @@ onmouseover="#{richAccordionItemBean.attributes['onmouseover'].value}" onmouseup="#{richAccordionItemBean.attributes['onmouseup'].value}" rendered="#{richAccordionItemBean.attributes['rendered'].value}" - rightIconActive="#{richAccordionItemBean.attributes['rightIconActive'].value}" - rightIconDisabled="#{richAccordionItemBean.attributes['rightIconDisabled'].value}" - rightIconInactive="#{richAccordionItemBean.attributes['rightIconInactive'].value}" + rightActiveIcon="#{richAccordionItemBean.attributes['rightActiveIcon'].value}" + rightDisabledIcon="#{richAccordionItemBean.attributes['rightDisabledIcon'].value}" + rightInactiveIcon="#{richAccordionItemBean.attributes['rightInactiveIcon'].value}" style="#{richAccordionItemBean.attributes['style'].value}" styleClass="#{richAccordionItemBean.attributes['styleClass'].value}" switchType="#{richAccordionItemBean.attributes['switchType'].value}" Modified: modules/tests/metamer/trunk/application/src/main/webapp/components/richCollapsiblePanel/facets.xhtml =================================================================== --- modules/tests/metamer/trunk/application/src/main/webapp/components/richCollapsiblePanel/facets.xhtml 2011-01-31 13:40:36 UTC (rev 21321) +++ modules/tests/metamer/trunk/application/src/main/webapp/components/richCollapsiblePanel/facets.xhtml 2011-01-31 13:42:56 UTC (rev 21322) @@ -51,11 +51,10 @@ expanded="#{richCollapsiblePanelBean.attributes['expanded'].value}" header="#{richCollapsiblePanelBean.attributes['header'].value}" headerClass="#{richCollapsiblePanelBean.attributes['headerClass'].value}" - headerControlClass="#{richCollapsiblePanelBean.attributes['headerControlClass'].value}" immediate="#{richCollapsiblePanelBean.attributes['immediate'].value}" lang="#{richCollapsiblePanelBean.attributes['lang'].value}" - leftIconCollapsed="#{richCollapsiblePanelBean.attributes['leftIconCollapsed'].value}" - leftIconExpanded="#{richCollapsiblePanelBean.attributes['leftIconExpanded'].value}" + leftCollapsedIcon="#{richCollapsiblePanelBean.attributes['leftCollapsedIcon'].value}" + leftExpandedIcon="#{richCollapsiblePanelBean.attributes['leftExpandedIcon'].value}" limitRender="#{richCollapsiblePanelBean.attributes['limitRender'].value}" onbeforedomupdate="#{richCollapsiblePanelBean.attributes['onbeforedomupdate'].value}" onbeforeswitch="#{richCollapsiblePanelBean.attributes['onbeforeswitch'].value}" @@ -71,8 +70,8 @@ onswitch="#{richCollapsiblePanelBean.attributes['onswitch'].value}" render="#{richCollapsiblePanelBean.attributes['render'].value}" rendered="#{richCollapsiblePanelBean.attributes['rendered'].value}" - rightIconCollapsed="#{richCollapsiblePanelBean.attributes['rightIconCollapsed'].value}" - rightIconExpanded="#{richCollapsiblePanelBean.attributes['rightIconExpanded'].value}" + rightCollapsedIcon="#{richCollapsiblePanelBean.attributes['rightCollapsedIcon'].value}" + rightExpandedIcon="#{richCollapsiblePanelBean.attributes['rightExpandedIcon'].value}" status="#{richCollapsiblePanelBean.attributes['status'].value}" style="#{richCollapsiblePanelBean.attributes['style'].value}" styleClass="#{richCollapsiblePanelBean.attributes['styleClass'].value}" Modified: modules/tests/metamer/trunk/application/src/main/webapp/components/richCollapsiblePanel/simple.xhtml =================================================================== --- modules/tests/metamer/trunk/application/src/main/webapp/components/richCollapsiblePanel/simple.xhtml 2011-01-31 13:40:36 UTC (rev 21321) +++ modules/tests/metamer/trunk/application/src/main/webapp/components/richCollapsiblePanel/simple.xhtml 2011-01-31 13:42:56 UTC (rev 21322) @@ -50,11 +50,10 @@ expanded="#{richCollapsiblePanelBean.attributes['expanded'].value}" header="#{richCollapsiblePanelBean.attributes['header'].value}" headerClass="#{richCollapsiblePanelBean.attributes['headerClass'].value}" - headerControlClass="#{richCollapsiblePanelBean.attributes['headerControlClass'].value}" immediate="#{richCollapsiblePanelBean.attributes['immediate'].value}" lang="#{richCollapsiblePanelBean.attributes['lang'].value}" - leftIconCollapsed="#{richCollapsiblePanelBean.attributes['leftIconCollapsed'].value}" - leftIconExpanded="#{richCollapsiblePanelBean.attributes['leftIconExpanded'].value}" + leftCollapsedIcon="#{richCollapsiblePanelBean.attributes['leftCollapsedIcon'].value}" + leftExpandedIcon="#{richCollapsiblePanelBean.attributes['leftExpandedIcon'].value}" limitRender="#{richCollapsiblePanelBean.attributes['limitRender'].value}" onbeforedomupdate="#{richCollapsiblePanelBean.attributes['onbeforedomupdate'].value}" onbeforeswitch="#{richCollapsiblePanelBean.attributes['onbeforeswitch'].value}" @@ -70,8 +69,8 @@ onswitch="#{richCollapsiblePanelBean.attributes['onswitch'].value}" render="#{richCollapsiblePanelBean.attributes['render'].value}" rendered="#{richCollapsiblePanelBean.attributes['rendered'].value}" - rightIconCollapsed="#{richCollapsiblePanelBean.attributes['rightIconCollapsed'].value}" - rightIconExpanded="#{richCollapsiblePanelBean.attributes['rightIconExpanded'].value}" + rightCollapsedIcon="#{richCollapsiblePanelBean.attributes['rightCollapsedIcon'].value}" + rightExpandedIcon="#{richCollapsiblePanelBean.attributes['rightExpandedIcon'].value}" status="#{richCollapsiblePanelBean.attributes['status'].value}" style="#{richCollapsiblePanelBean.attributes['style'].value}" styleClass="#{richCollapsiblePanelBean.attributes['styleClass'].value}" Modified: modules/tests/metamer/trunk/application/src/main/webapp/components/richFileUpload/simple.xhtml =================================================================== --- modules/tests/metamer/trunk/application/src/main/webapp/components/richFileUpload/simple.xhtml 2011-01-31 13:40:36 UTC (rev 21321) +++ modules/tests/metamer/trunk/application/src/main/webapp/components/richFileUpload/simple.xhtml 2011-01-31 13:42:56 UTC (rev 21322) @@ -43,7 +43,7 @@ <rich:fileUpload id="fileUpload" acceptedTypes="#{richFileUploadBean.attributes['acceptedTypes'].value}" dir="#{richFileUploadBean.attributes['dir'].value}" - enabled="#{richFileUploadBean.attributes['enabled'].value}" + disabled="#{richFileUploadBean.attributes['disabled'].value}" fileUploadListener="#{richFileUploadBean.listener}" lang="#{richFileUploadBean.attributes['lang'].value}" noDuplicate="#{richFileUploadBean.attributes['noDuplicate'].value}" @@ -74,7 +74,7 @@ <li>#{item.name}</li> </a4j:repeat> </ul> - + <br/> <a4j:commandButton id="clearUploadedDataButton" Modified: modules/tests/metamer/trunk/application/src/main/webapp/components/richTab/simple.xhtml =================================================================== --- modules/tests/metamer/trunk/application/src/main/webapp/components/richTab/simple.xhtml 2011-01-31 13:40:36 UTC (rev 21321) +++ modules/tests/metamer/trunk/application/src/main/webapp/components/richTab/simple.xhtml 2011-01-31 13:42:56 UTC (rev 21322) @@ -2,7 +2,7 @@ <!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:metamer="http://java.sun.com/jsf/composite/metamer" - xmlns:rich="http://richfaces.org/rich" xmlns:a4j="http://richfaces.org/a4j"> + xmlns:rich="http://richfaces.org/rich" > <!-- JBoss, Home of Professional Open Source @@ -47,9 +47,9 @@ disabled="#{richTabBean.attributes['disabled'].value}" header="#{richTabBean.attributes['header'].value}" headerClass="#{richTabBean.attributes['headerClass'].value}" - headerClassActive="#{richTabBean.attributes['headerClassActive'].value}" - headerClassDisabled="#{richTabBean.attributes['headerClassDisabled'].value}" - headerClassInactive="#{richTabBean.attributes['headerClassInactive'].value}" + headerActiveClass="#{richTabBean.attributes['headerActiveClass'].value}" + headerDisabledClass="#{richTabBean.attributes['headerDisabledClass'].value}" + headerInactiveClass="#{richTabBean.attributes['headerInactiveClass'].value}" headerStyle="#{richTabBean.attributes['headerStyle'].value}" lang="#{richTabBean.attributes['lang'].value}" name="#{richTabBean.attributes['name'].value}" Modified: modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/richAccordion/TestRichAccordion.java =================================================================== --- modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/richAccordion/TestRichAccordion.java 2011-01-31 13:40:36 UTC (rev 21321) +++ modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/richAccordion/TestRichAccordion.java 2011-01-31 13:42:56 UTC (rev 21322) @@ -249,35 +249,15 @@ } @Test - public void testItemContentClass() { - testStyleClass(itemContents[2], "itemContentClass"); + public void testItemActiveHeaderClass() { + testStyleClass(activeHeaders[0], "itemActiveHeaderClass"); } @Test - public void testItemHeaderClass() { - testStyleClass(itemHeaders[2], "itemHeaderClass"); - } - - @Test - public void testItemHeaderClassActive() { - testStyleClass(activeHeaders[0], "itemHeaderClassActive"); - } - - @Test - public void testItemHeaderClassDisabled() { - testStyleClass(disabledHeaders[3], "itemHeaderClassDisabled"); - } - - @Test - public void testItemHeaderClassInactive() { - testStyleClass(inactiveHeaders[1], "itemHeaderClassInactive"); - } - - @Test @IssueTracking("https://issues.jboss.org/browse/RF-10352") - public void testItemLeftIconActive() { + public void testItemActiveLeftIcon() { JQueryLocator icon = leftIcon.format(1).getDescendant(jq("div.rf-ac-itm-ico-act")); - JQueryLocator input = pjq("select[id$=itemLeftIconActiveInput]"); + JQueryLocator input = pjq("select[id$=itemActiveLeftIconInput]"); JQueryLocator image = leftIcon.format(1).getChild(jq("img")); // icon=null @@ -289,28 +269,9 @@ } @Test - public void testItemLeftIconDisabled() { - JQueryLocator icon = leftIcon.format(4).getDescendant(jq("div.rf-ac-itm-ico-inact")); - JQueryLocator input = pjq("select[id$=itemLeftIconDisabledInput]"); - JQueryLocator image = leftIcon.format(4).getChild(jq("img")); - - verifyStandardIcons(input, icon, image, "-dis"); - } - - @Test - @IssueTracking("https://issues.jboss.org/browse/RF-10352") - public void testItemLeftIconInactive() { - JQueryLocator icon = leftIcon.format(3).getDescendant(jq("div.rf-ac-itm-ico-inact")); - JQueryLocator input = pjq("select[id$=itemLeftIconInactiveInput]"); - JQueryLocator image = leftIcon.format(3).getChild(jq("img")); - - verifyStandardIcons(input, icon, image, ""); - } - - @Test - public void testItemRightIconActive() { + public void testItemActiveRightIcon() { JQueryLocator icon = rightIcon.format(1).getDescendant(jq("div.rf-ac-itm-ico-act")); - JQueryLocator input = pjq("select[id$=itemRightIconActiveInput]"); + JQueryLocator input = pjq("select[id$=itemActiveRightIconInput]"); JQueryLocator image = rightIcon.format(1).getChild(jq("img")); // icon=null @@ -322,18 +283,57 @@ } @Test - public void testItemRightIconDisabled() { + public void testItemContentClass() { + testStyleClass(itemContents[2], "itemContentClass"); + } + + @Test + public void testItemDisabledHeaderClass() { + testStyleClass(disabledHeaders[3], "itemDisabledHeaderClass"); + } + + @Test + public void testItemDisabledLeftIcon() { + JQueryLocator icon = leftIcon.format(4).getDescendant(jq("div.rf-ac-itm-ico-inact")); + JQueryLocator input = pjq("select[id$=itemDisabledLeftIconInput]"); + JQueryLocator image = leftIcon.format(4).getChild(jq("img")); + + verifyStandardIcons(input, icon, image, "-dis"); + } + + @Test + public void testItemDisabledRightIcon() { JQueryLocator icon = rightIcon.format(4).getDescendant(jq("div.rf-ac-itm-ico-inact")); - JQueryLocator input = pjq("select[id$=itemRightIconDisabledInput]"); + JQueryLocator input = pjq("select[id$=itemDisabledRightIconInput]"); JQueryLocator image = rightIcon.format(4).getChild(jq("img")); verifyStandardIcons(input, icon, image, "-hdr-dis"); } @Test - public void testItemRightIconInactive() { + public void testItemHeaderClass() { + testStyleClass(itemHeaders[2], "itemHeaderClass"); + } + + @Test + public void testItemInactiveHeaderClass() { + testStyleClass(inactiveHeaders[1], "itemInactiveHeaderClass"); + } + + @Test + @IssueTracking("https://issues.jboss.org/browse/RF-10352") + public void testItemInactiveLeftIcon() { + JQueryLocator icon = leftIcon.format(3).getDescendant(jq("div.rf-ac-itm-ico-inact")); + JQueryLocator input = pjq("select[id$=itemInactiveLeftIconInput]"); + JQueryLocator image = leftIcon.format(3).getChild(jq("img")); + + verifyStandardIcons(input, icon, image, ""); + } + + @Test + public void testItemInactiveRightIcon() { JQueryLocator icon = rightIcon.format(3).getDescendant(jq("div.rf-ac-itm-ico-inact")); - JQueryLocator input = pjq("select[id$=itemRightIconInactiveInput]"); + JQueryLocator input = pjq("select[id$=itemInactiveRightIconInput]"); JQueryLocator image = rightIcon.format(3).getChild(jq("img")); verifyStandardIcons(input, icon, image, "-hdr"); Modified: modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/richAccordionItem/TestRichAccordionItem.java =================================================================== --- modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/richAccordionItem/TestRichAccordionItem.java 2011-01-31 13:40:36 UTC (rev 21321) +++ modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/richAccordionItem/TestRichAccordionItem.java 2011-01-31 13:42:56 UTC (rev 21322) @@ -1,6 +1,6 @@ /******************************************************************************* * JBoss, Home of Professional Open Source - * Copyright 2010, Red Hat, Inc. and individual contributors + * Copyright 2010-2011, Red Hat, Inc. and individual contributors * by the @authors tag. See the copyright.txt in the distribution for a * full listing of individual contributors. * @@ -24,7 +24,6 @@ import static org.jboss.test.selenium.guard.request.RequestTypeGuardFactory.guardHttp; import static org.jboss.test.selenium.guard.request.RequestTypeGuardFactory.guardNoRequest; import static org.jboss.test.selenium.guard.request.RequestTypeGuardFactory.guardXhr; -import static org.jboss.test.selenium.locator.LocatorFactory.jq; import static org.jboss.test.selenium.utils.URLUtils.buildUrl; import static org.testng.Assert.assertEquals; import static org.testng.Assert.assertFalse; @@ -114,6 +113,14 @@ } @Test + public void testHeaderActiveClass() { + testStyleClass(activeHeaders[0], "headerActiveClass"); + assertFalse(selenium.belongsClass(activeHeaders[1], "metamer-ftest-class"), "headerActiveClass should be set only on first item"); + assertFalse(selenium.belongsClass(activeHeaders[2], "metamer-ftest-class"), "headerActiveClass should be set only on first item"); + assertFalse(selenium.belongsClass(activeHeaders[3], "metamer-ftest-class"), "headerActiveClass should be set only on first item"); + } + + @Test public void testHeaderClass() { testStyleClass(itemHeaders[0], "headerClass"); assertFalse(selenium.belongsClass(itemHeaders[1], "metamer-ftest-class"), "headerClass should be set only on first item"); @@ -122,27 +129,19 @@ } @Test - public void testHeaderClassActive() { - testStyleClass(activeHeaders[0], "headerClassActive"); - assertFalse(selenium.belongsClass(activeHeaders[1], "metamer-ftest-class"), "headerClassActive should be set only on first item"); - assertFalse(selenium.belongsClass(activeHeaders[2], "metamer-ftest-class"), "headerClassActive should be set only on first item"); - assertFalse(selenium.belongsClass(activeHeaders[3], "metamer-ftest-class"), "headerClassActive should be set only on first item"); - } - - @Test - public void testHeaderClassDisabled() { + public void testHeaderDisabledClass() { selenium.click(pjq("input[type=radio][name$=disabledInput][value=true]")); selenium.waitForPageToLoad(); - testStyleClass(disabledHeaders[0], "headerClassDisabled"); + testStyleClass(disabledHeaders[0], "headerDisabledClass"); } @Test - public void testHeaderClassInactive() { - testStyleClass(inactiveHeaders[0], "headerClassInactive"); - assertFalse(selenium.belongsClass(inactiveHeaders[1], "metamer-ftest-class"), "headerClassInactive should be set only on first item"); - assertFalse(selenium.belongsClass(inactiveHeaders[2], "metamer-ftest-class"), "headerClassInactive should be set only on first item"); - assertFalse(selenium.belongsClass(inactiveHeaders[3], "metamer-ftest-class"), "headerClassInactive should be set only on first item"); + public void testHeaderInactiveClass() { + testStyleClass(inactiveHeaders[0], "headerInactiveClass"); + assertFalse(selenium.belongsClass(inactiveHeaders[1], "metamer-ftest-class"), "headerInactiveClass should be set only on first item"); + assertFalse(selenium.belongsClass(inactiveHeaders[2], "metamer-ftest-class"), "headerInactiveClass should be set only on first item"); + assertFalse(selenium.belongsClass(inactiveHeaders[3], "metamer-ftest-class"), "headerInactiveClass should be set only on first item"); } @Test Modified: modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/richCollapsiblePanel/TestRichCollapsiblePanel.java =================================================================== --- modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/richCollapsiblePanel/TestRichCollapsiblePanel.java 2011-01-31 13:40:36 UTC (rev 21321) +++ modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/richCollapsiblePanel/TestRichCollapsiblePanel.java 2011-01-31 13:42:56 UTC (rev 21322) @@ -165,12 +165,6 @@ } @Test - @IssueTracking("https://issues.jboss.org/browse/RF-10331") - public void testHeaderControlClass() { - testStyleClass(header.getDescendant(jq("td.rf-cp-ico")), "headerControlClass"); - } - - @Test @IssueTracking("https://issues.jboss.org/browse/RF-10054") public void testImmediate() { selenium.click(pjq("input[type=radio][name$=immediateInput][value=true]")); @@ -190,9 +184,9 @@ } @Test - public void testLeftIconCollapsed() { + public void testLeftCollapsedIcon() { JQueryLocator icon = leftIcon.getDescendant(jq("div.rf-cp-ico-colps")); - JQueryLocator input = pjq("select[id$=leftIconCollapsedInput]"); + JQueryLocator input = pjq("select[id$=leftCollapsedIconInput]"); JQueryLocator image = leftIcon.getChild(jq("img:nth-child(1)")); // icon=null @@ -203,9 +197,9 @@ } @Test - public void testLeftIconExpanded() { + public void testLeftExpandedIcon() { JQueryLocator icon = leftIcon.getDescendant(jq("div.rf-cp-ico-exp")); - JQueryLocator input = pjq("select[id$=leftIconExpandedInput]"); + JQueryLocator input = pjq("select[id$=leftExpandedIconInput]"); JQueryLocator image = leftIcon.getChild(jq("img:nth-child(2)")); // icon=null @@ -329,9 +323,9 @@ } @Test - public void testRightIconCollapsed() { + public void testRightCollapsedIcon() { JQueryLocator icon = rightIcon.getDescendant(jq("div.rf-cp-ico-colps")); - JQueryLocator input = pjq("select[id$=rightIconCollapsedInput]"); + JQueryLocator input = pjq("select[id$=rightCollapsedIconInput]"); JQueryLocator image = rightIcon.getChild(jq("img:nth-child(1)")); // icon=null @@ -341,9 +335,9 @@ } @Test - public void testRightIconExpanded() { + public void testRightExpandedIcon() { JQueryLocator icon = rightIcon.getDescendant(jq("div.rf-cp-ico-exp")); - JQueryLocator input = pjq("select[id$=rightIconExpandedInput]"); + JQueryLocator input = pjq("select[id$=rightExpandedIconInput]"); JQueryLocator image = rightIcon.getChild(jq("img:nth-child(1)")); // icon=null Modified: modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/richTab/TestRichTab.java =================================================================== --- modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/richTab/TestRichTab.java 2011-01-31 13:40:36 UTC (rev 21321) +++ modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/richTab/TestRichTab.java 2011-01-31 13:42:56 UTC (rev 21322) @@ -1,6 +1,6 @@ /******************************************************************************* * JBoss, Home of Professional Open Source - * Copyright 2010, Red Hat, Inc. and individual contributors + * Copyright 2010-2011, Red Hat, Inc. and individual contributors * by the @authors tag. See the copyright.txt in the distribution for a * full listing of individual contributors. * @@ -90,13 +90,10 @@ @Test public void testContentClass() { - ElementLocator<?> classInput = pjq("input[id$=contentClassInput]"); - final String value = "metamer-ftest-class"; - - selenium.type(classInput, value); + selenium.type(pjq("input[id$=contentClassInput]"), "metamer-ftest-class"); selenium.waitForPageToLoad(); - assertTrue(selenium.belongsClass(itemContents[0], value), "contentClass does not work"); + assertTrue(selenium.belongsClass(itemContents[0], "metamer-ftest-class"), "contentClass does not work"); } @Test @@ -149,6 +146,20 @@ } @Test + public void testHeaderActiveClass() { + selenium.type(pjq("input[id$=headerActiveClassInput]"), "metamer-ftest-class"); + selenium.waitForPageToLoad(); + + assertTrue(selenium.belongsClass(activeHeaders[0], "metamer-ftest-class"), "headerActiveClass does not work"); + assertFalse(selenium.belongsClass(inactiveHeaders[0], "metamer-ftest-class"), "headerActiveClass does not work"); + assertFalse(selenium.belongsClass(disabledHeaders[0], "metamer-ftest-class"), "headerActiveClass does not work"); + + assertFalse(selenium.belongsClass(activeHeaders[1], "metamer-ftest-class"), "headerActiveClass does not work"); + assertFalse(selenium.belongsClass(inactiveHeaders[1], "metamer-ftest-class"), "headerActiveClass does not work"); + assertFalse(selenium.belongsClass(disabledHeaders[1], "metamer-ftest-class"), "headerActiveClass does not work"); + } + + @Test public void testHeaderClass() { selenium.type(pjq("input[id$=headerClassInput]"), "metamer-ftest-class"); selenium.waitForPageToLoad(); @@ -163,48 +174,34 @@ } @Test - public void testheaderClassActive() { - selenium.type(pjq("input[id$=headerClassActiveInput]"), "metamer-ftest-class"); + public void testHeaderDisabledClass() { + selenium.type(pjq("input[id$=headerDisabledClassInput]"), "metamer-ftest-class"); selenium.waitForPageToLoad(); - assertTrue(selenium.belongsClass(activeHeaders[0], "metamer-ftest-class"), "tabHeaderClassActive does not work"); - assertFalse(selenium.belongsClass(inactiveHeaders[0], "metamer-ftest-class"), "tabHeaderClassActive does not work"); - assertFalse(selenium.belongsClass(disabledHeaders[0], "metamer-ftest-class"), "tabHeaderClassActive does not work"); + assertFalse(selenium.belongsClass(activeHeaders[0], "metamer-ftest-class"), "headerDisabledClass does not work"); + assertFalse(selenium.belongsClass(inactiveHeaders[0], "metamer-ftest-class"), "headerDisabledClass does not work"); + assertTrue(selenium.belongsClass(disabledHeaders[0], "metamer-ftest-class"), "headerDisabledClass does not work"); - assertFalse(selenium.belongsClass(activeHeaders[1], "metamer-ftest-class"), "tabHeaderClassActive does not work"); - assertFalse(selenium.belongsClass(inactiveHeaders[1], "metamer-ftest-class"), "tabHeaderClassActive does not work"); - assertFalse(selenium.belongsClass(disabledHeaders[1], "metamer-ftest-class"), "tabHeaderClassActive does not work"); + assertFalse(selenium.belongsClass(activeHeaders[1], "metamer-ftest-class"), "headerDisabledClass does not work"); + assertFalse(selenium.belongsClass(inactiveHeaders[1], "metamer-ftest-class"), "headerDisabledClass does not work"); + assertFalse(selenium.belongsClass(disabledHeaders[1], "metamer-ftest-class"), "headerDisabledClass does not work"); } @Test - public void testTabHeaderClassDisabled() { - selenium.type(pjq("input[id$=headerClassDisabledInput]"), "metamer-ftest-class"); + public void testHeaderInactiveClass() { + selenium.type(pjq("input[id$=headerInactiveClassInput]"), "metamer-ftest-class"); selenium.waitForPageToLoad(); - assertFalse(selenium.belongsClass(activeHeaders[0], "metamer-ftest-class"), "tabHeaderClassDisabled does not work"); - assertFalse(selenium.belongsClass(inactiveHeaders[0], "metamer-ftest-class"), "tabHeaderClassDisabled does not work"); - assertTrue(selenium.belongsClass(disabledHeaders[0], "metamer-ftest-class"), "tabHeaderClassDisabled does not work"); + assertFalse(selenium.belongsClass(activeHeaders[0], "metamer-ftest-class"), "headerInactiveClass does not work"); + assertTrue(selenium.belongsClass(inactiveHeaders[0], "metamer-ftest-class"), "headerInactiveClass does not work"); + assertFalse(selenium.belongsClass(disabledHeaders[0], "metamer-ftest-class"), "headerInactiveClass does not work"); - assertFalse(selenium.belongsClass(activeHeaders[1], "metamer-ftest-class"), "tabHeaderClassDisabled does not work"); - assertFalse(selenium.belongsClass(inactiveHeaders[1], "metamer-ftest-class"), "tabHeaderClassDisabled does not work"); - assertFalse(selenium.belongsClass(disabledHeaders[1], "metamer-ftest-class"), "tabHeaderClassDisabled does not work"); + assertFalse(selenium.belongsClass(activeHeaders[1], "metamer-ftest-class"), "headerInactiveClass does not work"); + assertFalse(selenium.belongsClass(inactiveHeaders[1], "metamer-ftest-class"), "headerInactiveClass does not work"); + assertFalse(selenium.belongsClass(disabledHeaders[1], "metamer-ftest-class"), "headerInactiveClass does not work"); } @Test - public void testTabHeaderClassInactive() { - selenium.type(pjq("input[id$=headerClassInactiveInput]"), "metamer-ftest-class"); - selenium.waitForPageToLoad(); - - assertFalse(selenium.belongsClass(activeHeaders[0], "metamer-ftest-class"), "tabHeaderClassInactive does not work"); - assertTrue(selenium.belongsClass(inactiveHeaders[0], "metamer-ftest-class"), "tabHeaderClassInactive does not work"); - assertFalse(selenium.belongsClass(disabledHeaders[0], "metamer-ftest-class"), "tabHeaderClassInactive does not work"); - - assertFalse(selenium.belongsClass(activeHeaders[1], "metamer-ftest-class"), "tabHeaderClassInactive does not work"); - assertFalse(selenium.belongsClass(inactiveHeaders[1], "metamer-ftest-class"), "tabHeaderClassInactive does not work"); - assertFalse(selenium.belongsClass(disabledHeaders[1], "metamer-ftest-class"), "tabHeaderClassInactive does not work"); - } - - @Test public void testHeaderStyle() { ElementLocator<?> styleInput = pjq("input[id$=headerStyleInput]"); final String value = "background-color: yellow; font-size: 1.5em;"; Modified: modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/richTabPanel/TestRichTabPanel.java =================================================================== --- modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/richTabPanel/TestRichTabPanel.java 2011-01-31 13:40:36 UTC (rev 21321) +++ modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/richTabPanel/TestRichTabPanel.java 2011-01-31 13:42:56 UTC (rev 21322) @@ -103,6 +103,7 @@ } @Test + @IssueTracking("https://issues.jboss.org/browse/RF-10351") public void testActiveItem() { selenium.type(pjq("input[type=text][id$=activeItemInput]"), "tab5"); selenium.waitForPageToLoad(); @@ -442,88 +443,88 @@ } @Test - public void testTabContentClass() { - final String value = "metamer-ftest-class"; - - selenium.type(pjq("input[id$=tabContentClassInput]"), value); - selenium.waitForPageToLoad(); - - assertTrue(selenium.belongsClass(itemContents[0], value), "tabContentClass does not work"); - } - - @Test @IssueTracking("https://issues.jboss.org/browse/RF-9309") - public void testTabHeaderClass() { - selenium.type(pjq("input[id$=tabHeaderClassInput]"), "metamer-ftest-class"); + public void testTabActiveHeaderClass() { + selenium.type(pjq("input[id$=tabActiveHeaderClassInput]"), "metamer-ftest-class"); selenium.waitForPageToLoad(); for (JQueryLocator loc : activeHeaders) { - assertTrue(selenium.belongsClass(loc, "metamer-ftest-class"), "tabHeaderClass does not work"); + assertTrue(selenium.belongsClass(loc, "metamer-ftest-class"), "tabActiveHeaderClass does not work"); } for (JQueryLocator loc : inactiveHeaders) { - assertTrue(selenium.belongsClass(loc, "metamer-ftest-class"), "tabHeaderClass does not work"); + assertFalse(selenium.belongsClass(loc, "metamer-ftest-class"), "tabActiveHeaderClass does not work"); } for (JQueryLocator loc : disabledHeaders) { - assertTrue(selenium.belongsClass(loc, "metamer-ftest-class"), "tabHeaderClass does not work"); + assertFalse(selenium.belongsClass(loc, "metamer-ftest-class"), "tabActiveHeaderClass does not work"); } } @Test + public void testTabContentClass() { + final String value = "metamer-ftest-class"; + + selenium.type(pjq("input[id$=tabContentClassInput]"), value); + selenium.waitForPageToLoad(); + + assertTrue(selenium.belongsClass(itemContents[0], value), "tabContentClass does not work"); + } + + @Test @IssueTracking("https://issues.jboss.org/browse/RF-9309") - public void testTabHeaderClassActive() { - selenium.type(pjq("input[id$=tabHeaderClassActiveInput]"), "metamer-ftest-class"); + public void testTabDisabledHeaderClass() { + selenium.type(pjq("input[id$=tabDisabledHeaderClassInput]"), "metamer-ftest-class"); selenium.waitForPageToLoad(); for (JQueryLocator loc : activeHeaders) { - assertTrue(selenium.belongsClass(loc, "metamer-ftest-class"), "tabHeaderClassActive does not work"); + assertFalse(selenium.belongsClass(loc, "metamer-ftest-class"), "tabDisabledHeaderClass does not work"); } for (JQueryLocator loc : inactiveHeaders) { - assertFalse(selenium.belongsClass(loc, "metamer-ftest-class"), "tabHeaderClassActive does not work"); + assertFalse(selenium.belongsClass(loc, "metamer-ftest-class"), "tabDisabledHeaderClass does not work"); } for (JQueryLocator loc : disabledHeaders) { - assertFalse(selenium.belongsClass(loc, "metamer-ftest-class"), "tabHeaderClassActive does not work"); + assertTrue(selenium.belongsClass(loc, "metamer-ftest-class"), "tabDisabledHeaderClass does not work"); } } @Test @IssueTracking("https://issues.jboss.org/browse/RF-9309") - public void testTabHeaderClassDisabled() { - selenium.type(pjq("input[id$=tabHeaderClassDisabledInput]"), "metamer-ftest-class"); + public void testTabHeaderClass() { + selenium.type(pjq("input[id$=tabHeaderClassInput]"), "metamer-ftest-class"); selenium.waitForPageToLoad(); for (JQueryLocator loc : activeHeaders) { - assertFalse(selenium.belongsClass(loc, "metamer-ftest-class"), "tabHeaderClassDisabled does not work"); + assertTrue(selenium.belongsClass(loc, "metamer-ftest-class"), "tabHeaderClass does not work"); } for (JQueryLocator loc : inactiveHeaders) { - assertFalse(selenium.belongsClass(loc, "metamer-ftest-class"), "tabHeaderClassDisabled does not work"); + assertTrue(selenium.belongsClass(loc, "metamer-ftest-class"), "tabHeaderClass does not work"); } for (JQueryLocator loc : disabledHeaders) { - assertTrue(selenium.belongsClass(loc, "metamer-ftest-class"), "tabHeaderClassDisabled does not work"); + assertTrue(selenium.belongsClass(loc, "metamer-ftest-class"), "tabHeaderClass does not work"); } } @Test @IssueTracking("https://issues.jboss.org/browse/RF-9309") - public void testTabHeaderClassInactive() { - selenium.type(pjq("input[id$=tabHeaderClassInactiveInput]"), "metamer-ftest-class"); + public void testTabInactiveHeaderClass() { + selenium.type(pjq("input[id$=tabInactiveHeaderClassInput]"), "metamer-ftest-class"); selenium.waitForPageToLoad(); for (JQueryLocator loc : activeHeaders) { - assertFalse(selenium.belongsClass(loc, "metamer-ftest-class"), "tabHeaderClassInactive does not work"); + assertFalse(selenium.belongsClass(loc, "metamer-ftest-class"), "tabInactiveHeaderClass does not work"); } for (JQueryLocator loc : inactiveHeaders) { - assertTrue(selenium.belongsClass(loc, "metamer-ftest-class"), "tabHeaderClassInactive does not work"); + assertTrue(selenium.belongsClass(loc, "metamer-ftest-class"), "tabInactiveHeaderClass does not work"); } for (JQueryLocator loc : disabledHeaders) { - assertFalse(selenium.belongsClass(loc, "metamer-ftest-class"), "tabHeaderClassInactive does not work"); + assertFalse(selenium.belongsClass(loc, "metamer-ftest-class"), "tabInactiveHeaderClass does not work"); } }

13 years, 10 months

1
0
0 / 0

JBoss Rich Faces SVN: r21321 - in trunk/examples/richfaces-showcase/src/main: resources/org/richfaces/demo/data/common and 1 other directory.

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

Author: ilya_shaikovsky Date: 2011-01-31 08:40:36 -0500 (Mon, 31 Jan 2011) New Revision: 21321 Modified: trunk/examples/richfaces-showcase/src/main/java/org/richfaces/demo/validation/DayStatistics.java trunk/examples/richfaces-showcase/src/main/java/org/richfaces/demo/validation/PassTime.java trunk/examples/richfaces-showcase/src/main/resources/org/richfaces/demo/data/common/navigation.xml Log: names correction + checkstyle fixes Modified: trunk/examples/richfaces-showcase/src/main/java/org/richfaces/demo/validation/DayStatistics.java =================================================================== --- trunk/examples/richfaces-showcase/src/main/java/org/richfaces/demo/validation/DayStatistics.java 2011-01-31 13:36:28 UTC (rev 21320) +++ trunk/examples/richfaces-showcase/src/main/java/org/richfaces/demo/validation/DayStatistics.java 2011-01-31 13:40:36 UTC (rev 21321) @@ -23,40 +23,37 @@ @RequestScoped public class DayStatistics { - public DayStatistics() { - dayPasstimes.add(new PassTime("Sport", 0)); - dayPasstimes.add(new PassTime("Entertainment", 0)); - dayPasstimes.add(new PassTime("Sleeping", 0)); - dayPasstimes.add(new PassTime("Games", 0)); - } + private List<PassTime> dayPasstimes = new ArrayList<PassTime>(); - private List<PassTime> dayPasstimes = new ArrayList<PassTime>(); + public DayStatistics() { + dayPasstimes.add(new PassTime("Sport", 0)); + dayPasstimes.add(new PassTime("Entertainment", 0)); + dayPasstimes.add(new PassTime("Sleeping", 0)); + dayPasstimes.add(new PassTime("Games", 0)); + } - public List<PassTime> getDayPasstimes() { - return dayPasstimes; - } + public List<PassTime> getDayPasstimes() { + return dayPasstimes; + } - public void setDayPasstimes(List<PassTime> dayPasstimes) { - this.dayPasstimes = dayPasstimes; - } + public void setDayPasstimes(List<PassTime> dayPasstimes) { + this.dayPasstimes = dayPasstimes; + } - @NotNull - @Min(value = 1, message = "Please feel at list one entry") - @Max(value = 24, message = "Only 24h in a day!") - public Integer getTotalTime() { - Integer result = new Integer(0); - for (PassTime passtime : dayPasstimes) { - result += passtime.getTime(); - } - return result; - } + @NotNull + @Min(value = 1, message = "Please feel at list one entry") + @Max(value = 24, message = "Only 24h in a day!") + public Integer getTotalTime() { + Integer result = new Integer(0); + for (PassTime passtime : dayPasstimes) { + result += passtime.getTime(); + } + return result; + } - public void store(ActionEvent event) { - FacesContext.getCurrentInstance().addMessage( - event.getComponent().getClientId( - FacesContext.getCurrentInstance()), - new FacesMessage(FacesMessage.SEVERITY_INFO, - "Changes Stored Successfully", - "Changes Stored Successfully")); - } + public void store(ActionEvent event) { + FacesContext.getCurrentInstance().addMessage( + event.getComponent().getClientId(FacesContext.getCurrentInstance()), + new FacesMessage(FacesMessage.SEVERITY_INFO, "Changes Stored Successfully", "Changes Stored Successfully")); + } } Modified: trunk/examples/richfaces-showcase/src/main/java/org/richfaces/demo/validation/PassTime.java =================================================================== --- trunk/examples/richfaces-showcase/src/main/java/org/richfaces/demo/validation/PassTime.java 2011-01-31 13:36:28 UTC (rev 21320) +++ trunk/examples/richfaces-showcase/src/main/java/org/richfaces/demo/validation/PassTime.java 2011-01-31 13:40:36 UTC (rev 21321) @@ -9,29 +9,33 @@ public class PassTime { - public PassTime(String title, Integer time) { - setTitle(title); - setTime(time); - } - - @NotEmpty - @Length(max=15, min=3) - private String title; - @NotNull - @Min(0) - @Max(12) - private Integer time; - public String getTitle() { - return title; - } - public void setTitle(String title) { - this.title = title; - } - public Integer getTime() { - return time; - } - public void setTime(Integer time) { - this.time = time; - } - + @NotEmpty + @Length(max = 15, min = 3) + private String title; + @NotNull + @Min(0) + @Max(12) + private Integer time; + + public PassTime(String title, Integer time) { + setTitle(title); + setTime(time); + } + + public String getTitle() { + return title; + } + + public void setTitle(String title) { + this.title = title; + } + + public Integer getTime() { + return time; + } + + public void setTime(Integer time) { + this.time = time; + } + } Modified: trunk/examples/richfaces-showcase/src/main/resources/org/richfaces/demo/data/common/navigation.xml =================================================================== --- trunk/examples/richfaces-showcase/src/main/resources/org/richfaces/demo/data/common/navigation.xml 2011-01-31 13:36:28 UTC (rev 21320) +++ trunk/examples/richfaces-showcase/src/main/resources/org/richfaces/demo/data/common/navigation.xml 2011-01-31 13:40:36 UTC (rev 21321) @@ -283,11 +283,11 @@ </demo> <demo> <id>subTableToggleControl</id> - <name>rich:subTableToggleControl</name> + <name>rich:collapsibleSubTableToggler</name> <samples> <sample> <id>subTableToggleControl</id> - <name>rich:subTableToggleControl Basic Usage</name> + <name>rich:collapsibleSubTableToggler Basic Usage</name> </sample> </samples> </demo>

13 years, 10 months

1
0
0 / 0

JBoss Rich Faces SVN: r21320 - in trunk: core/impl/src/main/java/org/richfaces/application/push/impl and 3 other directories.

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

Author: nbelaevski Date: 2011-01-31 08:36:28 -0500 (Mon, 31 Jan 2011) New Revision: 21320 Added: trunk/core/api/src/main/java/org/richfaces/application/push/MessageListener.java Modified: trunk/core/api/src/main/java/org/richfaces/application/push/Request.java trunk/core/api/src/main/java/org/richfaces/application/push/Session.java trunk/core/api/src/main/java/org/richfaces/application/push/SessionManager.java trunk/core/impl/src/main/java/org/richfaces/application/push/impl/AbstractRequest.java trunk/core/impl/src/main/java/org/richfaces/application/push/impl/AbstractSession.java trunk/core/impl/src/main/java/org/richfaces/application/push/impl/SessionManagerImpl.java trunk/core/impl/src/main/java/org/richfaces/application/push/impl/SessionQueue.java trunk/core/impl/src/main/java/org/richfaces/application/push/impl/jms/MessagingContext.java trunk/core/impl/src/main/java/org/richfaces/application/push/impl/jms/PushHandlerImpl.java trunk/core/impl/src/main/java/org/richfaces/application/push/impl/jms/RequestImpl.java trunk/core/impl/src/main/java/org/richfaces/application/push/impl/jms/SessionImpl.java trunk/examples/push-demo/pom.xml trunk/ui/core/ui/src/main/java/org/richfaces/resource/PushResource.java Log: https://issues.jboss.org/browse/RF-10330 Added: trunk/core/api/src/main/java/org/richfaces/application/push/MessageListener.java =================================================================== --- trunk/core/api/src/main/java/org/richfaces/application/push/MessageListener.java (rev 0) +++ trunk/core/api/src/main/java/org/richfaces/application/push/MessageListener.java 2011-01-31 13:36:28 UTC (rev 21320) @@ -0,0 +1,34 @@ +/* + * JBoss, Home of Professional Open Source + * Copyright 2011, 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.application.push; + +import java.util.EventListener; + +/** + * @author Nick Belaevski + * + */ +public interface MessageListener extends EventListener { + + public void onMessage(Object message) throws MessageException; + +} Modified: trunk/core/api/src/main/java/org/richfaces/application/push/Request.java =================================================================== --- trunk/core/api/src/main/java/org/richfaces/application/push/Request.java 2011-01-31 12:57:38 UTC (rev 21319) +++ trunk/core/api/src/main/java/org/richfaces/application/push/Request.java 2011-01-31 13:36:28 UTC (rev 21320) @@ -45,4 +45,6 @@ public boolean isPolling(); + public MessageListener getMessageListener(); + } Modified: trunk/core/api/src/main/java/org/richfaces/application/push/Session.java =================================================================== --- trunk/core/api/src/main/java/org/richfaces/application/push/Session.java 2011-01-31 12:57:38 UTC (rev 21319) +++ trunk/core/api/src/main/java/org/richfaces/application/push/Session.java 2011-01-31 13:36:28 UTC (rev 21320) @@ -49,14 +49,8 @@ public void disconnect() throws Exception; - public void onRequestSuspended(); - - public void onRequestDisconnected(); + public void invalidate(); - public void onRequestResumed(); - public void destroy(); - public Request getRequest(); - } Modified: trunk/core/api/src/main/java/org/richfaces/application/push/SessionManager.java =================================================================== --- trunk/core/api/src/main/java/org/richfaces/application/push/SessionManager.java 2011-01-31 12:57:38 UTC (rev 21319) +++ trunk/core/api/src/main/java/org/richfaces/application/push/SessionManager.java 2011-01-31 13:36:28 UTC (rev 21320) @@ -32,8 +32,6 @@ public Session getPushSession(String id); - public void removePushSession(Session session); - public void requeue(Session session); public void destroy(); Modified: trunk/core/impl/src/main/java/org/richfaces/application/push/impl/AbstractRequest.java =================================================================== --- trunk/core/impl/src/main/java/org/richfaces/application/push/impl/AbstractRequest.java 2011-01-31 12:57:38 UTC (rev 21319) +++ trunk/core/impl/src/main/java/org/richfaces/application/push/impl/AbstractRequest.java 2011-01-31 13:36:28 UTC (rev 21320) @@ -44,6 +44,8 @@ import org.richfaces.application.push.Request; import org.richfaces.application.push.Session; import org.richfaces.application.push.TopicKey; +import org.richfaces.log.Logger; +import org.richfaces.log.RichfacesLogger; /** * @author Nick Belaevski @@ -51,6 +53,8 @@ */ public abstract class AbstractRequest implements Request { + private static final Logger LOGGER = RichfacesLogger.APPLICATION.getLogger(); + private static final String TOPIC_KEY = "topic"; private static final String DATA_KEY = "data"; @@ -110,8 +114,7 @@ try { request.flushMessages(); } catch (Throwable e) { - // TODO Auto-generated catch block - e.printStackTrace(); + LOGGER.error(e.getMessage(), e); } } @@ -178,7 +181,7 @@ submitted.compareAndSet(true, false); if (isPolling()) { - atmosphereResource.resume(); + resume(); } else if (!messagesQueue.isEmpty()) { submitToWorker(); } @@ -194,6 +197,12 @@ } public void resume() throws IOException { + //TODO - review + try { + getSession().disconnect(); + } catch (Exception e) { + LOGGER.error(e.getMessage(), e); + } atmosphereResource.resume(); } @@ -219,14 +228,18 @@ } protected void onSuspend() { + try { + getSession().connect(this); + } catch (Exception e) { + LOGGER.error(e.getMessage(), e); + } } protected void onResume() { try { session.disconnect(); } catch (Exception e) { - // TODO Auto-generated catch block - e.printStackTrace(); + LOGGER.error(e.getMessage(), e); } } @@ -234,8 +247,7 @@ try { session.disconnect(); } catch (Exception e) { - // TODO Auto-generated catch block - e.printStackTrace(); + LOGGER.error(e.getMessage(), e); } } Modified: trunk/core/impl/src/main/java/org/richfaces/application/push/impl/AbstractSession.java =================================================================== --- trunk/core/impl/src/main/java/org/richfaces/application/push/impl/AbstractSession.java 2011-01-31 12:57:38 UTC (rev 21319) +++ trunk/core/impl/src/main/java/org/richfaces/application/push/impl/AbstractSession.java 2011-01-31 13:36:28 UTC (rev 21320) @@ -26,6 +26,8 @@ import org.richfaces.application.push.Request; import org.richfaces.application.push.Session; import org.richfaces.application.push.SessionManager; +import org.richfaces.log.Logger; +import org.richfaces.log.RichfacesLogger; /** * @author Nick Belaevski @@ -33,6 +35,8 @@ */ public abstract class AbstractSession implements Session { + private static final Logger LOGGER = RichfacesLogger.APPLICATION.getLogger(); + private static final int MAX_INACTIVE_INTERVAL = 5 * 60 * 1000; private final String id; @@ -43,8 +47,11 @@ private volatile Request request; + private volatile boolean active = true; + public AbstractSession(String id, SessionManager sessionManager) { super(); + this.id = id; this.sessionManager = sessionManager; @@ -55,33 +62,61 @@ lastAccessedTime = System.currentTimeMillis(); } - private void requeue() { - resetLastAccessedTimeToCurrent(); + public synchronized void connect(Request request) throws Exception { + releaseRequest(); + + if (active) { + processConnect(request); + } else { + request.resume(); + } + } + + protected Request getRequest() { + return request; + } + + protected void processConnect(Request request) throws Exception { + this.request = request; + sessionManager.requeue(this); } - public void connect(Request request) throws Exception { - if (this.request != null) { - this.request.resume(); - } + private void releaseRequest() { + Request localRequestCopy = this.request; - this.request = request; + if (localRequestCopy != null) { + resetLastAccessedTimeToCurrent(); + this.request = null; - requeue(); - - request.suspend(); + try { + localRequestCopy.resume(); + } catch (IOException e) { + // TODO: handle exception + e.printStackTrace(); + } + } } - public void disconnect() throws Exception { - this.request = null; + public synchronized void disconnect() throws Exception { + processDisconnect(); } + protected void processDisconnect() throws Exception { + releaseRequest(); + } + public long getLastAccessedTime() { - if (request != null) { + if (!active) { + return -1; + } + + if (this.request != null) { + //being accessed right now return System.currentTimeMillis(); + } else { + return lastAccessedTime; } - - return lastAccessedTime; } public int getMaxInactiveInterval() { @@ -92,24 +127,19 @@ return id; } - public Request getRequest() { - return request; + public void invalidate() { + active = false; + + sessionManager.requeue(this); } + + public synchronized void destroy() { + active = false; - public void destroy() { - if (request != null) { - try { - request.resume(); - } catch (IOException e) { - // TODO Auto-generated catch block - e.printStackTrace(); - } - request = null; - //TODO - clean up request + try { + disconnect(); + } catch (Exception e) { + LOGGER.error(e.getMessage(), e); } - - sessionManager.removePushSession(this); - // TODO Auto-generated method stub - } } Modified: trunk/core/impl/src/main/java/org/richfaces/application/push/impl/SessionManagerImpl.java =================================================================== --- trunk/core/impl/src/main/java/org/richfaces/application/push/impl/SessionManagerImpl.java 2011-01-31 12:57:38 UTC (rev 21319) +++ trunk/core/impl/src/main/java/org/richfaces/application/push/impl/SessionManagerImpl.java 2011-01-31 13:36:28 UTC (rev 21320) @@ -67,14 +67,6 @@ return sessionMap.get(id); } - public void removePushSession(Session session) { - // XXX - possible null pointer exception - if (session != null) { - sessionMap.remove(session.getId()); - sessionQueue.remove(session); - } - } - public void destroy() { //TODO notify all session sessionQueue.clear(); @@ -82,7 +74,6 @@ while (!sessionMap.isEmpty()) { for (Iterator<Session> sessionsItr = sessionMap.values().iterator(); sessionsItr.hasNext(); ) { Session session = sessionsItr.next(); - sessionsItr.remove(); session.destroy(); } @@ -97,10 +88,10 @@ throw new IllegalStateException(); } - requeue(session); + sessionQueue.requeue(session, true); } public void requeue(Session session) { - sessionQueue.requeue(session); + sessionQueue.requeue(session, false); } } Modified: trunk/core/impl/src/main/java/org/richfaces/application/push/impl/SessionQueue.java =================================================================== --- trunk/core/impl/src/main/java/org/richfaces/application/push/impl/SessionQueue.java 2011-01-31 12:57:38 UTC (rev 21319) +++ trunk/core/impl/src/main/java/org/richfaces/application/push/impl/SessionQueue.java 2011-01-31 13:36:28 UTC (rev 21320) @@ -42,10 +42,10 @@ private static final Comparator<? super Session> SESSIONS_COMPARATOR = new Comparator<Session>() { public int compare(Session o1, Session o2) { - Long delay1 = Long.valueOf(o1.getLastAccessedTime() + o1.getMaxInactiveInterval()); - Long delay2 = Long.valueOf(o2.getLastAccessedTime() + o2.getMaxInactiveInterval()); + Long expTime1 = getExpirationTime(o1); + Long expTime2 = getExpirationTime(o2); - return delay1.compareTo(delay2); + return expTime1.compareTo(expTime2); } }; @@ -56,9 +56,22 @@ private final Condition available = lock.newCondition(); + private static long getExpirationTime(Session session) { + long lastAccessedTime = session.getLastAccessedTime(); + if (lastAccessedTime < 0) { + return Long.MIN_VALUE; + } + + return lastAccessedTime + session.getMaxInactiveInterval(); + } + private long getDelay(Session session, TimeUnit unit) { - return unit.convert(session.getLastAccessedTime() + session.getMaxInactiveInterval() - System.currentTimeMillis(), - TimeUnit.MILLISECONDS); + long expirationTime = getExpirationTime(session); + if (expirationTime < 0) { + return Long.MIN_VALUE; + } + + return unit.convert(expirationTime - System.currentTimeMillis(), TimeUnit.MILLISECONDS); } public Session take() throws InterruptedException { @@ -99,17 +112,20 @@ } } - public void requeue(Session session) { + public void requeue(Session session, boolean addIfNotExists) { final ReentrantLock lock = this.lock; lock.lock(); try { - queue.remove(session); + boolean exists = queue.remove(session); - Session first = queue.peek(); - queue.offer(session); - if (first == null || SESSIONS_COMPARATOR.compare(session, first) < 0) { - available.signalAll(); + if (exists || addIfNotExists) { + Session first = queue.peek(); + queue.offer(session); + if (first == null || SESSIONS_COMPARATOR.compare(session, first) < 0) { + available.signalAll(); + } } + } finally { lock.unlock(); } Modified: trunk/core/impl/src/main/java/org/richfaces/application/push/impl/jms/MessagingContext.java =================================================================== --- trunk/core/impl/src/main/java/org/richfaces/application/push/impl/jms/MessagingContext.java 2011-01-31 12:57:38 UTC (rev 21319) +++ trunk/core/impl/src/main/java/org/richfaces/application/push/impl/jms/MessagingContext.java 2011-01-31 13:36:28 UTC (rev 21320) @@ -39,6 +39,8 @@ import org.richfaces.application.push.Session; import org.richfaces.application.push.TopicKey; +import org.richfaces.log.Logger; +import org.richfaces.log.RichfacesLogger; import com.google.common.base.Function; import com.google.common.base.Joiner; @@ -55,6 +57,8 @@ private static final Joiner OR_JOINER = Joiner.on(" OR ").skipNulls(); + private static final Logger LOGGER = RichfacesLogger.APPLICATION.getLogger(); + private static final Function<TopicKey, String> TOPIC_KEY_TO_MESSAGE_SELECTOR = new Function<TopicKey, String>() { public String apply(TopicKey from) { if (Strings.isNullOrEmpty(from.getSubtopicName())) { @@ -159,7 +163,7 @@ public TopicSubscriber createTopicSubscriber(Session pushSession, javax.jms.Session jmsSession, Entry<TopicKey, Collection<TopicKey>> entry) throws JMSException, NamingException { - + TopicKey rootTopicKey = entry.getKey(); String subscriptionClientId = getSubscriptionClientId(pushSession, rootTopicKey); @@ -169,4 +173,19 @@ return jmsSession.createDurableSubscriber(jmsTopic, subscriptionClientId, createMessageSelector(entry.getValue()), true); } + /** + * @param session + * @param jmsSession + * @param rootTopicKeys + */ + public void removeTopicSubscriber(Session session, javax.jms.Session jmsSession, Collection<TopicKey> rootTopicKeys) { + for (TopicKey rootTopicKey : rootTopicKeys) { + try { + jmsSession.unsubscribe(getSubscriptionClientId(session, rootTopicKey)); + } catch (JMSException e) { + LOGGER.error(e.getMessage(), e); + } + } + } + } Modified: trunk/core/impl/src/main/java/org/richfaces/application/push/impl/jms/PushHandlerImpl.java =================================================================== --- trunk/core/impl/src/main/java/org/richfaces/application/push/impl/jms/PushHandlerImpl.java 2011-01-31 12:57:38 UTC (rev 21319) +++ trunk/core/impl/src/main/java/org/richfaces/application/push/impl/jms/PushHandlerImpl.java 2011-01-31 13:36:28 UTC (rev 21320) @@ -59,6 +59,6 @@ @Override protected Request createRequest(AtmosphereResource<HttpServletRequest, HttpServletResponse> resource, Session session) { - return new RequestImpl(resource, session, getWorker(), messagingContext, topicsContext); + return new RequestImpl(resource, session, getWorker(), topicsContext); } } Modified: trunk/core/impl/src/main/java/org/richfaces/application/push/impl/jms/RequestImpl.java =================================================================== --- trunk/core/impl/src/main/java/org/richfaces/application/push/impl/jms/RequestImpl.java 2011-01-31 12:57:38 UTC (rev 21319) +++ trunk/core/impl/src/main/java/org/richfaces/application/push/impl/jms/RequestImpl.java 2011-01-31 13:36:28 UTC (rev 21320) @@ -21,14 +21,10 @@ */ package org.richfaces.application.push.impl.jms; -import java.io.IOException; -import java.util.Collection; -import java.util.Map.Entry; import java.util.concurrent.ExecutorService; import javax.jms.JMSException; import javax.jms.Message; -import javax.jms.MessageListener; import javax.jms.ObjectMessage; import javax.jms.TextMessage; import javax.jms.Topic; @@ -37,6 +33,7 @@ import org.atmosphere.cpr.AtmosphereResource; import org.richfaces.application.push.MessageDataSerializer; +import org.richfaces.application.push.MessageException; import org.richfaces.application.push.Session; import org.richfaces.application.push.TopicKey; import org.richfaces.application.push.TopicsContext; @@ -48,79 +45,20 @@ * @author Nick Belaevski * */ -public class RequestImpl extends AbstractRequest implements MessageListener { +public class RequestImpl extends AbstractRequest implements org.richfaces.application.push.MessageListener { private static final Logger LOGGER = RichfacesLogger.APPLICATION.getLogger(); - private javax.jms.Session jmsSession; - - private MessagingContext messagingContext; - private TopicsContext topicsContext; public RequestImpl(AtmosphereResource<HttpServletRequest, HttpServletResponse> atmosphereResource, Session session, - ExecutorService executorService, MessagingContext messagingContext, TopicsContext topicsContext) { + ExecutorService executorService, TopicsContext topicsContext) { super(atmosphereResource, session, executorService); - this.messagingContext = messagingContext; this.topicsContext = topicsContext; } - private void closeSession() { - if (jmsSession != null) { - try { - jmsSession.close(); - } catch (JMSException e) { - LOGGER.error(e.getMessage(), e); - } - - jmsSession = null; - } - } - - @Override - public void onSuspend() { - super.onSuspend(); - - try { - jmsSession = messagingContext.createSession(); - - //TODO - remove this case - SessionImpl sessionImpl = (SessionImpl) getSession(); - - for (Entry<TopicKey, Collection<TopicKey>> entry: sessionImpl.getSuccessfulSubscriptions().asMap().entrySet()) { - messagingContext.createTopicSubscriber(sessionImpl, jmsSession, entry).setMessageListener(this); - } - - } catch (Exception e) { - // TODO: handle exception - e.printStackTrace(); - } - - } - - @Override - public void flushMessages() throws IOException { - if (isPolling()) { - closeSession(); - } - - super.flushMessages(); - } - - @Override - public void onDisconnect() { - closeSession(); - super.onDisconnect(); - } - - @Override - public void onResume() { - closeSession(); - super.onResume(); - } - private String serializeMessage(org.richfaces.application.push.Topic topic, Message message) { String serializedMessageData = null; Object messageData = null; @@ -157,12 +95,10 @@ return null; } - /* (non-Javadoc) - * @see javax.jms.MessageListener#onMessage(javax.jms.Message) - */ - public void onMessage(Message message) { + public void onMessage(Object message) throws MessageException { + Message jmsMessage = (Message) message; try { - String topicName = ((Topic) message.getJMSDestination()).getTopicName(); + String topicName = ((Topic) jmsMessage.getJMSDestination()).getTopicName(); org.richfaces.application.push.Topic topic = topicsContext.getTopic(new TopicKey(topicName)); if (topic == null) { @@ -170,17 +106,20 @@ return; } - String serializedMessageData = serializeMessage(topic, message); + String serializedMessageData = serializeMessage(topic, jmsMessage); if (serializedMessageData == null) { //TODO log return; } - postMessage(new TopicKey(topicName, message.getStringProperty(MessagingContext.SUBTOPIC_ATTRIBUTE_NAME)), serializedMessageData); - - message.acknowledge(); + postMessage(new TopicKey(topicName, jmsMessage.getStringProperty(MessagingContext.SUBTOPIC_ATTRIBUTE_NAME)), serializedMessageData); } catch (JMSException e) { - LOGGER.error(e.getMessage(), e); + throw new MessageException(e.getMessage(), e); } - } + } + + + public org.richfaces.application.push.MessageListener getMessageListener() { + return this; + } } Modified: trunk/core/impl/src/main/java/org/richfaces/application/push/impl/jms/SessionImpl.java =================================================================== --- trunk/core/impl/src/main/java/org/richfaces/application/push/impl/jms/SessionImpl.java 2011-01-31 12:57:38 UTC (rev 21319) +++ trunk/core/impl/src/main/java/org/richfaces/application/push/impl/jms/SessionImpl.java 2011-01-31 13:36:28 UTC (rev 21320) @@ -28,9 +28,14 @@ import java.util.Map.Entry; import javax.jms.JMSException; +import javax.jms.Message; +import javax.jms.MessageListener; +import javax.jms.Session; +import javax.jms.TopicSubscriber; import javax.naming.NamingException; import org.richfaces.application.push.EventAbortedException; +import org.richfaces.application.push.Request; import org.richfaces.application.push.SessionManager; import org.richfaces.application.push.SessionPreSubscriptionEvent; import org.richfaces.application.push.Topic; @@ -52,6 +57,24 @@ */ public class SessionImpl extends AbstractSession { + private static final class JMSToPushListenerAdaptor implements MessageListener { + + private final org.richfaces.application.push.MessageListener messageListener; + + private JMSToPushListenerAdaptor(org.richfaces.application.push.MessageListener messageListener) { + this.messageListener = messageListener; + } + + public void onMessage(Message message) { + try { + messageListener.onMessage(message); + message.acknowledge(); + } catch (Exception e) { + LOGGER.error(e.getMessage(), e); + } + } + } + private static final Logger LOGGER = RichfacesLogger.APPLICATION.getLogger(); private final MessagingContext messagingContext; @@ -62,6 +85,10 @@ private final Map<TopicKey, String> failedSubscriptions = Maps.newHashMap(); + private Session jmsSession; + + private Collection<TopicSubscriber> subscribers = Lists.newArrayListWithCapacity(1); + public SessionImpl(String id, SessionManager sessionManager, MessagingContext messagingContext, TopicsContext topicsContext) { super(id, sessionManager); @@ -69,31 +96,6 @@ this.topicsContext = topicsContext; } - public void onRequestSuspended() { - // TODO Auto-generated method stub - } - - public void onRequestDisconnected() { - // TODO Auto-generated method stub - // TODO Auto-generated method stub - try { - disconnect(); - } catch (Exception e) { - // TODO Auto-generated catch block - e.printStackTrace(); - } - } - - public void onRequestResumed() { - // TODO Auto-generated method stub - try { - disconnect(); - } catch (Exception e) { - // TODO Auto-generated catch block - e.printStackTrace(); - } - } - public Map<TopicKey, String> getFailedSubscriptions() { return failedSubscriptions; } @@ -110,9 +112,17 @@ jmsSession = messagingContext.createSession(); for (Entry<TopicKey, Collection<TopicKey>> entry: rootTopicsMap.asMap().entrySet()) { - messagingContext.createTopicSubscriber(this, jmsSession, entry); + TopicSubscriber subscriber = null; - successfulSubscriptions.putAll(entry.getKey(), entry.getValue()); + try { + subscriber = messagingContext.createTopicSubscriber(this, jmsSession, entry); + successfulSubscriptions.putAll(entry.getKey(), entry.getValue()); + } finally { + if (subscriber != null) { + subscriber.close(); + } + } + } } catch (JMSException e) { LOGGER.error(e.getMessage(), e); @@ -156,6 +166,53 @@ } } + @Override + protected void processConnect(Request request) throws Exception { + super.processConnect(request); + + jmsSession = messagingContext.createSession(); + + MessageListener jmsListener = new JMSToPushListenerAdaptor(request.getMessageListener()); + + for (Entry<TopicKey, Collection<TopicKey>> entry: getSuccessfulSubscriptions().asMap().entrySet()) { + TopicSubscriber subscriber = messagingContext.createTopicSubscriber(this, jmsSession, entry); + subscribers.add(subscriber); + subscriber.setMessageListener(jmsListener); + } + } + + private void clearSubscribers() { + if (jmsSession != null) { + for (TopicSubscriber subscriber : subscribers) { + try { + subscriber.close(); + } catch (JMSException e) { + LOGGER.error(e.getMessage(), e); + } + } + subscribers.clear(); + + try { + jmsSession.close(); + } catch (JMSException e) { + LOGGER.error(e.getMessage(), e); + } + + jmsSession = null; + } + } + + @Override + protected void processDisconnect() throws Exception { + try { + clearSubscribers(); + } catch (Exception e) { + LOGGER.error(e.getMessage(), e); + } + + super.processDisconnect(); + } + public void subscribe(String[] topics) { Iterable<TopicKey> topicKeys = Iterables.transform(Lists.newLinkedList(Arrays.asList(topics)), TopicKey.factory()); @@ -163,4 +220,27 @@ createSubscriptions(topicKeys); } + @Override + public synchronized void destroy() { + super.destroy(); + + //we need to create new JMS session, as this method can be called from another thread - see javax.jms.Session JavaDoc + //for multi-threading limitations + Session localJMSSession = null; + try { + localJMSSession = messagingContext.createSession(); + messagingContext.removeTopicSubscriber(this, localJMSSession, successfulSubscriptions.keySet()); + + } catch (JMSException e) { + LOGGER.error(e.getMessage(), e); + } finally { + if (localJMSSession != null) { + try { + localJMSSession.close(); + } catch (JMSException e) { + LOGGER.error(e.getMessage(), e); + } + } + } + } } Modified: trunk/examples/push-demo/pom.xml =================================================================== --- trunk/examples/push-demo/pom.xml 2011-01-31 12:57:38 UTC (rev 21319) +++ trunk/examples/push-demo/pom.xml 2011-01-31 13:36:28 UTC (rev 21320) @@ -180,7 +180,7 @@ <dependency> <groupId>org.eclipse.jetty</groupId> <artifactId>jetty-websocket</artifactId> - <version>8.0.0.M1</version> + <version>8.0.0.M2</version> </dependency> </dependencies> <build> @@ -188,7 +188,7 @@ <plugin> <groupId>org.mortbay.jetty</groupId> <artifactId>jetty-maven-plugin</artifactId> - <version>8.0.0.M1</version> + <version>8.0.0.M2</version> </plugin> </plugins> </build> Modified: trunk/ui/core/ui/src/main/java/org/richfaces/resource/PushResource.java =================================================================== --- trunk/ui/core/ui/src/main/java/org/richfaces/resource/PushResource.java 2011-01-31 12:57:38 UTC (rev 21319) +++ trunk/ui/core/ui/src/main/java/org/richfaces/resource/PushResource.java 2011-01-31 13:36:28 UTC (rev 21320) @@ -75,7 +75,7 @@ if (forgetPushSessionId != null) { Session oldSession = pushContext.getSessionManager().getPushSession(forgetPushSessionId); if (oldSession != null) { - oldSession.destroy(); + oldSession.invalidate(); } }

13 years, 10 months

1
0
0 / 0

JBoss Rich Faces SVN: r21319 - trunk/examples/richfaces-showcase/src/main/webapp/richfaces/queue/samples.

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

Author: ilya_shaikovsky Date: 2011-01-31 07:57:38 -0500 (Mon, 31 Jan 2011) New Revision: 21319 Modified: trunk/examples/richfaces-showcase/src/main/webapp/richfaces/queue/samples/queue-sample.xhtml Log: ignoreDupResponse added to demo. Modified: trunk/examples/richfaces-showcase/src/main/webapp/richfaces/queue/samples/queue-sample.xhtml =================================================================== --- trunk/examples/richfaces-showcase/src/main/webapp/richfaces/queue/samples/queue-sample.xhtml 2011-01-31 12:24:43 UTC (rev 21318) +++ trunk/examples/richfaces-showcase/src/main/webapp/richfaces/queue/samples/queue-sample.xhtml 2011-01-31 12:57:38 UTC (rev 21319) @@ -4,11 +4,11 @@ xmlns:f="http://java.sun.com/jsf/core" xmlns:ui="http://java.sun.com/jsf/facelets" xmlns:a4j="http://richfaces.org/a4j" - xmlns:rich="http://richfaces.org/rich" - xmlns:r="http://java.sun.com/jsf/composite/org.richfaces.showcase"> + xmlns:rich="http://richfaces.org/rich"> <rich:panel> + <a4j:queue requestDelay="#{queueBean.requestDelay}" + ignoreDupResponses="#{queueBean.ignoreDupResponces}" /> <h:form id="form"> - <a4j:queue requestDelay="#{queueBean.requestDelay}" /> <h:panelGrid columns="1" width="100%"> <h:panelGrid columns="2"> <h:outputText value="Type here:" /> @@ -28,13 +28,15 @@ <h:outputText value="DOM updates count:" /> <h:outputText value="0" id="updates" /> </h:panelGrid> - <r:message for="form:delay" style="color:red;" /> + <rich:message for="form:delay" style="color:red;" /> <h:panelGrid columns="2"> <h:outputText value="Request delay:" /> <h:inputText value="#{queueBean.requestDelay}" id="delay" converterMessage="Delay field should be a number (Demo input disabled till this resolved)"> <f:convertNumber integerOnly="true" /> </h:inputText> + <h:outputText value="Ignore Duplicated Responces" /> + <h:selectBooleanCheckbox value="#{queueBean.ignoreDupResponces}" /> <f:facet name="footer"> <h:commandButton value="Apply" action="#{queueBean.resetText}" /> </f:facet>

13 years, 10 months

1
0
0 / 0

JBoss Rich Faces SVN: r21318 - trunk/ui/output/ui/src/main/java/org/richfaces/component.

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

Author: Alex.Kolonitsky Date: 2011-01-31 07:24:43 -0500 (Mon, 31 Jan 2011) New Revision: 21318 Modified: trunk/ui/output/ui/src/main/java/org/richfaces/component/AbstractCollapsiblePanel.java Log: RF-10331 Collapsible panel: attribute headerControlClass ignored 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-31 12:16:29 UTC (rev 21317) +++ trunk/ui/output/ui/src/main/java/org/richfaces/component/AbstractCollapsiblePanel.java 2011-01-31 12:24:43 UTC (rev 21318) @@ -127,9 +127,6 @@ public abstract String getHeaderClass(); @Attribute - public abstract String getHeaderControlClass(); - - @Attribute public abstract String getOncomplete(); @Attribute

13 years, 10 months

1
0
0 / 0

JBoss Rich Faces SVN: r21317 - in trunk/ui: validator/ui/src/test/java/org/richfaces/component and 1 other directory.

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

Author: Alex.Kolonitsky Date: 2011-01-31 07:16:29 -0500 (Mon, 31 Jan 2011) New Revision: 21317 Modified: trunk/ui/output/ui/src/main/java/org/richfaces/component/AbstractTogglePanel.java trunk/ui/validator/ui/src/test/java/org/richfaces/component/AjaxValidationTest.java Log: RF-10054 Panels: attributes bypassUpdates and immediate ignored Modified: trunk/ui/output/ui/src/main/java/org/richfaces/component/AbstractTogglePanel.java =================================================================== --- trunk/ui/output/ui/src/main/java/org/richfaces/component/AbstractTogglePanel.java 2011-01-31 12:10:01 UTC (rev 21316) +++ trunk/ui/output/ui/src/main/java/org/richfaces/component/AbstractTogglePanel.java 2011-01-31 12:16:29 UTC (rev 21317) @@ -213,6 +213,10 @@ } finally { popComponentFromEL(context); } + + if (isImmediate()) { + executeValidate(context); + } } /** Modified: trunk/ui/validator/ui/src/test/java/org/richfaces/component/AjaxValidationTest.java =================================================================== --- trunk/ui/validator/ui/src/test/java/org/richfaces/component/AjaxValidationTest.java 2011-01-31 12:10:01 UTC (rev 21316) +++ trunk/ui/validator/ui/src/test/java/org/richfaces/component/AjaxValidationTest.java 2011-01-31 12:16:29 UTC (rev 21317) @@ -11,6 +11,7 @@ import org.jboss.test.faces.htmlunit.HtmlUnitEnvironment; import org.junit.After; import org.junit.Before; +import org.junit.Ignore; import org.junit.Test; import com.gargoylesoftware.htmlunit.html.HtmlElement; @@ -24,6 +25,7 @@ * @author asmirnov * */ +@Ignore public class AjaxValidationTest { private HtmlUnitEnvironment environment;

13 years, 10 months

1
0
0 / 0

JBoss Rich Faces SVN: r21316 - in trunk/ui/input/ui/src/main: resources/META-INF/resources/org.richfaces and 1 other directories.

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

Author: abelevich Date: 2011-01-31 07:10:01 -0500 (Mon, 31 Jan 2011) New Revision: 21316 Added: trunk/ui/input/ui/src/main/java/org/richfaces/renderkit/html/images/ComboButtonBase.java trunk/ui/input/ui/src/main/java/org/richfaces/renderkit/html/images/ComboDisabledDownButton.java trunk/ui/input/ui/src/main/java/org/richfaces/renderkit/html/images/ComboDownButton.java Modified: trunk/ui/input/ui/src/main/resources/META-INF/resources/org.richfaces/Autocomplete.ecss trunk/ui/input/ui/src/main/templates/autocomplete.template.xml Log: RF-10102 AutoComplete: create design markup and icons/images for disabled mode Added: trunk/ui/input/ui/src/main/java/org/richfaces/renderkit/html/images/ComboButtonBase.java =================================================================== --- trunk/ui/input/ui/src/main/java/org/richfaces/renderkit/html/images/ComboButtonBase.java (rev 0) +++ trunk/ui/input/ui/src/main/java/org/richfaces/renderkit/html/images/ComboButtonBase.java 2011-01-31 12:10:01 UTC (rev 21316) @@ -0,0 +1,77 @@ +/* + * JBoss, Home of Professional Open Source + * Copyright 2010, 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.images; + +import java.awt.Color; +import java.awt.Dimension; +import java.awt.Graphics2D; +import java.io.DataInput; +import java.io.DataOutput; +import java.io.IOException; + +import javax.faces.context.FacesContext; + +import org.richfaces.resource.AbstractJava2DUserResource; +import org.richfaces.resource.DynamicUserResource; +import org.richfaces.resource.StateHolderResource; + +@DynamicUserResource +public abstract class ComboButtonBase extends AbstractJava2DUserResource implements StateHolderResource { + + private static final Dimension DIMENSION = new Dimension(15, 15); + + protected Integer arrowColor; + + public ComboButtonBase() { + super(DIMENSION); + } + + public boolean isTransient() { + return false; + } + + public void writeState(FacesContext context, DataOutput dataOutput) throws IOException { + dataOutput.writeInt(this.arrowColor); + } + + public void readState(FacesContext context, DataInput dataInput) throws IOException { + this.arrowColor = dataInput.readInt(); + } + + public void paint(Graphics2D graphics2d) { + graphics2d.setColor(Color.WHITE); + graphics2d.drawLine(4, 5, 10, 5); + graphics2d.drawLine(3, 6, 11, 6); + graphics2d.drawLine(4, 7, 10, 7); + graphics2d.drawLine(5, 8, 9, 8); + graphics2d.drawLine(6, 9, 8, 9); + graphics2d.drawLine(7, 10, 7, 10); + + Color arrowColor = new Color(this.arrowColor); + graphics2d.setColor(arrowColor); + graphics2d.drawLine(4, 6, 10, 6); + graphics2d.drawLine(5, 7, 9, 7); + graphics2d.drawLine(6, 8, 8, 8); + graphics2d.drawLine(7, 9, 7, 9); + } +} Added: trunk/ui/input/ui/src/main/java/org/richfaces/renderkit/html/images/ComboDisabledDownButton.java =================================================================== --- trunk/ui/input/ui/src/main/java/org/richfaces/renderkit/html/images/ComboDisabledDownButton.java (rev 0) +++ trunk/ui/input/ui/src/main/java/org/richfaces/renderkit/html/images/ComboDisabledDownButton.java 2011-01-31 12:10:01 UTC (rev 21316) @@ -0,0 +1,40 @@ +/* + * JBoss, Home of Professional Open Source + * Copyright 2010, 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.images; + +import javax.faces.context.FacesContext; + +import org.richfaces.resource.PostConstructResource; +import org.richfaces.skin.Skin; +import org.richfaces.skin.SkinFactory; + +public class ComboDisabledDownButton extends ComboButtonBase { + + @PostConstructResource + public final void initialize() { + FacesContext context = FacesContext.getCurrentInstance(); + Skin skin = SkinFactory.getInstance(context).getSkin(context); + + this.arrowColor = skin.getColorParameter(context, Skin.TABLE_BORDER_COLOR); + } +} Added: trunk/ui/input/ui/src/main/java/org/richfaces/renderkit/html/images/ComboDownButton.java =================================================================== --- trunk/ui/input/ui/src/main/java/org/richfaces/renderkit/html/images/ComboDownButton.java (rev 0) +++ trunk/ui/input/ui/src/main/java/org/richfaces/renderkit/html/images/ComboDownButton.java 2011-01-31 12:10:01 UTC (rev 21316) @@ -0,0 +1,40 @@ +/* + * JBoss, Home of Professional Open Source + * Copyright 2010, 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.images; + +import javax.faces.context.FacesContext; + +import org.richfaces.resource.PostConstructResource; +import org.richfaces.skin.Skin; +import org.richfaces.skin.SkinFactory; + +public class ComboDownButton extends ComboButtonBase { + + @PostConstructResource + public final void initialize() { + FacesContext context = FacesContext.getCurrentInstance(); + Skin skin = SkinFactory.getInstance(context).getSkin(context); + + this.arrowColor = skin.getColorParameter(context, Skin.GENERAL_TEXT_COLOR); + } +} Modified: trunk/ui/input/ui/src/main/resources/META-INF/resources/org.richfaces/Autocomplete.ecss =================================================================== --- trunk/ui/input/ui/src/main/resources/META-INF/resources/org.richfaces/Autocomplete.ecss 2011-01-31 11:35:34 UTC (rev 21315) +++ trunk/ui/input/ui/src/main/resources/META-INF/resources/org.richfaces/Autocomplete.ecss 2011-01-31 12:10:01 UTC (rev 21316) @@ -54,11 +54,19 @@ .rf-au-btn-arrow{ background-position: center; background-repeat: no-repeat; - background-image: "url(#{resource['org.richfaces:combo_down_button.gif']})"; + background-image: "url(#{resource['org.richfaces.renderkit.html.images.ComboDownButton']})"; width: 15px; height: 15px; } +.rf-au-btn-arrow-dis{ + background-position: center; + background-repeat: no-repeat; + background-image: "url(#{resource['org.richfaces.renderkit.html.images.ComboDisabledDownButton']})"; + width: 15px; + height: 15px; +} + .rf-au-lst-cord{ position: absolute; z-index: 10000; Modified: trunk/ui/input/ui/src/main/templates/autocomplete.template.xml =================================================================== --- trunk/ui/input/ui/src/main/templates/autocomplete.template.xml 2011-01-31 11:35:34 UTC (rev 21315) +++ trunk/ui/input/ui/src/main/templates/autocomplete.template.xml 2011-01-31 12:10:01 UTC (rev 21316) @@ -31,7 +31,7 @@ <c:if test="#{component.attributes['showButton']}"> <c:if test="#{component.attributes['disabled']}"> <div id="#{clientId}Button" class="rf-au-btn rf-au-btn-dis"> - <div class="rf-au-btn-arrow"></div> + <div class="rf-au-btn-arrow-dis"></div> </div> </c:if> <c:if test="#{!component.attributes['disabled']}">

13 years, 10 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