richfaces-svn-commits
December 2010
richfaces-svn-commits@lists.jboss.org
- 1 participants
- 607 discussions
JBoss Rich Faces SVN: r20617 - trunk/examples/richfaces-showcase/src/main/resources/org/richfaces/demo/data/common.
by richfaces-svn-commits＠lists.jboss.org
Author: ilya_shaikovsky
Date: 2010-12-16 10:33:15 -0500 (Thu, 16 Dec 2010)
New Revision: 20617
Modified:
trunk/examples/richfaces-showcase/src/main/resources/org/richfaces/demo/data/common/navigation.xml
Log:
navigation.xml corrections
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 2010-12-16 15:32:54 UTC (rev 20616)
+++ trunk/examples/richfaces-showcase/src/main/resources/org/richfaces/demo/data/common/navigation.xml 2010-12-16 15:33:15 UTC (rev 20617)
@@ -548,6 +548,21 @@
</demo>
</demos>
</group>
+ <group>
+ <name>Drag and Drop</name>
+ <demos>
+ <demo new="true">
+ <id>dragDrop</id>
+ <name>Drag and Drop</name>
+ <samples>
+ <sample>
+ <id>dragDrop</id>
+ <name>Drag and Drop usage example</name>
+ </sample>
+ </samples>
+ </demo>
+ </demos>
+ </group>
<group>
<name>Misc Components/Features</name>
<demos>
@@ -593,19 +608,4 @@
</demo>
</demos>
</group>
- <group>
- <name>Drag'n'Drop</name>
- <demos>
- <demo>
- <id>dragDrop</id>
- <name>Drag'n'Drop</name>
- <samples>
- <sample>
- <id>dragDrop</id>
- <name>Drag'n'Drop usage example</name>
- </sample>
- </samples>
- </demo>
- </demos>
- </group>
</root>
14 years
- 1
- 0
JBoss Rich Faces SVN: r20616 - in trunk/ui/output/ui/src/main: templates and 1 other directory.
by richfaces-svn-commits＠lists.jboss.org
Author: amarkhel
Date: 2010-12-16 10:32:54 -0500 (Thu, 16 Dec 2010)
New Revision: 20616
Modified:
trunk/ui/output/ui/src/main/java/org/richfaces/renderkit/html/MenuGroupRendererBase.java
trunk/ui/output/ui/src/main/java/org/richfaces/renderkit/html/MenuItemRendererBase.java
trunk/ui/output/ui/src/main/templates/menugroup.template.xml
trunk/ui/output/ui/src/main/templates/menuitem.template.xml
Log:
RF-9989 Menu group: StringIndexOutOfBoundsException for attribute icon
- isStringEmpty method was implemented instead of CDK isEmpty method.
Modified: trunk/ui/output/ui/src/main/java/org/richfaces/renderkit/html/MenuGroupRendererBase.java
===================================================================
--- trunk/ui/output/ui/src/main/java/org/richfaces/renderkit/html/MenuGroupRendererBase.java 2010-12-16 15:25:30 UTC (rev 20615)
+++ trunk/ui/output/ui/src/main/java/org/richfaces/renderkit/html/MenuGroupRendererBase.java 2010-12-16 15:32:54 UTC (rev 20616)
@@ -91,4 +91,16 @@
}
return DEFAULT_MIN_POPUP_WIDTH;
}
+
+ /**
+ * It is introduced due to RF-10004 CDK: isEmpty method is generated incorrectly
+ * @param str
+ * @return
+ */
+ protected boolean isStringEmpty(String str) {
+ if (str != null && str.trim().length() > 0) {
+ return false;
+ }
+ return true;
+ }
}
Modified: trunk/ui/output/ui/src/main/java/org/richfaces/renderkit/html/MenuItemRendererBase.java
===================================================================
--- trunk/ui/output/ui/src/main/java/org/richfaces/renderkit/html/MenuItemRendererBase.java 2010-12-16 15:25:30 UTC (rev 20615)
+++ trunk/ui/output/ui/src/main/java/org/richfaces/renderkit/html/MenuItemRendererBase.java 2010-12-16 15:32:54 UTC (rev 20616)
@@ -97,14 +97,14 @@
protected String getOnClickFunction(FacesContext facesContext, UIComponent component) {
AbstractMenuItem menuItem = (AbstractMenuItem) component;
String subminMode = resolveSubmitMode(menuItem);
- if (subminMode == null || MenuComponent.MODE_SERVER.equalsIgnoreCase(subminMode)) {
+ if (menuItem.isDisabled()) {
+ return "";
+ } else if (subminMode == null || MenuComponent.MODE_SERVER.equalsIgnoreCase(subminMode)) {
return getServerSubmitFunction(menuItem);
} else if (MenuComponent.MODE_AJAX.equalsIgnoreCase(subminMode)) {
return getOnClick(facesContext, menuItem);
- } else if (menuItem.isDisabled()) {
+ } else if (MenuComponent.MODE_CLIENT.equalsIgnoreCase(subminMode)) {
return "";
- } else if (MenuComponent.MODE_CLIENT.equalsIgnoreCase(subminMode)) {
- return "";
}
return "";
@@ -173,4 +173,16 @@
}
return null;
}
+
+ /**
+ * It is introduced due to RF-10004 CDK: isEmpty method is generated incorrectly
+ * @param str
+ * @return
+ */
+ protected boolean isStringEmpty(String str) {
+ if (str != null && str.trim().length() > 0) {
+ return false;
+ }
+ return true;
+ }
}
Modified: trunk/ui/output/ui/src/main/templates/menugroup.template.xml
===================================================================
--- trunk/ui/output/ui/src/main/templates/menugroup.template.xml 2010-12-16 15:25:30 UTC (rev 20615)
+++ trunk/ui/output/ui/src/main/templates/menugroup.template.xml 2010-12-16 15:32:54 UTC (rev 20616)
@@ -40,7 +40,7 @@
<c:when test="iconFacet != null and iconFacet.isRendered()">
<cdk:call expression="iconFacet.encodeAll(facesContext)" />
</c:when>
- <c:when test="#{not empty iconAttribute}">
+ <c:when test="#{not isStringEmpty(iconAttribute)}">
<img width="16" height="16" src="#{RenderKitUtils.getResourceURL(iconAttribute, facesContext)}" alt="" />
</c:when>
<c:otherwise>
Modified: trunk/ui/output/ui/src/main/templates/menuitem.template.xml
===================================================================
--- trunk/ui/output/ui/src/main/templates/menuitem.template.xml 2010-12-16 15:25:30 UTC (rev 20615)
+++ trunk/ui/output/ui/src/main/templates/menuitem.template.xml 2010-12-16 15:32:54 UTC (rev 20616)
@@ -43,7 +43,7 @@
<c:when test="#{iconFacet != null and iconFacet.isRendered()}">
<cdk:call expression="iconFacet.encodeAll(facesContext)" />
</c:when>
- <c:when test="#{not empty iconAttribute}">
+ <c:when test="#{not isStringEmpty(iconAttribute)}">
<img width="16" height="16" src="#{RenderKitUtils.getResourceURL(iconAttribute, facesContext)}" alt="" />
</c:when>
<c:otherwise>
14 years
- 1
- 0
JBoss Rich Faces SVN: r20615 - trunk/dist.
by richfaces-svn-commits＠lists.jboss.org
Author: ilya_shaikovsky
Date: 2010-12-16 10:25:30 -0500 (Thu, 16 Dec 2010)
New Revision: 20615
Modified:
trunk/dist/readme-ui.txt
Log:
https://issues.jboss.org/browse/RF-9825
Modified: trunk/dist/readme-ui.txt
===================================================================
--- trunk/dist/readme-ui.txt 2010-12-16 15:21:24 UTC (rev 20614)
+++ trunk/dist/readme-ui.txt 2010-12-16 15:25:30 UTC (rev 20615)
@@ -133,8 +133,8 @@
Drag'n'Drop:
---------------------------------
NOTE: that names really could be renaimed. so refer to jira's and docs for more info if having problems with name
-rich:draggable
-rich:droppable
+rich:dragSource
+rich:dropTarget
rich:dragIndicator
14 years
- 1
- 0
JBoss Rich Faces SVN: r20614 - trunk/dist.
by richfaces-svn-commits＠lists.jboss.org
Author: ilya_shaikovsky
Date: 2010-12-16 10:21:24 -0500 (Thu, 16 Dec 2010)
New Revision: 20614
Modified:
trunk/dist/readme-ui.txt
Log:
https://issues.jboss.org/browse/RF-9825
Modified: trunk/dist/readme-ui.txt
===================================================================
--- trunk/dist/readme-ui.txt 2010-12-16 14:51:35 UTC (rev 20613)
+++ trunk/dist/readme-ui.txt 2010-12-16 15:21:24 UTC (rev 20614)
@@ -85,6 +85,7 @@
rich:panel
rich:popupPanel
rich:tabPanel
+rich:tab
rich:togglePanel
rich:toggleControl
rich:togglePanelItem
@@ -92,15 +93,51 @@
rich:accordion
rich:accordionItem
rich:progressBar
+rich:tooltip
+rich:message
+rich:messages
---------------------------------
+Menus:
+---------------------------------
+rich:toolbar
+rich:dropDownMenu
+rich:menuGroup
+rich:menuItem
+rich:menuSeparator
+rich:panelMenu
+rich:panelMenuGroup
+rich:panelMenuItem
+
+---------------------------------
Input:
---------------------------------
rich:autocomplete
rich:inplaceInput
+rich:inplaceSelect
rich:inputNumberSlider
rich:inputNumberSpinner
+rich:select
+rich:calendar
+rich:fileUpload
+---------------------------------
+Trees:
+---------------------------------
+rich:tree
+rich:treeNode
+rich:treeModelAdaptor
+rich:treeModelRecursiveAdaptor
+
+---------------------------------
+Drag'n'Drop:
+---------------------------------
+NOTE: that names really could be renaimed. so refer to jira's and docs for more info if having problems with name
+rich:draggable
+rich:droppable
+rich:dragIndicator
+
+
Learn more
----------
RichFaces Project - http://www.jboss.org/richfaces
14 years
- 1
- 0
JBoss Rich Faces SVN: r20613 - trunk/examples/richfaces-showcase/src/main/java/org/richfaces/demo/calendar.
by richfaces-svn-commits＠lists.jboss.org
Author: ilya_shaikovsky
Date: 2010-12-16 09:51:35 -0500 (Thu, 16 Dec 2010)
New Revision: 20613
Modified:
trunk/examples/richfaces-showcase/src/main/java/org/richfaces/demo/calendar/CalendarBean.java
Log:
https://issues.jboss.org/browse/RF-10029
Modified: trunk/examples/richfaces-showcase/src/main/java/org/richfaces/demo/calendar/CalendarBean.java
===================================================================
--- trunk/examples/richfaces-showcase/src/main/java/org/richfaces/demo/calendar/CalendarBean.java 2010-12-16 14:33:55 UTC (rev 20612)
+++ trunk/examples/richfaces-showcase/src/main/java/org/richfaces/demo/calendar/CalendarBean.java 2010-12-16 14:51:35 UTC (rev 20613)
@@ -1,15 +1,16 @@
package org.richfaces.demo.calendar;
+import java.io.Serializable;
import java.util.Date;
import java.util.Locale;
import javax.faces.bean.ManagedBean;
-import javax.faces.bean.RequestScoped;
+import javax.faces.bean.ViewScoped;
import javax.faces.event.ValueChangeEvent;
@ManagedBean
-@RequestScoped
-public class CalendarBean {
+@ViewScoped
+public class CalendarBean implements Serializable{
private Locale locale;
private boolean popup;
14 years
- 1
- 0
JBoss Rich Faces SVN: r20612 - in trunk/examples/richfaces-showcase/src/main/webapp: richfaces/dropDownMenu/samples and 1 other directory.
by richfaces-svn-commits＠lists.jboss.org
Author: ilya_shaikovsky
Date: 2010-12-16 09:33:55 -0500 (Thu, 16 Dec 2010)
New Revision: 20612
Added:
trunk/examples/richfaces-showcase/src/main/webapp/images/icons/new.gif
trunk/examples/richfaces-showcase/src/main/webapp/images/icons/palette_edit.gif
trunk/examples/richfaces-showcase/src/main/webapp/images/icons/print.gif
trunk/examples/richfaces-showcase/src/main/webapp/images/icons/print_edit.gif
trunk/examples/richfaces-showcase/src/main/webapp/images/icons/print_preview.gif
trunk/examples/richfaces-showcase/src/main/webapp/images/icons/search_item.gif
trunk/examples/richfaces-showcase/src/main/webapp/images/icons/timer_task.gif
trunk/examples/richfaces-showcase/src/main/webapp/images/icons/webapp_session_config.gif
trunk/examples/richfaces-showcase/src/main/webapp/images/icons/webapp_welcome.gif
trunk/examples/richfaces-showcase/src/main/webapp/images/icons/yellow_lamp.gif
Modified:
trunk/examples/richfaces-showcase/src/main/webapp/richfaces/dropDownMenu/samples/sideMenu-sample.xhtml
Log:
https://issues.jboss.org/browse/RF-10028
Added: trunk/examples/richfaces-showcase/src/main/webapp/images/icons/new.gif
===================================================================
(Binary files differ)
Property changes on: trunk/examples/richfaces-showcase/src/main/webapp/images/icons/new.gif
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/examples/richfaces-showcase/src/main/webapp/images/icons/palette_edit.gif
===================================================================
(Binary files differ)
Property changes on: trunk/examples/richfaces-showcase/src/main/webapp/images/icons/palette_edit.gif
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/examples/richfaces-showcase/src/main/webapp/images/icons/print.gif
===================================================================
(Binary files differ)
Property changes on: trunk/examples/richfaces-showcase/src/main/webapp/images/icons/print.gif
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/examples/richfaces-showcase/src/main/webapp/images/icons/print_edit.gif
===================================================================
(Binary files differ)
Property changes on: trunk/examples/richfaces-showcase/src/main/webapp/images/icons/print_edit.gif
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/examples/richfaces-showcase/src/main/webapp/images/icons/print_preview.gif
===================================================================
(Binary files differ)
Property changes on: trunk/examples/richfaces-showcase/src/main/webapp/images/icons/print_preview.gif
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/examples/richfaces-showcase/src/main/webapp/images/icons/search_item.gif
===================================================================
(Binary files differ)
Property changes on: trunk/examples/richfaces-showcase/src/main/webapp/images/icons/search_item.gif
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/examples/richfaces-showcase/src/main/webapp/images/icons/timer_task.gif
===================================================================
(Binary files differ)
Property changes on: trunk/examples/richfaces-showcase/src/main/webapp/images/icons/timer_task.gif
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/examples/richfaces-showcase/src/main/webapp/images/icons/webapp_session_config.gif
===================================================================
(Binary files differ)
Property changes on: trunk/examples/richfaces-showcase/src/main/webapp/images/icons/webapp_session_config.gif
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/examples/richfaces-showcase/src/main/webapp/images/icons/webapp_welcome.gif
===================================================================
(Binary files differ)
Property changes on: trunk/examples/richfaces-showcase/src/main/webapp/images/icons/webapp_welcome.gif
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/examples/richfaces-showcase/src/main/webapp/images/icons/yellow_lamp.gif
===================================================================
(Binary files differ)
Property changes on: trunk/examples/richfaces-showcase/src/main/webapp/images/icons/yellow_lamp.gif
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Modified: trunk/examples/richfaces-showcase/src/main/webapp/richfaces/dropDownMenu/samples/sideMenu-sample.xhtml
===================================================================
--- trunk/examples/richfaces-showcase/src/main/webapp/richfaces/dropDownMenu/samples/sideMenu-sample.xhtml 2010-12-16 14:24:25 UTC (rev 20611)
+++ trunk/examples/richfaces-showcase/src/main/webapp/richfaces/dropDownMenu/samples/sideMenu-sample.xhtml 2010-12-16 14:33:55 UTC (rev 20612)
@@ -25,7 +25,7 @@
<rich:menuItem label="Suboption 1-1" />
<rich:menuItem label="Suboption 1-2">
<f:facet name="icon">
- <h:graphicImage value="/richfaces/toolBar/images/print.gif" />
+ <h:graphicImage value="/images/icons/print.gif" />
</f:facet>
</rich:menuItem>
<rich:menuItem label="Suboption 1-3" />
14 years
- 1
- 0
JBoss Rich Faces SVN: r20611 - trunk/examples/richfaces-showcase/src/main/webapp/richfaces/toolBar/samples.
by richfaces-svn-commits＠lists.jboss.org
Author: ilya_shaikovsky
Date: 2010-12-16 09:24:25 -0500 (Thu, 16 Dec 2010)
New Revision: 20611
Modified:
trunk/examples/richfaces-showcase/src/main/webapp/richfaces/toolBar/samples/toolBar-sample.xhtml
trunk/examples/richfaces-showcase/src/main/webapp/richfaces/toolBar/samples/toolBarIcons-sample.xhtml
Log:
https://issues.jboss.org/browse/RF-10027
Modified: trunk/examples/richfaces-showcase/src/main/webapp/richfaces/toolBar/samples/toolBar-sample.xhtml
===================================================================
--- trunk/examples/richfaces-showcase/src/main/webapp/richfaces/toolBar/samples/toolBar-sample.xhtml 2010-12-16 13:54:50 UTC (rev 20610)
+++ trunk/examples/richfaces-showcase/src/main/webapp/richfaces/toolBar/samples/toolBar-sample.xhtml 2010-12-16 14:24:25 UTC (rev 20611)
@@ -23,24 +23,24 @@
}
</style>
- <rich:toolBar height="26" itemSeparator="grid">
- <rich:toolBarGroup>
+ <rich:toolbar height="26" itemSeparator="grid">
+ <rich:toolbarGroup>
<h:graphicImage value="/images/icons/create_doc.gif" styleClass="pic" />
<h:graphicImage value="/images/icons/create_folder.gif"
styleClass="pic" />
<h:graphicImage value="/images/icons/copy.gif" styleClass="pic" />
- </rich:toolBarGroup>
- <rich:toolBarGroup>
+ </rich:toolbarGroup>
+ <rich:toolbarGroup>
<h:graphicImage value="/images/icons/save.gif" styleClass="pic" />
<h:graphicImage value="/images/icons/save_as.gif" styleClass="pic" />
<h:graphicImage value="/images/icons/save_all.gif" styleClass="pic" />
- </rich:toolBarGroup>
- <rich:toolBarGroup location="right">
+ </rich:toolbarGroup>
+ <rich:toolbarGroup location="right">
<h:inputText styleClass="barsearch" />
<h:commandButton styleClass="barsearchbutton" onclick="return false;"
value="Search" />
- </rich:toolBarGroup>
- </rich:toolBar>
+ </rich:toolbarGroup>
+ </rich:toolbar>
</ui:composition>
\ No newline at end of file
Modified: trunk/examples/richfaces-showcase/src/main/webapp/richfaces/toolBar/samples/toolBarIcons-sample.xhtml
===================================================================
--- trunk/examples/richfaces-showcase/src/main/webapp/richfaces/toolBar/samples/toolBarIcons-sample.xhtml 2010-12-16 13:54:50 UTC (rev 20610)
+++ trunk/examples/richfaces-showcase/src/main/webapp/richfaces/toolBar/samples/toolBarIcons-sample.xhtml 2010-12-16 14:24:25 UTC (rev 20611)
@@ -73,23 +73,23 @@
</h:panelGrid>
</h:form>
<a4j:outputPanel ajaxRendered="true">
- <rich:toolBar id="bar" height="30"
+ <rich:toolbar id="bar" height="30"
itemSeparator="#{toolBarBean.groupSeparator}">
- <rich:toolBarGroup itemSeparator="#{toolBarBean.groupItemSeparator}">
+ <rich:toolbarGroup itemSeparator="#{toolBarBean.groupItemSeparator}">
<h:outputText value="Group1.1"></h:outputText>
<h:outputText value="Group1.2"></h:outputText>
<h:outputText value="Group1.3"></h:outputText>
- </rich:toolBarGroup>
- <rich:toolBarGroup itemSeparator="#{toolBarBean.groupItemSeparator}">
+ </rich:toolbarGroup>
+ <rich:toolbarGroup itemSeparator="#{toolBarBean.groupItemSeparator}">
<h:outputText value="Group2.1"></h:outputText>
<h:outputText value="Group2.2"></h:outputText>
- </rich:toolBarGroup>
- <rich:toolBarGroup location="right"
+ </rich:toolbarGroup>
+ <rich:toolbarGroup location="right"
itemSeparator="#{toolBarBean.groupItemSeparator}">
<h:outputText value="Group3.1"></h:outputText>
<h:outputText value="Group3.2"></h:outputText>
- </rich:toolBarGroup>
- </rich:toolBar>
+ </rich:toolbarGroup>
+ </rich:toolbar>
</a4j:outputPanel>
</ui:composition>
\ No newline at end of file
14 years
- 1
- 0
JBoss Rich Faces SVN: r20610 - modules/tests/metamer/trunk/application/src/main/java/org/richfaces/tests/metamer/bean.
by richfaces-svn-commits＠lists.jboss.org
Author: ppitonak(a)redhat.com
Date: 2010-12-16 08:54:50 -0500 (Thu, 16 Dec 2010)
New Revision: 20610
Modified:
modules/tests/metamer/trunk/application/src/main/java/org/richfaces/tests/metamer/bean/A4JLogBean.java
modules/tests/metamer/trunk/application/src/main/java/org/richfaces/tests/metamer/bean/A4JMediaOutputBean.java
modules/tests/metamer/trunk/application/src/main/java/org/richfaces/tests/metamer/bean/A4JOutputPanelBean.java
modules/tests/metamer/trunk/application/src/main/java/org/richfaces/tests/metamer/bean/A4JParamBean.java
modules/tests/metamer/trunk/application/src/main/java/org/richfaces/tests/metamer/bean/MediaData.java
modules/tests/metamer/trunk/application/src/main/java/org/richfaces/tests/metamer/bean/RichCollapsibleSubTableBean.java
modules/tests/metamer/trunk/application/src/main/java/org/richfaces/tests/metamer/bean/RichCollapsibleSubTableTogglerlBean.java
Log:
* scope of beans changed to view
Modified: modules/tests/metamer/trunk/application/src/main/java/org/richfaces/tests/metamer/bean/A4JLogBean.java
===================================================================
--- modules/tests/metamer/trunk/application/src/main/java/org/richfaces/tests/metamer/bean/A4JLogBean.java 2010-12-16 13:44:29 UTC (rev 20609)
+++ modules/tests/metamer/trunk/application/src/main/java/org/richfaces/tests/metamer/bean/A4JLogBean.java 2010-12-16 13:54:50 UTC (rev 20610)
@@ -19,16 +19,15 @@
* 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.bean;
import java.io.Serializable;
import javax.annotation.PostConstruct;
import javax.faces.bean.ManagedBean;
-import javax.faces.bean.SessionScoped;
-import org.richfaces.component.UIAjaxLog;
+import javax.faces.bean.ViewScoped;
+import org.richfaces.component.UIAjaxLog;
import org.richfaces.tests.metamer.Attributes;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -40,7 +39,7 @@
* @version $Revision$
*/
@ManagedBean(name = "a4jLogBean")
-@SessionScoped
+@ViewScoped
public class A4JLogBean implements Serializable {
private static final long serialVersionUID = -1L;
@@ -57,9 +56,9 @@
logger.debug("initializing bean " + getClass().getName());
name = "John";
-
+
attributes = Attributes.getComponentAttributesFromClass(UIAjaxLog.class, getClass());
-
+
attributes.setAttribute("rendered", true);
attributes.setAttribute("level", "debug");
}
Modified: modules/tests/metamer/trunk/application/src/main/java/org/richfaces/tests/metamer/bean/A4JMediaOutputBean.java
===================================================================
--- modules/tests/metamer/trunk/application/src/main/java/org/richfaces/tests/metamer/bean/A4JMediaOutputBean.java 2010-12-16 13:44:29 UTC (rev 20609)
+++ modules/tests/metamer/trunk/application/src/main/java/org/richfaces/tests/metamer/bean/A4JMediaOutputBean.java 2010-12-16 13:54:50 UTC (rev 20610)
@@ -19,7 +19,6 @@
* 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.bean;
import java.awt.Color;
@@ -34,10 +33,10 @@
import javax.annotation.PostConstruct;
import javax.faces.bean.ManagedBean;
-import javax.faces.bean.SessionScoped;
+import javax.faces.bean.ViewScoped;
import javax.imageio.ImageIO;
-import org.richfaces.component.UIMediaOutput;
+import org.richfaces.component.UIMediaOutput;
import org.richfaces.tests.metamer.Attributes;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -49,7 +48,7 @@
* @version $Revision$
*/
@ManagedBean(name = "a4jMediaOutputBean")
-@SessionScoped
+@ViewScoped
public class A4JMediaOutputBean implements Serializable {
private static final long serialVersionUID = -1L;
@@ -65,7 +64,7 @@
logger.debug("initializing bean " + getClass().getName());
attributes = Attributes.getComponentAttributesFromClass(UIMediaOutput.class, getClass());
-
+
attributes.setAttribute("session", true);
attributes.setAttribute("rendered", true);
attributes.remove("createContent");
Modified: modules/tests/metamer/trunk/application/src/main/java/org/richfaces/tests/metamer/bean/A4JOutputPanelBean.java
===================================================================
--- modules/tests/metamer/trunk/application/src/main/java/org/richfaces/tests/metamer/bean/A4JOutputPanelBean.java 2010-12-16 13:44:29 UTC (rev 20609)
+++ modules/tests/metamer/trunk/application/src/main/java/org/richfaces/tests/metamer/bean/A4JOutputPanelBean.java 2010-12-16 13:54:50 UTC (rev 20610)
@@ -25,9 +25,9 @@
import javax.annotation.PostConstruct;
import javax.faces.bean.ManagedBean;
-import javax.faces.bean.SessionScoped;
+import javax.faces.bean.ViewScoped;
+
import org.richfaces.component.UIOutputPanel;
-
import org.richfaces.tests.metamer.Attributes;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -39,7 +39,7 @@
* @version $Revision$
*/
@ManagedBean(name = "a4jOutputPanelBean")
-@SessionScoped
+@ViewScoped
public class A4JOutputPanelBean implements Serializable {
private static final long serialVersionUID = 4814439475400649809L;
Modified: modules/tests/metamer/trunk/application/src/main/java/org/richfaces/tests/metamer/bean/A4JParamBean.java
===================================================================
--- modules/tests/metamer/trunk/application/src/main/java/org/richfaces/tests/metamer/bean/A4JParamBean.java 2010-12-16 13:44:29 UTC (rev 20609)
+++ modules/tests/metamer/trunk/application/src/main/java/org/richfaces/tests/metamer/bean/A4JParamBean.java 2010-12-16 13:54:50 UTC (rev 20610)
@@ -19,16 +19,15 @@
* 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.bean;
import java.io.Serializable;
import javax.annotation.PostConstruct;
import javax.faces.bean.ManagedBean;
-import javax.faces.bean.SessionScoped;
-import org.ajax4jsf.component.UIActionParameter;
+import javax.faces.bean.ViewScoped;
+import org.ajax4jsf.component.UIActionParameter;
import org.richfaces.tests.metamer.Attributes;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -40,14 +39,12 @@
* @version $Revision$
*/
@ManagedBean(name = "a4jParamBean")
-@SessionScoped
+@ViewScoped
public class A4JParamBean implements Serializable {
private static final long serialVersionUID = -23993426776944L;
private static Logger logger;
private Attributes attributes;
- private int width;
- private int height;
private String parameter;
/**
@@ -59,7 +56,7 @@
logger.debug("initializing bean " + getClass().getName());
attributes = Attributes.getComponentAttributesFromClass(UIActionParameter.class, getClass());
-
+
attributes.setAttribute("name", "param");
attributes.setAttribute("noEscape", true);
attributes.setAttribute("value", "screen.width");
@@ -96,5 +93,4 @@
parameter = null;
return null;
}
-
}
Modified: modules/tests/metamer/trunk/application/src/main/java/org/richfaces/tests/metamer/bean/MediaData.java
===================================================================
--- modules/tests/metamer/trunk/application/src/main/java/org/richfaces/tests/metamer/bean/MediaData.java 2010-12-16 13:44:29 UTC (rev 20609)
+++ modules/tests/metamer/trunk/application/src/main/java/org/richfaces/tests/metamer/bean/MediaData.java 2010-12-16 13:54:50 UTC (rev 20610)
@@ -19,21 +19,17 @@
* 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.bean;
-import javax.faces.bean.ManagedBean;
-import javax.faces.bean.SessionScoped;
-
import java.io.Serializable;
+import javax.faces.bean.ManagedBean;
+import javax.faces.bean.ViewScoped;
+
@ManagedBean(name = "mediaData")
-@SessionScoped
+@ViewScoped
public class MediaData implements Serializable {
- /**
- *
- */
private static final long serialVersionUID = 1L;
int height = 120;
int width = 300;
@@ -42,10 +38,9 @@
String text;
public MediaData() {
- setText("RichFaces 4.0");
- setColor(1000);
- setScale(2);
- System.out.println("MediaData instantiated");
+ text = "RichFaces 4.0";
+ color = 1000;
+ scale = 2;
}
public Integer getColor() {
Modified: modules/tests/metamer/trunk/application/src/main/java/org/richfaces/tests/metamer/bean/RichCollapsibleSubTableBean.java
===================================================================
--- modules/tests/metamer/trunk/application/src/main/java/org/richfaces/tests/metamer/bean/RichCollapsibleSubTableBean.java 2010-12-16 13:44:29 UTC (rev 20609)
+++ modules/tests/metamer/trunk/application/src/main/java/org/richfaces/tests/metamer/bean/RichCollapsibleSubTableBean.java 2010-12-16 13:54:50 UTC (rev 20610)
@@ -28,7 +28,7 @@
import javax.annotation.PostConstruct;
import javax.faces.bean.ManagedBean;
import javax.faces.bean.ManagedProperty;
-import javax.faces.bean.SessionScoped;
+import javax.faces.bean.ViewScoped;
import org.richfaces.component.UICollapsibleSubTable;
import org.richfaces.tests.metamer.Attributes;
@@ -44,7 +44,7 @@
* @version $Revision$
*/
@ManagedBean(name="richSubTableBean")
-@SessionScoped
+@ViewScoped
public class RichCollapsibleSubTableBean implements Serializable {
private static final long serialVersionUID = -1L;
Modified: modules/tests/metamer/trunk/application/src/main/java/org/richfaces/tests/metamer/bean/RichCollapsibleSubTableTogglerlBean.java
===================================================================
--- modules/tests/metamer/trunk/application/src/main/java/org/richfaces/tests/metamer/bean/RichCollapsibleSubTableTogglerlBean.java 2010-12-16 13:44:29 UTC (rev 20609)
+++ modules/tests/metamer/trunk/application/src/main/java/org/richfaces/tests/metamer/bean/RichCollapsibleSubTableTogglerlBean.java 2010-12-16 13:54:50 UTC (rev 20610)
@@ -28,7 +28,7 @@
import javax.annotation.PostConstruct;
import javax.faces.bean.ManagedBean;
import javax.faces.bean.ManagedProperty;
-import javax.faces.bean.SessionScoped;
+import javax.faces.bean.ViewScoped;
import org.richfaces.component.UICollapsibleSubTableToggleControl;
import org.richfaces.tests.metamer.Attributes;
@@ -44,7 +44,7 @@
* @version $Revision$
*/
@ManagedBean(name="richSubTableTogglerBean")
-@SessionScoped
+@ViewScoped
public class RichCollapsibleSubTableTogglerlBean implements Serializable {
private static final long serialVersionUID = -1L;
14 years
- 1
- 0
JBoss Rich Faces SVN: r20609 - in modules/tests/metamer/trunk/application/src/main: webapp/components/richCollapsibleSubTable and 1 other directories.
by richfaces-svn-commits＠lists.jboss.org
Author: ppitonak(a)redhat.com
Date: 2010-12-16 08:44:29 -0500 (Thu, 16 Dec 2010)
New Revision: 20609
Added:
modules/tests/metamer/trunk/application/src/main/java/org/richfaces/tests/metamer/bean/RichCollapsibleSubTableBean.java
modules/tests/metamer/trunk/application/src/main/java/org/richfaces/tests/metamer/bean/RichCollapsibleSubTableTogglerlBean.java
Removed:
modules/tests/metamer/trunk/application/src/main/java/org/richfaces/tests/metamer/bean/RichSubTableBean.java
modules/tests/metamer/trunk/application/src/main/java/org/richfaces/tests/metamer/bean/RichSubTableToggleControlBean.java
Modified:
modules/tests/metamer/trunk/application/src/main/java/org/richfaces/tests/metamer/bean/RichBean.java
modules/tests/metamer/trunk/application/src/main/webapp/components/richCollapsibleSubTable/components2.xhtml
modules/tests/metamer/trunk/application/src/main/webapp/components/richCollapsibleSubTableToggler/simple.xhtml
Log:
* bean for collapsibleSubTable and collapsibleSubTableToggler renamed
Modified: modules/tests/metamer/trunk/application/src/main/java/org/richfaces/tests/metamer/bean/RichBean.java
===================================================================
--- modules/tests/metamer/trunk/application/src/main/java/org/richfaces/tests/metamer/bean/RichBean.java 2010-12-16 13:02:05 UTC (rev 20608)
+++ modules/tests/metamer/trunk/application/src/main/java/org/richfaces/tests/metamer/bean/RichBean.java 2010-12-16 13:44:29 UTC (rev 20609)
@@ -120,8 +120,8 @@
components.put("richAutocomplete", "Rich Autocomplete");
components.put("richCalendar", "Rich Calendar");
components.put("richCollapsiblePanel", "Rich Collapsible Panel");
- components.put("richCollapsibleSubTable", "Rich Collapsible Subtable");
- components.put("richCollapsibleSubTableToggler", "Rich Collapsible Subtable Toggler");
+ components.put("richCollapsibleSubTable", "Rich Collapsible Sub Table");
+ components.put("richCollapsibleSubTableToggler", "Rich Collapsible Sub Table Toggler");
components.put("richColumn", "Rich Column");
components.put("richColumnGroup", "Rich Column Group");
components.put("richComponentControl", "Rich Component Control");
Copied: modules/tests/metamer/trunk/application/src/main/java/org/richfaces/tests/metamer/bean/RichCollapsibleSubTableBean.java (from rev 20608, modules/tests/metamer/trunk/application/src/main/java/org/richfaces/tests/metamer/bean/RichSubTableBean.java)
===================================================================
--- modules/tests/metamer/trunk/application/src/main/java/org/richfaces/tests/metamer/bean/RichCollapsibleSubTableBean.java (rev 0)
+++ modules/tests/metamer/trunk/application/src/main/java/org/richfaces/tests/metamer/bean/RichCollapsibleSubTableBean.java 2010-12-16 13:44:29 UTC (rev 20609)
@@ -0,0 +1,131 @@
+/*******************************************************************************
+ * 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.tests.metamer.bean;
+
+import java.io.Serializable;
+import java.util.ArrayList;
+import java.util.List;
+
+import javax.annotation.PostConstruct;
+import javax.faces.bean.ManagedBean;
+import javax.faces.bean.ManagedProperty;
+import javax.faces.bean.SessionScoped;
+
+import org.richfaces.component.UICollapsibleSubTable;
+import org.richfaces.tests.metamer.Attributes;
+import org.richfaces.tests.metamer.model.Employee;
+import org.richfaces.tests.metamer.model.Employee.Sex;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+/**
+ * Managed bean for rich:collapsibleSubTable.
+ *
+ * @author <a href="mailto:ppitonak@redhat.com">Pavol Pitonak</a>
+ * @version $Revision$
+ */
+@ManagedBean(name="richSubTableBean")
+@SessionScoped
+public class RichCollapsibleSubTableBean implements Serializable {
+
+ private static final long serialVersionUID = -1L;
+ private static Logger logger;
+ private Attributes attributes;
+ @ManagedProperty(value = "#{model.employees}")
+ private List<Employee> employees;
+ private List<List<Employee>> lists;
+ // true = model, false = empty table
+ private boolean state;
+
+ /**
+ * Initializes the managed bean.
+ */
+ @PostConstruct
+ public void init() {
+ logger = LoggerFactory.getLogger(getClass());
+ logger.debug("initializing bean " + getClass().getName());
+
+ attributes = Attributes.getComponentAttributesFromClass(UICollapsibleSubTable.class, getClass());
+
+ attributes.setAttribute("expandMode", "client");
+ attributes.setAttribute("expanded", true);
+ attributes.setAttribute("rendered", true);
+ attributes.setAttribute("rows", 5);
+
+ // TODO these attributes have to be tested in another way
+ attributes.remove("componentState");
+ attributes.remove("rowKeyVar");
+ attributes.remove("stateVar");
+ attributes.remove("var");
+ attributes.remove("value");
+
+ List<Employee> men = new ArrayList<Employee>();
+ List<Employee> women = new ArrayList<Employee>();
+
+ for (Employee e : employees) {
+ if (e.getSex() == Sex.MALE) {
+ men.add(e);
+ } else {
+ women.add(e);
+ }
+ }
+
+ lists = new ArrayList<List<Employee>>();
+ lists.add(men);
+ lists.add(women);
+
+ state = true;
+ }
+
+ public Attributes getAttributes() {
+ return attributes;
+ }
+
+ public void setAttributes(Attributes attributes) {
+ this.attributes = attributes;
+ }
+
+ public List<Employee> getEmployees() {
+ return employees;
+ }
+
+ public void setEmployees(List<Employee> employees) {
+ this.employees = employees;
+ }
+
+ public List<List<Employee>> getLists() {
+ return lists;
+ }
+
+ public void setLists(List<List<Employee>> lists) {
+ this.lists = lists;
+ }
+
+ public boolean isState() {
+ return state;
+ }
+
+ public void setState(boolean state) {
+ this.state = state;
+ }
+
+}
Copied: modules/tests/metamer/trunk/application/src/main/java/org/richfaces/tests/metamer/bean/RichCollapsibleSubTableTogglerlBean.java (from rev 20608, modules/tests/metamer/trunk/application/src/main/java/org/richfaces/tests/metamer/bean/RichSubTableToggleControlBean.java)
===================================================================
--- modules/tests/metamer/trunk/application/src/main/java/org/richfaces/tests/metamer/bean/RichCollapsibleSubTableTogglerlBean.java (rev 0)
+++ modules/tests/metamer/trunk/application/src/main/java/org/richfaces/tests/metamer/bean/RichCollapsibleSubTableTogglerlBean.java 2010-12-16 13:44:29 UTC (rev 20609)
@@ -0,0 +1,123 @@
+/*******************************************************************************
+ * 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.tests.metamer.bean;
+
+import java.io.Serializable;
+import java.util.ArrayList;
+import java.util.List;
+
+import javax.annotation.PostConstruct;
+import javax.faces.bean.ManagedBean;
+import javax.faces.bean.ManagedProperty;
+import javax.faces.bean.SessionScoped;
+
+import org.richfaces.component.UICollapsibleSubTableToggleControl;
+import org.richfaces.tests.metamer.Attributes;
+import org.richfaces.tests.metamer.model.Employee;
+import org.richfaces.tests.metamer.model.Employee.Sex;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+/**
+ * Managed bean for rich:collapsibleSubTableToggler.
+ *
+ * @author <a href="mailto:ppitonak@redhat.com">Pavol Pitonak</a>
+ * @version $Revision$
+ */
+@ManagedBean(name="richSubTableTogglerBean")
+@SessionScoped
+public class RichCollapsibleSubTableTogglerlBean implements Serializable {
+
+ private static final long serialVersionUID = -1L;
+ private static Logger logger;
+ private Attributes attributes;
+ @ManagedProperty(value = "#{model.employees}")
+ private List<Employee> employees;
+ private List<List<Employee>> lists;
+ // true = model, false = empty table
+ private boolean state;
+
+ /**
+ * Initializes the managed bean.
+ */
+ @PostConstruct
+ public void init() {
+ logger = LoggerFactory.getLogger(getClass());
+ logger.debug("initializing bean " + getClass().getName());
+
+ attributes = Attributes.getComponentAttributesFromClass(UICollapsibleSubTableToggleControl.class, getClass());
+ attributes.setAttribute("event", "click");
+ attributes.setAttribute("rendered", true);
+ // TODO these attributes have to be tested in another way
+ attributes.remove("for");
+
+ List<Employee> men = new ArrayList<Employee>();
+ List<Employee> women = new ArrayList<Employee>();
+
+ for (Employee e : employees) {
+ if (e.getSex() == Sex.MALE) {
+ men.add(e);
+ } else {
+ women.add(e);
+ }
+ }
+
+ lists = new ArrayList<List<Employee>>();
+ lists.add(men);
+ lists.add(women);
+
+ state = true;
+ }
+
+ public Attributes getAttributes() {
+ return attributes;
+ }
+
+ public void setAttributes(Attributes attributes) {
+ this.attributes = attributes;
+ }
+
+ public List<Employee> getEmployees() {
+ return employees;
+ }
+
+ public void setEmployees(List<Employee> employees) {
+ this.employees = employees;
+ }
+
+ public List<List<Employee>> getLists() {
+ return lists;
+ }
+
+ public void setLists(List<List<Employee>> lists) {
+ this.lists = lists;
+ }
+
+ public boolean isState() {
+ return state;
+ }
+
+ public void setState(boolean state) {
+ this.state = state;
+ }
+
+}
Deleted: modules/tests/metamer/trunk/application/src/main/java/org/richfaces/tests/metamer/bean/RichSubTableBean.java
===================================================================
--- modules/tests/metamer/trunk/application/src/main/java/org/richfaces/tests/metamer/bean/RichSubTableBean.java 2010-12-16 13:02:05 UTC (rev 20608)
+++ modules/tests/metamer/trunk/application/src/main/java/org/richfaces/tests/metamer/bean/RichSubTableBean.java 2010-12-16 13:44:29 UTC (rev 20609)
@@ -1,131 +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.tests.metamer.bean;
-
-import java.io.Serializable;
-import java.util.ArrayList;
-import java.util.List;
-
-import javax.annotation.PostConstruct;
-import javax.faces.bean.ManagedBean;
-import javax.faces.bean.ManagedProperty;
-import javax.faces.bean.SessionScoped;
-
-import org.richfaces.component.UICollapsibleSubTable;
-import org.richfaces.tests.metamer.Attributes;
-import org.richfaces.tests.metamer.model.Employee;
-import org.richfaces.tests.metamer.model.Employee.Sex;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-/**
- * Managed bean for rich:subTable.
- *
- * @author <a href="mailto:ppitonak@redhat.com">Pavol Pitonak</a>
- * @version $Revision$
- */
-@ManagedBean(name = "richSubTableBean")
-@SessionScoped
-public class RichSubTableBean implements Serializable {
-
- private static final long serialVersionUID = -1L;
- private static Logger logger;
- private Attributes attributes;
- @ManagedProperty(value = "#{model.employees}")
- private List<Employee> employees;
- private List<List<Employee>> lists;
- // true = model, false = empty table
- private boolean state;
-
- /**
- * Initializes the managed bean.
- */
- @PostConstruct
- public void init() {
- logger = LoggerFactory.getLogger(getClass());
- logger.debug("initializing bean " + getClass().getName());
-
- attributes = Attributes.getComponentAttributesFromClass(UICollapsibleSubTable.class, getClass());
-
- attributes.setAttribute("expandMode", "client");
- attributes.setAttribute("expanded", true);
- attributes.setAttribute("rendered", true);
- attributes.setAttribute("rows", 5);
-
- // TODO these attributes have to be tested in another way
- attributes.remove("componentState");
- attributes.remove("rowKeyVar");
- attributes.remove("stateVar");
- attributes.remove("var");
- attributes.remove("value");
-
- List<Employee> men = new ArrayList<Employee>();
- List<Employee> women = new ArrayList<Employee>();
-
- for (Employee e : employees) {
- if (e.getSex() == Sex.MALE) {
- men.add(e);
- } else {
- women.add(e);
- }
- }
-
- lists = new ArrayList<List<Employee>>();
- lists.add(men);
- lists.add(women);
-
- state = true;
- }
-
- public Attributes getAttributes() {
- return attributes;
- }
-
- public void setAttributes(Attributes attributes) {
- this.attributes = attributes;
- }
-
- public List<Employee> getEmployees() {
- return employees;
- }
-
- public void setEmployees(List<Employee> employees) {
- this.employees = employees;
- }
-
- public List<List<Employee>> getLists() {
- return lists;
- }
-
- public void setLists(List<List<Employee>> lists) {
- this.lists = lists;
- }
-
- public boolean isState() {
- return state;
- }
-
- public void setState(boolean state) {
- this.state = state;
- }
-
-}
Deleted: modules/tests/metamer/trunk/application/src/main/java/org/richfaces/tests/metamer/bean/RichSubTableToggleControlBean.java
===================================================================
--- modules/tests/metamer/trunk/application/src/main/java/org/richfaces/tests/metamer/bean/RichSubTableToggleControlBean.java 2010-12-16 13:02:05 UTC (rev 20608)
+++ modules/tests/metamer/trunk/application/src/main/java/org/richfaces/tests/metamer/bean/RichSubTableToggleControlBean.java 2010-12-16 13:44:29 UTC (rev 20609)
@@ -1,123 +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.tests.metamer.bean;
-
-import java.io.Serializable;
-import java.util.ArrayList;
-import java.util.List;
-
-import javax.annotation.PostConstruct;
-import javax.faces.bean.ManagedBean;
-import javax.faces.bean.ManagedProperty;
-import javax.faces.bean.SessionScoped;
-
-import org.richfaces.component.UICollapsibleSubTableToggleControl;
-import org.richfaces.tests.metamer.Attributes;
-import org.richfaces.tests.metamer.model.Employee;
-import org.richfaces.tests.metamer.model.Employee.Sex;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-/**
- * Managed bean for rich:subTableToggleControl.
- *
- * @author <a href="mailto:ppitonak@redhat.com">Pavol Pitonak</a>
- * @version $Revision$
- */
-@ManagedBean(name = "richSubTableToggleControlBean")
-@SessionScoped
-public class RichSubTableToggleControlBean implements Serializable {
-
- private static final long serialVersionUID = -1L;
- private static Logger logger;
- private Attributes attributes;
- @ManagedProperty(value = "#{model.employees}")
- private List<Employee> employees;
- private List<List<Employee>> lists;
- // true = model, false = empty table
- private boolean state;
-
- /**
- * Initializes the managed bean.
- */
- @PostConstruct
- public void init() {
- logger = LoggerFactory.getLogger(getClass());
- logger.debug("initializing bean " + getClass().getName());
-
- attributes = Attributes.getComponentAttributesFromClass(UICollapsibleSubTableToggleControl.class, getClass());
- attributes.setAttribute("event", "click");
- attributes.setAttribute("rendered", true);
- // TODO these attributes have to be tested in another way
- attributes.remove("for");
-
- List<Employee> men = new ArrayList<Employee>();
- List<Employee> women = new ArrayList<Employee>();
-
- for (Employee e : employees) {
- if (e.getSex() == Sex.MALE) {
- men.add(e);
- } else {
- women.add(e);
- }
- }
-
- lists = new ArrayList<List<Employee>>();
- lists.add(men);
- lists.add(women);
-
- state = true;
- }
-
- public Attributes getAttributes() {
- return attributes;
- }
-
- public void setAttributes(Attributes attributes) {
- this.attributes = attributes;
- }
-
- public List<Employee> getEmployees() {
- return employees;
- }
-
- public void setEmployees(List<Employee> employees) {
- this.employees = employees;
- }
-
- public List<List<Employee>> getLists() {
- return lists;
- }
-
- public void setLists(List<List<Employee>> lists) {
- this.lists = lists;
- }
-
- public boolean isState() {
- return state;
- }
-
- public void setState(boolean state) {
- this.state = state;
- }
-
-}
Modified: modules/tests/metamer/trunk/application/src/main/webapp/components/richCollapsibleSubTable/components2.xhtml
===================================================================
--- modules/tests/metamer/trunk/application/src/main/webapp/components/richCollapsibleSubTable/components2.xhtml 2010-12-16 13:02:05 UTC (rev 20608)
+++ modules/tests/metamer/trunk/application/src/main/webapp/components/richCollapsibleSubTable/components2.xhtml 2010-12-16 13:44:29 UTC (rev 20609)
@@ -119,7 +119,7 @@
</rich:column>
<rich:column id="columnName">
<rich:inplaceInput id="nameInput" value="#{item.name}" defaultLabel="Click here to edit">
- <a4j:ajax event="inputchange" render="@this"/>
+ <a4j:ajax event="change" render="@this"/>
</rich:inplaceInput>
</rich:column>
<rich:column id="columnTitle">
Modified: modules/tests/metamer/trunk/application/src/main/webapp/components/richCollapsibleSubTableToggler/simple.xhtml
===================================================================
--- modules/tests/metamer/trunk/application/src/main/webapp/components/richCollapsibleSubTableToggler/simple.xhtml 2010-12-16 13:02:05 UTC (rev 20608)
+++ modules/tests/metamer/trunk/application/src/main/webapp/components/richCollapsibleSubTableToggler/simple.xhtml 2010-12-16 13:44:29 UTC (rev 20609)
@@ -39,7 +39,7 @@
<ui:define name="outOfTemplateBefore">
<br/>
<h:outputText value="Show data in table: " />
- <h:selectBooleanCheckbox id="noDataCheckbox" value="#{richSubTableToggleControlBean.state}">
+ <h:selectBooleanCheckbox id="noDataCheckbox" value="#{richSubTableTogglerBean.state}">
<a4j:ajax render="richDataTable"/>
</h:selectBooleanCheckbox>
<br/><br/>
@@ -47,7 +47,7 @@
<ui:define name="component">
- <rich:dataTable id="richDataTable" value="#{richSubTableToggleControlBean.lists}" var="list">
+ <rich:dataTable id="richDataTable" value="#{richSubTableTogglerBean.lists}" var="list">
<f:facet name="header">
<rich:columnGroup>
<rich:column id="columnHeaderEmployees" colspan="3">
@@ -67,12 +67,12 @@
<rich:column id="columnTC" colspan="3">
<rich:collapsibleSubTableToggler id="richSTTControl"
- collapseIcon="#{richSubTableToggleControlBean.attributes['collapseIcon'].value}"
- collapseLabel="#{richSubTableToggleControlBean.attributes['collapseLabel'].value}"
- event="#{richSubTableToggleControlBean.attributes['event'].value}"
- expandIcon="#{richSubTableToggleControlBean.attributes['expandIcon'].value}"
- expandLabel="#{richSubTableToggleControlBean.attributes['expandLabel'].value}"
- rendered="#{richSubTableToggleControlBean.attributes['rendered'].value}"
+ collapseIcon="#{richSubTableTogglerBean.attributes['collapseIcon'].value}"
+ collapseLabel="#{richSubTableTogglerBean.attributes['collapseLabel'].value}"
+ event="#{richSubTableTogglerBean.attributes['event'].value}"
+ expandIcon="#{richSubTableTogglerBean.attributes['expandIcon'].value}"
+ expandLabel="#{richSubTableTogglerBean.attributes['expandLabel'].value}"
+ rendered="#{richSubTableTogglerBean.attributes['rendered'].value}"
for="richSubTable"/>
<h:outputText value="#{list[0].sex == 'MALE' ? 'Men' : 'Women'}" />
</rich:column>
@@ -81,7 +81,7 @@
expandMode="client"
expanded="true"
rows="5"
- value="#{richSubTableToggleControlBean.state ? list : null}"
+ value="#{richSubTableTogglerBean.state ? list : null}"
var="item">
<f:facet name="header">
@@ -114,7 +114,7 @@
</ui:define>
<ui:define name="outOfTemplateAfter">
- <metamer:attributes value="#{richSubTableToggleControlBean.attributes}" id="attributes" />
+ <metamer:attributes value="#{richSubTableTogglerBean.attributes}" id="attributes" />
</ui:define>
</ui:composition>
14 years
- 1
- 0
JBoss Rich Faces SVN: r20608 - in modules/tests/metamer/trunk/application/src/main/java/org/richfaces/tests/metamer: bean and 1 other directory.
by richfaces-svn-commits＠lists.jboss.org
Author: ppitonak(a)redhat.com
Date: 2010-12-16 08:02:05 -0500 (Thu, 16 Dec 2010)
New Revision: 20608
Added:
modules/tests/metamer/trunk/application/src/main/java/org/richfaces/tests/metamer/Behavior.java
Modified:
modules/tests/metamer/trunk/application/src/main/java/org/richfaces/tests/metamer/Attributes.java
modules/tests/metamer/trunk/application/src/main/java/org/richfaces/tests/metamer/bean/A4JAjaxBean.java
modules/tests/metamer/trunk/application/src/main/java/org/richfaces/tests/metamer/bean/A4JAttachQueueBean.java
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/java/org/richfaces/tests/metamer/bean/A4JJSFunctionBean.java
modules/tests/metamer/trunk/application/src/main/java/org/richfaces/tests/metamer/bean/A4JLogBean.java
modules/tests/metamer/trunk/application/src/main/java/org/richfaces/tests/metamer/bean/A4JMediaOutputBean.java
modules/tests/metamer/trunk/application/src/main/java/org/richfaces/tests/metamer/bean/A4JOutputPanelBean.java
modules/tests/metamer/trunk/application/src/main/java/org/richfaces/tests/metamer/bean/A4JParamBean.java
modules/tests/metamer/trunk/application/src/main/java/org/richfaces/tests/metamer/bean/A4JPollBean.java
modules/tests/metamer/trunk/application/src/main/java/org/richfaces/tests/metamer/bean/A4JPushBean.java
modules/tests/metamer/trunk/application/src/main/java/org/richfaces/tests/metamer/bean/A4JQueueBean.java
modules/tests/metamer/trunk/application/src/main/java/org/richfaces/tests/metamer/bean/A4JRegionBean.java
modules/tests/metamer/trunk/application/src/main/java/org/richfaces/tests/metamer/bean/A4JRepeatBean.java
modules/tests/metamer/trunk/application/src/main/java/org/richfaces/tests/metamer/bean/A4JStatusBean.java
modules/tests/metamer/trunk/application/src/main/java/org/richfaces/tests/metamer/bean/CommandButtonBean.java
modules/tests/metamer/trunk/application/src/main/java/org/richfaces/tests/metamer/bean/HDataTableBean.java
modules/tests/metamer/trunk/application/src/main/java/org/richfaces/tests/metamer/bean/RichAccordionBean.java
modules/tests/metamer/trunk/application/src/main/java/org/richfaces/tests/metamer/bean/RichAccordionItemBean.java
modules/tests/metamer/trunk/application/src/main/java/org/richfaces/tests/metamer/bean/RichAutocompleteBean.java
modules/tests/metamer/trunk/application/src/main/java/org/richfaces/tests/metamer/bean/RichCalendarBean.java
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/RichColumnBean.java
modules/tests/metamer/trunk/application/src/main/java/org/richfaces/tests/metamer/bean/RichColumnGroupBean.java
modules/tests/metamer/trunk/application/src/main/java/org/richfaces/tests/metamer/bean/RichComponentControlBean.java
modules/tests/metamer/trunk/application/src/main/java/org/richfaces/tests/metamer/bean/RichDataGridBean.java
modules/tests/metamer/trunk/application/src/main/java/org/richfaces/tests/metamer/bean/RichDataScrollerBean.java
modules/tests/metamer/trunk/application/src/main/java/org/richfaces/tests/metamer/bean/RichDataTableBean.java
modules/tests/metamer/trunk/application/src/main/java/org/richfaces/tests/metamer/bean/RichDropDownMenuBean.java
modules/tests/metamer/trunk/application/src/main/java/org/richfaces/tests/metamer/bean/RichExtendedDataTableBean.java
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/RichInplaceInputBean.java
modules/tests/metamer/trunk/application/src/main/java/org/richfaces/tests/metamer/bean/RichInplaceSelectBean.java
modules/tests/metamer/trunk/application/src/main/java/org/richfaces/tests/metamer/bean/RichInputNumberSliderBean.java
modules/tests/metamer/trunk/application/src/main/java/org/richfaces/tests/metamer/bean/RichInputNumberSpinnerBean.java
modules/tests/metamer/trunk/application/src/main/java/org/richfaces/tests/metamer/bean/RichJQueryBean.java
modules/tests/metamer/trunk/application/src/main/java/org/richfaces/tests/metamer/bean/RichListBean.java
modules/tests/metamer/trunk/application/src/main/java/org/richfaces/tests/metamer/bean/RichMenuGroupBean.java
modules/tests/metamer/trunk/application/src/main/java/org/richfaces/tests/metamer/bean/RichMenuItemBean.java
modules/tests/metamer/trunk/application/src/main/java/org/richfaces/tests/metamer/bean/RichPanelBean.java
modules/tests/metamer/trunk/application/src/main/java/org/richfaces/tests/metamer/bean/RichPanelMenuBean.java
modules/tests/metamer/trunk/application/src/main/java/org/richfaces/tests/metamer/bean/RichPopupPanelBean.java
modules/tests/metamer/trunk/application/src/main/java/org/richfaces/tests/metamer/bean/RichProgressBarBean.java
modules/tests/metamer/trunk/application/src/main/java/org/richfaces/tests/metamer/bean/RichSelectBean.java
modules/tests/metamer/trunk/application/src/main/java/org/richfaces/tests/metamer/bean/RichSubTableBean.java
modules/tests/metamer/trunk/application/src/main/java/org/richfaces/tests/metamer/bean/RichSubTableToggleControlBean.java
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/RichTabPanelBean.java
modules/tests/metamer/trunk/application/src/main/java/org/richfaces/tests/metamer/bean/RichToggleControlBean.java
modules/tests/metamer/trunk/application/src/main/java/org/richfaces/tests/metamer/bean/RichTogglePanelBean.java
modules/tests/metamer/trunk/application/src/main/java/org/richfaces/tests/metamer/bean/RichTogglePanelItemBean.java
modules/tests/metamer/trunk/application/src/main/java/org/richfaces/tests/metamer/bean/RichToolbarBean.java
modules/tests/metamer/trunk/application/src/main/java/org/richfaces/tests/metamer/bean/RichToolbarGroupBean.java
modules/tests/metamer/trunk/application/src/main/java/org/richfaces/tests/metamer/bean/RichTooltipBean.java
modules/tests/metamer/trunk/application/src/main/java/org/richfaces/tests/metamer/bean/RichTreeBean.java
modules/tests/metamer/trunk/application/src/main/java/org/richfaces/tests/metamer/bean/RichTreeModelAdaptorBean.java
modules/tests/metamer/trunk/application/src/main/java/org/richfaces/tests/metamer/bean/RichTreeModelRecursiveAdaptorBean.java
modules/tests/metamer/trunk/application/src/main/java/org/richfaces/tests/metamer/bean/RichTreeNodeBean.java
Log:
* mechanism for getting attributes of UI components and behaviors refactored
Modified: modules/tests/metamer/trunk/application/src/main/java/org/richfaces/tests/metamer/Attributes.java
===================================================================
--- modules/tests/metamer/trunk/application/src/main/java/org/richfaces/tests/metamer/Attributes.java 2010-12-16 12:34:22 UTC (rev 20607)
+++ modules/tests/metamer/trunk/application/src/main/java/org/richfaces/tests/metamer/Attributes.java 2010-12-16 13:02:05 UTC (rev 20608)
@@ -62,7 +62,7 @@
import org.slf4j.LoggerFactory;
/**
- * Representation of all attributes of a JSF component.
+ * Representation of all attributes of a JSF component or behavior.
*
* @author <a href="mailto:ppitonak@redhat.com">Pavol Pitonak</a>
* @version $Revision$
@@ -95,7 +95,7 @@
}
if (!loadFromClass && richfacesAttributes.containsKey(componentClass)) {
- logger.debug("retrieving attributes of " + componentClass.getName() + " from faces-config.xml");
+ logger.info("retrieving attributes of " + componentClass.getName() + " from faces-config.xml");
if (attributes == null) {
attributes = new TreeMap<String, Attribute>();
}
@@ -104,7 +104,7 @@
attributes.put(newAttr.getName(), newAttr);
}
} else {
- logger.debug("retrieving attributes of " + componentClass.getName() + " from class descriptor");
+ logger.info("retrieving attributes of " + componentClass.getName() + " from class descriptor");
loadAttributesFromClass(componentClass);
}
@@ -115,42 +115,68 @@
}
/**
- * Factory method for creating instances of class Attributes.
+ * Constructor for empty class Attributes.
*
* @param componentClass
* class object of a JSF component whose attributes will be stored
* @param beanClass
+ * class object of a managed bean
+ */
+ private Attributes(Class<?> componentClass, Class<?> beanClass) {
+ logger.debug("creating attributes map for " + componentClass);
+ this.beanClass = beanClass;
+ attributes = new TreeMap<String, Attribute>();
+ }
+
+ /**
+ * Factory method for creating instances of class Attributes. Attributes are loaded from faces-config.xml.
+ *
+ * @param clazz
+ * class object of a JSF component whose attributes will be stored
+ * @param beanClass
* class object of a managed bean
*/
- public static Attributes getUIComponentAttributes(Class<? extends UIComponent> componentClass, Class<?> beanClass) {
- return new Attributes(componentClass, beanClass, true);
+ public static Attributes getComponentAttributesFromFacesConfig(Class<? extends UIComponent> clazz, Class<?> beanClass) {
+ return new Attributes(clazz, beanClass, false);
}
/**
- * Factory method for creating instances of class Attributes.
+ * Factory method for creating instances of class Attributes. Attributes are loaded from class.
*
- * @param componentClass
- * class object of a RichFaces component whose attributes will be stored
+ * @param clazz
+ * class object of a JSF component whose attributes will be stored
* @param beanClass
* class object of a managed bean
*/
- public static Attributes getUIComponentAttributes(Class<? extends UIComponent> componentClass, Class<?> beanClass, boolean loadFromClass) {
- return new Attributes(componentClass, beanClass, loadFromClass);
+ public static Attributes getComponentAttributesFromClass(Class<? extends UIComponent> clazz, Class<?> beanClass) {
+ return new Attributes(clazz, beanClass, true);
}
/**
- * Factory method for creating instances of class Attributes.
- *
- * @param behaviorClass
+ * Factory method for creating instances of class Attributes. Attributes are loaded from faces-config.xml.
+ *
+ * @param clazz
* class object of a JSF behavior whose attributes will be stored
* @param beanClass
* class object of a managed bean
*/
- public static Attributes getBehaviorAttributes(Class<? extends BehaviorBase> behaviorClass, Class<?> beanClass) {
- return new Attributes(behaviorClass, beanClass, true);
+ public static Attributes getBehaviorAttributesFromFacesConfig(Class<? extends BehaviorBase> clazz, Class<?> beanClass) {
+ return new Attributes(clazz, beanClass, false);
}
/**
+ * Factory method for creating instances of class Attributes. Attributes are loaded from class.
+ *
+ * @param clazz
+ * class object of a JSF behavior whose attributes will be stored
+ * @param beanClass
+ * class object of a managed bean
+ */
+ public static Attributes getBehaviorAttributesFromClass(Class<? extends BehaviorBase> clazz, Class<?> beanClass) {
+ return new Attributes(clazz, beanClass, true);
+ }
+
+ /**
* Factory method for creating instances of class Attributes.
*
* @param behaviorClass
@@ -260,7 +286,6 @@
*/
public void clear() {
attributes.clear();
-
}
/**
@@ -546,7 +571,7 @@
*/
public boolean hasSelectOptions(String attributeName) {
List<SelectItem> options = attributes.get(attributeName).getSelectOptions();
- return options != null && options.size() != 0;
+ return options != null && !options.isEmpty();
}
public boolean containsKey(Object key) {
@@ -624,6 +649,7 @@
JAXBContext context = JAXBContext.newInstance(FacesConfigHolder.class);
FacesConfigHolder facesConfigHolder = (FacesConfigHolder) context.createUnmarshaller().unmarshal(configFile);
List<Component> components = facesConfigHolder.getComponents();
+ List<Behavior> behaviors = facesConfigHolder.getBehaviors();
for (Component c : components) {
if (c.getAttributes() == null) {
@@ -643,6 +669,24 @@
logger.info("attributes for component " + c.getComponentClass().getName() + " loaded");
}
+ for (Behavior b : behaviors) {
+ if (b.getAttributes() == null) {
+ continue;
+ }
+
+ // remove hidden attributes
+ Iterator<Attribute> i = b.getAttributes().iterator();
+ while (i.hasNext()) {
+ Attribute a = i.next();
+ if (a.isHidden() || "id".equals(a.getName()) || "binding".equals(a.getName())) {
+ i.remove();
+ }
+ }
+
+ richfacesAttributes.put(b.getBehaviorClass(), b.getAttributes());
+ logger.info("attributes for behavior " + b.getBehaviorClass().getName() + " loaded");
+ }
+
} catch (IOException ex) {
logger.error("Input/output error.", ex);
} catch (JAXBException ex) {
@@ -655,6 +699,7 @@
private static final class FacesConfigHolder {
private List<Component> components;
+ private List<Behavior> behaviors;
@XmlElement(name = "component", namespace = "http://java.sun.com/xml/ns/javaee")
public List<Component> getComponents() {
@@ -664,5 +709,14 @@
public void setComponents(List<Component> components) {
this.components = components;
}
+
+ @XmlElement(name = "behavior", namespace = "http://java.sun.com/xml/ns/javaee")
+ public List<Behavior> getBehaviors() {
+ return behaviors;
+ }
+
+ public void setBehaviors(List<Behavior> behaviors) {
+ this.behaviors = behaviors;
+ }
}
}
Added: modules/tests/metamer/trunk/application/src/main/java/org/richfaces/tests/metamer/Behavior.java
===================================================================
--- modules/tests/metamer/trunk/application/src/main/java/org/richfaces/tests/metamer/Behavior.java (rev 0)
+++ modules/tests/metamer/trunk/application/src/main/java/org/richfaces/tests/metamer/Behavior.java 2010-12-16 13:02:05 UTC (rev 20608)
@@ -0,0 +1,79 @@
+/*******************************************************************************
+ * 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.tests.metamer;
+
+import java.io.Serializable;
+import java.util.List;
+import javax.xml.bind.annotation.XmlElement;
+import javax.xml.bind.annotation.XmlRootElement;
+
+/**
+ * Representation of a RichFaces behavior in faces-config.xml.
+ *
+ * @author <a href="mailto:ppitonak@redhat.com">Pavol Pitonak</a>
+ * @version $Revision$
+ */
+@XmlRootElement(name = "behavior", namespace = "http://java.sun.com/xml/ns/javaee")
+public class Behavior implements Serializable {
+
+ private static final long serialVersionUID = -1L;
+ private String description;
+ private String behaviorId;
+ private Class<?> behaviorClass;
+ private List<Attribute> attributes;
+
+ @XmlElement(name = "behavior-id", namespace = "http://java.sun.com/xml/ns/javaee")
+ public String getBehaviorId() {
+ return behaviorId;
+ }
+
+ public void setBehaviorId(String behaviorId) {
+ this.behaviorId = behaviorId;
+ }
+
+ @XmlElement(name = "description", namespace = "http://java.sun.com/xml/ns/javaee")
+ public String getDescription() {
+ return description;
+ }
+
+ public void setDescription(String description) {
+ this.description = description;
+ }
+
+ @XmlElement(name = "behavior-class", namespace = "http://java.sun.com/xml/ns/javaee")
+ public Class<?> getBehaviorClass() {
+ return behaviorClass;
+ }
+
+ public void setBehaviorClass(Class<?> behaviorClass) {
+ this.behaviorClass = behaviorClass;
+ }
+
+ @XmlElement(name = "property", namespace = "http://java.sun.com/xml/ns/javaee")
+ public List<Attribute> getAttributes() {
+ return attributes;
+ }
+
+ public void setAttributes(List<Attribute> attributes) {
+ this.attributes = attributes;
+ }
+}
Property changes on: modules/tests/metamer/trunk/application/src/main/java/org/richfaces/tests/metamer/Behavior.java
___________________________________________________________________
Name: svn:keywords
+ Revision
Modified: modules/tests/metamer/trunk/application/src/main/java/org/richfaces/tests/metamer/bean/A4JAjaxBean.java
===================================================================
--- modules/tests/metamer/trunk/application/src/main/java/org/richfaces/tests/metamer/bean/A4JAjaxBean.java 2010-12-16 12:34:22 UTC (rev 20607)
+++ modules/tests/metamer/trunk/application/src/main/java/org/richfaces/tests/metamer/bean/A4JAjaxBean.java 2010-12-16 13:02:05 UTC (rev 20608)
@@ -65,7 +65,8 @@
logger = LoggerFactory.getLogger(getClass());
logger.debug("initializing bean " + getClass().getName());
- attributes = Attributes.getBehaviorAttributes(AjaxBehavior.class, getClass());
+ attributes = Attributes.getBehaviorAttributesFromFacesConfig(AjaxBehavior.class, getClass());
+
// the 'event' attribute for behavior tag must be a literal
attributes.remove("event");
Modified: modules/tests/metamer/trunk/application/src/main/java/org/richfaces/tests/metamer/bean/A4JAttachQueueBean.java
===================================================================
--- modules/tests/metamer/trunk/application/src/main/java/org/richfaces/tests/metamer/bean/A4JAttachQueueBean.java 2010-12-16 12:34:22 UTC (rev 20607)
+++ modules/tests/metamer/trunk/application/src/main/java/org/richfaces/tests/metamer/bean/A4JAttachQueueBean.java 2010-12-16 13:02:05 UTC (rev 20608)
@@ -58,11 +58,11 @@
logger.debug("initializing bean " + getClass().getName());
// initialize attributes
- attributes = Attributes.getUIComponentAttributes(UIAttachQueue.class, getClass());
+ attributes = Attributes.getComponentAttributesFromClass(UIAttachQueue.class, getClass());
initializeAttributes(attributes);
attributes.setAttribute("requestDelay", 500);
- attributes2 = Attributes.getUIComponentAttributes(UIAttachQueue.class, getClass());
+ attributes2 = Attributes.getComponentAttributesFromClass(UIAttachQueue.class, getClass());
initializeAttributes(attributes2);
attributes2.setAttribute("requestDelay", 1500);
}
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-16 12:34:22 UTC (rev 20607)
+++ modules/tests/metamer/trunk/application/src/main/java/org/richfaces/tests/metamer/bean/A4JCommandButtonBean.java 2010-12-16 13:02:05 UTC (rev 20608)
@@ -57,7 +57,7 @@
logger = LoggerFactory.getLogger(getClass());
logger.debug("initializing bean " + getClass().getName());
- attributes = Attributes.getUIComponentAttributes(UICommandButton.class, getClass(), false);
+ attributes = Attributes.getComponentAttributesFromFacesConfig(UICommandButton.class, getClass());
attributes.setAttribute("action", "first6CharsAction");
attributes.setAttribute("actionListener", "toUpperCaseActionListener");
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-16 12:34:22 UTC (rev 20607)
+++ modules/tests/metamer/trunk/application/src/main/java/org/richfaces/tests/metamer/bean/A4JCommandLinkBean.java 2010-12-16 13:02:05 UTC (rev 20608)
@@ -57,7 +57,7 @@
logger = LoggerFactory.getLogger(getClass());
logger.debug("initializing bean " + getClass().getName());
- attributes = Attributes.getUIComponentAttributes(UICommandLink.class, getClass(), false);
+ attributes = Attributes.getComponentAttributesFromFacesConfig(UICommandLink.class, getClass());
attributes.setAttribute("value", "command link");
attributes.setAttribute("rendered", true);
Modified: modules/tests/metamer/trunk/application/src/main/java/org/richfaces/tests/metamer/bean/A4JJSFunctionBean.java
===================================================================
--- modules/tests/metamer/trunk/application/src/main/java/org/richfaces/tests/metamer/bean/A4JJSFunctionBean.java 2010-12-16 12:34:22 UTC (rev 20607)
+++ modules/tests/metamer/trunk/application/src/main/java/org/richfaces/tests/metamer/bean/A4JJSFunctionBean.java 2010-12-16 13:02:05 UTC (rev 20608)
@@ -60,7 +60,7 @@
logger.debug("initializing bean " + getClass().getName());
year = Integer.parseInt(new SimpleDateFormat("yyyy").format(new Date()));
- attributes = Attributes.getUIComponentAttributes(UIFunction.class, getClass(), false);
+ attributes = Attributes.getComponentAttributesFromFacesConfig(UIFunction.class, getClass());
attributes.setAttribute("name", "metamerFunction");
attributes.setAttribute("render", "time1, time2, year");
Modified: modules/tests/metamer/trunk/application/src/main/java/org/richfaces/tests/metamer/bean/A4JLogBean.java
===================================================================
--- modules/tests/metamer/trunk/application/src/main/java/org/richfaces/tests/metamer/bean/A4JLogBean.java 2010-12-16 12:34:22 UTC (rev 20607)
+++ modules/tests/metamer/trunk/application/src/main/java/org/richfaces/tests/metamer/bean/A4JLogBean.java 2010-12-16 13:02:05 UTC (rev 20608)
@@ -57,8 +57,9 @@
logger.debug("initializing bean " + getClass().getName());
name = "John";
- attributes = Attributes.getUIComponentAttributes(UIAjaxLog.class, getClass());
+ attributes = Attributes.getComponentAttributesFromClass(UIAjaxLog.class, getClass());
+
attributes.setAttribute("rendered", true);
attributes.setAttribute("level", "debug");
}
Modified: modules/tests/metamer/trunk/application/src/main/java/org/richfaces/tests/metamer/bean/A4JMediaOutputBean.java
===================================================================
--- modules/tests/metamer/trunk/application/src/main/java/org/richfaces/tests/metamer/bean/A4JMediaOutputBean.java 2010-12-16 12:34:22 UTC (rev 20607)
+++ modules/tests/metamer/trunk/application/src/main/java/org/richfaces/tests/metamer/bean/A4JMediaOutputBean.java 2010-12-16 13:02:05 UTC (rev 20608)
@@ -64,7 +64,8 @@
logger = LoggerFactory.getLogger(getClass());
logger.debug("initializing bean " + getClass().getName());
- attributes = Attributes.getUIComponentAttributes(UIMediaOutput.class, getClass());
+ attributes = Attributes.getComponentAttributesFromClass(UIMediaOutput.class, getClass());
+
attributes.setAttribute("session", true);
attributes.setAttribute("rendered", true);
attributes.remove("createContent");
Modified: modules/tests/metamer/trunk/application/src/main/java/org/richfaces/tests/metamer/bean/A4JOutputPanelBean.java
===================================================================
--- modules/tests/metamer/trunk/application/src/main/java/org/richfaces/tests/metamer/bean/A4JOutputPanelBean.java 2010-12-16 12:34:22 UTC (rev 20607)
+++ modules/tests/metamer/trunk/application/src/main/java/org/richfaces/tests/metamer/bean/A4JOutputPanelBean.java 2010-12-16 13:02:05 UTC (rev 20608)
@@ -55,7 +55,8 @@
logger = LoggerFactory.getLogger(getClass());
logger.debug("initializing bean " + getClass().getName());
- attributes = Attributes.getUIComponentAttributes(UIOutputPanel.class, getClass());
+ attributes = Attributes.getComponentAttributesFromClass(UIOutputPanel.class, getClass());
+
attributes.setAttribute("ajaxRendered", true);
attributes.setAttribute("layout", "block");
attributes.setAttribute("rendered", true);
Modified: modules/tests/metamer/trunk/application/src/main/java/org/richfaces/tests/metamer/bean/A4JParamBean.java
===================================================================
--- modules/tests/metamer/trunk/application/src/main/java/org/richfaces/tests/metamer/bean/A4JParamBean.java 2010-12-16 12:34:22 UTC (rev 20607)
+++ modules/tests/metamer/trunk/application/src/main/java/org/richfaces/tests/metamer/bean/A4JParamBean.java 2010-12-16 13:02:05 UTC (rev 20608)
@@ -58,7 +58,8 @@
logger = LoggerFactory.getLogger(getClass());
logger.debug("initializing bean " + getClass().getName());
- attributes = Attributes.getUIComponentAttributes(UIActionParameter.class, getClass());
+ attributes = Attributes.getComponentAttributesFromClass(UIActionParameter.class, getClass());
+
attributes.setAttribute("name", "param");
attributes.setAttribute("noEscape", true);
attributes.setAttribute("value", "screen.width");
Modified: modules/tests/metamer/trunk/application/src/main/java/org/richfaces/tests/metamer/bean/A4JPollBean.java
===================================================================
--- modules/tests/metamer/trunk/application/src/main/java/org/richfaces/tests/metamer/bean/A4JPollBean.java 2010-12-16 12:34:22 UTC (rev 20607)
+++ modules/tests/metamer/trunk/application/src/main/java/org/richfaces/tests/metamer/bean/A4JPollBean.java 2010-12-16 13:02:05 UTC (rev 20608)
@@ -57,7 +57,8 @@
logger = LoggerFactory.getLogger(getClass());
logger.debug("initializing bean " + getClass().getName());
- attributes = Attributes.getUIComponentAttributes(UIPoll.class, getClass());
+ attributes = Attributes.getComponentAttributesFromClass(UIPoll.class, getClass());
+
attributes.setAttribute("enabled", true);
attributes.setAttribute("rendered", true);
attributes.setAttribute("interval", 2500);
Modified: modules/tests/metamer/trunk/application/src/main/java/org/richfaces/tests/metamer/bean/A4JPushBean.java
===================================================================
--- modules/tests/metamer/trunk/application/src/main/java/org/richfaces/tests/metamer/bean/A4JPushBean.java 2010-12-16 12:34:22 UTC (rev 20607)
+++ modules/tests/metamer/trunk/application/src/main/java/org/richfaces/tests/metamer/bean/A4JPushBean.java 2010-12-16 13:02:05 UTC (rev 20608)
@@ -73,7 +73,7 @@
logger = LoggerFactory.getLogger(getClass());
logger.debug("initializing bean " + getClass().getName());
- attributes = Attributes.getUIComponentAttributes(UIPush.class, getClass());
+ attributes = Attributes.getComponentAttributesFromClass(UIPush.class, getClass());
attributes.setAttribute("interval", 1000);
attributes.setAttribute("action", "increaseCounterAction");
attributes.setAttribute("actionListener", "increaseCounterActionListener");
Modified: modules/tests/metamer/trunk/application/src/main/java/org/richfaces/tests/metamer/bean/A4JQueueBean.java
===================================================================
--- modules/tests/metamer/trunk/application/src/main/java/org/richfaces/tests/metamer/bean/A4JQueueBean.java 2010-12-16 12:34:22 UTC (rev 20607)
+++ modules/tests/metamer/trunk/application/src/main/java/org/richfaces/tests/metamer/bean/A4JQueueBean.java 2010-12-16 13:02:05 UTC (rev 20608)
@@ -60,7 +60,7 @@
logger.debug("initializing bean " + getClass().getName());
// initialize attributes
- attributes = Attributes.getUIComponentAttributes(UIQueue.class, getClass());
+ attributes = Attributes.getComponentAttributesFromClass(UIQueue.class, getClass());
attributes.setAttribute("rendered", true);
attributes.setAttribute("requestDelay", 750);
Modified: modules/tests/metamer/trunk/application/src/main/java/org/richfaces/tests/metamer/bean/A4JRegionBean.java
===================================================================
--- modules/tests/metamer/trunk/application/src/main/java/org/richfaces/tests/metamer/bean/A4JRegionBean.java 2010-12-16 12:34:22 UTC (rev 20607)
+++ modules/tests/metamer/trunk/application/src/main/java/org/richfaces/tests/metamer/bean/A4JRegionBean.java 2010-12-16 13:02:05 UTC (rev 20608)
@@ -81,9 +81,8 @@
user1 = new Employee();
user2 = new Employee();
- attributes = Attributes.getUIComponentAttributes(UIRegion.class, getClass());
+ attributes = Attributes.getComponentAttributesFromClass(UIRegion.class, getClass());
attributes.setAttribute("rendered", true);
-
}
// getters and setters for page simple.xhtml
Modified: modules/tests/metamer/trunk/application/src/main/java/org/richfaces/tests/metamer/bean/A4JRepeatBean.java
===================================================================
--- modules/tests/metamer/trunk/application/src/main/java/org/richfaces/tests/metamer/bean/A4JRepeatBean.java 2010-12-16 12:34:22 UTC (rev 20607)
+++ modules/tests/metamer/trunk/application/src/main/java/org/richfaces/tests/metamer/bean/A4JRepeatBean.java 2010-12-16 13:02:05 UTC (rev 20608)
@@ -143,7 +143,7 @@
}
// initialize attributes
- attributes = Attributes.getUIComponentAttributes(UIRepeat.class, getClass());
+ attributes = Attributes.getComponentAttributesFromClass(UIRepeat.class, getClass());
attributes.setAttribute("rendered", true);
// TODO has to be tested in other way
attributes.remove("componentState");
Modified: modules/tests/metamer/trunk/application/src/main/java/org/richfaces/tests/metamer/bean/A4JStatusBean.java
===================================================================
--- modules/tests/metamer/trunk/application/src/main/java/org/richfaces/tests/metamer/bean/A4JStatusBean.java 2010-12-16 12:34:22 UTC (rev 20607)
+++ modules/tests/metamer/trunk/application/src/main/java/org/richfaces/tests/metamer/bean/A4JStatusBean.java 2010-12-16 13:02:05 UTC (rev 20608)
@@ -58,7 +58,7 @@
logger = LoggerFactory.getLogger(getClass());
logger.debug("initializing bean " + getClass().getName());
- attributes = Attributes.getUIComponentAttributes(UIStatus.class, getClass());
+ attributes = Attributes.getComponentAttributesFromClass(UIStatus.class, getClass());
attributes.setAttribute("rendered", true);
// hidden attributes
Modified: modules/tests/metamer/trunk/application/src/main/java/org/richfaces/tests/metamer/bean/CommandButtonBean.java
===================================================================
--- modules/tests/metamer/trunk/application/src/main/java/org/richfaces/tests/metamer/bean/CommandButtonBean.java 2010-12-16 12:34:22 UTC (rev 20607)
+++ modules/tests/metamer/trunk/application/src/main/java/org/richfaces/tests/metamer/bean/CommandButtonBean.java 2010-12-16 13:02:05 UTC (rev 20608)
@@ -57,7 +57,7 @@
logger = LoggerFactory.getLogger(getClass());
logger.debug("initializing bean " + getClass().getName());
- attributes = Attributes.getUIComponentAttributes(HtmlCommandButton.class, getClass());
+ attributes = Attributes.getComponentAttributesFromClass(HtmlCommandButton.class, getClass());
attributes.setAttribute("value", "command button");
attributes.setAttribute("rendered", "true");
Modified: modules/tests/metamer/trunk/application/src/main/java/org/richfaces/tests/metamer/bean/HDataTableBean.java
===================================================================
--- modules/tests/metamer/trunk/application/src/main/java/org/richfaces/tests/metamer/bean/HDataTableBean.java 2010-12-16 12:34:22 UTC (rev 20607)
+++ modules/tests/metamer/trunk/application/src/main/java/org/richfaces/tests/metamer/bean/HDataTableBean.java 2010-12-16 13:02:05 UTC (rev 20608)
@@ -61,7 +61,7 @@
logger = LoggerFactory.getLogger(getClass());
logger.debug("initializing bean " + getClass().getName());
- attributes = Attributes.getUIComponentAttributes(HtmlDataTable.class, getClass());
+ attributes = Attributes.getComponentAttributesFromClass(HtmlDataTable.class, getClass());
attributes.setAttribute("rendered", true);
attributes.setAttribute("rows", 10);
Modified: modules/tests/metamer/trunk/application/src/main/java/org/richfaces/tests/metamer/bean/RichAccordionBean.java
===================================================================
--- modules/tests/metamer/trunk/application/src/main/java/org/richfaces/tests/metamer/bean/RichAccordionBean.java 2010-12-16 12:34:22 UTC (rev 20607)
+++ modules/tests/metamer/trunk/application/src/main/java/org/richfaces/tests/metamer/bean/RichAccordionBean.java 2010-12-16 13:02:05 UTC (rev 20608)
@@ -54,7 +54,7 @@
logger = LoggerFactory.getLogger(getClass());
logger.debug("initializing bean " + getClass().getName());
- attributes = Attributes.getUIComponentAttributes(HtmlAccordion.class, getClass(), false);
+ attributes = Attributes.getComponentAttributesFromFacesConfig(HtmlAccordion.class, getClass());
attributes.setAttribute("rendered", true);
Modified: modules/tests/metamer/trunk/application/src/main/java/org/richfaces/tests/metamer/bean/RichAccordionItemBean.java
===================================================================
--- modules/tests/metamer/trunk/application/src/main/java/org/richfaces/tests/metamer/bean/RichAccordionItemBean.java 2010-12-16 12:34:22 UTC (rev 20607)
+++ modules/tests/metamer/trunk/application/src/main/java/org/richfaces/tests/metamer/bean/RichAccordionItemBean.java 2010-12-16 13:02:05 UTC (rev 20608)
@@ -54,7 +54,7 @@
logger = LoggerFactory.getLogger(getClass());
logger.debug("initializing bean " + getClass().getName());
- attributes = Attributes.getUIComponentAttributes(HtmlAccordionItem.class, getClass(), false);
+ attributes = Attributes.getComponentAttributesFromFacesConfig(HtmlAccordionItem.class, getClass());
attributes.setAttribute("header", "Item 1");
attributes.setAttribute("name", "item1");
Modified: modules/tests/metamer/trunk/application/src/main/java/org/richfaces/tests/metamer/bean/RichAutocompleteBean.java
===================================================================
--- modules/tests/metamer/trunk/application/src/main/java/org/richfaces/tests/metamer/bean/RichAutocompleteBean.java 2010-12-16 12:34:22 UTC (rev 20607)
+++ modules/tests/metamer/trunk/application/src/main/java/org/richfaces/tests/metamer/bean/RichAutocompleteBean.java 2010-12-16 13:02:05 UTC (rev 20608)
@@ -63,7 +63,7 @@
logger = LoggerFactory.getLogger(getClass());
logger.debug("initializing bean " + getClass().getName());
- attributes = Attributes.getUIComponentAttributes(UIAutocomplete.class, getClass());
+ attributes = Attributes.getComponentAttributesFromClass(UIAutocomplete.class, getClass());
attributes.setAttribute("converterMessage", "converter message");
attributes.setAttribute("mode", "ajax");
attributes.setAttribute("rendered", true);
Modified: modules/tests/metamer/trunk/application/src/main/java/org/richfaces/tests/metamer/bean/RichCalendarBean.java
===================================================================
--- modules/tests/metamer/trunk/application/src/main/java/org/richfaces/tests/metamer/bean/RichCalendarBean.java 2010-12-16 12:34:22 UTC (rev 20607)
+++ modules/tests/metamer/trunk/application/src/main/java/org/richfaces/tests/metamer/bean/RichCalendarBean.java 2010-12-16 13:02:05 UTC (rev 20608)
@@ -56,7 +56,7 @@
logger = LoggerFactory.getLogger(getClass());
logger.debug("initializing bean " + getClass().getName());
- attributes = Attributes.getUIComponentAttributes(UICalendar.class, getClass(), false);
+ attributes = Attributes.getComponentAttributesFromFacesConfig(UICalendar.class, getClass());
attributes.setAttribute("datePattern", "MMM d, yyyy HH:mm");
attributes.setAttribute("direction", "bottom-right");
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-16 12:34:22 UTC (rev 20607)
+++ modules/tests/metamer/trunk/application/src/main/java/org/richfaces/tests/metamer/bean/RichCollapsiblePanelBean.java 2010-12-16 13:02:05 UTC (rev 20608)
@@ -53,7 +53,7 @@
logger = LoggerFactory.getLogger(getClass());
logger.debug("initializing bean " + getClass().getName());
- attributes = Attributes.getUIComponentAttributes(UICollapsiblePanel.class, getClass());
+ attributes = Attributes.getComponentAttributesFromClass(UICollapsiblePanel.class, getClass());
attributes.setAttribute("rendered", true);
attributes.setAttribute("header", "collapsible panel header");
Modified: modules/tests/metamer/trunk/application/src/main/java/org/richfaces/tests/metamer/bean/RichColumnBean.java
===================================================================
--- modules/tests/metamer/trunk/application/src/main/java/org/richfaces/tests/metamer/bean/RichColumnBean.java 2010-12-16 12:34:22 UTC (rev 20607)
+++ modules/tests/metamer/trunk/application/src/main/java/org/richfaces/tests/metamer/bean/RichColumnBean.java 2010-12-16 13:02:05 UTC (rev 20608)
@@ -54,7 +54,7 @@
logger = LoggerFactory.getLogger(getClass());
logger.debug("initializing bean " + getClass().getName());
- attributes = Attributes.getUIComponentAttributes(UIColumn.class, getClass(), false);
+ attributes = Attributes.getComponentAttributesFromFacesConfig(UIColumn.class, getClass());
attributes.setAttribute("colspan", 1);
attributes.setAttribute("rendered", true);
attributes.setAttribute("rowspan", 1);
Modified: modules/tests/metamer/trunk/application/src/main/java/org/richfaces/tests/metamer/bean/RichColumnGroupBean.java
===================================================================
--- modules/tests/metamer/trunk/application/src/main/java/org/richfaces/tests/metamer/bean/RichColumnGroupBean.java 2010-12-16 12:34:22 UTC (rev 20607)
+++ modules/tests/metamer/trunk/application/src/main/java/org/richfaces/tests/metamer/bean/RichColumnGroupBean.java 2010-12-16 13:02:05 UTC (rev 20608)
@@ -55,7 +55,7 @@
logger = LoggerFactory.getLogger(getClass());
logger.debug("initializing bean " + getClass().getName());
- attributes = Attributes.getUIComponentAttributes(UIColumnGroup.class, getClass());
+ attributes = Attributes.getComponentAttributesFromClass(UIColumnGroup.class, getClass());
attributes.setAttribute("rendered", true);
}
Modified: modules/tests/metamer/trunk/application/src/main/java/org/richfaces/tests/metamer/bean/RichComponentControlBean.java
===================================================================
--- modules/tests/metamer/trunk/application/src/main/java/org/richfaces/tests/metamer/bean/RichComponentControlBean.java 2010-12-16 12:34:22 UTC (rev 20607)
+++ modules/tests/metamer/trunk/application/src/main/java/org/richfaces/tests/metamer/bean/RichComponentControlBean.java 2010-12-16 13:02:05 UTC (rev 20608)
@@ -55,7 +55,7 @@
logger = LoggerFactory.getLogger(getClass());
logger.debug("initializing bean " + getClass().getName());
- attributes = Attributes.getBehaviorAttributes(ComponentControlBehavior.class, getClass());
+ attributes = Attributes.getBehaviorAttributesFromFacesConfig(ComponentControlBehavior.class, getClass());
attributes.setAttribute("operation", "previous");
attributes.setAttribute("target", "scroller");
Modified: modules/tests/metamer/trunk/application/src/main/java/org/richfaces/tests/metamer/bean/RichDataGridBean.java
===================================================================
--- modules/tests/metamer/trunk/application/src/main/java/org/richfaces/tests/metamer/bean/RichDataGridBean.java 2010-12-16 12:34:22 UTC (rev 20607)
+++ modules/tests/metamer/trunk/application/src/main/java/org/richfaces/tests/metamer/bean/RichDataGridBean.java 2010-12-16 13:02:05 UTC (rev 20608)
@@ -58,7 +58,7 @@
logger = LoggerFactory.getLogger(getClass());
logger.debug("initializing bean " + getClass().getName());
- attributes = Attributes.getUIComponentAttributes(UIDataGrid.class, getClass());
+ attributes = Attributes.getComponentAttributesFromClass(UIDataGrid.class, getClass());
attributes.setAttribute("columns", 3);
attributes.setAttribute("rendered", true);
Modified: modules/tests/metamer/trunk/application/src/main/java/org/richfaces/tests/metamer/bean/RichDataScrollerBean.java
===================================================================
--- modules/tests/metamer/trunk/application/src/main/java/org/richfaces/tests/metamer/bean/RichDataScrollerBean.java 2010-12-16 12:34:22 UTC (rev 20607)
+++ modules/tests/metamer/trunk/application/src/main/java/org/richfaces/tests/metamer/bean/RichDataScrollerBean.java 2010-12-16 13:02:05 UTC (rev 20608)
@@ -57,7 +57,7 @@
logger = LoggerFactory.getLogger(getClass());
logger.debug("initializing bean " + getClass().getName());
- attributes = Attributes.getUIComponentAttributes(UIDataScroller.class, getClass());
+ attributes = Attributes.getComponentAttributesFromClass(UIDataScroller.class, getClass());
attributes.setAttribute("boundaryControls", "show");
attributes.setAttribute("fastControls", "show");
Modified: modules/tests/metamer/trunk/application/src/main/java/org/richfaces/tests/metamer/bean/RichDataTableBean.java
===================================================================
--- modules/tests/metamer/trunk/application/src/main/java/org/richfaces/tests/metamer/bean/RichDataTableBean.java 2010-12-16 12:34:22 UTC (rev 20607)
+++ modules/tests/metamer/trunk/application/src/main/java/org/richfaces/tests/metamer/bean/RichDataTableBean.java 2010-12-16 13:02:05 UTC (rev 20608)
@@ -87,7 +87,7 @@
logger = LoggerFactory.getLogger(getClass());
logger.debug("initializing bean " + getClass().getName());
- attributes = Attributes.getUIComponentAttributes(UIDataTable.class, getClass());
+ attributes = Attributes.getComponentAttributesFromClass(UIDataTable.class, getClass());
attributes.setAttribute("rendered", true);
attributes.setAttribute("rows", 10);
Modified: modules/tests/metamer/trunk/application/src/main/java/org/richfaces/tests/metamer/bean/RichDropDownMenuBean.java
===================================================================
--- modules/tests/metamer/trunk/application/src/main/java/org/richfaces/tests/metamer/bean/RichDropDownMenuBean.java 2010-12-16 12:34:22 UTC (rev 20607)
+++ modules/tests/metamer/trunk/application/src/main/java/org/richfaces/tests/metamer/bean/RichDropDownMenuBean.java 2010-12-16 13:02:05 UTC (rev 20608)
@@ -53,7 +53,7 @@
logger = LoggerFactory.getLogger(getClass());
logger.debug("initializing bean " + getClass().getName());
- attributes = Attributes.getUIComponentAttributes(UIDropDownMenu.class, getClass(), false);
+ attributes = Attributes.getComponentAttributesFromFacesConfig(UIDropDownMenu.class, getClass());
attributes.setAttribute("mode", "ajax");
attributes.setAttribute("rendered", true);
Modified: modules/tests/metamer/trunk/application/src/main/java/org/richfaces/tests/metamer/bean/RichExtendedDataTableBean.java
===================================================================
--- modules/tests/metamer/trunk/application/src/main/java/org/richfaces/tests/metamer/bean/RichExtendedDataTableBean.java 2010-12-16 12:34:22 UTC (rev 20607)
+++ modules/tests/metamer/trunk/application/src/main/java/org/richfaces/tests/metamer/bean/RichExtendedDataTableBean.java 2010-12-16 13:02:05 UTC (rev 20608)
@@ -87,7 +87,7 @@
logger = LoggerFactory.getLogger(getClass());
logger.debug("initializing bean " + getClass().getName());
- attributes = Attributes.getUIComponentAttributes(UIExtendedDataTable.class, getClass());
+ attributes = Attributes.getComponentAttributesFromClass(UIExtendedDataTable.class, getClass());
attributes.setAttribute("rendered", true);
attributes.setAttribute("rows", 30);
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 2010-12-16 12:34:22 UTC (rev 20607)
+++ modules/tests/metamer/trunk/application/src/main/java/org/richfaces/tests/metamer/bean/RichFileUploadBean.java 2010-12-16 13:02:05 UTC (rev 20608)
@@ -60,7 +60,7 @@
logger.debug("initializing bean " + getClass().getName());
files = new ArrayList<UploadedFile>();
- attributes = Attributes.getUIComponentAttributes(UIFileUpload.class, getClass(), false);
+ attributes = Attributes.getComponentAttributesFromFacesConfig(UIFileUpload.class, getClass());
attributes.setAttribute("enabled", true);
attributes.setAttribute("noDuplicate", false);
Modified: modules/tests/metamer/trunk/application/src/main/java/org/richfaces/tests/metamer/bean/RichInplaceInputBean.java
===================================================================
--- modules/tests/metamer/trunk/application/src/main/java/org/richfaces/tests/metamer/bean/RichInplaceInputBean.java 2010-12-16 12:34:22 UTC (rev 20607)
+++ modules/tests/metamer/trunk/application/src/main/java/org/richfaces/tests/metamer/bean/RichInplaceInputBean.java 2010-12-16 13:02:05 UTC (rev 20608)
@@ -54,7 +54,7 @@
logger = LoggerFactory.getLogger(getClass());
logger.debug("initializing bean " + getClass().getName());
- attributes = Attributes.getUIComponentAttributes(UIInplaceInput.class, getClass(), false);
+ attributes = Attributes.getComponentAttributesFromFacesConfig(UIInplaceInput.class, getClass());
attributes.setAttribute("defaultLabel", "Click here to edit");
attributes.setAttribute("editEvent", "click");
Modified: modules/tests/metamer/trunk/application/src/main/java/org/richfaces/tests/metamer/bean/RichInplaceSelectBean.java
===================================================================
--- modules/tests/metamer/trunk/application/src/main/java/org/richfaces/tests/metamer/bean/RichInplaceSelectBean.java 2010-12-16 12:34:22 UTC (rev 20607)
+++ modules/tests/metamer/trunk/application/src/main/java/org/richfaces/tests/metamer/bean/RichInplaceSelectBean.java 2010-12-16 13:02:05 UTC (rev 20608)
@@ -68,7 +68,7 @@
capitalsOptions.add(new SelectItem(capital.getState(), capital.getState()));
}
- attributes = Attributes.getUIComponentAttributes(UIInplaceSelect.class, getClass(), false);
+ attributes = Attributes.getComponentAttributesFromFacesConfig(UIInplaceSelect.class, getClass());
attributes.setAttribute("defaultLabel", "Click here to edit");
attributes.setAttribute("editEvent", "click");
Modified: modules/tests/metamer/trunk/application/src/main/java/org/richfaces/tests/metamer/bean/RichInputNumberSliderBean.java
===================================================================
--- modules/tests/metamer/trunk/application/src/main/java/org/richfaces/tests/metamer/bean/RichInputNumberSliderBean.java 2010-12-16 12:34:22 UTC (rev 20607)
+++ modules/tests/metamer/trunk/application/src/main/java/org/richfaces/tests/metamer/bean/RichInputNumberSliderBean.java 2010-12-16 13:02:05 UTC (rev 20608)
@@ -54,7 +54,7 @@
logger = LoggerFactory.getLogger(getClass());
logger.debug("initializing bean " + getClass().getName());
- attributes = Attributes.getUIComponentAttributes(HtmlInputNumberSlider.class, getClass());
+ attributes = Attributes.getComponentAttributesFromClass(HtmlInputNumberSlider.class, getClass());
attributes.setAttribute("enableManualInput", true);
attributes.setAttribute("inputSize", 3);
Modified: modules/tests/metamer/trunk/application/src/main/java/org/richfaces/tests/metamer/bean/RichInputNumberSpinnerBean.java
===================================================================
--- modules/tests/metamer/trunk/application/src/main/java/org/richfaces/tests/metamer/bean/RichInputNumberSpinnerBean.java 2010-12-16 12:34:22 UTC (rev 20607)
+++ modules/tests/metamer/trunk/application/src/main/java/org/richfaces/tests/metamer/bean/RichInputNumberSpinnerBean.java 2010-12-16 13:02:05 UTC (rev 20608)
@@ -54,7 +54,7 @@
logger = LoggerFactory.getLogger(getClass());
logger.debug("initializing bean " + getClass().getName());
- attributes = Attributes.getUIComponentAttributes(HtmlInputNumberSpinner.class, getClass(), false);
+ attributes = Attributes.getComponentAttributesFromFacesConfig(HtmlInputNumberSpinner.class, getClass());
attributes.setAttribute("enableManualInput", true);
attributes.setAttribute("maxValue", 10);
Modified: modules/tests/metamer/trunk/application/src/main/java/org/richfaces/tests/metamer/bean/RichJQueryBean.java
===================================================================
--- modules/tests/metamer/trunk/application/src/main/java/org/richfaces/tests/metamer/bean/RichJQueryBean.java 2010-12-16 12:34:22 UTC (rev 20607)
+++ modules/tests/metamer/trunk/application/src/main/java/org/richfaces/tests/metamer/bean/RichJQueryBean.java 2010-12-16 13:02:05 UTC (rev 20608)
@@ -61,7 +61,7 @@
componentsDataList = new ArrayList<String>();
addComponent();
- attributes = Attributes.getUIComponentAttributes(UIJQuery.class, getClass());
+ attributes = Attributes.getComponentAttributesFromClass(UIJQuery.class, getClass());
attributes.setAttribute("event", "click");
attributes.setAttribute("name", "bubu");
Modified: modules/tests/metamer/trunk/application/src/main/java/org/richfaces/tests/metamer/bean/RichListBean.java
===================================================================
--- modules/tests/metamer/trunk/application/src/main/java/org/richfaces/tests/metamer/bean/RichListBean.java 2010-12-16 12:34:22 UTC (rev 20607)
+++ modules/tests/metamer/trunk/application/src/main/java/org/richfaces/tests/metamer/bean/RichListBean.java 2010-12-16 13:02:05 UTC (rev 20608)
@@ -54,7 +54,7 @@
logger = LoggerFactory.getLogger(getClass());
logger.debug("initializing bean " + getClass().getName());
- attributes = Attributes.getUIComponentAttributes(UIList.class, getClass());
+ attributes = Attributes.getComponentAttributesFromClass(UIList.class, getClass());
attributes.setAttribute("type", "ordered");
attributes.setAttribute("rendered", true);
Modified: modules/tests/metamer/trunk/application/src/main/java/org/richfaces/tests/metamer/bean/RichMenuGroupBean.java
===================================================================
--- modules/tests/metamer/trunk/application/src/main/java/org/richfaces/tests/metamer/bean/RichMenuGroupBean.java 2010-12-16 12:34:22 UTC (rev 20607)
+++ modules/tests/metamer/trunk/application/src/main/java/org/richfaces/tests/metamer/bean/RichMenuGroupBean.java 2010-12-16 13:02:05 UTC (rev 20608)
@@ -52,7 +52,7 @@
logger = LoggerFactory.getLogger(getClass());
logger.debug("initializing bean " + getClass().getName());
- attributes = Attributes.getUIComponentAttributes(UIMenuGroup.class, getClass(), false);
+ attributes = Attributes.getComponentAttributesFromFacesConfig(UIMenuGroup.class, getClass());
attributes.setAttribute("rendered", true);
Modified: modules/tests/metamer/trunk/application/src/main/java/org/richfaces/tests/metamer/bean/RichMenuItemBean.java
===================================================================
--- modules/tests/metamer/trunk/application/src/main/java/org/richfaces/tests/metamer/bean/RichMenuItemBean.java 2010-12-16 12:34:22 UTC (rev 20607)
+++ modules/tests/metamer/trunk/application/src/main/java/org/richfaces/tests/metamer/bean/RichMenuItemBean.java 2010-12-16 13:02:05 UTC (rev 20608)
@@ -52,7 +52,7 @@
logger = LoggerFactory.getLogger(getClass());
logger.debug("initializing bean " + getClass().getName());
- attributes = Attributes.getUIComponentAttributes(UIMenuItem.class, getClass(), false);
+ attributes = Attributes.getComponentAttributesFromFacesConfig(UIMenuItem.class, getClass());
attributes.setAttribute("icon", "/resources/images/icons/create_doc.gif");
attributes.setAttribute("label", "New");
Modified: modules/tests/metamer/trunk/application/src/main/java/org/richfaces/tests/metamer/bean/RichPanelBean.java
===================================================================
--- modules/tests/metamer/trunk/application/src/main/java/org/richfaces/tests/metamer/bean/RichPanelBean.java 2010-12-16 12:34:22 UTC (rev 20607)
+++ modules/tests/metamer/trunk/application/src/main/java/org/richfaces/tests/metamer/bean/RichPanelBean.java 2010-12-16 13:02:05 UTC (rev 20608)
@@ -54,7 +54,7 @@
logger = LoggerFactory.getLogger(getClass());
logger.debug("initializing bean " + getClass().getName());
- attributes = Attributes.getUIComponentAttributes(UIPanel.class, getClass());
+ attributes = Attributes.getComponentAttributesFromClass(UIPanel.class, getClass());
attributes.setAttribute("rendered", true);
Modified: modules/tests/metamer/trunk/application/src/main/java/org/richfaces/tests/metamer/bean/RichPanelMenuBean.java
===================================================================
--- modules/tests/metamer/trunk/application/src/main/java/org/richfaces/tests/metamer/bean/RichPanelMenuBean.java 2010-12-16 12:34:22 UTC (rev 20607)
+++ modules/tests/metamer/trunk/application/src/main/java/org/richfaces/tests/metamer/bean/RichPanelMenuBean.java 2010-12-16 13:02:05 UTC (rev 20608)
@@ -55,7 +55,7 @@
logger = LoggerFactory.getLogger(getClass());
logger.debug("initializing bean " + getClass().getName());
- attributes = Attributes.getUIComponentAttributes(UIPanelMenu.class, getClass(), false);
+ attributes = Attributes.getComponentAttributesFromFacesConfig(UIPanelMenu.class, getClass());
attributes.setAttribute("groupCollapseIconLeft", "disc");
attributes.setAttribute("groupCollapseIconRight", "chevronDown");
Modified: modules/tests/metamer/trunk/application/src/main/java/org/richfaces/tests/metamer/bean/RichPopupPanelBean.java
===================================================================
--- modules/tests/metamer/trunk/application/src/main/java/org/richfaces/tests/metamer/bean/RichPopupPanelBean.java 2010-12-16 12:34:22 UTC (rev 20607)
+++ modules/tests/metamer/trunk/application/src/main/java/org/richfaces/tests/metamer/bean/RichPopupPanelBean.java 2010-12-16 13:02:05 UTC (rev 20608)
@@ -54,7 +54,7 @@
logger = LoggerFactory.getLogger(getClass());
logger.debug("initializing bean " + getClass().getName());
- attributes = Attributes.getUIComponentAttributes(UIPopupPanel.class, getClass(), false);
+ attributes = Attributes.getComponentAttributesFromFacesConfig(UIPopupPanel.class, getClass());
attributes.setAttribute("header", "popup panel header");
attributes.setAttribute("height", 300);
Modified: modules/tests/metamer/trunk/application/src/main/java/org/richfaces/tests/metamer/bean/RichProgressBarBean.java
===================================================================
--- modules/tests/metamer/trunk/application/src/main/java/org/richfaces/tests/metamer/bean/RichProgressBarBean.java 2010-12-16 12:34:22 UTC (rev 20607)
+++ modules/tests/metamer/trunk/application/src/main/java/org/richfaces/tests/metamer/bean/RichProgressBarBean.java 2010-12-16 13:02:05 UTC (rev 20608)
@@ -60,7 +60,7 @@
logger = LoggerFactory.getLogger(getClass());
logger.debug("initializing bean " + getClass().getName());
- attributes = Attributes.getUIComponentAttributes(UIProgressBar.class, getClass());
+ attributes = Attributes.getComponentAttributesFromClass(UIProgressBar.class, getClass());
attributes.setAttribute("maxValue", 100);
attributes.setAttribute("minValue", 0);
Modified: modules/tests/metamer/trunk/application/src/main/java/org/richfaces/tests/metamer/bean/RichSelectBean.java
===================================================================
--- modules/tests/metamer/trunk/application/src/main/java/org/richfaces/tests/metamer/bean/RichSelectBean.java 2010-12-16 12:34:22 UTC (rev 20607)
+++ modules/tests/metamer/trunk/application/src/main/java/org/richfaces/tests/metamer/bean/RichSelectBean.java 2010-12-16 13:02:05 UTC (rev 20608)
@@ -68,7 +68,7 @@
capitalsOptions.add(new SelectItem(capital.getState(), capital.getState()));
}
- attributes = Attributes.getUIComponentAttributes(UISelect.class, getClass(), false);
+ attributes = Attributes.getComponentAttributesFromFacesConfig(UISelect.class, getClass());
attributes.setAttribute("defaultLabel", "Click here to edit");
attributes.setAttribute("enableManualInput", true);
Modified: modules/tests/metamer/trunk/application/src/main/java/org/richfaces/tests/metamer/bean/RichSubTableBean.java
===================================================================
--- modules/tests/metamer/trunk/application/src/main/java/org/richfaces/tests/metamer/bean/RichSubTableBean.java 2010-12-16 12:34:22 UTC (rev 20607)
+++ modules/tests/metamer/trunk/application/src/main/java/org/richfaces/tests/metamer/bean/RichSubTableBean.java 2010-12-16 13:02:05 UTC (rev 20608)
@@ -64,7 +64,7 @@
logger = LoggerFactory.getLogger(getClass());
logger.debug("initializing bean " + getClass().getName());
- attributes = Attributes.getUIComponentAttributes(UICollapsibleSubTable.class, getClass());
+ attributes = Attributes.getComponentAttributesFromClass(UICollapsibleSubTable.class, getClass());
attributes.setAttribute("expandMode", "client");
attributes.setAttribute("expanded", true);
Modified: modules/tests/metamer/trunk/application/src/main/java/org/richfaces/tests/metamer/bean/RichSubTableToggleControlBean.java
===================================================================
--- modules/tests/metamer/trunk/application/src/main/java/org/richfaces/tests/metamer/bean/RichSubTableToggleControlBean.java 2010-12-16 12:34:22 UTC (rev 20607)
+++ modules/tests/metamer/trunk/application/src/main/java/org/richfaces/tests/metamer/bean/RichSubTableToggleControlBean.java 2010-12-16 13:02:05 UTC (rev 20608)
@@ -64,7 +64,7 @@
logger = LoggerFactory.getLogger(getClass());
logger.debug("initializing bean " + getClass().getName());
- attributes = Attributes.getUIComponentAttributes(UICollapsibleSubTableToggleControl.class, getClass());
+ attributes = Attributes.getComponentAttributesFromClass(UICollapsibleSubTableToggleControl.class, getClass());
attributes.setAttribute("event", "click");
attributes.setAttribute("rendered", true);
// TODO these attributes have to be tested in another way
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 2010-12-16 12:34:22 UTC (rev 20607)
+++ modules/tests/metamer/trunk/application/src/main/java/org/richfaces/tests/metamer/bean/RichTabBean.java 2010-12-16 13:02:05 UTC (rev 20608)
@@ -54,7 +54,7 @@
logger = LoggerFactory.getLogger(getClass());
logger.debug("initializing bean " + getClass().getName());
- attributes = Attributes.getUIComponentAttributes(HtmlTab.class, getClass());
+ attributes = Attributes.getComponentAttributesFromClass(HtmlTab.class, getClass());
attributes.setAttribute("header", "tab1 header");
attributes.setAttribute("name", "tab1");
Modified: modules/tests/metamer/trunk/application/src/main/java/org/richfaces/tests/metamer/bean/RichTabPanelBean.java
===================================================================
--- modules/tests/metamer/trunk/application/src/main/java/org/richfaces/tests/metamer/bean/RichTabPanelBean.java 2010-12-16 12:34:22 UTC (rev 20607)
+++ modules/tests/metamer/trunk/application/src/main/java/org/richfaces/tests/metamer/bean/RichTabPanelBean.java 2010-12-16 13:02:05 UTC (rev 20608)
@@ -54,7 +54,7 @@
logger = LoggerFactory.getLogger(getClass());
logger.debug("initializing bean " + getClass().getName());
- attributes = Attributes.getUIComponentAttributes(HtmlTabPanel.class, getClass());
+ attributes = Attributes.getComponentAttributesFromClass(HtmlTabPanel.class, getClass());
attributes.setAttribute("activeItem", "tab1");
attributes.setAttribute("rendered", true);
Modified: modules/tests/metamer/trunk/application/src/main/java/org/richfaces/tests/metamer/bean/RichToggleControlBean.java
===================================================================
--- modules/tests/metamer/trunk/application/src/main/java/org/richfaces/tests/metamer/bean/RichToggleControlBean.java 2010-12-16 12:34:22 UTC (rev 20607)
+++ modules/tests/metamer/trunk/application/src/main/java/org/richfaces/tests/metamer/bean/RichToggleControlBean.java 2010-12-16 13:02:05 UTC (rev 20608)
@@ -54,7 +54,7 @@
logger = LoggerFactory.getLogger(getClass());
logger.debug("initializing bean " + getClass().getName());
- attributes = Attributes.getBehaviorAttributes(ToggleControl.class, getClass());
+ attributes = Attributes.getBehaviorAttributesFromFacesConfig(ToggleControl.class, getClass());
attributes.setAttribute("targetPanel", "panel1");
attributes.setAttribute("targetItem", "item1");
Modified: modules/tests/metamer/trunk/application/src/main/java/org/richfaces/tests/metamer/bean/RichTogglePanelBean.java
===================================================================
--- modules/tests/metamer/trunk/application/src/main/java/org/richfaces/tests/metamer/bean/RichTogglePanelBean.java 2010-12-16 12:34:22 UTC (rev 20607)
+++ modules/tests/metamer/trunk/application/src/main/java/org/richfaces/tests/metamer/bean/RichTogglePanelBean.java 2010-12-16 13:02:05 UTC (rev 20608)
@@ -54,7 +54,7 @@
logger = LoggerFactory.getLogger(getClass());
logger.debug("initializing bean " + getClass().getName());
- attributes = Attributes.getUIComponentAttributes(HtmlTogglePanel.class, getClass(), false);
+ attributes = Attributes.getComponentAttributesFromFacesConfig(HtmlTogglePanel.class, getClass());
attributes.setAttribute("activeItem", "item1");
attributes.setAttribute("rendered", true);
Modified: modules/tests/metamer/trunk/application/src/main/java/org/richfaces/tests/metamer/bean/RichTogglePanelItemBean.java
===================================================================
--- modules/tests/metamer/trunk/application/src/main/java/org/richfaces/tests/metamer/bean/RichTogglePanelItemBean.java 2010-12-16 12:34:22 UTC (rev 20607)
+++ modules/tests/metamer/trunk/application/src/main/java/org/richfaces/tests/metamer/bean/RichTogglePanelItemBean.java 2010-12-16 13:02:05 UTC (rev 20608)
@@ -54,7 +54,7 @@
logger = LoggerFactory.getLogger(getClass());
logger.debug("initializing bean " + getClass().getName());
- attributes = Attributes.getUIComponentAttributes(HtmlTogglePanelItem.class, getClass(), false);
+ attributes = Attributes.getComponentAttributesFromFacesConfig(HtmlTogglePanelItem.class, getClass());
attributes.setAttribute("name", "item1");
attributes.setAttribute("rendered", true);
Modified: modules/tests/metamer/trunk/application/src/main/java/org/richfaces/tests/metamer/bean/RichToolbarBean.java
===================================================================
--- modules/tests/metamer/trunk/application/src/main/java/org/richfaces/tests/metamer/bean/RichToolbarBean.java 2010-12-16 12:34:22 UTC (rev 20607)
+++ modules/tests/metamer/trunk/application/src/main/java/org/richfaces/tests/metamer/bean/RichToolbarBean.java 2010-12-16 13:02:05 UTC (rev 20608)
@@ -52,7 +52,7 @@
logger = LoggerFactory.getLogger(getClass());
logger.debug("initializing bean " + getClass().getName());
- attributes = Attributes.getUIComponentAttributes(UIToolbar.class, getClass(), false);
+ attributes = Attributes.getComponentAttributesFromFacesConfig(UIToolbar.class, getClass());
attributes.setAttribute("height", 28);
attributes.setAttribute("rendered", true);
Modified: modules/tests/metamer/trunk/application/src/main/java/org/richfaces/tests/metamer/bean/RichToolbarGroupBean.java
===================================================================
--- modules/tests/metamer/trunk/application/src/main/java/org/richfaces/tests/metamer/bean/RichToolbarGroupBean.java 2010-12-16 12:34:22 UTC (rev 20607)
+++ modules/tests/metamer/trunk/application/src/main/java/org/richfaces/tests/metamer/bean/RichToolbarGroupBean.java 2010-12-16 13:02:05 UTC (rev 20608)
@@ -52,7 +52,7 @@
logger = LoggerFactory.getLogger(getClass());
logger.debug("initializing bean " + getClass().getName());
- attributes = Attributes.getUIComponentAttributes(UIToolbarGroup.class, getClass(), false);
+ attributes = Attributes.getComponentAttributesFromFacesConfig(UIToolbarGroup.class, getClass());
attributes.setAttribute("rendered", true);
}
Modified: modules/tests/metamer/trunk/application/src/main/java/org/richfaces/tests/metamer/bean/RichTooltipBean.java
===================================================================
--- modules/tests/metamer/trunk/application/src/main/java/org/richfaces/tests/metamer/bean/RichTooltipBean.java 2010-12-16 12:34:22 UTC (rev 20607)
+++ modules/tests/metamer/trunk/application/src/main/java/org/richfaces/tests/metamer/bean/RichTooltipBean.java 2010-12-16 13:02:05 UTC (rev 20608)
@@ -58,7 +58,7 @@
logger = LoggerFactory.getLogger(getClass());
logger.debug("initializing bean " + getClass().getName());
- attributes = Attributes.getUIComponentAttributes(UITooltip.class, getClass(), false);
+ attributes = Attributes.getComponentAttributesFromFacesConfig(UITooltip.class, getClass());
// set defaults
Modified: modules/tests/metamer/trunk/application/src/main/java/org/richfaces/tests/metamer/bean/RichTreeBean.java
===================================================================
--- modules/tests/metamer/trunk/application/src/main/java/org/richfaces/tests/metamer/bean/RichTreeBean.java 2010-12-16 12:34:22 UTC (rev 20607)
+++ modules/tests/metamer/trunk/application/src/main/java/org/richfaces/tests/metamer/bean/RichTreeBean.java 2010-12-16 13:02:05 UTC (rev 20608)
@@ -75,7 +75,7 @@
logger = LoggerFactory.getLogger(getClass());
logger.debug("initializing bean " + getClass().getName());
- attributes = Attributes.getUIComponentAttributes(UITree.class, getClass(), false);
+ attributes = Attributes.getComponentAttributesFromFacesConfig(UITree.class, getClass());
attributes.get("rendered").setValue(true);
attributes.get("toggleType").setValue("ajax");
attributes.get("selectionType").setValue("ajax");
Modified: modules/tests/metamer/trunk/application/src/main/java/org/richfaces/tests/metamer/bean/RichTreeModelAdaptorBean.java
===================================================================
--- modules/tests/metamer/trunk/application/src/main/java/org/richfaces/tests/metamer/bean/RichTreeModelAdaptorBean.java 2010-12-16 12:34:22 UTC (rev 20607)
+++ modules/tests/metamer/trunk/application/src/main/java/org/richfaces/tests/metamer/bean/RichTreeModelAdaptorBean.java 2010-12-16 13:02:05 UTC (rev 20608)
@@ -52,7 +52,7 @@
logger = LoggerFactory.getLogger(getClass());
logger.debug("initializing bean " + getClass().getName());
- attributes = Attributes.getUIComponentAttributes(UITreeModelAdaptor.class, getClass(), false);
+ attributes = Attributes.getComponentAttributesFromFacesConfig(UITreeModelAdaptor.class, getClass());
attributes.setAttribute("rendered", true);
}
Modified: modules/tests/metamer/trunk/application/src/main/java/org/richfaces/tests/metamer/bean/RichTreeModelRecursiveAdaptorBean.java
===================================================================
--- modules/tests/metamer/trunk/application/src/main/java/org/richfaces/tests/metamer/bean/RichTreeModelRecursiveAdaptorBean.java 2010-12-16 12:34:22 UTC (rev 20607)
+++ modules/tests/metamer/trunk/application/src/main/java/org/richfaces/tests/metamer/bean/RichTreeModelRecursiveAdaptorBean.java 2010-12-16 13:02:05 UTC (rev 20608)
@@ -78,7 +78,7 @@
logger = LoggerFactory.getLogger(getClass());
logger.debug("initializing bean " + getClass().getName());
- attributes = Attributes.getUIComponentAttributes(UITreeModelRecursiveAdaptor.class, getClass(), false);
+ attributes = Attributes.getComponentAttributesFromFacesConfig(UITreeModelRecursiveAdaptor.class, getClass());
attributes.get("rendered").setValue(true);
}
Modified: modules/tests/metamer/trunk/application/src/main/java/org/richfaces/tests/metamer/bean/RichTreeNodeBean.java
===================================================================
--- modules/tests/metamer/trunk/application/src/main/java/org/richfaces/tests/metamer/bean/RichTreeNodeBean.java 2010-12-16 12:34:22 UTC (rev 20607)
+++ modules/tests/metamer/trunk/application/src/main/java/org/richfaces/tests/metamer/bean/RichTreeNodeBean.java 2010-12-16 13:02:05 UTC (rev 20608)
@@ -53,7 +53,7 @@
logger.debug("initializing bean " + getClass().getName());
for (int i = 0; i < attributes.length; i++) {
- attributes[i] = Attributes.getUIComponentAttributes(UITreeModelAdaptor.class, getClass(), false);
+ attributes[i] = Attributes.getComponentAttributesFromFacesConfig(UITreeModelAdaptor.class, getClass());
attributes[i].get("rendered").setValue(true);
14 years
- 1
- 0