[richfaces-svn-commits] JBoss Rich Faces SVN: r17292 - in root/examples/richfaces-showcase/trunk/src/main: java/org/richfaces/demo/tables/model/expenses and 4 other directories.

Author: ilya_shaikovsky Date: 2010-05-26 14:16:47 -0400 (Wed, 26 May 2010) New Revision: 17292 Added: root/examples/richfaces-showcase/trunk/src/main/webapp/richfaces/dataScroller/ root/examples/richfaces-showcase/trunk/src/main/webapp/richfaces/dataScroller/dataScrollerCustomization.xhtml root/examples/richfaces-showcase/trunk/src/main/webapp/richfaces/dataScroller/simpleScrolling.xhtml Removed: root/examples/richfaces-showcase/trunk/src/main/java/org/richfaces/demo/tables/data/ root/examples/richfaces-showcase/trunk/src/main/java/org/richfaces/demo/tables/report/ Modified: root/examples/richfaces-showcase/trunk/src/main/java/org/richfaces/demo/tables/model/expenses/ExpenseReport.java root/examples/richfaces-showcase/trunk/src/main/java/org/richfaces/demo/tables/model/expenses/ExpenseReportRecord.java root/examples/richfaces-showcase/trunk/src/main/resources/org/richfaces/demo/data/common/navigation.xml root/examples/richfaces-showcase/trunk/src/main/webapp/richfaces/component-sample.xhtml root/examples/richfaces-showcase/trunk/src/main/webapp/richfaces/dataTable/simpleTable.xhtml Log: https://jira.jboss.org/browse/RF-8290 Modified: root/examples/richfaces-showcase/trunk/src/main/java/org/richfaces/demo/tables/model/expenses/ExpenseReport.java =================================================================== --- root/examples/richfaces-showcase/trunk/src/main/java/org/richfaces/demo/tables/model/expenses/ExpenseReport.java 2010-05-26 18:11:01 UTC (rev 17291) +++ root/examples/richfaces-showcase/trunk/src/main/java/org/richfaces/demo/tables/model/expenses/ExpenseReport.java 2010-05-26 18:16:47 UTC (rev 17292) @@ -5,22 +5,22 @@ import java.util.List; public class ExpenseReport { - private List records = null; + private List<ExpenseReportRecord> records = null; - public List getRecords() { + public List<ExpenseReportRecord> getRecords() { if (records == null) { initRecords(); } return records; } - public void setRecords(List records) { + public void setRecords(List<ExpenseReportRecord> records) { this.records = records; } public double getTotalMeals() { double ret = 0.0; - Iterator it = getRecords().iterator(); + Iterator<ExpenseReportRecord> it = getRecords().iterator(); while (it.hasNext()) { ExpenseReportRecord record = (ExpenseReportRecord) it.next(); ret += record.getTotalMeals(); @@ -30,7 +30,7 @@ public double getTotalHotels() { double ret = 0.0; - Iterator it = getRecords().iterator(); + Iterator<ExpenseReportRecord> it = getRecords().iterator(); while (it.hasNext()) { ExpenseReportRecord record = (ExpenseReportRecord) it.next(); ret += record.getTotalHotels(); @@ -40,7 +40,7 @@ public double getTotalTransport() { double ret = 0.0; - Iterator it = getRecords().iterator(); + Iterator<ExpenseReportRecord> it = getRecords().iterator(); while (it.hasNext()) { ExpenseReportRecord record = (ExpenseReportRecord) it.next(); ret += record.getTotalTransport(); @@ -57,7 +57,7 @@ } private void initRecords() { - records = new ArrayList(); + records = new ArrayList<ExpenseReportRecord>(); ExpenseReportRecord rec; rec = new ExpenseReportRecord(); rec.setCity("San Jose"); @@ -69,9 +69,6 @@ rec.getItems().add(new ExpenseReportRecordItem("27-Aug-97", 96.25, 109.0, 36.00, "Seattle")); rec.getItems().add(new ExpenseReportRecordItem("28-Aug-97", 35.0, 109.0, 36.0, "Seattle")); records.add(rec); - rec = new ExpenseReportRecord(); - rec.setCity("new"); - records.add(rec); } } Modified: root/examples/richfaces-showcase/trunk/src/main/java/org/richfaces/demo/tables/model/expenses/ExpenseReportRecord.java =================================================================== --- root/examples/richfaces-showcase/trunk/src/main/java/org/richfaces/demo/tables/model/expenses/ExpenseReportRecord.java 2010-05-26 18:11:01 UTC (rev 17291) +++ root/examples/richfaces-showcase/trunk/src/main/java/org/richfaces/demo/tables/model/expenses/ExpenseReportRecord.java 2010-05-26 18:16:47 UTC (rev 17292) @@ -6,7 +6,7 @@ public class ExpenseReportRecord { private String city; - private List items = new ArrayList(); + private List<ExpenseReportRecordItem> items = new ArrayList<ExpenseReportRecordItem>(); public String getCity() { return city; @@ -16,17 +16,17 @@ this.city = city; } - public List getItems() { + public List<ExpenseReportRecordItem> getItems() { return this.items; } - public void setItems(List items) { + public void setItems(List<ExpenseReportRecordItem> items) { this.items = items; } public double getTotalMeals() { double ret = 0.0; - Iterator it = items.iterator(); + Iterator<ExpenseReportRecordItem> it = items.iterator(); while (it.hasNext()) { ExpenseReportRecordItem item = (ExpenseReportRecordItem) it.next(); ret += item.getMeals(); @@ -36,7 +36,7 @@ public double getTotalHotels() { double ret = 0.0; - Iterator it = items.iterator(); + Iterator<ExpenseReportRecordItem> it = items.iterator(); while (it.hasNext()) { ExpenseReportRecordItem item = (ExpenseReportRecordItem) it.next(); ret += item.getHotels(); @@ -46,7 +46,7 @@ public double getTotalTransport() { double ret = 0.0; - Iterator it = items.iterator(); + Iterator<ExpenseReportRecordItem> it = items.iterator(); while (it.hasNext()) { ExpenseReportRecordItem item = (ExpenseReportRecordItem) it.next(); ret += item.getTransport(); Modified: root/examples/richfaces-showcase/trunk/src/main/resources/org/richfaces/demo/data/common/navigation.xml =================================================================== --- root/examples/richfaces-showcase/trunk/src/main/resources/org/richfaces/demo/data/common/navigation.xml 2010-05-26 18:11:01 UTC (rev 17291) +++ root/examples/richfaces-showcase/trunk/src/main/resources/org/richfaces/demo/data/common/navigation.xml 2010-05-26 18:16:47 UTC (rev 17292) @@ -186,10 +186,16 @@ <name>Data Table Styling</name> <description> <!-- TODO: rowClass should appears at this sample after completion --> - <!-- TODO: rowClasses should be used instead of jQuerry selectors after will works --> - <!-- TODO: onrowmouseover, onrowmouseout - should be used instead of jQuery selector --> + <!-- + TODO: rowClasses should be used instead of jQuerry selectors + after will works + --> + <!-- + TODO: onrowmouseover, onrowmouseout - should be used instead of + jQuery selector + --> </description> - </sample> + </sample> <sample> <id>tableSorting</id> <name>Data Table Sorting</name> @@ -223,7 +229,21 @@ <name>Table Basic Usage</name> </sample> </samples> - </demo> + </demo> + <demo> + <id>dataScroller</id> + <name>rich:dataScroller</name> + <samples> + <sample> + <id>simpleScrolling</id> + <name>DataScroller Basic Usage</name> + </sample> + <sample> + <id>dataScrollerCustomization</id> + <name>DataScroller Customization</name> + </sample> + </samples> + </demo> </demos> </group> </root> Modified: root/examples/richfaces-showcase/trunk/src/main/webapp/richfaces/component-sample.xhtml =================================================================== --- root/examples/richfaces-showcase/trunk/src/main/webapp/richfaces/component-sample.xhtml 2010-05-26 18:11:01 UTC (rev 17291) +++ root/examples/richfaces-showcase/trunk/src/main/webapp/richfaces/component-sample.xhtml 2010-05-26 18:16:47 UTC (rev 17292) @@ -14,10 +14,11 @@ </f:metadata> </ui:define> <ui:define name="body"> - <ui:repeat value="#{demoNavigator.currentDemo.samples}" var="s"> + <ui:repeat value="#{demoNavigator.currentDemo.samples}" var="s" varStatus="status"> <h:link value="#{s.name}" includeViewParams="true"> <f:param name="sample" value="#{s.id}" /> </h:link> + <h:outputText value="CUR" style="color:orange" rendered="#{(s.id == sample) or (status.index==0 and sample=='')}"/> <h:outputText value=" | " /> </ui:repeat> <fieldset><legend>#{demoNavigator.currentSample.name}</legend> Added: root/examples/richfaces-showcase/trunk/src/main/webapp/richfaces/dataScroller/dataScrollerCustomization.xhtml =================================================================== --- root/examples/richfaces-showcase/trunk/src/main/webapp/richfaces/dataScroller/dataScrollerCustomization.xhtml (rev 0) +++ root/examples/richfaces-showcase/trunk/src/main/webapp/richfaces/dataScroller/dataScrollerCustomization.xhtml 2010-05-26 18:16:47 UTC (rev 17292) @@ -0,0 +1,52 @@ +<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> +<html xmlns="http://www.w3.org/1999/xhtml" + xmlns:h="http://java.sun.com/jsf/html" + xmlns:f="http://java.sun.com/jsf/core" + xmlns:ui="http://java.sun.com/jsf/facelets" + xmlns:a4j="http://richfaces.org/a4j" + xmlns:tbl="http://richfaces.org/rich" + xmlns:ds="http://richfaces.org/datascroller" + > + +<ui:composition> + <h:form id="form"> + <tbl:dataTable value="#{carsBean.allInventoryItems}" var="car" + id="table" rows="10"> + <tbl:column accept="#{carsFiteringBean.acceptVendor}"> + <f:facet name="header"> + <h:outputText value="Vendor " /> + </f:facet> + <h:outputText value="#{car.vendor}" /> + </tbl:column> + <tbl:column> + <f:facet name="header"> + <h:outputText value="Model" /> + </f:facet> + <h:outputText value="#{car.model}" /> + </tbl:column> + <tbl:column> + <f:facet name="header"> + <h:outputText value="Price" /> + </f:facet> + <h:outputText value="#{car.price}" /> + </tbl:column> + <tbl:column> + <f:facet name="header"> + <h:outputText value="Mileage" /> + </f:facet> + <h:outputText value="#{car.mileage}" /> + </tbl:column> + <tbl:column> + <f:facet name="header"> + <h:outputText value="VIN " /> + </f:facet> + <h:outputText value="#{car.vin}" /> + </tbl:column> + <f:facet name="footer"> + <ds:dataScroller/> + </f:facet> + </tbl:dataTable> + </h:form> +</ui:composition> + +</html> \ No newline at end of file Added: root/examples/richfaces-showcase/trunk/src/main/webapp/richfaces/dataScroller/simpleScrolling.xhtml =================================================================== --- root/examples/richfaces-showcase/trunk/src/main/webapp/richfaces/dataScroller/simpleScrolling.xhtml (rev 0) +++ root/examples/richfaces-showcase/trunk/src/main/webapp/richfaces/dataScroller/simpleScrolling.xhtml 2010-05-26 18:16:47 UTC (rev 17292) @@ -0,0 +1,52 @@ +<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> +<html xmlns="http://www.w3.org/1999/xhtml" + xmlns:h="http://java.sun.com/jsf/html" + xmlns:f="http://java.sun.com/jsf/core" + xmlns:ui="http://java.sun.com/jsf/facelets" + xmlns:a4j="http://richfaces.org/a4j" + xmlns:tbl="http://richfaces.org/rich" + xmlns:ds="http://richfaces.org/datascroller" + > + +<ui:composition> + <h:form id="form"> + <tbl:dataTable value="#{carsBean.allInventoryItems}" var="car" + id="table" rows="10"> + <tbl:column accept="#{carsFiteringBean.acceptVendor}"> + <f:facet name="header"> + <h:outputText value="Vendor " /> + </f:facet> + <h:outputText value="#{car.vendor}" /> + </tbl:column> + <tbl:column> + <f:facet name="header"> + <h:outputText value="Model" /> + </f:facet> + <h:outputText value="#{car.model}" /> + </tbl:column> + <tbl:column> + <f:facet name="header"> + <h:outputText value="Price" /> + </f:facet> + <h:outputText value="#{car.price}" /> + </tbl:column> + <tbl:column> + <f:facet name="header"> + <h:outputText value="Mileage" /> + </f:facet> + <h:outputText value="#{car.mileage}" /> + </tbl:column> + <tbl:column> + <f:facet name="header"> + <h:outputText value="VIN " /> + </f:facet> + <h:outputText value="#{car.vin}" /> + </tbl:column> + <f:facet name="footer"> + <ds:dataScroller/> + </f:facet> + </tbl:dataTable> + </h:form> +</ui:composition> + +</html> \ No newline at end of file Modified: root/examples/richfaces-showcase/trunk/src/main/webapp/richfaces/dataTable/simpleTable.xhtml =================================================================== --- root/examples/richfaces-showcase/trunk/src/main/webapp/richfaces/dataTable/simpleTable.xhtml 2010-05-26 18:11:01 UTC (rev 17291) +++ root/examples/richfaces-showcase/trunk/src/main/webapp/richfaces/dataTable/simpleTable.xhtml 2010-05-26 18:16:47 UTC (rev 17292) @@ -46,11 +46,6 @@ </f:facet> </tbl:column> <tbl:column> - <f:facet name="header"> - <h:outputText value="#{record.totalMeals}"> - <f:convertNumber pattern="$####.00" /> - </h:outputText> - </f:facet> <h:outputText value="#{expense.meals}"> <f:convertNumber pattern="$####.00" /> </h:outputText>