Author: ppitonak(a)redhat.com Date: 2011-01-19 07:23:59 -0500 (Wed, 19 Jan 2011) New Revision: 21077 Modified: modules/tests/metamer/trunk/application/src/main/java/org/richfaces/tests/metamer/Attribute.java 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/Behavior.java modules/tests/metamer/trunk/application/src/main/java/org/richfaces/tests/metamer/bean/A4JActionListenerBean.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/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/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/A4JPushEventProcuder.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/RichAutocompleteBean.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/RichExtendedDataTableBean.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/RichJQueryBean.java modules/tests/metamer/trunk/application/src/main/java/org/richfaces/tests/metamer/bean/RichMenuSeparatorBean.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/RichProgressBarBean.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/model/CalendarModel.java modules/tests/metamer/trunk/application/src/main/java/org/richfaces/tests/metamer/model/CalendarModelItem.java Log: * code refactored and cleaned up Modified: modules/tests/metamer/trunk/application/src/main/java/org/richfaces/tests/metamer/Attribute.java =================================================================== --- modules/tests/metamer/trunk/application/src/main/java/org/richfaces/tests/metamer/Attribute.java 2011-01-19 11:19:22 UTC (rev 21076) +++ modules/tests/metamer/trunk/application/src/main/java/org/richfaces/tests/metamer/Attribute.java 2011-01-19 12:23:59 UTC (rev 21077) @@ -1,6 +1,6 @@ /******************************************************************************* * JBoss, Home of Professional Open Source - * Copyright 2010, Red Hat, Inc. and individual contributors + * Copyright 2010-2011, Red Hat, Inc. and individual contributors * by the @authors tag. See the copyright.txt in the distribution for a * full listing of individual contributors. * @@ -137,11 +137,11 @@ public void setType(Class<?> type) { this.type = type; } - + public Class<?> getMemberType() { return memberType; } - + public void setMemberType(Class<?> memberType) { this.memberType = memberType; } 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 2011-01-19 11:19:22 UTC (rev 21076) +++ modules/tests/metamer/trunk/application/src/main/java/org/richfaces/tests/metamer/Attributes.java 2011-01-19 12:23:59 UTC (rev 21077) @@ -1,6 +1,6 @@ /******************************************************************************* * JBoss, Home of Professional Open Source - * Copyright 2010, Red Hat, Inc. and individual contributors + * Copyright 2010-2011, Red Hat, Inc. and individual contributors * by the @authors tag. See the copyright.txt in the distribution for a * full listing of individual contributors. * @@ -42,6 +42,7 @@ import java.util.TreeMap; import java.util.regex.Matcher; import java.util.regex.Pattern; + import javax.el.ELContext; import javax.el.ExpressionFactory; import javax.el.MethodExpression; @@ -57,6 +58,7 @@ import javax.xml.bind.JAXBException; import javax.xml.bind.annotation.XmlElement; import javax.xml.bind.annotation.XmlRootElement; + import org.richfaces.component.UIStatus; import org.richfaces.tests.metamer.bean.RichBean; import org.slf4j.Logger; Modified: 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 2011-01-19 11:19:22 UTC (rev 21076) +++ modules/tests/metamer/trunk/application/src/main/java/org/richfaces/tests/metamer/Behavior.java 2011-01-19 12:23:59 UTC (rev 21077) @@ -1,6 +1,6 @@ /******************************************************************************* * JBoss, Home of Professional Open Source - * Copyright 2010, Red Hat, Inc. and individual contributors + * Copyright 2010-2011, Red Hat, Inc. and individual contributors * by the @authors tag. See the copyright.txt in the distribution for a * full listing of individual contributors. * @@ -23,6 +23,7 @@ import java.io.Serializable; import java.util.List; + import javax.xml.bind.annotation.XmlElement; import javax.xml.bind.annotation.XmlRootElement; Modified: modules/tests/metamer/trunk/application/src/main/java/org/richfaces/tests/metamer/bean/A4JActionListenerBean.java =================================================================== --- modules/tests/metamer/trunk/application/src/main/java/org/richfaces/tests/metamer/bean/A4JActionListenerBean.java 2011-01-19 11:19:22 UTC (rev 21076) +++ modules/tests/metamer/trunk/application/src/main/java/org/richfaces/tests/metamer/bean/A4JActionListenerBean.java 2011-01-19 12:23:59 UTC (rev 21077) @@ -1,6 +1,6 @@ /******************************************************************************* * JBoss, Home of Professional Open Source - * Copyright 2010, Red Hat, Inc. and individual contributors + * Copyright 2010-2011, Red Hat, Inc. and individual contributors * by the @authors tag. See the copyright.txt in the distribution for a * full listing of individual contributors. * 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 2011-01-19 11:19:22 UTC (rev 21076) +++ modules/tests/metamer/trunk/application/src/main/java/org/richfaces/tests/metamer/bean/A4JAjaxBean.java 2011-01-19 12:23:59 UTC (rev 21077) @@ -1,6 +1,6 @@ /******************************************************************************* * JBoss, Home of Professional Open Source - * Copyright 2010, Red Hat, Inc. and individual contributors + * Copyright 2010-2011, Red Hat, Inc. and individual contributors * by the @authors tag. See the copyright.txt in the distribution for a * full listing of individual contributors. * 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 2011-01-19 11:19:22 UTC (rev 21076) +++ modules/tests/metamer/trunk/application/src/main/java/org/richfaces/tests/metamer/bean/A4JAttachQueueBean.java 2011-01-19 12:23:59 UTC (rev 21077) @@ -1,6 +1,6 @@ /******************************************************************************* * JBoss, Home of Professional Open Source - * Copyright 2010, Red Hat, Inc. and individual contributors + * Copyright 2010-2011, Red Hat, Inc. and individual contributors * by the @authors tag. See the copyright.txt in the distribution for a * full listing of individual contributors. * @@ -26,8 +26,8 @@ import javax.annotation.PostConstruct; import javax.faces.bean.ManagedBean; import javax.faces.bean.ViewScoped; + import org.richfaces.component.UIAttachQueue; - import org.richfaces.tests.metamer.Attributes; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -58,21 +58,21 @@ logger.debug("initializing bean " + getClass().getName()); // initialize attributes - attributes = Attributes.getComponentAttributesFromClass(UIAttachQueue.class, getClass()); + attributes = Attributes.getComponentAttributesFromFacesConfig(UIAttachQueue.class, getClass()); initializeAttributes(attributes); attributes.setAttribute("requestDelay", 500); - attributes2 = Attributes.getComponentAttributesFromClass(UIAttachQueue.class, getClass()); + attributes2 = Attributes.getComponentAttributesFromFacesConfig(UIAttachQueue.class, getClass()); initializeAttributes(attributes2); attributes2.setAttribute("requestDelay", 1500); } - + private void initializeAttributes(Attributes attributes) { attributes.setAttribute("rendered", true); - + // hidden attributes attributes.remove("queueId"); - + // not implemented yet // TODO RFPL-734 attributes.remove("name"); 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 2011-01-19 11:19:22 UTC (rev 21076) +++ modules/tests/metamer/trunk/application/src/main/java/org/richfaces/tests/metamer/bean/A4JCommandButtonBean.java 2011-01-19 12:23:59 UTC (rev 21077) @@ -1,6 +1,6 @@ /******************************************************************************* * JBoss, Home of Professional Open Source - * Copyright 2010, Red Hat, Inc. and individual contributors + * Copyright 2010-2011, Red Hat, Inc. and individual contributors * by the @authors tag. See the copyright.txt in the distribution for a * full listing of individual contributors. * @@ -26,6 +26,7 @@ import javax.faces.bean.ManagedBean; import javax.faces.bean.ViewScoped; import javax.faces.event.ActionEvent; + import org.richfaces.component.UICommandButton; import org.richfaces.tests.metamer.Attributes; import org.slf4j.Logger; 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 2011-01-19 11:19:22 UTC (rev 21076) +++ modules/tests/metamer/trunk/application/src/main/java/org/richfaces/tests/metamer/bean/A4JCommandLinkBean.java 2011-01-19 12:23:59 UTC (rev 21077) @@ -1,6 +1,6 @@ /******************************************************************************* * JBoss, Home of Professional Open Source - * Copyright 2010, Red Hat, Inc. and individual contributors + * Copyright 2010-2011, Red Hat, Inc. and individual contributors * by the @authors tag. See the copyright.txt in the distribution for a * full listing of individual contributors. * @@ -22,10 +22,12 @@ package org.richfaces.tests.metamer.bean; import java.io.Serializable; + import javax.annotation.PostConstruct; import javax.faces.bean.ManagedBean; import javax.faces.bean.ViewScoped; import javax.faces.event.ActionEvent; + import org.richfaces.component.UICommandLink; import org.richfaces.tests.metamer.Attributes; import org.slf4j.Logger; 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 2011-01-19 11:19:22 UTC (rev 21076) +++ modules/tests/metamer/trunk/application/src/main/java/org/richfaces/tests/metamer/bean/A4JJSFunctionBean.java 2011-01-19 12:23:59 UTC (rev 21077) @@ -1,6 +1,6 @@ /******************************************************************************* * JBoss, Home of Professional Open Source - * Copyright 2010, Red Hat, Inc. and individual contributors + * Copyright 2010-2011, Red Hat, Inc. and individual contributors * by the @authors tag. See the copyright.txt in the distribution for a * full listing of individual contributors. * @@ -29,8 +29,8 @@ import javax.faces.bean.ManagedBean; import javax.faces.bean.SessionScoped; import javax.faces.event.ActionEvent; + import org.richfaces.component.UIFunction; - import org.richfaces.tests.metamer.Attributes; import org.slf4j.Logger; import org.slf4j.LoggerFactory; 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 2011-01-19 11:19:22 UTC (rev 21076) +++ modules/tests/metamer/trunk/application/src/main/java/org/richfaces/tests/metamer/bean/A4JMediaOutputBean.java 2011-01-19 12:23:59 UTC (rev 21077) @@ -61,7 +61,7 @@ logger = LoggerFactory.getLogger(getClass()); logger.debug("initializing bean " + getClass().getName()); - attributes = Attributes.getComponentAttributesFromClass(UIMediaOutput.class, getClass()); + attributes = Attributes.getComponentAttributesFromFacesConfig(UIMediaOutput.class, getClass()); attributes.setAttribute("session", true); attributes.setAttribute("rendered", true); 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 2011-01-19 11:19:22 UTC (rev 21076) +++ modules/tests/metamer/trunk/application/src/main/java/org/richfaces/tests/metamer/bean/A4JOutputPanelBean.java 2011-01-19 12:23:59 UTC (rev 21077) @@ -1,6 +1,6 @@ /******************************************************************************* * JBoss, Home of Professional Open Source - * Copyright 2010, Red Hat, Inc. and individual contributors + * Copyright 2010-2011, Red Hat, Inc. and individual contributors * by the @authors tag. See the copyright.txt in the distribution for a * full listing of individual contributors. * @@ -55,8 +55,8 @@ logger = LoggerFactory.getLogger(getClass()); logger.debug("initializing bean " + getClass().getName()); - attributes = Attributes.getComponentAttributesFromClass(UIOutputPanel.class, getClass()); - + attributes = Attributes.getComponentAttributesFromFacesConfig(UIOutputPanel.class, getClass()); + attributes.setAttribute("ajaxRendered", true); attributes.setAttribute("layout", "block"); attributes.setAttribute("rendered", true); @@ -94,6 +94,4 @@ counter++; return null; } - } - 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 2011-01-19 11:19:22 UTC (rev 21076) +++ modules/tests/metamer/trunk/application/src/main/java/org/richfaces/tests/metamer/bean/A4JPollBean.java 2011-01-19 12:23:59 UTC (rev 21077) @@ -1,6 +1,6 @@ /******************************************************************************* * JBoss, Home of Professional Open Source - * Copyright 2010, Red Hat, Inc. and individual contributors + * Copyright 2010-2011, Red Hat, Inc. and individual contributors * by the @authors tag. See the copyright.txt in the distribution for a * full listing of individual contributors. * @@ -57,8 +57,8 @@ logger = LoggerFactory.getLogger(getClass()); logger.debug("initializing bean " + getClass().getName()); - attributes = Attributes.getComponentAttributesFromClass(UIPoll.class, getClass()); - + attributes = Attributes.getComponentAttributesFromFacesConfig(UIPoll.class, getClass()); + attributes.setAttribute("enabled", true); attributes.setAttribute("rendered", true); attributes.setAttribute("interval", 2500); @@ -115,4 +115,3 @@ counter--; } } - 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 2011-01-19 11:19:22 UTC (rev 21076) +++ modules/tests/metamer/trunk/application/src/main/java/org/richfaces/tests/metamer/bean/A4JPushBean.java 2011-01-19 12:23:59 UTC (rev 21077) @@ -1,6 +1,6 @@ /******************************************************************************* * JBoss, Home of Professional Open Source - * Copyright 2010, Red Hat, Inc. and individual contributors + * Copyright 2010-2011, Red Hat, Inc. and individual contributors * by the @authors tag. See the copyright.txt in the distribution for a * full listing of individual contributors. * @@ -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.io.Serializable; @@ -31,9 +30,9 @@ import javax.faces.bean.ManagedProperty; import javax.faces.bean.SessionScoped; import javax.faces.event.ActionEvent; + //import org.ajax4jsf.event.PushEventListener; import org.richfaces.component.UIPush; - import org.richfaces.tests.metamer.Attributes; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -53,7 +52,6 @@ private Attributes attributes; private int counter = 0; // private transient volatile PushEventListener listener; - @ManagedProperty(value = "#{a4jPushEventProcuder}") private transient A4JPushEventProcuder pushEventProducer; @@ -102,12 +100,11 @@ public void setAttributes(Attributes attributes) { this.attributes = attributes; } - + // public void setListener(EventListener listener) { // this.listener = (PushEventListener) listener; // pushEventProducer.registerListener(this.listener); // } - public int getCounter() { return counter; } @@ -134,4 +131,3 @@ return new Date(); } } - Modified: modules/tests/metamer/trunk/application/src/main/java/org/richfaces/tests/metamer/bean/A4JPushEventProcuder.java =================================================================== --- modules/tests/metamer/trunk/application/src/main/java/org/richfaces/tests/metamer/bean/A4JPushEventProcuder.java 2011-01-19 11:19:22 UTC (rev 21076) +++ modules/tests/metamer/trunk/application/src/main/java/org/richfaces/tests/metamer/bean/A4JPushEventProcuder.java 2011-01-19 12:23:59 UTC (rev 21077) @@ -1,6 +1,6 @@ /******************************************************************************* * JBoss, Home of Professional Open Source - * Copyright 2010, Red Hat, Inc. and individual contributors + * Copyright 2010-2011, Red Hat, Inc. and individual contributors * by the @authors tag. See the copyright.txt in the distribution for a * full listing of individual contributors. * 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 2011-01-19 11:19:22 UTC (rev 21076) +++ modules/tests/metamer/trunk/application/src/main/java/org/richfaces/tests/metamer/bean/A4JQueueBean.java 2011-01-19 12:23:59 UTC (rev 21077) @@ -1,6 +1,6 @@ /******************************************************************************* * JBoss, Home of Professional Open Source - * Copyright 2010, Red Hat, Inc. and individual contributors + * Copyright 2010-2011, Red Hat, Inc. and individual contributors * by the @authors tag. See the copyright.txt in the distribution for a * full listing of individual contributors. * @@ -26,8 +26,8 @@ import javax.annotation.PostConstruct; import javax.faces.bean.ManagedBean; import javax.faces.bean.ViewScoped; -import org.richfaces.component.UIQueue; +import org.richfaces.component.UIQueue; import org.richfaces.tests.metamer.Attributes; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -46,7 +46,6 @@ private static Logger logger; private Attributes attributes; private String text; - private A4JQueueBean globalQueue; private A4JQueueBean formQueue1; private A4JQueueBean formQueue2; @@ -60,7 +59,7 @@ logger.debug("initializing bean " + getClass().getName()); // initialize attributes - attributes = Attributes.getComponentAttributesFromClass(UIQueue.class, getClass()); + attributes = Attributes.getComponentAttributesFromFacesConfig(UIQueue.class, getClass()); attributes.setAttribute("rendered", true); attributes.setAttribute("requestDelay", 750); @@ -106,7 +105,7 @@ } return formQueue2; } - + public A4JQueueBean[] getFormQueues() { return new A4JQueueBean[]{getFormQueue1(), getFormQueue2()}; } 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 2011-01-19 11:19:22 UTC (rev 21076) +++ modules/tests/metamer/trunk/application/src/main/java/org/richfaces/tests/metamer/bean/A4JRegionBean.java 2011-01-19 12:23:59 UTC (rev 21077) @@ -1,6 +1,6 @@ /******************************************************************************* * JBoss, Home of Professional Open Source - * Copyright 2010, Red Hat, Inc. and individual contributors + * Copyright 2010-2011, Red Hat, Inc. and individual contributors * by the @authors tag. See the copyright.txt in the distribution for a * full listing of individual contributors. * @@ -47,11 +47,11 @@ public class A4JRegionBean implements Serializable { private static final long serialVersionUID = -1L; - private static final SelectItem[] AVAILABLE_EXECUTE_OPTIONS = new SelectItem[] { new SelectItem(null, "default"), + private static final SelectItem[] AVAILABLE_EXECUTE_OPTIONS = new SelectItem[]{new SelectItem(null, "default"), new SelectItem("@all"), new SelectItem("@form"), new SelectItem("@region"), new SelectItem("@this"), new SelectItem("outerValueInput", "Outer"), new SelectItem("regionValueInput", "Region"), new SelectItem("nestedRegionValueInput", "Nested region"), - new SelectItem("decorationValueInput", "Decoration"), new SelectItem("insertionValueInput", "Insertion") }; + new SelectItem("decorationValueInput", "Decoration"), new SelectItem("insertionValueInput", "Insertion")}; private static Logger logger; // for page simple.xhtml private Attributes attributes; @@ -81,7 +81,7 @@ user1 = new Employee(); user2 = new Employee(); - attributes = Attributes.getComponentAttributesFromClass(UIRegion.class, getClass()); + attributes = Attributes.getComponentAttributesFromFacesConfig(UIRegion.class, getClass()); attributes.setAttribute("rendered", true); } @@ -162,7 +162,7 @@ public void setOuterExecute(String outerExecute) { this.outerExecute = outerExecute; } - + public String getInsertionExecute() { return insertionExecute; } 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 2011-01-19 11:19:22 UTC (rev 21076) +++ modules/tests/metamer/trunk/application/src/main/java/org/richfaces/tests/metamer/bean/A4JRepeatBean.java 2011-01-19 12:23:59 UTC (rev 21077) @@ -1,6 +1,6 @@ /******************************************************************************* * JBoss, Home of Professional Open Source - * Copyright 2010, Red Hat, Inc. and individual contributors + * Copyright 2010-2011, Red Hat, Inc. and individual contributors * by the @authors tag. See the copyright.txt in the distribution for a * full listing of individual contributors. * @@ -143,7 +143,7 @@ } // initialize attributes - attributes = Attributes.getComponentAttributesFromClass(UIRepeat.class, getClass()); + attributes = Attributes.getComponentAttributesFromFacesConfig(UIRepeat.class, getClass()); attributes.setAttribute("rendered", true); // TODO has to be tested in other way attributes.remove("componentState"); @@ -155,7 +155,7 @@ attributes.remove("value"); attributes.remove("stateVar"); attributes.remove("var"); - + // should be hidden attributes.remove("relativeRowIndex"); attributes.remove("rowAvailable"); 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 2011-01-19 11:19:22 UTC (rev 21076) +++ modules/tests/metamer/trunk/application/src/main/java/org/richfaces/tests/metamer/bean/A4JStatusBean.java 2011-01-19 12:23:59 UTC (rev 21077) @@ -1,6 +1,6 @@ /******************************************************************************* * JBoss, Home of Professional Open Source - * Copyright 2010, Red Hat, Inc. and individual contributors + * Copyright 2010-2011, Red Hat, Inc. and individual contributors * by the @authors tag. See the copyright.txt in the distribution for a * full listing of individual contributors. * @@ -45,7 +45,6 @@ private static final long serialVersionUID = -1L; private static Logger logger; private Attributes attributes; - private String facetStartValue = "START"; private String facetStopValue = "STOP"; private String facetErrorValue = "ERROR"; @@ -58,7 +57,7 @@ logger = LoggerFactory.getLogger(getClass()); logger.debug("initializing bean " + getClass().getName()); - attributes = Attributes.getComponentAttributesFromClass(UIStatus.class, getClass()); + attributes = Attributes.getComponentAttributesFromFacesConfig(UIStatus.class, getClass()); attributes.setAttribute("rendered", true); // hidden attributes 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 2011-01-19 11:19:22 UTC (rev 21076) +++ modules/tests/metamer/trunk/application/src/main/java/org/richfaces/tests/metamer/bean/RichAutocompleteBean.java 2011-01-19 12:23:59 UTC (rev 21077) @@ -1,6 +1,6 @@ /******************************************************************************* * JBoss, Home of Professional Open Source - * Copyright 2010, Red Hat, Inc. and individual contributors + * Copyright 2010-2011, Red Hat, Inc. and individual contributors * by the @authors tag. See the copyright.txt in the distribution for a * full listing of individual contributors. * @@ -30,8 +30,8 @@ import javax.faces.bean.ManagedBean; import javax.faces.bean.ManagedProperty; import javax.faces.bean.SessionScoped; + import org.richfaces.component.UIAutocomplete; - import org.richfaces.tests.metamer.Attributes; import org.richfaces.tests.metamer.model.Capital; import org.slf4j.Logger; @@ -63,7 +63,7 @@ logger = LoggerFactory.getLogger(getClass()); logger.debug("initializing bean " + getClass().getName()); - attributes = Attributes.getComponentAttributesFromClass(UIAutocomplete.class, getClass()); + attributes = Attributes.getComponentAttributesFromFacesConfig(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/RichDataGridBean.java =================================================================== --- modules/tests/metamer/trunk/application/src/main/java/org/richfaces/tests/metamer/bean/RichDataGridBean.java 2011-01-19 11:19:22 UTC (rev 21076) +++ modules/tests/metamer/trunk/application/src/main/java/org/richfaces/tests/metamer/bean/RichDataGridBean.java 2011-01-19 12:23:59 UTC (rev 21077) @@ -1,6 +1,6 @@ /******************************************************************************* * JBoss, Home of Professional Open Source - * Copyright 2010, Red Hat, Inc. and individual contributors + * Copyright 2010-2011, Red Hat, Inc. and individual contributors * by the @authors tag. See the copyright.txt in the distribution for a * full listing of individual contributors. * @@ -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.io.Serializable; @@ -49,7 +48,7 @@ // true = model, false = empty table private boolean state = true; private int page = 1; - + /** * Initializes the managed bean. */ @@ -58,11 +57,11 @@ logger = LoggerFactory.getLogger(getClass()); logger.debug("initializing bean " + getClass().getName()); - attributes = Attributes.getComponentAttributesFromClass(UIDataGrid.class, getClass()); + attributes = Attributes.getComponentAttributesFromFacesConfig(UIDataGrid.class, getClass()); attributes.setAttribute("columns", 3); attributes.setAttribute("rendered", true); - + // TODO has to be tested in other way attributes.remove("componentState"); attributes.remove("rowKeyVar"); @@ -70,7 +69,7 @@ attributes.remove("stateVar"); attributes.remove("value"); attributes.remove("var"); - + // should be hidden attributes.remove("rows"); attributes.remove("rowAvailable"); @@ -104,5 +103,4 @@ public void setPage(int page) { this.page = page; } - } 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 2011-01-19 11:19:22 UTC (rev 21076) +++ modules/tests/metamer/trunk/application/src/main/java/org/richfaces/tests/metamer/bean/RichDataScrollerBean.java 2011-01-19 12:23:59 UTC (rev 21077) @@ -1,6 +1,6 @@ /******************************************************************************* * JBoss, Home of Professional Open Source - * Copyright 2010, Red Hat, Inc. and individual contributors + * Copyright 2010-2011, Red Hat, Inc. and individual contributors * by the @authors tag. See the copyright.txt in the distribution for a * full listing of individual contributors. * @@ -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.io.Serializable; @@ -48,7 +47,7 @@ private Attributes attributes; private int page = 1; private boolean state = true; - + /** * Initializes the managed bean. */ @@ -57,8 +56,8 @@ logger = LoggerFactory.getLogger(getClass()); logger.debug("initializing bean " + getClass().getName()); - attributes = Attributes.getComponentAttributesFromClass(UIDataScroller.class, getClass()); - + attributes = Attributes.getComponentAttributesFromFacesConfig(UIDataScroller.class, getClass()); + attributes.setAttribute("boundaryControls", "show"); attributes.setAttribute("fastControls", "show"); attributes.setAttribute("fastStep", 1); @@ -114,5 +113,4 @@ public void setState(boolean state) { this.state = state; } - } 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 2011-01-19 11:19:22 UTC (rev 21076) +++ modules/tests/metamer/trunk/application/src/main/java/org/richfaces/tests/metamer/bean/RichDataTableBean.java 2011-01-19 12:23:59 UTC (rev 21077) @@ -1,6 +1,6 @@ /******************************************************************************* * JBoss, Home of Professional Open Source - * Copyright 2010, Red Hat, Inc. and individual contributors + * Copyright 2010-2011, Red Hat, Inc. and individual contributors * by the @authors tag. See the copyright.txt in the distribution for a * full listing of individual contributors. * @@ -87,7 +87,7 @@ logger = LoggerFactory.getLogger(getClass()); logger.debug("initializing bean " + getClass().getName()); - attributes = Attributes.getComponentAttributesFromClass(UIDataTable.class, getClass()); + attributes = Attributes.getComponentAttributesFromFacesConfig(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/RichExtendedDataTableBean.java =================================================================== --- modules/tests/metamer/trunk/application/src/main/java/org/richfaces/tests/metamer/bean/RichExtendedDataTableBean.java 2011-01-19 11:19:22 UTC (rev 21076) +++ modules/tests/metamer/trunk/application/src/main/java/org/richfaces/tests/metamer/bean/RichExtendedDataTableBean.java 2011-01-19 12:23:59 UTC (rev 21077) @@ -1,6 +1,6 @@ /******************************************************************************* * JBoss, Home of Professional Open Source - * Copyright 2010, Red Hat, Inc. and individual contributors + * Copyright 2010-2011, Red Hat, Inc. and individual contributors * by the @authors tag. See the copyright.txt in the distribution for a * full listing of individual contributors. * @@ -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.io.Serializable; @@ -59,24 +58,23 @@ private int page = 1; // true = model, false = empty table private boolean state = true; - // sorting private ColumnSortingMap sorting = new ColumnSortingMap() { + private static final long serialVersionUID = 1L; + protected UIDataTableBase getBinding() { return binding; } + protected Attributes getAttributes() { return attributes; } }; - // filtering private Map<String, Object> filtering = new HashMap<String, Object>(); - // facets private Map<String, String> facets = new HashMap<String, String>(); - private UIExtendedDataTable binding; /** @@ -87,13 +85,13 @@ logger = LoggerFactory.getLogger(getClass()); logger.debug("initializing bean " + getClass().getName()); - attributes = Attributes.getComponentAttributesFromClass(UIExtendedDataTable.class, getClass()); + attributes = Attributes.getComponentAttributesFromFacesConfig(UIExtendedDataTable.class, getClass()); attributes.setAttribute("rendered", true); attributes.setAttribute("rows", 30); attributes.setAttribute("styleClass", "extended-data-table"); attributes.setAttribute("style", null); - + // setup types attributes.get("selection").setType(TreeSet.class); attributes.get("selection").setMemberType(Integer.class); @@ -215,7 +213,7 @@ public boolean accept(Employee e) { String sex = (String) getFiltering().get("sex"); if (sex == null || sex.length() == 0 || sex.equalsIgnoreCase("all") - || sex.equalsIgnoreCase(e.getSex().toString())) { + || sex.equalsIgnoreCase(e.getSex().toString())) { return true; } return false; @@ -234,8 +232,4 @@ public Map<String, Object> getFiltering() { return filtering; } - - - - } 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 2011-01-19 11:19:22 UTC (rev 21076) +++ modules/tests/metamer/trunk/application/src/main/java/org/richfaces/tests/metamer/bean/RichInplaceSelectBean.java 2011-01-19 12:23:59 UTC (rev 21077) @@ -1,6 +1,6 @@ /******************************************************************************* * JBoss, Home of Professional Open Source - * Copyright 2010, Red Hat, Inc. and individual contributors + * Copyright 2010-2011, Red Hat, Inc. and individual contributors * by the @authors tag. See the copyright.txt in the distribution for a * full listing of individual contributors. * @@ -31,8 +31,8 @@ import javax.faces.bean.ViewScoped; import javax.faces.event.ValueChangeEvent; import javax.faces.model.SelectItem; + import org.richfaces.component.UIInplaceSelect; - import org.richfaces.tests.metamer.Attributes; import org.richfaces.tests.metamer.model.Capital; import org.slf4j.Logger; 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 2011-01-19 11:19:22 UTC (rev 21076) +++ modules/tests/metamer/trunk/application/src/main/java/org/richfaces/tests/metamer/bean/RichJQueryBean.java 2011-01-19 12:23:59 UTC (rev 21077) @@ -1,6 +1,6 @@ /******************************************************************************* * JBoss, Home of Professional Open Source - * Copyright 2010, Red Hat, Inc. and individual contributors + * Copyright 2010-2011, Red Hat, Inc. and individual contributors * by the @authors tag. See the copyright.txt in the distribution for a * full listing of individual contributors. * @@ -61,7 +61,7 @@ componentsDataList = new ArrayList<String>(); addComponent(); - attributes = Attributes.getComponentAttributesFromClass(UIJQuery.class, getClass()); + attributes = Attributes.getComponentAttributesFromFacesConfig(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/RichMenuSeparatorBean.java =================================================================== --- modules/tests/metamer/trunk/application/src/main/java/org/richfaces/tests/metamer/bean/RichMenuSeparatorBean.java 2011-01-19 11:19:22 UTC (rev 21076) +++ modules/tests/metamer/trunk/application/src/main/java/org/richfaces/tests/metamer/bean/RichMenuSeparatorBean.java 2011-01-19 12:23:59 UTC (rev 21077) @@ -1,6 +1,6 @@ /******************************************************************************* * JBoss, Home of Professional Open Source - * Copyright 2010, Red Hat, Inc. and individual contributors + * Copyright 2010-2011, Red Hat, Inc. and individual contributors * by the @authors tag. See the copyright.txt in the distribution for a * full listing of individual contributors. * @@ -22,9 +22,11 @@ package org.richfaces.tests.metamer.bean; import java.io.Serializable; + import javax.annotation.PostConstruct; import javax.faces.bean.ManagedBean; import javax.faces.bean.ViewScoped; + import org.richfaces.component.UIMenuSeparator; import org.richfaces.tests.metamer.Attributes; import org.slf4j.Logger; 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 2011-01-19 11:19:22 UTC (rev 21076) +++ modules/tests/metamer/trunk/application/src/main/java/org/richfaces/tests/metamer/bean/RichPanelBean.java 2011-01-19 12:23:59 UTC (rev 21077) @@ -1,6 +1,6 @@ /******************************************************************************* * JBoss, Home of Professional Open Source - * Copyright 2010, Red Hat, Inc. and individual contributors + * Copyright 2010-2011, Red Hat, Inc. and individual contributors * by the @authors tag. See the copyright.txt in the distribution for a * full listing of individual contributors. * @@ -54,7 +54,7 @@ logger = LoggerFactory.getLogger(getClass()); logger.debug("initializing bean " + getClass().getName()); - attributes = Attributes.getComponentAttributesFromClass(UIPanel.class, getClass()); + attributes = Attributes.getComponentAttributesFromFacesConfig(UIPanel.class, getClass()); attributes.setAttribute("rendered", true); 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 2011-01-19 11:19:22 UTC (rev 21076) +++ modules/tests/metamer/trunk/application/src/main/java/org/richfaces/tests/metamer/bean/RichProgressBarBean.java 2011-01-19 12:23:59 UTC (rev 21077) @@ -60,7 +60,7 @@ logger = LoggerFactory.getLogger(getClass()); logger.debug("initializing bean " + getClass().getName()); - attributes = Attributes.getComponentAttributesFromClass(UIProgressBar.class, getClass()); + attributes = Attributes.getComponentAttributesFromFacesConfig(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/RichTabBean.java =================================================================== --- modules/tests/metamer/trunk/application/src/main/java/org/richfaces/tests/metamer/bean/RichTabBean.java 2011-01-19 11:19:22 UTC (rev 21076) +++ modules/tests/metamer/trunk/application/src/main/java/org/richfaces/tests/metamer/bean/RichTabBean.java 2011-01-19 12:23:59 UTC (rev 21077) @@ -1,6 +1,6 @@ /******************************************************************************* * JBoss, Home of Professional Open Source - * Copyright 2010, Red Hat, Inc. and individual contributors + * Copyright 2010-2011, Red Hat, Inc. and individual contributors * by the @authors tag. See the copyright.txt in the distribution for a * full listing of individual contributors. * @@ -27,7 +27,7 @@ import javax.faces.bean.ManagedBean; import javax.faces.bean.ViewScoped; -import org.richfaces.component.AbstractTab; +import org.richfaces.component.UITab; import org.richfaces.tests.metamer.Attributes; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -54,7 +54,7 @@ logger = LoggerFactory.getLogger(getClass()); logger.debug("initializing bean " + getClass().getName()); - attributes = Attributes.getComponentAttributesFromClass(AbstractTab.class, getClass()); + attributes = Attributes.getComponentAttributesFromFacesConfig(UITab.class, getClass()); attributes.setAttribute("header", "tab1 header"); attributes.setAttribute("name", "tab1"); Modified: modules/tests/metamer/trunk/application/src/main/java/org/richfaces/tests/metamer/model/CalendarModel.java =================================================================== --- modules/tests/metamer/trunk/application/src/main/java/org/richfaces/tests/metamer/model/CalendarModel.java 2011-01-19 11:19:22 UTC (rev 21076) +++ modules/tests/metamer/trunk/application/src/main/java/org/richfaces/tests/metamer/model/CalendarModel.java 2011-01-19 12:23:59 UTC (rev 21077) @@ -1,6 +1,6 @@ /******************************************************************************* * JBoss, Home of Professional Open Source - * Copyright 2010, Red Hat, Inc. and individual contributors + * Copyright 2010-2011, Red Hat, Inc. and individual contributors * by the @authors tag. See the copyright.txt in the distribution for a * full listing of individual contributors. * Modified: modules/tests/metamer/trunk/application/src/main/java/org/richfaces/tests/metamer/model/CalendarModelItem.java =================================================================== --- modules/tests/metamer/trunk/application/src/main/java/org/richfaces/tests/metamer/model/CalendarModelItem.java 2011-01-19 11:19:22 UTC (rev 21076) +++ modules/tests/metamer/trunk/application/src/main/java/org/richfaces/tests/metamer/model/CalendarModelItem.java 2011-01-19 12:23:59 UTC (rev 21077) @@ -1,6 +1,6 @@ /******************************************************************************* * JBoss, Home of Professional Open Source - * Copyright 2010, Red Hat, Inc. and individual contributors + * Copyright 2010-2011, Red Hat, Inc. and individual contributors * by the @authors tag. See the copyright.txt in the distribution for a * full listing of individual contributors. *