From richfaces-svn-commits at lists.jboss.org Tue Jan 11 11:13:39 2011 Content-Type: multipart/mixed; boundary="===============5411375589535301625==" MIME-Version: 1.0 From: richfaces-svn-commits at lists.jboss.org To: richfaces-svn-commits at lists.jboss.org Subject: [richfaces-svn-commits] JBoss Rich Faces SVN: r20949 - in modules/tests/metamer/trunk/application/src/main: resources/org/richfaces/tests/metamer/bean and 1 other directories. Date: Tue, 11 Jan 2011 11:13:38 -0500 Message-ID: <201101111613.p0BGDcIR025531@svn01.web.mwc.hst.phx2.redhat.com> --===============5411375589535301625== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Author: lfryc(a)redhat.com Date: 2011-01-11 11:13:37 -0500 (Tue, 11 Jan 2011) New Revision: 20949 Added: modules/tests/metamer/trunk/application/src/main/resources/org/richfaces= /tests/metamer/bean/RichCollapsibleSubTableBean.properties Removed: modules/tests/metamer/trunk/application/src/main/webapp/components/richC= ollapsibleSubTable/sorting-using-component-control.xhtml Modified: modules/tests/metamer/trunk/application/src/main/java/org/richfaces/test= s/metamer/bean/RichCollapsibleSubTableBean.java modules/tests/metamer/trunk/application/src/main/java/org/richfaces/test= s/metamer/bean/RichTooltipBean.java modules/tests/metamer/trunk/application/src/main/resources/org/richfaces= /tests/metamer/bean/RichTooltipBean.properties modules/tests/metamer/trunk/application/src/main/webapp/components/richC= ollapsibleSubTable/filtering.xhtml modules/tests/metamer/trunk/application/src/main/webapp/components/richC= ollapsibleSubTable/list.xhtml modules/tests/metamer/trunk/application/src/main/webapp/components/richC= ollapsibleSubTable/sorting-using-column.xhtml Log: rich:collapsibleSubTable - sample completion (RFPL-731) Modified: modules/tests/metamer/trunk/application/src/main/java/org/richfac= es/tests/metamer/bean/RichCollapsibleSubTableBean.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- modules/tests/metamer/trunk/application/src/main/java/org/richfaces/tes= ts/metamer/bean/RichCollapsibleSubTableBean.java 2011-01-11 12:21:10 UTC (r= ev 20948) +++ modules/tests/metamer/trunk/application/src/main/java/org/richfaces/tes= ts/metamer/bean/RichCollapsibleSubTableBean.java 2011-01-11 16:13:37 UTC (r= ev 20949) @@ -33,7 +33,9 @@ import javax.faces.bean.ViewScoped; = import org.richfaces.component.UICollapsibleSubTable; +import org.richfaces.component.UIDataTableBase; import org.richfaces.tests.metamer.Attributes; +import org.richfaces.tests.metamer.ColumnSortingMap; import org.richfaces.tests.metamer.model.Employee; import org.richfaces.tests.metamer.model.Employee.Sex; import org.slf4j.Logger; @@ -45,7 +47,7 @@ * @author Pavol Pitonak * @version $Revision$ */ -(a)ManagedBean(name=3D"richSubTableBean") +(a)ManagedBean(name =3D "richSubTableBean") @ViewScoped public class RichCollapsibleSubTableBean implements Serializable { = @@ -55,12 +57,29 @@ @ManagedProperty(value =3D "#{model.employees}") private List employees; private List> lists; + private UICollapsibleSubTable binding; // true =3D model, false =3D empty table private boolean state; = // facets private Map facets =3D new HashMap(); = + // sorting + private ColumnSortingMap sorting =3D new ColumnSortingMap() { + private static final long serialVersionUID =3D 1L; + + protected UIDataTableBase getBinding() { + return binding; + } + + protected Attributes getAttributes() { + return attributes; + } + }; + + // filtering + private Map filtering =3D new HashMap(= ); + /** * Initializes the managed bean. */ @@ -68,15 +87,15 @@ public void init() { logger =3D LoggerFactory.getLogger(getClass()); logger.debug("initializing bean " + getClass().getName()); - = + attributes =3D Attributes.getComponentAttributesFromFacesConfig(UI= CollapsibleSubTable.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("selection"); attributes.remove("filterVar"); attributes.remove("keepSaved"); attributes.remove("iterationStatusVar"); @@ -139,5 +158,20 @@ public Map getFacets() { return facets; } - + = + public UICollapsibleSubTable getBinding() { + return binding; + } + = + public void setBinding(UICollapsibleSubTable binding) { + this.binding =3D binding; + } + = + public ColumnSortingMap getSorting() { + return sorting; + } + = + public Map getFiltering() { + return filtering; + } } Modified: modules/tests/metamer/trunk/application/src/main/java/org/richfac= es/tests/metamer/bean/RichTooltipBean.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- modules/tests/metamer/trunk/application/src/main/java/org/richfaces/tes= ts/metamer/bean/RichTooltipBean.java 2011-01-11 12:21:10 UTC (rev 20948) +++ modules/tests/metamer/trunk/application/src/main/java/org/richfaces/tes= ts/metamer/bean/RichTooltipBean.java 2011-01-11 16:13:37 UTC (rev 20949) @@ -67,20 +67,16 @@ attributes.setAttribute("followMouse", true); attributes.setAttribute("disabled", false); attributes.setAttribute("layout", "inline"); - attributes.setAttribute("direction", "bottomRight"); attributes.setAttribute("mode", "client"); attributes.setAttribute("showEvent", "mouseenter"); attributes.setAttribute("hideEvent", "mouseleave"); attributes.setAttribute("target", "form:panel"); = - // intentionally hidden attributes - attributes.remove("bypassUpdates"); + // attributes that needs to be tested in other way attributes.remove("converter"); - attributes.remove("data"); - attributes.remove("execute"); - attributes.remove("limitToList"); + = + // intentionally hidden attributes attributes.remove("localValue"); - attributes.remove("render"); attributes.remove("value"); } = Added: modules/tests/metamer/trunk/application/src/main/resources/org/richf= aces/tests/metamer/bean/RichCollapsibleSubTableBean.properties =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- modules/tests/metamer/trunk/application/src/main/resources/org/richface= s/tests/metamer/bean/RichCollapsibleSubTableBean.properties = (rev 0) +++ modules/tests/metamer/trunk/application/src/main/resources/org/richface= s/tests/metamer/bean/RichCollapsibleSubTableBean.properties 2011-01-11 16:1= 3:37 UTC (rev 20949) @@ -0,0 +1,6 @@ +attr.expandMode.server=3Dserver +attr.expandMode.ajax=3Dajax +attr.expandMode.client=3Dclient +attr.expandMode.null=3D +attr.sortMode.single=3Dsingle +attr.sortMode.multi=3Dmulti \ No newline at end of file Modified: modules/tests/metamer/trunk/application/src/main/resources/org/ri= chfaces/tests/metamer/bean/RichTooltipBean.properties =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- modules/tests/metamer/trunk/application/src/main/resources/org/richface= s/tests/metamer/bean/RichTooltipBean.properties 2011-01-11 12:21:10 UTC (re= v 20948) +++ modules/tests/metamer/trunk/application/src/main/resources/org/richface= s/tests/metamer/bean/RichTooltipBean.properties 2011-01-11 16:13:37 UTC (re= v 20949) @@ -1,9 +1,22 @@ attr.layout.inline=3Dinline attr.layout.block=3Dblock -attr.direction.topRight=3DtopRight +attr.direction.auto=3Dauto attr.direction.topLeft=3DtopLeft +attr.direction.bottomLeft=3DbottomLeft attr.direction.bottomRight=3DbottomRight -attr.direction.bottomLeft=3DbottomLeft -attr.direction.auto=3Dauto +attr.direction.autoLeft=3DautoLeft +attr.direction.autoRight=3DautoRight +attr.direction.topAuto=3DtopAuto +attr.direction.bottomAuto=3DbottomAuto +attr.direction.null=3D attr.mode.client=3Dclient -attr.mode.ajax=3Dajax \ No newline at end of file +attr.mode.ajax=3Dajax +attr.jointPoint.auto=3Dauto +attr.jointPoint.topLeft=3DtopLeft +attr.jointPoint.bottomLeft=3DbottomLeft +attr.jointPoint.bottomRight=3DbottomRight +attr.jointPoint.autoLeft=3DautoLeft +attr.jointPoint.autoRight=3DautoRight +attr.jointPoint.topAuto=3DtopAuto +attr.jointPoint.bottomAuto=3DbottomAuto +attr.jointPoint.null=3D \ No newline at end of file Modified: modules/tests/metamer/trunk/application/src/main/webapp/component= s/richCollapsibleSubTable/filtering.xhtml =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- modules/tests/metamer/trunk/application/src/main/webapp/components/rich= CollapsibleSubTable/filtering.xhtml 2011-01-11 12:21:10 UTC (rev 20948) +++ modules/tests/metamer/trunk/application/src/main/webapp/components/rich= CollapsibleSubTable/filtering.xhtml 2011-01-11 16:13:37 UTC (rev 20949) @@ -2,7 +2,8 @@ + xmlns:rich=3D"http://richfaces.org/rich" xmlns:a4j=3D"http://richfac= es.org/a4j" + xmlns:fn=3D"http://java.sun.com/jsp/jstl/functions"> = - - - - - - - - - - - - -
- - - - -

-
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - header facet - - - - no data facet - - - - - - - - - - - - - - - - footer facet - - - - - - - - - - - -
- \ No newline at end of file --===============5411375589535301625==--