8:22 a.m.
Author: ilya_shaikovsky
Date: 2009-11-02 09:22:28 -0500 (Mon, 02 Nov 2009)
New Revision: 15813
Added:
branches/community/3.3.X/samples/richfaces-demo/src/main/java/org/richfaces/demo/dataTableScroller/DataScrollerBean.java
Modified:
branches/community/3.3.X/samples/richfaces-demo/src/main/java/org/richfaces/datatablescroller/DataTableScrollerBean.java
branches/community/3.3.X/samples/richfaces-demo/src/main/webapp/WEB-INF/faces-config.xml
branches/community/3.3.X/samples/richfaces-demo/src/main/webapp/richfaces/dataTableScroller/examples/customScroller.xhtml
branches/community/3.3.X/samples/richfaces-demo/src/main/webapp/richfaces/dataTableScroller/examples/simpleScroller.xhtml
Log:
refactoring according to https://jira.jboss.org/jira/browse/RF-7934
Modified:
branches/community/3.3.X/samples/richfaces-demo/src/main/java/org/richfaces/datatablescroller/DataTableScrollerBean.java
===================================================================
---
branches/community/3.3.X/samples/richfaces-demo/src/main/java/org/richfaces/datatablescroller/DataTableScrollerBean.java 2009-11-02
13:13:21 UTC (rev 15812)
+++
branches/community/3.3.X/samples/richfaces-demo/src/main/java/org/richfaces/datatablescroller/DataTableScrollerBean.java 2009-11-02
14:22:28 UTC (rev 15813)
@@ -14,7 +14,6 @@
import javax.faces.context.FacesContext;
import javax.faces.event.ActionEvent;
-import javax.faces.model.SelectItem;
import org.richfaces.component.UIScrollableDataTable;
import org.richfaces.demo.datafilterslider.DemoInventoryItem;
@@ -30,16 +29,6 @@
private DemoInventoryItem currentItem = new DemoInventoryItem();
- private int rows = 10;
-
- public int getRows() {
- return rows;
- }
-
- public void setRows(int rows) {
- this.rows = rows;
- }
-
public void fetchCurrentRow(ActionEvent event) {
String vin=(FacesContext.getCurrentInstance().
getExternalContext().getRequestParameterMap().get("vin"));
@@ -63,7 +52,6 @@
private SortOrder order = new SortOrder();
- private int scrollerPage=1;
private ArrayList<DemoInventoryItem[]> model = null;
@@ -133,17 +121,6 @@
return allCars;
}
- public List<SelectItem> getPagesToScroll() {
- List<SelectItem> list = new ArrayList<SelectItem>();
- for (int i = 1; i <= allCars.size() / getRows()+1; i++) {
- if (Math.abs(i - scrollerPage) < 5) {
- SelectItem item = new SelectItem(i);
- list.add(item);
- }
- }
- return list;
- }
-
public List<DemoInventoryItem> getTenRandomCars() {
List<DemoInventoryItem> result = new ArrayList<DemoInventoryItem>();
int size = getAllCars().size() - 1;
@@ -314,14 +291,6 @@
return columns;
}
- public int getScrollerPage() {
- return scrollerPage;
- }
-
- public void setScrollerPage(int scrollerPage) {
- this.scrollerPage = scrollerPage;
- }
-
public SortOrder getOrder() {
return order;
}
Added:
branches/community/3.3.X/samples/richfaces-demo/src/main/java/org/richfaces/demo/dataTableScroller/DataScrollerBean.java
===================================================================
---
branches/community/3.3.X/samples/richfaces-demo/src/main/java/org/richfaces/demo/dataTableScroller/DataScrollerBean.java
(rev 0)
+++
branches/community/3.3.X/samples/richfaces-demo/src/main/java/org/richfaces/demo/dataTableScroller/DataScrollerBean.java 2009-11-02
14:22:28 UTC (rev 15813)
@@ -0,0 +1,49 @@
+package org.richfaces.demo.dataTableScroller;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import javax.faces.model.SelectItem;
+
+public class DataScrollerBean {
+
+ private int rows = 10;
+ private int scrollerPage=1;
+ private int size;
+
+ public int getRows() {
+ return rows;
+ }
+
+ public void setRows(int rows) {
+ this.rows = rows;
+ }
+
+ public List<SelectItem> getPagesToScroll() {
+ List<SelectItem> list = new ArrayList<SelectItem>();
+ for (int i = 1; i <= size / getRows()+1; i++) {
+ if (Math.abs(i - scrollerPage) < 5) {
+ SelectItem item = new SelectItem(i);
+ list.add(item);
+ }
+ }
+ return list;
+ }
+
+ public int getScrollerPage() {
+ return scrollerPage;
+ }
+
+ public void setScrollerPage(int scrollerPage) {
+ this.scrollerPage = scrollerPage;
+ }
+
+ public int getSize() {
+ return size;
+ }
+
+ public void setSize(int size) {
+ this.size = size;
+ }
+
+}
Modified:
branches/community/3.3.X/samples/richfaces-demo/src/main/webapp/WEB-INF/faces-config.xml
===================================================================
---
branches/community/3.3.X/samples/richfaces-demo/src/main/webapp/WEB-INF/faces-config.xml 2009-11-02
13:13:21 UTC (rev 15812)
+++
branches/community/3.3.X/samples/richfaces-demo/src/main/webapp/WEB-INF/faces-config.xml 2009-11-02
14:22:28 UTC (rev 15813)
@@ -130,6 +130,15 @@
<managed-bean-scope>session</managed-bean-scope>
</managed-bean>
<managed-bean>
+ <managed-bean-name>dataScrollerBean</managed-bean-name>
+
<managed-bean-class>org.richfaces.demo.dataTableScroller.DataScrollerBean</managed-bean-class>
+ <managed-bean-scope>request</managed-bean-scope>
+ <managed-property>
+ <property-name>size</property-name>
+ <value>#{dataTableScrollerBean.allCars.size()}</value>
+ </managed-property>
+ </managed-bean>
+ <managed-bean>
<managed-bean-name>toggleBean</managed-bean-name>
<managed-bean-class>org.richfaces.demo.togglePanel.ToggleBean</managed-bean-class>
<managed-bean-scope>session</managed-bean-scope>
Modified:
branches/community/3.3.X/samples/richfaces-demo/src/main/webapp/richfaces/dataTableScroller/examples/customScroller.xhtml
===================================================================
---
branches/community/3.3.X/samples/richfaces-demo/src/main/webapp/richfaces/dataTableScroller/examples/customScroller.xhtml 2009-11-02
13:13:21 UTC (rev 15812)
+++
branches/community/3.3.X/samples/richfaces-demo/src/main/webapp/richfaces/dataTableScroller/examples/customScroller.xhtml 2009-11-02
14:22:28 UTC (rev 15813)
@@ -10,9 +10,10 @@
padding-left: 10px;
}
</style>
+ <a4j:keepAlive beanName="dataScrollerBean" ajaxOnly="true"/>
<h:form>
<rich:dataTable width="483" id="carList"
- rows="#{dataTableScrollerBean.rows}" columnClasses="col"
+ rows="#{dataScrollerBean.rows}" columnClasses="col"
value="#{dataTableScrollerBean.allCars}" var="category">
<f:facet name="header">
<rich:columnGroup>
@@ -44,7 +45,7 @@
</rich:column>
<f:facet name="footer">
<rich:datascroller maxPages="20" fastControls="hide"
- page="#{dataTableScrollerBean.scrollerPage}" pagesVar="pages"
+ page="#{dataScrollerBean.scrollerPage}" pagesVar="pages"
id="ds">
<f:facet name="first">
<h:outputText value="First" styleClass="scrollerCell" />
@@ -73,9 +74,9 @@
<f:facet name="pages">
<h:panelGroup>
<h:outputText value="Page "/>
- <h:selectOneMenu value="#{dataTableScrollerBean.scrollerPage}"
+ <h:selectOneMenu value="#{dataScrollerBean.scrollerPage}"
onchange="#{rich:component('ds')}.switchToPage(this.value)">
- <f:selectItems value="#{dataTableScrollerBean.pagesToScroll}" />
+ <f:selectItems value="#{dataScrollerBean.pagesToScroll}" />
</h:selectOneMenu>
<h:outputText value=" of #{pages}" />
</h:panelGroup>
Modified:
branches/community/3.3.X/samples/richfaces-demo/src/main/webapp/richfaces/dataTableScroller/examples/simpleScroller.xhtml
===================================================================
---
branches/community/3.3.X/samples/richfaces-demo/src/main/webapp/richfaces/dataTableScroller/examples/simpleScroller.xhtml 2009-11-02
13:13:21 UTC (rev 15812)
+++
branches/community/3.3.X/samples/richfaces-demo/src/main/webapp/richfaces/dataTableScroller/examples/simpleScroller.xhtml 2009-11-02
14:22:28 UTC (rev 15813)
@@ -10,10 +10,10 @@
width: 100px;
}
</style>
-
+ <a4j:keepAlive beanName="dataScrollerBean" ajaxOnly="true"/>
<h:form>
<rich:datascroller align="left" for="carList"
maxPages="20"
- page="#{dataTableScrollerBean.scrollerPage}" reRender="sc2"
id="sc1" />
+ page="#{dataScrollerBean.scrollerPage}" reRender="sc2"
id="sc1" />
<rich:spacer height="30" />
<rich:dataTable width="483" id="carList" rows="10"
columnClasses="col"
value="#{dataTableScrollerBean.allCars}" var="category">
@@ -51,7 +51,7 @@
</rich:dataTable>
<rich:datascroller align="left" for="carList"
maxPages="20"
- page="#{dataTableScrollerBean.scrollerPage}" id="sc2"
reRender="sc1" />
+ page="#{dataScrollerBean.scrollerPage}" id="sc2"
reRender="sc1" />
</h:form>
</ui:composition>
\ No newline at end of file