[richfaces-svn-commits] JBoss Rich Faces SVN: r5964 - in trunk: framework/impl/src/main/java/org/richfaces/model and 3 other directories.

[richfaces-svn-commits at lists.jboss.org]

Author: maksimkaszynski
Date: 2008-02-08 13:12:41 -0500 (Fri, 08 Feb 2008)
New Revision: 5964

Modified:
   trunk/framework/api/src/main/java/org/richfaces/model/ScrollableTableDataModel.java
   trunk/framework/impl/src/main/java/org/richfaces/model/DataModelCache.java
   trunk/samples/richfaces-demo/src/main/java/org/richfaces/datatablescroller/DataTableScrollerBean.java
   trunk/samples/richfaces-demo/src/main/webapp/richfaces/scrollableDataTable/examples/scrollableDataTable.xhtml
   trunk/ui/scrollableDataTable/src/main/java/org/richfaces/component/UIScrollableDataTable.java
Log:
reviewed code related to sortOrder

Modified: trunk/framework/api/src/main/java/org/richfaces/model/ScrollableTableDataModel.java
===================================================================
--- trunk/framework/api/src/main/java/org/richfaces/model/ScrollableTableDataModel.java	2008-02-08 18:11:39 UTC (rev 5963)
+++ trunk/framework/api/src/main/java/org/richfaces/model/ScrollableTableDataModel.java	2008-02-08 18:12:41 UTC (rev 5964)
@@ -95,6 +95,7 @@
 	
 	private SortOrder lastSortOrder;
 	
+	
 	/**
 	 * Load range of data items from the source.
 	 * Starting from startRow, and up to but excluding endRow
@@ -159,7 +160,7 @@
 		if (id instanceof SimpleRowKey) {
 			int i = ((SimpleRowKey) id).intValue();
 			
-			List l = loadData(i, i + 1, lastSortOrder);
+			List<?> l = loadData(i, i + 1, lastSortOrder);
 			
 			return l.get(0);
 			
@@ -237,6 +238,11 @@
 		}
 		return o;
 	}
-
-
+	/*
+	 * FIXME: This method is most likely redundant
+	public void setSortOrder(SortOrder sortOrder) {
+		lastSortOrder = sortOrder;
+	}
+	*/
+	
 }

Modified: trunk/framework/impl/src/main/java/org/richfaces/model/DataModelCache.java
===================================================================
--- trunk/framework/impl/src/main/java/org/richfaces/model/DataModelCache.java	2008-02-08 18:11:39 UTC (rev 5963)
+++ trunk/framework/impl/src/main/java/org/richfaces/model/DataModelCache.java	2008-02-08 18:12:41 UTC (rev 5964)
@@ -182,5 +182,11 @@
 		// TODO Auto-generated method stub
 		super.walk(context, visitor, range, argument);
 	}
-	
+	/*
+	 * FIXME: see superclass
+	@Override
+	public void setSortOrder(SortOrder sortOrder) {
+		scrollableTableDataModel.setSortOrder(sortOrder);
+	}
+	*/
 }

Modified: trunk/samples/richfaces-demo/src/main/java/org/richfaces/datatablescroller/DataTableScrollerBean.java
===================================================================
--- trunk/samples/richfaces-demo/src/main/java/org/richfaces/datatablescroller/DataTableScrollerBean.java	2008-02-08 18:11:39 UTC (rev 5963)
+++ trunk/samples/richfaces-demo/src/main/java/org/richfaces/datatablescroller/DataTableScrollerBean.java	2008-02-08 18:12:41 UTC (rev 5964)
@@ -10,6 +10,7 @@
 import java.util.List;
 import java.util.Random;
 
+import org.richfaces.component.UIScrollableDataTable;
 import org.richfaces.demo.datafilterslider.DemoInventoryItem;
 import org.richfaces.model.ScrollableTableDataModel.SimpleRowKey;
 import org.richfaces.model.selection.SimpleSelection;
@@ -21,6 +22,9 @@
  */
 public class DataTableScrollerBean {
 	private SimpleSelection selection = new SimpleSelection();
+	
+	private UIScrollableDataTable table;
+	
 	private ArrayList<DemoInventoryItem> selectedCars = new ArrayList<DemoInventoryItem>(); 
 	private static int DECIMALS = 1;
 	private static int ROUNDING_MODE = BigDecimal.ROUND_HALF_UP;
@@ -166,7 +170,10 @@
 		Iterator<SimpleRowKey> iterator = getSelection().getKeys();
 		while (iterator.hasNext()){
 			SimpleRowKey key = iterator.next();
-			getSelectedCars().add(getAllCars().get(key.intValue()));
+			table.setRowKey(key);
+			if (table.isRowAvailable()) {
+				getSelectedCars().add((DemoInventoryItem) table.getRowData());
+			}
 		}
 		return null;
 	}
@@ -178,4 +185,12 @@
 	public void setSelectedCars(ArrayList<DemoInventoryItem> selectedCars) {
 		this.selectedCars = selectedCars;
 	}
+
+	public UIScrollableDataTable getTable() {
+		return table;
+	}
+
+	public void setTable(UIScrollableDataTable table) {
+		this.table = table;
+	}
 }

Modified: trunk/samples/richfaces-demo/src/main/webapp/richfaces/scrollableDataTable/examples/scrollableDataTable.xhtml
===================================================================
--- trunk/samples/richfaces-demo/src/main/webapp/richfaces/scrollableDataTable/examples/scrollableDataTable.xhtml	2008-02-08 18:11:39 UTC (rev 5963)
+++ trunk/samples/richfaces-demo/src/main/webapp/richfaces/scrollableDataTable/examples/scrollableDataTable.xhtml	2008-02-08 18:12:41 UTC (rev 5964)
@@ -10,7 +10,8 @@
 			<rich:spacer height="30" />
 			<rich:scrollableDataTable rowKeyVar="rkv" frozenColCount="1" height="400px" 
 				width="700px" id="carList" rows="40" columnClasses="col"
-				value="#{dataTableScrollerBean.allCars}" var="category" sortMode="single"
+				value="#{dataTableScrollerBean.allCars}" var="category" sortMode="single"
+				binding="#{dataTableScrollerBean.table}"
 				selection="#{dataTableScrollerBean.selection}">
 
 				<rich:column id="make">

Modified: trunk/ui/scrollableDataTable/src/main/java/org/richfaces/component/UIScrollableDataTable.java
===================================================================
--- trunk/ui/scrollableDataTable/src/main/java/org/richfaces/component/UIScrollableDataTable.java	2008-02-08 18:11:39 UTC (rev 5963)
+++ trunk/ui/scrollableDataTable/src/main/java/org/richfaces/component/UIScrollableDataTable.java	2008-02-08 18:12:41 UTC (rev 5964)
@@ -189,7 +189,10 @@
 
 			model = new DataModelCache(model);
 		}
-		
+		/*
+		 * TODO: Verify - do we really need it
+			model.setSortOrder(getSortOrder());
+		*/
 		return model;		
 	}