richfaces-svn-commits
December 2010
richfaces-svn-commits@lists.jboss.org
- 1 participants
- 607 discussions
JBoss Rich Faces SVN: r20577 - in modules/tests/metamer/trunk/application/src/main: webapp/components/a4jCommandButton and 1 other directories.
by richfaces-svn-commits＠lists.jboss.org
Author: ppitonak(a)redhat.com
Date: 2010-12-15 08:03:51 -0500 (Wed, 15 Dec 2010)
New Revision: 20577
Modified:
modules/tests/metamer/trunk/application/src/main/java/org/richfaces/tests/metamer/bean/A4JCommandButtonBean.java
modules/tests/metamer/trunk/application/src/main/java/org/richfaces/tests/metamer/bean/A4JCommandLinkBean.java
modules/tests/metamer/trunk/application/src/main/webapp/components/a4jCommandButton/simple.xhtml
modules/tests/metamer/trunk/application/src/main/webapp/components/a4jCommandLink/simple.xhtml
Log:
* samples for command button and command link fixed
Modified: modules/tests/metamer/trunk/application/src/main/java/org/richfaces/tests/metamer/bean/A4JCommandButtonBean.java
===================================================================
--- modules/tests/metamer/trunk/application/src/main/java/org/richfaces/tests/metamer/bean/A4JCommandButtonBean.java 2010-12-15 12:05:43 UTC (rev 20576)
+++ modules/tests/metamer/trunk/application/src/main/java/org/richfaces/tests/metamer/bean/A4JCommandButtonBean.java 2010-12-15 13:03:51 UTC (rev 20577)
@@ -27,7 +27,6 @@
import javax.faces.bean.ViewScoped;
import javax.faces.event.ActionEvent;
import org.richfaces.component.UICommandButton;
-import org.richfaces.tests.metamer.Attribute;
import org.richfaces.tests.metamer.Attributes;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -58,21 +57,15 @@
logger = LoggerFactory.getLogger(getClass());
logger.debug("initializing bean " + getClass().getName());
- attributes = Attributes.getUIComponentAttributes(UICommandButton.class, getClass());
+ attributes = Attributes.getUIComponentAttributes(UICommandButton.class, getClass(), false);
- attributes.setAttribute("value", "command button");
- attributes.setAttribute("rendered", true);
attributes.setAttribute("action", "first6CharsAction");
attributes.setAttribute("actionListener", "toUpperCaseActionListener");
+ attributes.setAttribute("disabled", false);
+ attributes.get("disabled").setType(Boolean.class);
attributes.setAttribute("render", "output1 output2 output3");
-
- Attribute attr = attributes.get("disabled");
- if (attr == null) {
- attr = new Attribute("disabled");
- }
- attr.setType(Boolean.class);
- attributes.put("disabled", attr);
-
+ attributes.setAttribute("rendered", true);
+ attributes.setAttribute("value", "command button");
}
/**
Modified: modules/tests/metamer/trunk/application/src/main/java/org/richfaces/tests/metamer/bean/A4JCommandLinkBean.java
===================================================================
--- modules/tests/metamer/trunk/application/src/main/java/org/richfaces/tests/metamer/bean/A4JCommandLinkBean.java 2010-12-15 12:05:43 UTC (rev 20576)
+++ modules/tests/metamer/trunk/application/src/main/java/org/richfaces/tests/metamer/bean/A4JCommandLinkBean.java 2010-12-15 13:03:51 UTC (rev 20577)
@@ -57,12 +57,10 @@
logger = LoggerFactory.getLogger(getClass());
logger.debug("initializing bean " + getClass().getName());
- attributes = Attributes.getUIComponentAttributes(UICommandLink.class, getClass());
+ attributes = Attributes.getUIComponentAttributes(UICommandLink.class, getClass(), false);
attributes.setAttribute("value", "command link");
- attributes.setAttribute("rendered", "true");
- attributes.setAttribute("disabled", false);
- attributes.get("disabled").setType(Boolean.class);
+ attributes.setAttribute("rendered", true);
attributes.setAttribute("action", "first6CharsAction");
attributes.setAttribute("actionListener", "toUpperCaseActionListener");
attributes.setAttribute("render", "output1 output2 output3");
Modified: modules/tests/metamer/trunk/application/src/main/webapp/components/a4jCommandButton/simple.xhtml
===================================================================
--- modules/tests/metamer/trunk/application/src/main/webapp/components/a4jCommandButton/simple.xhtml 2010-12-15 12:05:43 UTC (rev 20576)
+++ modules/tests/metamer/trunk/application/src/main/webapp/components/a4jCommandButton/simple.xhtml 2010-12-15 13:03:51 UTC (rev 20577)
@@ -50,10 +50,15 @@
action="#{a4jButtonBean.attributes.action}"
actionListener="#{a4jButtonBean.attributes.actionListener}"
bypassUpdates="#{a4jButtonBean.attributes['bypassUpdates'].value}"
+ data="#{a4jButtonBean.attributes['data'].value}"
disabled="#{a4jButtonBean.attributes['disabled'].value}"
+ execute="#{a4jButtonBean.attributes['execute'].value}"
immediate="#{a4jButtonBean.attributes['immediate'].value}"
limitRender="#{a4jButtonBean.attributes['limitRender'].value}"
+ onbeforedomupdate="#{a4jButtonBean.attributes['onbeforedomupdate'].value}"
+ onbegin="#{a4jButtonBean.attributes['onbegin'].value}"
onclick="#{a4jButtonBean.attributes['onclick'].value}"
+ oncomplete="#{a4jButtonBean.attributes['oncomplete'].value}"
ondblclick="#{a4jButtonBean.attributes['ondblclick'].value}"
onkeydown="#{a4jButtonBean.attributes['onkeydown'].value}"
onkeypress="#{a4jButtonBean.attributes['onkeypress'].value}"
@@ -65,10 +70,13 @@
onmouseup="#{a4jButtonBean.attributes['onmouseup'].value}"
render="#{a4jButtonBean.attributes['render'].value}"
rendered="#{a4jButtonBean.attributes['rendered'].value}"
+ status="#{a4jButtonBean.attributes['status'].value}"
style="#{a4jButtonBean.attributes['style'].value}"
styleClass="#{a4jButtonBean.attributes['styleClass'].value}"
+ title="#{a4jButtonBean.attributes['title'].value}"
+ type="#{a4jButtonBean.attributes['type'].value}"
value="#{a4jButtonBean.attributes['value'].value}"
- execute="@form" />
+ />
</h:panelGrid>
<h:panelGrid id="outputs" columns="2">
Modified: modules/tests/metamer/trunk/application/src/main/webapp/components/a4jCommandLink/simple.xhtml
===================================================================
--- modules/tests/metamer/trunk/application/src/main/webapp/components/a4jCommandLink/simple.xhtml 2010-12-15 12:05:43 UTC (rev 20576)
+++ modules/tests/metamer/trunk/application/src/main/webapp/components/a4jCommandLink/simple.xhtml 2010-12-15 13:03:51 UTC (rev 20577)
@@ -50,10 +50,18 @@
action="#{a4jLinkBean.attributes.action}"
actionListener="#{a4jLinkBean.attributes.actionListener}"
bypassUpdates="#{a4jLinkBean.attributes['bypassUpdates'].value}"
+ charset="#{a4jLinkBean.attributes['charset'].value}"
+ coords="#{a4jLinkBean.attributes['coords'].value}"
+ data="#{a4jLinkBean.attributes['data'].value}"
disabled="#{a4jLinkBean.attributes['disabled'].value}"
+ execute="#{a4jLinkBean.attributes['execute'].value}"
+ hreflang="#{a4jLinkBean.attributes['hreflang'].value}"
immediate="#{a4jLinkBean.attributes['immediate'].value}"
limitRender="#{a4jLinkBean.attributes['limitRender'].value}"
+ onbeforedomupdate="#{a4jLinkBean.attributes['onbeforedomupdate'].value}"
+ onbegin="#{a4jLinkBean.attributes['onbegin'].value}"
onclick="#{a4jLinkBean.attributes['onclick'].value}"
+ oncomplete="#{a4jLinkBean.attributes['oncomplete'].value}"
ondblclick="#{a4jLinkBean.attributes['ondblclick'].value}"
onkeydown="#{a4jLinkBean.attributes['onkeydown'].value}"
onkeypress="#{a4jLinkBean.attributes['onkeypress'].value}"
@@ -63,13 +71,18 @@
onmouseout="#{a4jLinkBean.attributes['onmouseout'].value}"
onmouseover="#{a4jLinkBean.attributes['onmouseover'].value}"
onmouseup="#{a4jLinkBean.attributes['onmouseup'].value}"
+ rel="#{a4jLinkBean.attributes['rel'].value}"
render="#{a4jLinkBean.attributes['render'].value}"
rendered="#{a4jLinkBean.attributes['rendered'].value}"
+ rev="#{a4jLinkBean.attributes['rev'].value}"
+ shape="#{a4jLinkBean.attributes['shape'].value}"
+ status="#{a4jLinkBean.attributes['status'].value}"
style="#{a4jLinkBean.attributes['style'].value}"
styleClass="#{a4jLinkBean.attributes['styleClass'].value}"
+ title="#{a4jLinkBean.attributes['title'].value}"
+ type="#{a4jLinkBean.attributes['type'].value}"
value="#{a4jLinkBean.attributes['value'].value}"
- execute="@form" />
-
+ />
</h:panelGrid>
<h:panelGrid id="outputs" columns="2">
14 years
- 1
- 0
JBoss Rich Faces SVN: r20576 - modules/tests/metamer/trunk/application/src/main/webapp/components/richCollapsiblePanel.
by richfaces-svn-commits＠lists.jboss.org
Author: ppitonak(a)redhat.com
Date: 2010-12-15 07:05:43 -0500 (Wed, 15 Dec 2010)
New Revision: 20576
Modified:
modules/tests/metamer/trunk/application/src/main/webapp/components/richCollapsiblePanel/facets.xhtml
Log:
* attributes fixed
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 2010-12-15 12:04:05 UTC (rev 20575)
+++ modules/tests/metamer/trunk/application/src/main/webapp/components/richCollapsiblePanel/facets.xhtml 2010-12-15 12:05:43 UTC (rev 20576)
@@ -53,16 +53,13 @@
headerClass="#{richCollapsiblePanelBean.attributes['headerClass'].value}"
headerControlClass="#{richCollapsiblePanelBean.attributes['headerControlClass'].value}"
immediate="#{richCollapsiblePanelBean.attributes['immediate'].value}"
- itemChangeListener="#{richCollapsiblePanelBean.attributes['itemChangeListener'].value}"
lang="#{richCollapsiblePanelBean.attributes['lang'].value}"
- limitToList="#{richCollapsiblePanelBean.attributes['limitToList'].value}"
+ limitRender="#{richCollapsiblePanelBean.attributes['limitRender'].value}"
onbeforedomupdate="#{richCollapsiblePanelBean.attributes['onbeforedomupdate'].value}"
- onbeforeitemchange="#{richCollapsiblePanelBean.attributes['onbeforeitemchange'].value}"
onbeforeswitch="#{richCollapsiblePanelBean.attributes['onbeforeswitch'].value}"
onclick="#{richCollapsiblePanelBean.attributes['onclick'].value}"
oncomplete="#{richCollapsiblePanelBean.attributes['oncomplete'].value}"
ondblclick="#{richCollapsiblePanelBean.attributes['ondblclick'].value}"
- onitemchange="#{richCollapsiblePanelBean.attributes['onitemchange'].value}"
onmousedown="#{richCollapsiblePanelBean.attributes['onmousedown'].value}"
onmousemove="#{richCollapsiblePanelBean.attributes['onmousemove'].value}"
onmouseout="#{richCollapsiblePanelBean.attributes['onmouseout'].value}"
@@ -76,6 +73,7 @@
styleClass="#{richCollapsiblePanelBean.attributes['styleClass'].value}"
switchType="#{richCollapsiblePanelBean.attributes['switchType'].value}"
title="#{richCollapsiblePanelBean.attributes['title'].value}"
+ toggleListener="#{richCollapsiblePanelBean.toggleListener}"
>
<f:facet name="headerExpanded" >
14 years
- 1
- 0
JBoss Rich Faces SVN: r20575 - in modules/tests/metamer/trunk/application/src/main: webapp/components/richCollapsiblePanel and 1 other directory.
by richfaces-svn-commits＠lists.jboss.org
Author: ppitonak(a)redhat.com
Date: 2010-12-15 07:04:05 -0500 (Wed, 15 Dec 2010)
New Revision: 20575
Modified:
modules/tests/metamer/trunk/application/src/main/java/org/richfaces/tests/metamer/bean/RichCollapsiblePanelBean.java
modules/tests/metamer/trunk/application/src/main/webapp/components/richCollapsiblePanel/simple.xhtml
Log:
* sample for collapsible panel fixed (listener)
Modified: modules/tests/metamer/trunk/application/src/main/java/org/richfaces/tests/metamer/bean/RichCollapsiblePanelBean.java
===================================================================
--- modules/tests/metamer/trunk/application/src/main/java/org/richfaces/tests/metamer/bean/RichCollapsiblePanelBean.java 2010-12-15 11:08:33 UTC (rev 20574)
+++ modules/tests/metamer/trunk/application/src/main/java/org/richfaces/tests/metamer/bean/RichCollapsiblePanelBean.java 2010-12-15 12:04:05 UTC (rev 20575)
@@ -22,13 +22,11 @@
package org.richfaces.tests.metamer.bean;
import java.io.Serializable;
-
import javax.annotation.PostConstruct;
import javax.faces.bean.ManagedBean;
import javax.faces.bean.ViewScoped;
import org.richfaces.component.UICollapsiblePanel;
-import org.richfaces.event.ToggleEvent;
-
+import org.richfaces.event.PanelToggleEvent;
import org.richfaces.tests.metamer.Attributes;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -77,11 +75,7 @@
this.attributes = attributes;
}
- public void panelToggleListener(ToggleEvent event) {
- RichBean.logToPage("* panel " + (event.isExpanded() ? "expanded" : "collapsed"));
+ public void toggleListener(PanelToggleEvent event) {
+ RichBean.logToPage("* panel " + (event.getExpanded() ? "expanded" : "collapsed"));
}
-
- public void toggleListener() {
- RichBean.logToPage("* toggle listener");
- }
}
Property changes on: modules/tests/metamer/trunk/application/src/main/java/org/richfaces/tests/metamer/bean/RichCollapsiblePanelBean.java
___________________________________________________________________
Name: svn:keywords
+ Revision
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 2010-12-15 11:08:33 UTC (rev 20574)
+++ modules/tests/metamer/trunk/application/src/main/webapp/components/richCollapsiblePanel/simple.xhtml 2010-12-15 12:04:05 UTC (rev 20575)
@@ -72,7 +72,7 @@
styleClass="#{richCollapsiblePanelBean.attributes['styleClass'].value}"
switchType="#{richCollapsiblePanelBean.attributes['switchType'].value}"
title="#{richCollapsiblePanelBean.attributes['title'].value}"
- toggleListener="#{richCollapsiblePanelBean.panelToggleListener}"
+ toggleListener="#{richCollapsiblePanelBean.toggleListener}"
>
Lorem ipsum dolor sit amet, consectetur adipiscing elit. Phasellus a neque turpis, at cursus nunc.
14 years
- 1
- 0
JBoss Rich Faces SVN: r20574 - in modules/tests/metamer/trunk/application/src/main/webapp/components: richCollapsiblePanel and 3 other directories.
by richfaces-svn-commits＠lists.jboss.org
Author: ppitonak(a)redhat.com
Date: 2010-12-15 06:08:33 -0500 (Wed, 15 Dec 2010)
New Revision: 20574
Modified:
modules/tests/metamer/trunk/application/src/main/webapp/components/richAccordion/simple.xhtml
modules/tests/metamer/trunk/application/src/main/webapp/components/richCollapsiblePanel/simple.xhtml
modules/tests/metamer/trunk/application/src/main/webapp/components/richPanelMenu/simple.xhtml
modules/tests/metamer/trunk/application/src/main/webapp/components/richTabPanel/simple.xhtml
modules/tests/metamer/trunk/application/src/main/webapp/components/richTogglePanel/simple.xhtml
Log:
* attributes order changed
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 2010-12-15 10:37:50 UTC (rev 20573)
+++ modules/tests/metamer/trunk/application/src/main/webapp/components/richAccordion/simple.xhtml 2010-12-15 11:08:33 UTC (rev 20574)
@@ -46,7 +46,6 @@
cycledSwitching="#{richAccordionBean.attributes['cycledSwitching'].value}"
data="#{richAccordionBean.attributes['data'].value}"
dir="#{richAccordionBean.attributes['dir'].value}"
- limitRender="#{richAccordionBean.attributes['limitRender'].value}"
execute="#{richAccordionBean.attributes['execute'].value}"
height="#{richAccordionBean.attributes['height'].value}"
immediate="#{richAccordionBean.attributes['immediate'].value}"
@@ -57,6 +56,7 @@
itemHeaderClassDisabled="#{richAccordionBean.attributes['itemHeaderClassDisabled'].value}"
itemHeaderClassInactive="#{richAccordionBean.attributes['itemHeaderClassInactive'].value}"
lang="#{richAccordionBean.attributes['lang'].value}"
+ limitRender="#{richAccordionBean.attributes['limitRender'].value}"
onbeforeitemchange="#{richAccordionBean.attributes['onbeforeitemchange'].value}"
onclick="#{richAccordionBean.attributes['onclick'].value}"
ondblclick="#{richAccordionBean.attributes['ondblclick'].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 2010-12-15 10:37:50 UTC (rev 20573)
+++ modules/tests/metamer/trunk/application/src/main/webapp/components/richCollapsiblePanel/simple.xhtml 2010-12-15 11:08:33 UTC (rev 20574)
@@ -46,7 +46,6 @@
bypassUpdates="#{richCollapsiblePanelBean.attributes['bypassUpdates'].value}"
data="#{richCollapsiblePanelBean.attributes['data'].value}"
dir="#{richCollapsiblePanelBean.attributes['dir'].value}"
- limitRender="#{richCollapsiblePanelBean.attributes['limitRender'].value}"
execute="#{richCollapsiblePanelBean.attributes['execute'].value}"
expanded="#{richCollapsiblePanelBean.attributes['expanded'].value}"
header="#{richCollapsiblePanelBean.attributes['header'].value}"
@@ -54,6 +53,7 @@
headerControlClass="#{richCollapsiblePanelBean.attributes['headerControlClass'].value}"
immediate="#{richCollapsiblePanelBean.attributes['immediate'].value}"
lang="#{richCollapsiblePanelBean.attributes['lang'].value}"
+ limitRender="#{richCollapsiblePanelBean.attributes['limitRender'].value}"
onbeforedomupdate="#{richCollapsiblePanelBean.attributes['onbeforedomupdate'].value}"
onbeforeswitch="#{richCollapsiblePanelBean.attributes['onbeforeswitch'].value}"
onclick="#{richCollapsiblePanelBean.attributes['onclick'].value}"
Modified: modules/tests/metamer/trunk/application/src/main/webapp/components/richPanelMenu/simple.xhtml
===================================================================
--- modules/tests/metamer/trunk/application/src/main/webapp/components/richPanelMenu/simple.xhtml 2010-12-15 10:37:50 UTC (rev 20573)
+++ modules/tests/metamer/trunk/application/src/main/webapp/components/richPanelMenu/simple.xhtml 2010-12-15 11:08:33 UTC (rev 20574)
@@ -49,7 +49,6 @@
collapseEvent="#{richPanelMenuBean.attributes['collapseEvent'].value}"
data="#{richPanelMenuBean.attributes['data'].value}"
disabled="#{richPanelMenuBean.attributes['disabled'].value}"
- limitRender="#{richPanelMenuBean.attributes['limitRender'].value}"
execute="#{richPanelMenuBean.attributes['execute'].value}"
expandEvent="#{richPanelMenuBean.attributes['expandEvent'].value}"
expandSingle="#{richPanelMenuBean.attributes['expandSingle'].value}"
@@ -71,6 +70,7 @@
itemIconLeft="#{richPanelMenuBean.attributes['topItemDisableIconLeft'].value}"
itemIconRight="#{richPanelMenuBean.attributes['topItemDisableIconRight'].value}"
itemMode="#{richPanelMenuBean.attributes['itemMode'].value}"
+ limitRender="#{richPanelMenuBean.attributes['limitRender'].value}"
onclick="#{richPanelMenuBean.attributes['onclick'].value}"
ondblclick="#{richPanelMenuBean.attributes['ondblclick'].value}"
onmousedown="#{richPanelMenuBean.attributes['onmousedown'].value}"
Modified: modules/tests/metamer/trunk/application/src/main/webapp/components/richTabPanel/simple.xhtml
===================================================================
--- modules/tests/metamer/trunk/application/src/main/webapp/components/richTabPanel/simple.xhtml 2010-12-15 10:37:50 UTC (rev 20573)
+++ modules/tests/metamer/trunk/application/src/main/webapp/components/richTabPanel/simple.xhtml 2010-12-15 11:08:33 UTC (rev 20574)
@@ -46,13 +46,13 @@
cycledSwitching="#{richTabPanelBean.attributes['cycledSwitching'].value}"
data="#{richTabPanelBean.attributes['data'].value}"
dir="#{richTabPanelBean.attributes['dir'].value}"
- limitRender="#{richTabPanelBean.attributes['limitRender'].value}"
execute="#{richTabPanelBean.attributes['execute'].value}"
headerAlignment="#{richTabPanelBean.attributes['headerAlignment'].value}"
headerPosition="#{richTabPanelBean.attributes['headerPosition'].value}"
immediate="#{richTabPanelBean.attributes['immediate'].value}"
itemChangeListener="#{richBean.itemChangeListener}"
lang="#{richTabPanelBean.attributes['lang'].value}"
+ limitRender="#{richTabPanelBean.attributes['limitRender'].value}"
onbeforeitemchange="#{richTabPanelBean.attributes['onbeforeitemchange'].value}"
onclick="#{richTabPanelBean.attributes['onclick'].value}"
ondblclick="#{richTabPanelBean.attributes['ondblclick'].value}"
Modified: modules/tests/metamer/trunk/application/src/main/webapp/components/richTogglePanel/simple.xhtml
===================================================================
--- modules/tests/metamer/trunk/application/src/main/webapp/components/richTogglePanel/simple.xhtml 2010-12-15 10:37:50 UTC (rev 20573)
+++ modules/tests/metamer/trunk/application/src/main/webapp/components/richTogglePanel/simple.xhtml 2010-12-15 11:08:33 UTC (rev 20574)
@@ -84,11 +84,11 @@
cycledSwitching="#{richTogglePanelBean.attributes['cycledSwitching'].value}"
data="#{richTogglePanelBean.attributes['data'].value}"
dir="#{richTogglePanelBean.attributes['dir'].value}"
- limitRender="#{richTogglePanelBean.attributes['limitRender'].value}"
execute="#{richTogglePanelBean.attributes['execute'].value}"
immediate="#{richTogglePanelBean.attributes['immediate'].value}"
itemChangeListener="#{richBean.itemChangeListener}"
lang="#{richTogglePanelBean.attributes['lang'].value}"
+ limitRender="#{richTogglePanelBean.attributes['limitRender'].value}"
onbeforeitemchange="#{richTogglePanelBean.attributes['onbeforeitemchange'].value}"
onclick="#{richTogglePanelBean.attributes['onclick'].value}"
ondblclick="#{richTogglePanelBean.attributes['ondblclick'].value}"
14 years, 1 month
- 1
- 0
JBoss Rich Faces SVN: r20573 - modules/tests/metamer/trunk/application/src/main/webapp/components/richCollapsiblePanel and 9 other directories.
by richfaces-svn-commits＠lists.jboss.org
Author: Alex.Kolonitsky
Date: 2010-12-15 05:37:50 -0500 (Wed, 15 Dec 2010)
New Revision: 20573
Modified:
modules/tests/metamer/trunk/application/src/main/webapp/components/richAccordion/simple.xhtml
modules/tests/metamer/trunk/application/src/main/webapp/components/richCollapsiblePanel/simple.xhtml
modules/tests/metamer/trunk/application/src/main/webapp/components/richPanelMenu/simple.xhtml
modules/tests/metamer/trunk/application/src/main/webapp/components/richTabPanel/simple.xhtml
modules/tests/metamer/trunk/application/src/main/webapp/components/richTogglePanel/simple.xhtml
trunk/core/api/src/main/java/org/ajax4jsf/context/AjaxContext.java
trunk/core/impl/src/main/java/org/ajax4jsf/context/AjaxContextImpl.java
trunk/ui/common/ui/src/main/java/org/richfaces/renderkit/AjaxChildrenRenderer.java
trunk/ui/common/ui/src/main/java/org/richfaces/renderkit/util/AjaxRendererUtils.java
trunk/ui/output/ui/src/main/java/org/richfaces/component/AbstractPanelMenu.java
trunk/ui/output/ui/src/main/java/org/richfaces/component/AbstractPanelMenuItem.java
trunk/ui/output/ui/src/main/java/org/richfaces/component/AbstractTogglePanel.java
trunk/ui/output/ui/src/main/java/org/richfaces/component/AbstractTooltip.java
trunk/ui/output/ui/src/main/java/org/richfaces/component/UIPanelMenu.java
trunk/ui/output/ui/src/main/java/org/richfaces/component/UIPanelMenuItem.java
trunk/ui/output/ui/src/main/java/org/richfaces/component/UITogglePanel.java
trunk/ui/output/ui/src/main/java/org/richfaces/component/UITooltip.java
trunk/ui/output/ui/src/main/resources/META-INF/pn.faces-config.xml
trunk/ui/output/ui/src/main/resources/META-INF/pn.taglib.xml
Log:
RF-10002: Rename attribute disableImplicitRender to limitRender
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 2010-12-15 09:58:08 UTC (rev 20572)
+++ modules/tests/metamer/trunk/application/src/main/webapp/components/richAccordion/simple.xhtml 2010-12-15 10:37:50 UTC (rev 20573)
@@ -46,7 +46,7 @@
cycledSwitching="#{richAccordionBean.attributes['cycledSwitching'].value}"
data="#{richAccordionBean.attributes['data'].value}"
dir="#{richAccordionBean.attributes['dir'].value}"
- disableImplicitRender="#{richAccordionBean.attributes['disableImplicitRender'].value}"
+ limitRender="#{richAccordionBean.attributes['limitRender'].value}"
execute="#{richAccordionBean.attributes['execute'].value}"
height="#{richAccordionBean.attributes['height'].value}"
immediate="#{richAccordionBean.attributes['immediate'].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 2010-12-15 09:58:08 UTC (rev 20572)
+++ modules/tests/metamer/trunk/application/src/main/webapp/components/richCollapsiblePanel/simple.xhtml 2010-12-15 10:37:50 UTC (rev 20573)
@@ -46,7 +46,7 @@
bypassUpdates="#{richCollapsiblePanelBean.attributes['bypassUpdates'].value}"
data="#{richCollapsiblePanelBean.attributes['data'].value}"
dir="#{richCollapsiblePanelBean.attributes['dir'].value}"
- disableImplicitRender="#{richCollapsiblePanelBean.attributes['disableImplicitRender'].value}"
+ limitRender="#{richCollapsiblePanelBean.attributes['limitRender'].value}"
execute="#{richCollapsiblePanelBean.attributes['execute'].value}"
expanded="#{richCollapsiblePanelBean.attributes['expanded'].value}"
header="#{richCollapsiblePanelBean.attributes['header'].value}"
Modified: modules/tests/metamer/trunk/application/src/main/webapp/components/richPanelMenu/simple.xhtml
===================================================================
--- modules/tests/metamer/trunk/application/src/main/webapp/components/richPanelMenu/simple.xhtml 2010-12-15 09:58:08 UTC (rev 20572)
+++ modules/tests/metamer/trunk/application/src/main/webapp/components/richPanelMenu/simple.xhtml 2010-12-15 10:37:50 UTC (rev 20573)
@@ -49,7 +49,7 @@
collapseEvent="#{richPanelMenuBean.attributes['collapseEvent'].value}"
data="#{richPanelMenuBean.attributes['data'].value}"
disabled="#{richPanelMenuBean.attributes['disabled'].value}"
- disableImplicitRender="#{richPanelMenuBean.attributes['disableImplicitRender'].value}"
+ limitRender="#{richPanelMenuBean.attributes['limitRender'].value}"
execute="#{richPanelMenuBean.attributes['execute'].value}"
expandEvent="#{richPanelMenuBean.attributes['expandEvent'].value}"
expandSingle="#{richPanelMenuBean.attributes['expandSingle'].value}"
Modified: modules/tests/metamer/trunk/application/src/main/webapp/components/richTabPanel/simple.xhtml
===================================================================
--- modules/tests/metamer/trunk/application/src/main/webapp/components/richTabPanel/simple.xhtml 2010-12-15 09:58:08 UTC (rev 20572)
+++ modules/tests/metamer/trunk/application/src/main/webapp/components/richTabPanel/simple.xhtml 2010-12-15 10:37:50 UTC (rev 20573)
@@ -46,7 +46,7 @@
cycledSwitching="#{richTabPanelBean.attributes['cycledSwitching'].value}"
data="#{richTabPanelBean.attributes['data'].value}"
dir="#{richTabPanelBean.attributes['dir'].value}"
- disableImplicitRender="#{richTabPanelBean.attributes['disableImplicitRender'].value}"
+ limitRender="#{richTabPanelBean.attributes['limitRender'].value}"
execute="#{richTabPanelBean.attributes['execute'].value}"
headerAlignment="#{richTabPanelBean.attributes['headerAlignment'].value}"
headerPosition="#{richTabPanelBean.attributes['headerPosition'].value}"
Modified: modules/tests/metamer/trunk/application/src/main/webapp/components/richTogglePanel/simple.xhtml
===================================================================
--- modules/tests/metamer/trunk/application/src/main/webapp/components/richTogglePanel/simple.xhtml 2010-12-15 09:58:08 UTC (rev 20572)
+++ modules/tests/metamer/trunk/application/src/main/webapp/components/richTogglePanel/simple.xhtml 2010-12-15 10:37:50 UTC (rev 20573)
@@ -84,7 +84,7 @@
cycledSwitching="#{richTogglePanelBean.attributes['cycledSwitching'].value}"
data="#{richTogglePanelBean.attributes['data'].value}"
dir="#{richTogglePanelBean.attributes['dir'].value}"
- disableImplicitRender="#{richTogglePanelBean.attributes['disableImplicitRender'].value}"
+ limitRender="#{richTogglePanelBean.attributes['limitRender'].value}"
execute="#{richTogglePanelBean.attributes['execute'].value}"
immediate="#{richTogglePanelBean.attributes['immediate'].value}"
itemChangeListener="#{richBean.itemChangeListener}"
Modified: trunk/core/api/src/main/java/org/ajax4jsf/context/AjaxContext.java
===================================================================
--- trunk/core/api/src/main/java/org/ajax4jsf/context/AjaxContext.java 2010-12-15 09:58:08 UTC (rev 20572)
+++ trunk/core/api/src/main/java/org/ajax4jsf/context/AjaxContext.java 2010-12-15 10:37:50 UTC (rev 20573)
@@ -47,7 +47,7 @@
private static final String DEFAULT_CONTEXT_CLASS = "org.ajax4jsf.context.AjaxContextImpl";
private static Map<ClassLoader, Class<? extends AjaxContext>> ajaxContextClasses =
new HashMap<ClassLoader, Class<? extends AjaxContext>>();
- private boolean disableImplicitRender;
+ private boolean limitRender;
protected AjaxContext() { }
@@ -125,12 +125,12 @@
public abstract void setSubmittedRegionClientId(String submittedClientId);
- public boolean isDisableImplicitRender() {
- return disableImplicitRender;
+ public boolean isLimitRender() {
+ return limitRender;
}
- public void setDisableImplicitRender(boolean disableImplicitRender) {
- this.disableImplicitRender = disableImplicitRender;
+ public void setLimitRender(boolean limitRender) {
+ this.limitRender = limitRender;
}
/**
Modified: trunk/core/impl/src/main/java/org/ajax4jsf/context/AjaxContextImpl.java
===================================================================
--- trunk/core/impl/src/main/java/org/ajax4jsf/context/AjaxContextImpl.java 2010-12-15 09:58:08 UTC (rev 20572)
+++ trunk/core/impl/src/main/java/org/ajax4jsf/context/AjaxContextImpl.java 2010-12-15 10:37:50 UTC (rev 20573)
@@ -302,8 +302,8 @@
}
// Is that component limit to list ?
- if (Boolean.TRUE.equals(component.getAttributes().get("disableImplicitRender"))) {
- setDisableImplicitRender(true);
+ if (Boolean.TRUE.equals(component.getAttributes().get("limitRender"))) {
+ setLimitRender(true);
}
}
Modified: trunk/ui/common/ui/src/main/java/org/richfaces/renderkit/AjaxChildrenRenderer.java
===================================================================
--- trunk/ui/common/ui/src/main/java/org/richfaces/renderkit/AjaxChildrenRenderer.java 2010-12-15 09:58:08 UTC (rev 20572)
+++ trunk/ui/common/ui/src/main/java/org/richfaces/renderkit/AjaxChildrenRenderer.java 2010-12-15 10:37:50 UTC (rev 20573)
@@ -72,7 +72,7 @@
// Do not check children if we have no id to render under naming
// container.
- if (AjaxContext.getCurrentInstance(context).isDisableImplicitRender() && noIdUnderPath(path, ids)) {
+ if (AjaxContext.getCurrentInstance(context).isLimitRender() && noIdUnderPath(path, ids)) {
return;
}
}
@@ -113,7 +113,7 @@
if (component.isRendered()) { // skip not-rendered components.
boolean found = false;
- boolean disableImplicitRender = AjaxContext.getCurrentInstance(context).isDisableImplicitRender();
+ boolean limitRender = AjaxContext.getCurrentInstance(context).isLimitRender();
String elementId = component.getId();
String absoluteId = currentPath + elementId;
@@ -133,12 +133,12 @@
}
//
- if (!found && disableImplicitRender && (component instanceof NamingContainer)
+ if (!found && limitRender && (component instanceof NamingContainer)
&& noIdUnderPath(absoluteId + NamingContainer.SEPARATOR_CHAR, ids)) {
return;
}
- if (!found && !disableImplicitRender && (component instanceof AjaxOutput)) {
+ if (!found && !limitRender && (component instanceof AjaxOutput)) {
if (((AjaxOutput) component).isAjaxRendered()) {
// renderChild(context, element);
Modified: trunk/ui/common/ui/src/main/java/org/richfaces/renderkit/util/AjaxRendererUtils.java
===================================================================
--- trunk/ui/common/ui/src/main/java/org/richfaces/renderkit/util/AjaxRendererUtils.java 2010-12-15 09:58:08 UTC (rev 20572)
+++ trunk/ui/common/ui/src/main/java/org/richfaces/renderkit/util/AjaxRendererUtils.java 2010-12-15 10:37:50 UTC (rev 20573)
@@ -359,7 +359,7 @@
// options.put("parameters", parameters);
// }
// // parameter to render only current list of areas.
-//// if (isAjaxDisableImplicitRender(uiComponent)) {
+//// if (isAjaxLimitRender(uiComponent)) {
//// Set<? extends Object> ajaxAreas = getAjaxAreas(uiComponent);
//// Set<String> areasIds = new HashSet<String>();
//// if (null != ajaxAreas) {
@@ -507,7 +507,7 @@
// Set ajaxAreas = getAjaxAreas(uiComponent);
// onClick.append(',');
// // parameter to render only current list of areas.
- // if (isAjaxDisableImplicitRender(uiComponent) && ajaxAreas != null &&
+ // if (isAjaxLimitRender(uiComponent) && ajaxAreas != null &&
// ajaxAreas.size() > 0)
// {
// onClick.append('[');
Modified: trunk/ui/output/ui/src/main/java/org/richfaces/component/AbstractPanelMenu.java
===================================================================
--- trunk/ui/output/ui/src/main/java/org/richfaces/component/AbstractPanelMenu.java 2010-12-15 09:58:08 UTC (rev 20572)
+++ trunk/ui/output/ui/src/main/java/org/richfaces/component/AbstractPanelMenu.java 2010-12-15 10:37:50 UTC (rev 20573)
@@ -200,7 +200,7 @@
public abstract boolean isBypassUpdates();
- public abstract boolean isDisableImplicitRender();
+ public abstract boolean isLimitRender();
public abstract Object getData();
Modified: trunk/ui/output/ui/src/main/java/org/richfaces/component/AbstractPanelMenuItem.java
===================================================================
--- trunk/ui/output/ui/src/main/java/org/richfaces/component/AbstractPanelMenuItem.java 2010-12-15 09:58:08 UTC (rev 20572)
+++ trunk/ui/output/ui/src/main/java/org/richfaces/component/AbstractPanelMenuItem.java 2010-12-15 10:37:50 UTC (rev 20573)
@@ -119,7 +119,7 @@
public abstract boolean isBypassUpdates();
- public abstract boolean isDisableImplicitRender();
+ public abstract boolean isLimitRender();
public abstract Object getData();
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 2010-12-15 09:58:08 UTC (rev 20572)
+++ trunk/ui/output/ui/src/main/java/org/richfaces/component/AbstractTogglePanel.java 2010-12-15 10:37:50 UTC (rev 20573)
@@ -572,7 +572,7 @@
public abstract boolean isBypassUpdates();
- public abstract boolean isDisableImplicitRender();
+ public abstract boolean isLimitRender();
public abstract boolean isCycledSwitching();
Modified: trunk/ui/output/ui/src/main/java/org/richfaces/component/AbstractTooltip.java
===================================================================
--- trunk/ui/output/ui/src/main/java/org/richfaces/component/AbstractTooltip.java 2010-12-15 09:58:08 UTC (rev 20572)
+++ trunk/ui/output/ui/src/main/java/org/richfaces/component/AbstractTooltip.java 2010-12-15 10:37:50 UTC (rev 20573)
@@ -88,7 +88,7 @@
public abstract boolean isBypassUpdates();
- public abstract boolean isDisableImplicitRender();
+ public abstract boolean isLimitRender();
public abstract Object getData();
Modified: trunk/ui/output/ui/src/main/java/org/richfaces/component/UIPanelMenu.java
===================================================================
--- trunk/ui/output/ui/src/main/java/org/richfaces/component/UIPanelMenu.java 2010-12-15 09:58:08 UTC (rev 20572)
+++ trunk/ui/output/ui/src/main/java/org/richfaces/component/UIPanelMenu.java 2010-12-15 10:37:50 UTC (rev 20573)
@@ -43,7 +43,7 @@
activeItem,
itemChangeListener,
bypassUpdates,
- disableImplicitRender,
+ limitRender,
data,
status,
execute,
@@ -122,12 +122,12 @@
getStateHelper().put(PropertyKeys.bypassUpdates, bypassUpdates);
}
- public boolean isDisableImplicitRender() {
- return Boolean.valueOf(String.valueOf(getStateHelper().eval(PropertyKeys.disableImplicitRender)));
+ public boolean isLimitRender() {
+ return Boolean.valueOf(String.valueOf(getStateHelper().eval(PropertyKeys.limitRender)));
}
- public void setDisableImplicitRender(boolean disableImplicitRender) {
- getStateHelper().put(PropertyKeys.disableImplicitRender, disableImplicitRender);
+ public void setLimitRender(boolean limitRender) {
+ getStateHelper().put(PropertyKeys.limitRender, limitRender);
}
public Object getData() {
Modified: trunk/ui/output/ui/src/main/java/org/richfaces/component/UIPanelMenuItem.java
===================================================================
--- trunk/ui/output/ui/src/main/java/org/richfaces/component/UIPanelMenuItem.java 2010-12-15 09:58:08 UTC (rev 20572)
+++ trunk/ui/output/ui/src/main/java/org/richfaces/component/UIPanelMenuItem.java 2010-12-15 10:37:50 UTC (rev 20573)
@@ -38,7 +38,7 @@
name,
disabled,
bypassUpdates,
- disableImplicitRender,
+ limitRender,
data,
status,
execute,
@@ -85,12 +85,12 @@
getStateHelper().put(PropertyKeys.bypassUpdates, bypassUpdates);
}
- public boolean isDisableImplicitRender() {
- return Boolean.valueOf(String.valueOf(getStateHelper().eval(PropertyKeys.disableImplicitRender)));
+ public boolean isLimitRender() {
+ return Boolean.valueOf(String.valueOf(getStateHelper().eval(PropertyKeys.limitRender)));
}
- public void setDisableImplicitRender(boolean disableImplicitRender) {
- getStateHelper().put(PropertyKeys.disableImplicitRender, disableImplicitRender);
+ public void setLimitRender(boolean limitRender) {
+ getStateHelper().put(PropertyKeys.limitRender, limitRender);
}
public Object getData() {
Modified: trunk/ui/output/ui/src/main/java/org/richfaces/component/UITogglePanel.java
===================================================================
--- trunk/ui/output/ui/src/main/java/org/richfaces/component/UITogglePanel.java 2010-12-15 09:58:08 UTC (rev 20572)
+++ trunk/ui/output/ui/src/main/java/org/richfaces/component/UITogglePanel.java 2010-12-15 10:37:50 UTC (rev 20573)
@@ -33,7 +33,7 @@
public enum PropertyKeys {
switchType,
bypassUpdates,
- disableImplicitRender,
+ limitRender,
cycledSwitching,
data,
status,
@@ -59,12 +59,12 @@
getStateHelper().put(PropertyKeys.bypassUpdates, bypassUpdates);
}
- public boolean isDisableImplicitRender() {
- return Boolean.valueOf(String.valueOf(getStateHelper().eval(PropertyKeys.disableImplicitRender)));
+ public boolean isLimitRender() {
+ return Boolean.valueOf(String.valueOf(getStateHelper().eval(PropertyKeys.limitRender)));
}
- public void setDisableImplicitRender(boolean disableImplicitRender) {
- getStateHelper().put(PropertyKeys.disableImplicitRender, disableImplicitRender);
+ public void setLimitRender(boolean limitRender) {
+ getStateHelper().put(PropertyKeys.limitRender, limitRender);
}
public boolean isCycledSwitching() {
Modified: trunk/ui/output/ui/src/main/java/org/richfaces/component/UITooltip.java
===================================================================
--- trunk/ui/output/ui/src/main/java/org/richfaces/component/UITooltip.java 2010-12-15 09:58:08 UTC (rev 20572)
+++ trunk/ui/output/ui/src/main/java/org/richfaces/component/UITooltip.java 2010-12-15 10:37:50 UTC (rev 20573)
@@ -49,7 +49,7 @@
showEvent,
verticalOffset,
bypassUpdates,
- disableImplicitRender,
+ limitRender,
data,
status,
execute,
@@ -176,12 +176,12 @@
getStateHelper().put(PropertyKeys.bypassUpdates, bypassUpdates);
}
- public boolean isDisableImplicitRender() {
- return Boolean.valueOf(String.valueOf(getStateHelper().eval(PropertyKeys.disableImplicitRender)));
+ public boolean isLimitRender() {
+ return Boolean.valueOf(String.valueOf(getStateHelper().eval(PropertyKeys.limitRender)));
}
- public void setDisableImplicitRender(boolean disableImplicitRender) {
- getStateHelper().put(PropertyKeys.disableImplicitRender, disableImplicitRender);
+ public void setLimitRender(boolean limitRender) {
+ getStateHelper().put(PropertyKeys.limitRender, limitRender);
}
public Object getData() {
Modified: trunk/ui/output/ui/src/main/resources/META-INF/pn.faces-config.xml
===================================================================
--- trunk/ui/output/ui/src/main/resources/META-INF/pn.faces-config.xml 2010-12-15 09:58:08 UTC (rev 20572)
+++ trunk/ui/output/ui/src/main/resources/META-INF/pn.faces-config.xml 2010-12-15 10:37:50 UTC (rev 20573)
@@ -889,7 +889,7 @@
</property>
<property>
<description></description>
- <property-name>disableImplicitRender</property-name>
+ <property-name>limitRender</property-name>
<property-class>boolean</property-class>
</property>
<property>
@@ -940,7 +940,7 @@
</property>
<property>
<description></description>
- <property-name>disableImplicitRender</property-name>
+ <property-name>limitRender</property-name>
<property-class>boolean</property-class>
</property>
<property>
@@ -990,7 +990,7 @@
</property>
<property>
<description></description>
- <property-name>disableImplicitRender</property-name>
+ <property-name>limitRender</property-name>
<property-class>boolean</property-class>
</property>
<property>
@@ -1235,7 +1235,7 @@
</property>
<property>
<description></description>
- <property-name>disableImplicitRender</property-name>
+ <property-name>limitRender</property-name>
<property-class>boolean</property-class>
</property>
<property>
@@ -1579,7 +1579,7 @@
<property-class>boolean</property-class>
</property>
<property>
- <property-name>disableImplicitRender</property-name>
+ <property-name>limitRender</property-name>
<property-class>boolean</property-class>
</property>
<property>
@@ -1943,7 +1943,7 @@
</property>
<property>
<description></description>
- <property-name>disableImplicitRender</property-name>
+ <property-name>limitRender</property-name>
<property-class>boolean</property-class>
</property>
<property>
@@ -2087,7 +2087,7 @@
</property>
<property>
<description></description>
- <property-name>disableImplicitRender</property-name>
+ <property-name>limitRender</property-name>
<property-class>boolean</property-class>
</property>
<property>
Modified: trunk/ui/output/ui/src/main/resources/META-INF/pn.taglib.xml
===================================================================
--- trunk/ui/output/ui/src/main/resources/META-INF/pn.taglib.xml 2010-12-15 09:58:08 UTC (rev 20572)
+++ trunk/ui/output/ui/src/main/resources/META-INF/pn.taglib.xml 2010-12-15 10:37:50 UTC (rev 20573)
@@ -26,7 +26,7 @@
<type>boolean</type>
</attribute>
<attribute>
- <name>disableImplicitRender</name>
+ <name>limitRender</name>
<type>boolean</type>
</attribute>
<attribute>
@@ -362,7 +362,7 @@
<type>boolean</type>
</attribute>
<attribute>
- <name>disableImplicitRender</name>
+ <name>limitRender</name>
<type>boolean</type>
</attribute>
<attribute>
@@ -557,7 +557,7 @@
<type>boolean</type>
</attribute>
<attribute>
- <name>disableImplicitRender</name>
+ <name>limitRender</name>
<type>boolean</type>
</attribute>
<attribute>
@@ -627,12 +627,6 @@
<type>javax.faces.el.MethodBinding</type>
</attribute>
<attribute>
- <description>MethodExpression representing the application action to invoke when this component is activated by the user. The expression must evaluate to a public method that takes no parameters, and returns an Object (the toString() of which is called to derive the logical outcome) which is passed to the NavigationHandler for this application.</description>
- <display-name>Application Action</display-name>
- <name>actionExpression</name>
- <type>javax.el.MethodExpression</type>
- </attribute>
- <attribute>
<description><p> MethodExpression representing an action listener method that will be notified when this component is activated by the user. The expression must evaluate to a public method that takes an ActionEvent parameter, with a return type of void, <span class="changed_added_2_0">or to a public method that takes no arguments with a return type of void. In the latter case, the method has no way of easily knowing where the event came from, but this can be useful in cases where a notification is needed that "some action happened".</span> </p></description>
<display-name>Action Listener</display-name>
<name>actionListener</name>
@@ -679,7 +673,7 @@
<type>boolean</type>
</attribute>
<attribute>
- <name>disableImplicitRender</name>
+ <name>limitRender</name>
<type>boolean</type>
</attribute>
<attribute>
@@ -947,7 +941,7 @@
<type>boolean</type>
</attribute>
<attribute>
- <name>disableImplicitRender</name>
+ <name>limitRender</name>
<type>boolean</type>
</attribute>
<attribute>
@@ -1047,7 +1041,7 @@
<type>boolean</type>
</attribute>
<attribute>
- <name>disableImplicitRender</name>
+ <name>limitRender</name>
<type>boolean</type>
</attribute>
<attribute>
@@ -1223,7 +1217,7 @@
<type>boolean</type>
</attribute>
<attribute>
- <name>disableImplicitRender</name>
+ <name>limitRender</name>
<type>boolean</type>
</attribute>
<attribute>
@@ -1468,7 +1462,7 @@
<type>boolean</type>
</attribute>
<attribute>
- <name>disableImplicitRender</name>
+ <name>limitRender</name>
<type>boolean</type>
</attribute>
<attribute>
14 years, 1 month
- 1
- 0
JBoss Rich Faces SVN: r20572 - trunk/ui/dnd/ui/src/main/resources/META-INF/resources/org.richfaces.
by richfaces-svn-commits＠lists.jboss.org
Author: pyaschenko
Date: 2010-12-15 04:58:08 -0500 (Wed, 15 Dec 2010)
New Revision: 20572
Modified:
trunk/ui/dnd/ui/src/main/resources/META-INF/resources/org.richfaces/dnd-draggable.js
trunk/ui/dnd/ui/src/main/resources/META-INF/resources/org.richfaces/dnd-droppable.js
trunk/ui/dnd/ui/src/main/resources/META-INF/resources/org.richfaces/dnd-indicator.js
trunk/ui/dnd/ui/src/main/resources/META-INF/resources/org.richfaces/dnd-manager.js
Log:
https://issues.jboss.org/browse/RF-9766
client side code review
Modified: trunk/ui/dnd/ui/src/main/resources/META-INF/resources/org.richfaces/dnd-draggable.js
===================================================================
--- trunk/ui/dnd/ui/src/main/resources/META-INF/resources/org.richfaces/dnd-draggable.js 2010-12-14 23:59:44 UTC (rev 20571)
+++ trunk/ui/dnd/ui/src/main/resources/META-INF/resources/org.richfaces/dnd-draggable.js 2010-12-15 09:58:08 UTC (rev 20572)
@@ -1,3 +1,11 @@
+/*
+ * code review by Pavel Yaschenko
+ *
+ * No event's unbindings when component would be destroyed
+ * Hint: easy way to unbind - use namespaces when bind event handlers
+ *
+ */
+
(function ($, rf) {
rf.ui = rf.ui || {};
Modified: trunk/ui/dnd/ui/src/main/resources/META-INF/resources/org.richfaces/dnd-droppable.js
===================================================================
--- trunk/ui/dnd/ui/src/main/resources/META-INF/resources/org.richfaces/dnd-droppable.js 2010-12-14 23:59:44 UTC (rev 20571)
+++ trunk/ui/dnd/ui/src/main/resources/META-INF/resources/org.richfaces/dnd-droppable.js 2010-12-15 09:58:08 UTC (rev 20572)
@@ -1,3 +1,11 @@
+/*
+ * code review by Pavel Yaschenko
+ *
+ * No event's unbindings when component would be destroyed
+ * Hint: easy way to unbind - use namespaces when bind event handlers
+ *
+ */
+
(function ($, rf) {
rf.ui = rf.ui || {};
Modified: trunk/ui/dnd/ui/src/main/resources/META-INF/resources/org.richfaces/dnd-indicator.js
===================================================================
--- trunk/ui/dnd/ui/src/main/resources/META-INF/resources/org.richfaces/dnd-indicator.js 2010-12-14 23:59:44 UTC (rev 20571)
+++ trunk/ui/dnd/ui/src/main/resources/META-INF/resources/org.richfaces/dnd-indicator.js 2010-12-15 09:58:08 UTC (rev 20572)
@@ -1,3 +1,13 @@
+/*
+ * code review by Pavel Yaschenko
+ *
+ * 1. No need to save DOM element (this.indicator). We can use id to get dom element. It helps to avoid memory leaks :)
+ *
+ * 2. Name refactoring: change names acceptClass, rejectClass, draggingClass
+ * to more readable names: getAcceptClass, getRejectClass, getDragClass
+ *
+ */
+
(function ($, rf) {
rf.ui = rf.ui || {};
Modified: trunk/ui/dnd/ui/src/main/resources/META-INF/resources/org.richfaces/dnd-manager.js
===================================================================
--- trunk/ui/dnd/ui/src/main/resources/META-INF/resources/org.richfaces/dnd-manager.js 2010-12-14 23:59:44 UTC (rev 20571)
+++ trunk/ui/dnd/ui/src/main/resources/META-INF/resources/org.richfaces/dnd-manager.js 2010-12-15 09:58:08 UTC (rev 20572)
@@ -1,3 +1,25 @@
+/*
+ * code review by Pavel Yaschenko
+ *
+ * records in draggables and droppables should be cleaned up when remove component from DOM
+ *
+ * draft code: something like this
+ *
+ *
+ rf.ui.Draggable = function (id, options) {
+ var c = rf.$(id);
+ if (c) {
+ var baseDestroy = c.destroy;
+ c. destroy = f ()
+ {
+ rf.ui.DnDManager.removeDraggable(id)
+ baseDestroy.call(this);
+ }
+ }
+ // other code ...
+ }
+ */
+
(function ($, rf) {
rf.ui = rf.ui || {};
14 years, 1 month
- 1
- 0
JBoss Rich Faces SVN: r20571 - branches.
by richfaces-svn-commits＠lists.jboss.org
Author: alexsmirnov
Date: 2010-12-14 18:59:44 -0500 (Tue, 14 Dec 2010)
New Revision: 20571
Added:
branches/RF-7654/
Log:
create rich:message working branch
Copied: branches/RF-7654 (from rev 20570, trunk)
14 years, 1 month
- 1
- 0
JBoss Rich Faces SVN: r20570 - in trunk/cdk/maven-resources-plugin/src/main/java/org/richfaces/cdk: resource/scan/impl and 2 other directories.
by richfaces-svn-commits＠lists.jboss.org
Author: nbelaevski
Date: 2010-12-14 18:50:50 -0500 (Tue, 14 Dec 2010)
New Revision: 20570
Removed:
trunk/cdk/maven-resources-plugin/src/main/java/org/richfaces/cdk/resource/writer/impl/CharResourceProcessor.java
Modified:
trunk/cdk/maven-resources-plugin/src/main/java/org/richfaces/cdk/ProcessMojo.java
trunk/cdk/maven-resources-plugin/src/main/java/org/richfaces/cdk/resource/scan/impl/DynamicResourcesScanner.java
trunk/cdk/maven-resources-plugin/src/main/java/org/richfaces/cdk/resource/writer/ResourceProcessor.java
trunk/cdk/maven-resources-plugin/src/main/java/org/richfaces/cdk/resource/writer/impl/CSSResourceProcessor.java
trunk/cdk/maven-resources-plugin/src/main/java/org/richfaces/cdk/resource/writer/impl/JavaScriptResourceProcessor.java
trunk/cdk/maven-resources-plugin/src/main/java/org/richfaces/cdk/resource/writer/impl/ResourceWriterImpl.java
trunk/cdk/maven-resources-plugin/src/main/java/org/richfaces/cdk/resource/writer/impl/ThroughputResourceProcessor.java
Log:
Bug fixing for maven-resources-plugin:
- Reflections switched to use single-threaded executor
- Added processing of ${project.build.sourceEncoding} for char-based resources
- Improved IOException handling in ResourceWriterImpl
- Removed classes annotated with @DynamicResource from scanning - only @DynamicUserResource should be used
- Added warning message when generated output is being overwritten
Modified: trunk/cdk/maven-resources-plugin/src/main/java/org/richfaces/cdk/ProcessMojo.java
===================================================================
--- trunk/cdk/maven-resources-plugin/src/main/java/org/richfaces/cdk/ProcessMojo.java 2010-12-14 19:48:23 UTC (rev 20569)
+++ trunk/cdk/maven-resources-plugin/src/main/java/org/richfaces/cdk/ProcessMojo.java 2010-12-14 23:50:50 UTC (rev 20570)
@@ -31,6 +31,7 @@
import java.net.URISyntaxException;
import java.net.URL;
import java.net.URLClassLoader;
+import java.nio.charset.Charset;
import java.util.Arrays;
import java.util.Collection;
import java.util.Collections;
@@ -76,6 +77,7 @@
import com.google.common.base.Function;
import com.google.common.base.Predicate;
import com.google.common.base.Predicates;
+import com.google.common.base.Strings;
import com.google.common.collect.Constraints;
import com.google.common.collect.Lists;
import com.google.common.collect.Sets;
@@ -161,20 +163,34 @@
*/
private String webRoot;
+ /**
+ * @parameter expression="${encoding}" default-value="${project.build.sourceEncoding}"
+ */
+ private String encoding;
+
//TODO handle resource locales
private Locale resourceLocales;
private Collection<ResourceKey> foundResources = Sets.newHashSet();
- private Collection<ResourceProcessor> resourceProcessors = Arrays.<ResourceProcessor>asList(
- new JavaScriptResourceProcessor(getLog()),
- new CSSResourceProcessor());
-
// TODO executor parameters
private static ExecutorService createExecutorService() {
return Executors.newFixedThreadPool(Runtime.getRuntime().availableProcessors());
}
+ private Collection<ResourceProcessor> getDefaultResourceProcessors() {
+ Charset charset = Charset.defaultCharset();
+ if (!Strings.isNullOrEmpty(encoding)) {
+ charset = Charset.forName(encoding);
+ } else {
+ getLog().warn("Encoding is not set explicitly, CDK resources plugin will use default platform encoding for processing char-based resources");
+ }
+
+ return Arrays.<ResourceProcessor>asList(
+ new JavaScriptResourceProcessor(charset, getLog()),
+ new CSSResourceProcessor(charset));
+ }
+
private Predicate<Resource> createResourcesFilter() {
Predicate<CharSequence> contentTypePredicate = MorePredicates.compose(includedContentTypes,
excludedContentTypes, REGEX_CONTAINS_BUILDER_FUNCTION);
@@ -287,7 +303,7 @@
faces = new FacesImpl(null, new FileNameMapperImpl(fileNameMappings), resourceHandler);
faces.start();
- ResourceWriterImpl resourceWriter = new ResourceWriterImpl(resourceOutputDir, resourceMappingDir, resourceProcessors);
+ ResourceWriterImpl resourceWriter = new ResourceWriterImpl(resourceOutputDir, resourceMappingDir, getDefaultResourceProcessors(), getLog());
ResourceTaskFactoryImpl taskFactory = new ResourceTaskFactoryImpl(faces);
taskFactory.setResourceWriter(resourceWriter);
Modified: trunk/cdk/maven-resources-plugin/src/main/java/org/richfaces/cdk/resource/scan/impl/DynamicResourcesScanner.java
===================================================================
--- trunk/cdk/maven-resources-plugin/src/main/java/org/richfaces/cdk/resource/scan/impl/DynamicResourcesScanner.java 2010-12-14 19:48:23 UTC (rev 20569)
+++ trunk/cdk/maven-resources-plugin/src/main/java/org/richfaces/cdk/resource/scan/impl/DynamicResourcesScanner.java 2010-12-14 23:50:50 UTC (rev 20570)
@@ -35,7 +35,6 @@
import org.richfaces.cdk.resource.scan.impl.reflections.ReflectionsExt;
import org.richfaces.cdk.vfs.VFSRoot;
import org.richfaces.cdk.vfs.VFSType;
-import org.richfaces.resource.DynamicResource;
import org.richfaces.resource.DynamicUserResource;
import org.richfaces.resource.ResourceFactory;
import org.richfaces.resource.ResourceKey;
@@ -99,12 +98,11 @@
ConfigurationBuilder configurationBuilder = new ConfigurationBuilder().setUrls(urls);
configurationBuilder.setScanners(new SubTypesScanner(), new TypeAnnotationsScanner(),
- new MarkerResourcesScanner()).useParallelExecutor();
+ new MarkerResourcesScanner());
ReflectionsExt refl = new ReflectionsExt(configurationBuilder);
Collection<Class<?>> allClasses = Sets.newHashSet();
- addAnnotatedClasses(DynamicResource.class, refl, allClasses);
addAnnotatedClasses(DynamicUserResource.class, refl, allClasses);
allClasses.addAll(refl.getMarkedClasses());
Modified: trunk/cdk/maven-resources-plugin/src/main/java/org/richfaces/cdk/resource/writer/ResourceProcessor.java
===================================================================
--- trunk/cdk/maven-resources-plugin/src/main/java/org/richfaces/cdk/resource/writer/ResourceProcessor.java 2010-12-14 19:48:23 UTC (rev 20569)
+++ trunk/cdk/maven-resources-plugin/src/main/java/org/richfaces/cdk/resource/writer/ResourceProcessor.java 2010-12-14 23:50:50 UTC (rev 20570)
@@ -25,6 +25,9 @@
import java.io.InputStream;
import java.io.OutputStream;
+import com.google.common.io.InputSupplier;
+import com.google.common.io.OutputSupplier;
+
/**
* @author Nick Belaevski
*
@@ -33,6 +36,6 @@
public boolean isSupportedFile(String name);
- public void process(String resourceName, InputStream in, OutputStream out) throws IOException;
+ public void process(String resourceName, InputSupplier<? extends InputStream> in, OutputSupplier<? extends OutputStream> out) throws IOException;
}
Modified: trunk/cdk/maven-resources-plugin/src/main/java/org/richfaces/cdk/resource/writer/impl/CSSResourceProcessor.java
===================================================================
--- trunk/cdk/maven-resources-plugin/src/main/java/org/richfaces/cdk/resource/writer/impl/CSSResourceProcessor.java 2010-12-14 19:48:23 UTC (rev 20569)
+++ trunk/cdk/maven-resources-plugin/src/main/java/org/richfaces/cdk/resource/writer/impl/CSSResourceProcessor.java 2010-12-14 23:50:50 UTC (rev 20570)
@@ -22,25 +22,54 @@
package org.richfaces.cdk.resource.writer.impl;
import java.io.IOException;
+import java.io.InputStream;
+import java.io.InputStreamReader;
+import java.io.OutputStream;
+import java.io.OutputStreamWriter;
import java.io.Reader;
import java.io.Writer;
+import java.nio.charset.Charset;
+import org.richfaces.cdk.resource.writer.ResourceProcessor;
+
+import com.google.common.io.Closeables;
+import com.google.common.io.InputSupplier;
+import com.google.common.io.OutputSupplier;
import com.yahoo.platform.yui.compressor.CssCompressor;
/**
* @author Nick Belaevski
*
*/
-public class CSSResourceProcessor extends CharResourceProcessor {
+public class CSSResourceProcessor implements ResourceProcessor {
+ private Charset charset;
+
+ public CSSResourceProcessor(Charset charset) {
+ this.charset = charset;
+ }
+
@Override
public boolean isSupportedFile(String name) {
return name.endsWith(".css");
}
@Override
- protected void doActualProcess(String resourceName, Reader in, Writer out) throws IOException {
- new CssCompressor(in).compress(out, 0);
+ public void process(String resourceName, InputSupplier<? extends InputStream> in,
+ OutputSupplier<? extends OutputStream> out) throws IOException {
+
+ Reader reader = null;
+ Writer writer = null;
+
+ try {
+ reader = new InputStreamReader(in.getInput(), charset);
+ writer = new OutputStreamWriter(out.getOutput(), charset);
+
+ new CssCompressor(reader).compress(writer, 0);
+ } finally {
+ Closeables.closeQuietly(reader);
+ Closeables.closeQuietly(writer);
+ }
}
}
Deleted: trunk/cdk/maven-resources-plugin/src/main/java/org/richfaces/cdk/resource/writer/impl/CharResourceProcessor.java
===================================================================
--- trunk/cdk/maven-resources-plugin/src/main/java/org/richfaces/cdk/resource/writer/impl/CharResourceProcessor.java 2010-12-14 19:48:23 UTC (rev 20569)
+++ trunk/cdk/maven-resources-plugin/src/main/java/org/richfaces/cdk/resource/writer/impl/CharResourceProcessor.java 2010-12-14 23:50:50 UTC (rev 20570)
@@ -1,62 +0,0 @@
-/*
- * 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.cdk.resource.writer.impl;
-
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.InputStreamReader;
-import java.io.OutputStream;
-import java.io.OutputStreamWriter;
-import java.io.Reader;
-import java.io.Writer;
-
-import org.richfaces.cdk.resource.writer.ResourceProcessor;
-
-import com.google.common.io.Closeables;
-
-/**
- * @author Nick Belaevski
- *
- */
-public abstract class CharResourceProcessor implements ResourceProcessor {
-
- protected abstract void doActualProcess(String resourceName, Reader in, Writer out) throws IOException;
-
- @Override
- public void process(String resourceName, InputStream in, OutputStream out) throws IOException {
-
- boolean threw = true;
- Reader reader = new InputStreamReader(in);
- try {
- Writer writer = new OutputStreamWriter(out);
- try {
- doActualProcess(resourceName, reader, writer);
- threw = false;
- } finally {
- Closeables.close(writer, threw);
- }
- } finally {
- Closeables.close(reader, threw);
- }
- }
-
-}
Modified: trunk/cdk/maven-resources-plugin/src/main/java/org/richfaces/cdk/resource/writer/impl/JavaScriptResourceProcessor.java
===================================================================
--- trunk/cdk/maven-resources-plugin/src/main/java/org/richfaces/cdk/resource/writer/impl/JavaScriptResourceProcessor.java 2010-12-14 19:48:23 UTC (rev 20569)
+++ trunk/cdk/maven-resources-plugin/src/main/java/org/richfaces/cdk/resource/writer/impl/JavaScriptResourceProcessor.java 2010-12-14 23:50:50 UTC (rev 20570)
@@ -22,23 +22,34 @@
package org.richfaces.cdk.resource.writer.impl;
import java.io.IOException;
+import java.io.InputStream;
+import java.io.InputStreamReader;
+import java.io.OutputStream;
+import java.io.OutputStreamWriter;
import java.io.Reader;
import java.io.Writer;
+import java.nio.charset.Charset;
import org.apache.maven.plugin.logging.Log;
+import org.richfaces.cdk.resource.writer.ResourceProcessor;
+import com.google.common.io.Closeables;
+import com.google.common.io.InputSupplier;
+import com.google.common.io.OutputSupplier;
import com.yahoo.platform.yui.compressor.JavaScriptCompressor;
/**
* @author Nick Belaevski
*
*/
-public class JavaScriptResourceProcessor extends CharResourceProcessor {
+public class JavaScriptResourceProcessor implements ResourceProcessor {
+ private Charset charset;
+
private Log log;
- public JavaScriptResourceProcessor(Log log) {
- super();
+ public JavaScriptResourceProcessor(Charset charset, Log log) {
+ this.charset = charset;
this.log = log;
}
@@ -48,17 +59,30 @@
}
@Override
- protected void doActualProcess(String resourceName, Reader in, Writer out) throws IOException {
- MavenLogErrorReporter reporter = new MavenLogErrorReporter(resourceName);
- new JavaScriptCompressor(in, reporter).compress(out, 0, true, true, false, false);
+ public void process(String resourceName, InputSupplier<? extends InputStream> in,
+ OutputSupplier<? extends OutputStream> out) throws IOException {
+
+ Reader reader = null;
+ Writer writer = null;
- if (reporter.hasErrors() && log.isErrorEnabled()) {
- log.error(reporter.getErrorsLog());
+ try {
+ reader = new InputStreamReader(in.getInput(), charset);
+ writer = new OutputStreamWriter(out.getOutput(), charset);
+
+ MavenLogErrorReporter reporter = new MavenLogErrorReporter(resourceName);
+ new JavaScriptCompressor(reader, reporter).compress(writer, 0, true, true, false, false);
+
+ if (reporter.hasErrors() && log.isErrorEnabled()) {
+ log.error(reporter.getErrorsLog());
+ }
+
+ if (reporter.hasWarnings() && log.isDebugEnabled()) {
+ log.debug(reporter.getWarningsLog());
+ }
+ } finally {
+ Closeables.closeQuietly(reader);
+ Closeables.closeQuietly(writer);
}
-
- if (reporter.hasWarnings() && log.isDebugEnabled()) {
- log.debug(reporter.getWarningsLog());
- }
}
}
Modified: trunk/cdk/maven-resources-plugin/src/main/java/org/richfaces/cdk/resource/writer/impl/ResourceWriterImpl.java
===================================================================
--- trunk/cdk/maven-resources-plugin/src/main/java/org/richfaces/cdk/resource/writer/impl/ResourceWriterImpl.java 2010-12-14 19:48:23 UTC (rev 20569)
+++ trunk/cdk/maven-resources-plugin/src/main/java/org/richfaces/cdk/resource/writer/impl/ResourceWriterImpl.java 2010-12-14 23:50:50 UTC (rev 20570)
@@ -26,19 +26,25 @@
import java.io.File;
import java.io.FileOutputStream;
import java.io.IOException;
+import java.io.InputStream;
+import java.text.MessageFormat;
import java.util.Collections;
import java.util.Map;
import java.util.Properties;
import javax.faces.application.Resource;
+import org.apache.maven.plugin.logging.Log;
import org.richfaces.cdk.ResourceWriter;
import org.richfaces.cdk.resource.writer.ResourceProcessor;
import org.richfaces.cdk.strings.Constants;
import org.richfaces.resource.ResourceFactory;
+import com.google.common.base.Predicate;
import com.google.common.collect.Iterables;
import com.google.common.collect.Maps;
+import com.google.common.io.Files;
+import com.google.common.io.InputSupplier;
/**
* @author Nick Belaevski
@@ -46,6 +52,22 @@
*/
public class ResourceWriterImpl implements ResourceWriter {
+ private static final class ResourceInputStreamSupplier implements InputSupplier<InputStream> {
+
+ private Resource resource;
+
+ public ResourceInputStreamSupplier(Resource resource) {
+ super();
+ this.resource = resource;
+ }
+
+ @Override
+ public InputStream getInput() throws IOException {
+ return resource.getInputStream();
+ }
+
+ }
+
private File resourceContentsDir;
private File resourceMappingDir;
@@ -53,43 +75,65 @@
private Map<String, String> processedResources = Maps.newConcurrentMap();
private Iterable<ResourceProcessor> resourceProcessors;
+
+ private Log log;
- public ResourceWriterImpl(File resourceContentsDir, File resourceMappingDir, Iterable<ResourceProcessor> resourceProcessors) {
+ private long currentTime;
+
+ public ResourceWriterImpl(File resourceContentsDir, File resourceMappingDir, Iterable<ResourceProcessor> resourceProcessors, Log log) {
this.resourceContentsDir = resourceContentsDir;
this.resourceMappingDir = resourceMappingDir;
this.resourceProcessors = Iterables.concat(resourceProcessors, Collections.singleton(ThroughputResourceProcessor.INSTANCE));
+ this.log = log;
+
resourceContentsDir.mkdirs();
+
+ currentTime = System.currentTimeMillis();
}
private String getResourceQualifier(Resource resource) {
return COLON_JOINER.join(resource.getLibraryName(), resource.getResourceName());
}
- private File createOutputFile(String path) throws IOException {
+ private synchronized File createOutputFile(String path) throws IOException {
File outFile = new File(resourceContentsDir, path);
outFile.getParentFile().mkdirs();
- outFile.createNewFile();
+
+ if (outFile.exists()) {
+ if (outFile.lastModified() > currentTime) {
+ log.warn(MessageFormat.format("File {0} already exists and will be overwritten", outFile.getPath()));
+ }
+ outFile.delete();
+ }
+ if (!outFile.createNewFile()) {
+ log.warn(MessageFormat.format("Could not create {0} file", outFile.getPath()));
+ }
+
+
return outFile;
}
public void writeResource(String skinName, Resource resource) throws IOException {
- String requestPath = resource.getRequestPath();
+ final String requestPath = resource.getRequestPath();
String requestPathWithSkin = requestPath;
if (requestPath.startsWith(ResourceFactory.SKINNED_RESOURCE_PREFIX)) {
requestPathWithSkin = Constants.SLASH_JOINER.join(skinName,
requestPath.substring(ResourceFactory.SKINNED_RESOURCE_PREFIX.length()));
}
+
+ ResourceProcessor matchingProcessor = Iterables.get(Iterables.filter(resourceProcessors, new Predicate<ResourceProcessor>() {
+ @Override
+ public boolean apply(ResourceProcessor input) {
+ return input.isSupportedFile(requestPath);
+ }
+ }), 0);
- for (ResourceProcessor resourceProcessor : resourceProcessors) {
- if (resourceProcessor.isSupportedFile(requestPath)) {
- File outFile = createOutputFile(requestPathWithSkin);
- resourceProcessor.process(requestPathWithSkin, resource.getInputStream(), new FileOutputStream(outFile));
- processedResources.put(getResourceQualifier(resource), requestPath);
- return;
- }
- }
+ File outFile = createOutputFile(requestPathWithSkin);
+
+ matchingProcessor.process(requestPathWithSkin, new ResourceInputStreamSupplier(resource), Files.newOutputStreamSupplier(outFile));
+ processedResources.put(getResourceQualifier(resource), requestPath);
}
@Override
Modified: trunk/cdk/maven-resources-plugin/src/main/java/org/richfaces/cdk/resource/writer/impl/ThroughputResourceProcessor.java
===================================================================
--- trunk/cdk/maven-resources-plugin/src/main/java/org/richfaces/cdk/resource/writer/impl/ThroughputResourceProcessor.java 2010-12-14 19:48:23 UTC (rev 20569)
+++ trunk/cdk/maven-resources-plugin/src/main/java/org/richfaces/cdk/resource/writer/impl/ThroughputResourceProcessor.java 2010-12-14 23:50:50 UTC (rev 20570)
@@ -28,7 +28,8 @@
import org.richfaces.cdk.resource.writer.ResourceProcessor;
import com.google.common.io.ByteStreams;
-import com.google.common.io.Closeables;
+import com.google.common.io.InputSupplier;
+import com.google.common.io.OutputSupplier;
/**
* @author Nick Belaevski
@@ -46,13 +47,10 @@
}
@Override
- public void process(String resourceName, InputStream in, OutputStream out) throws IOException {
- try {
- ByteStreams.copy(in, out);
- } finally {
- Closeables.close(in, true);
- Closeables.close(out, true);
- }
- }
+ public void process(String resourceName, InputSupplier<? extends InputStream> in,
+ OutputSupplier<? extends OutputStream> out) throws IOException {
+ ByteStreams.copy(in, out);
+ }
+
}
14 years, 1 month
- 1
- 0
JBoss Rich Faces SVN: r20569 - trunk/ui/misc/ui/src/main/java/org/richfaces/component.
by richfaces-svn-commits＠lists.jboss.org
Author: nbelaevski
Date: 2010-12-14 14:48:23 -0500 (Tue, 14 Dec 2010)
New Revision: 20569
Modified:
trunk/ui/misc/ui/src/main/java/org/richfaces/component/AbstractJQuery.java
Log:
https://issues.jboss.org/browse/RF-9941
Modified: trunk/ui/misc/ui/src/main/java/org/richfaces/component/AbstractJQuery.java
===================================================================
--- trunk/ui/misc/ui/src/main/java/org/richfaces/component/AbstractJQuery.java 2010-12-14 19:46:10 UTC (rev 20568)
+++ trunk/ui/misc/ui/src/main/java/org/richfaces/component/AbstractJQuery.java 2010-12-14 19:48:23 UTC (rev 20569)
@@ -47,12 +47,16 @@
setRendererType("org.richfaces.JQueryRenderer");
}
+ @Attribute
public abstract String getName();
+ @Attribute
public abstract String getSelector();
+ @Attribute
public abstract String getEvent();
+ @Attribute
public abstract String getQuery();
@Attribute(defaultValue = "JQueryAttachType.DEFAULT")
14 years, 1 month
- 1
- 0
JBoss Rich Faces SVN: r20568 - in trunk/ui: iteration/ui/src/main/java/org/richfaces/renderkit and 1 other directory.
by richfaces-svn-commits＠lists.jboss.org
Author: nbelaevski
Date: 2010-12-14 14:46:10 -0500 (Tue, 14 Dec 2010)
New Revision: 20568
Modified:
trunk/ui/common/ui/src/main/java/org/richfaces/renderkit/RenderKitUtils.java
trunk/ui/iteration/ui/src/main/java/org/richfaces/renderkit/ListRendererBase.java
Log:
Minor optimization for RenderKitUtils
https://issues.jboss.org/browse/RF-9744
Modified: trunk/ui/common/ui/src/main/java/org/richfaces/renderkit/RenderKitUtils.java
===================================================================
--- trunk/ui/common/ui/src/main/java/org/richfaces/renderkit/RenderKitUtils.java 2010-12-14 19:44:26 UTC (rev 20567)
+++ trunk/ui/common/ui/src/main/java/org/richfaces/renderkit/RenderKitUtils.java 2010-12-14 19:46:10 UTC (rev 20568)
@@ -434,10 +434,11 @@
public static void renderPassThroughAttributesOptimized(FacesContext context, UIComponent component,
Map<String, ComponentAttribute> knownAttributesMap) throws IOException {
- boolean disabled = isDisabled(component);
- Set<String> handledAttributes = new HashSet<String>(knownAttributesMap.size());
Object attributesThatAreSetObject = component.getAttributes().get(ATTRIBUTES_THAT_ARE_SET);
if (attributesThatAreSetObject instanceof Collection<?>) {
+ boolean disabled = isDisabled(component);
+ Set<String> handledAttributes = new HashSet<String>(knownAttributesMap.size());
+
Collection<?> attributesThatAreSet = (Collection<?>) attributesThatAreSetObject;
for (Object attributeNameObject : attributesThatAreSet) {
if (attributeNameObject == null) {
Modified: trunk/ui/iteration/ui/src/main/java/org/richfaces/renderkit/ListRendererBase.java
===================================================================
--- trunk/ui/iteration/ui/src/main/java/org/richfaces/renderkit/ListRendererBase.java 2010-12-14 19:44:26 UTC (rev 20567)
+++ trunk/ui/iteration/ui/src/main/java/org/richfaces/renderkit/ListRendererBase.java 2010-12-14 19:46:10 UTC (rev 20568)
@@ -134,6 +134,7 @@
writer.writeAttribute(HtmlConstants.CLASS_ATTRIBUTE,
HtmlUtil.concatClasses(helper.getRowClass(), helper.getColumnClass(), "rf-dlst-trm"), null);
+ renderHandlers(context, sequence);
termFacet.encodeAll(context);
writer.endElement(HtmlConstants.DT_ELEMENT);
}
14 years, 1 month
- 1
- 0