From richfaces-svn-commits at lists.jboss.org Tue Jan 11 13:32:06 2011 Content-Type: multipart/mixed; boundary="===============5003437755878554787==" 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: r20953 - in trunk: examples/iteration-demo/src/main/webapp and 2 other directories. Date: Tue, 11 Jan 2011 13:32:05 -0500 Message-ID: <201101111832.p0BIW5Kk010076@svn01.web.mwc.hst.phx2.redhat.com> --===============5003437755878554787== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Author: abelevich Date: 2011-01-11 13:32:03 -0500 (Tue, 11 Jan 2011) New Revision: 20953 Modified: trunk/examples/iteration-demo/src/main/java/org/richfaces/demo/DataBean.= java trunk/examples/iteration-demo/src/main/webapp/dataTable.xhtml trunk/ui/iteration/ui/src/main/java/org/richfaces/component/AbstractData= Scroller.java trunk/ui/iteration/ui/src/main/templates/datascroller.template.xml Log: RF-9780: 'renderIfSinglePage' attribute is added for dataScroller. Modified: trunk/examples/iteration-demo/src/main/java/org/richfaces/demo/Da= taBean.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 --- trunk/examples/iteration-demo/src/main/java/org/richfaces/demo/DataBean= .java 2011-01-11 17:33:06 UTC (rev 20952) +++ trunk/examples/iteration-demo/src/main/java/org/richfaces/demo/DataBean= .java 2011-01-11 18:32:03 UTC (rev 20953) @@ -34,7 +34,7 @@ private String operation =3D "operation"; = private boolean rendered =3D true; - + private boolean renderIfSinglePage =3D true; private List employeeList; private boolean state =3D true; = @@ -152,4 +152,12 @@ public Collection getSelectedRowKeys() { return selectedRowKeys; } + + public boolean isRenderIfSinglePage() { + return renderIfSinglePage; + } + + public void setRenderIfSinglePage(boolean renderIfSinglePage) { + this.renderIfSinglePage =3D renderIfSinglePage; + } } Modified: trunk/examples/iteration-demo/src/main/webapp/dataTable.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 --- trunk/examples/iteration-demo/src/main/webapp/dataTable.xhtml 2011-01-1= 1 17:33:06 UTC (rev 20952) +++ trunk/examples/iteration-demo/src/main/webapp/dataTable.xhtml 2011-01-1= 1 18:32:03 UTC (rev 20953) @@ -1,139 +1,154 @@ - + - + xmlns:h=3D"http://java.sun.com/jsf/html" + xmlns:f=3D"http://java.sun.com/jsf/core" + xmlns:ui=3D"http://java.sun.com/jsf/facelets" + xmlns:it=3D"http://richfaces.org/iteration" + xmlns:misc=3D"http://richfaces.org/misc" + xmlns:a4j=3D"http://richfaces.org/a4j"> + = - Richfaces Tables + Richfaces Tables = - - - = - - - - + + = - - = - + + + + = - - - - + + + = - - + + + + = - - - - - + + = - - - - - - + + + + + = - - - + + + + + + = - - - - + + + = - - - + + + + = - - - + + + = - - - + + + = - - - - + + + = - - - + + + + = - - = - = + + + = -
+ = - = +
= - - - - - + = - - - = - - - - - + + + + + = - - - - + + + = - + + + + + + + + + + + + +
+ + + + + + Modified: trunk/ui/iteration/ui/src/main/java/org/richfaces/component/Abstr= actDataScroller.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 --- trunk/ui/iteration/ui/src/main/java/org/richfaces/component/AbstractDat= aScroller.java 2011-01-11 17:33:06 UTC (rev 20952) +++ trunk/ui/iteration/ui/src/main/java/org/richfaces/component/AbstractDat= aScroller.java 2011-01-11 18:32:03 UTC (rev 20953) @@ -88,6 +88,9 @@ = private Integer page; = + @Attribute(defaultValue =3D "true") + public abstract boolean isRenderIfSinglePage(); + @Attribute public abstract String getLastPageMode(); = @@ -127,7 +130,7 @@ public String getFor() { return (String)getStateHelper().eval("for"); } - = + public void setFor(String forId) { getStateHelper().put("for", forId); } Modified: trunk/ui/iteration/ui/src/main/templates/datascroller.template.xml =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 --- trunk/ui/iteration/ui/src/main/templates/datascroller.template.xml 2011= -01-11 17:33:06 UTC (rev 20952) +++ trunk/ui/iteration/ui/src/main/templates/datascroller.template.xml 2011= -01-11 18:32:03 UTC (rev 20953) @@ -37,78 +37,80 @@ = = - = - = - - = - - - - - - - - - - = - - - - - - - - - - = - - - - - - - - - = - = - - = - - - - - - - - - - = - - - - - - - - - = - = - - - - - - - - - = - = - = + = - - + = + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file --===============5003437755878554787==--