[richfaces-svn-commits] JBoss Rich Faces SVN: r4699 - trunk/ui/scrollableDataTable/src/main/java/org/richfaces/component.

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

Author: konstantin.mishin
Date: 2007-12-11 08:24:56 -0500 (Tue, 11 Dec 2007)
New Revision: 4699

Modified:
   trunk/ui/scrollableDataTable/src/main/java/org/richfaces/component/UIScrollableDataTable.java
Log:
RF-1453

Modified: trunk/ui/scrollableDataTable/src/main/java/org/richfaces/component/UIScrollableDataTable.java
===================================================================
--- trunk/ui/scrollableDataTable/src/main/java/org/richfaces/component/UIScrollableDataTable.java	2007-12-11 13:24:41 UTC (rev 4698)
+++ trunk/ui/scrollableDataTable/src/main/java/org/richfaces/component/UIScrollableDataTable.java	2007-12-11 13:24:56 UTC (rev 4699)
@@ -129,6 +129,7 @@
 		if (log.isTraceEnabled()) {
 			log.trace("UIScrollableDataTable.processDecodes(faces)");
 		}
+		checkRange();
 		super.processDecodes(faces);
 	}
 	
@@ -158,6 +159,7 @@
 		}
 		
 		useSavedRanges = false;
+		checkRange();
 		super.encodeBegin(context);
 	}
 	
@@ -386,4 +388,12 @@
 	public void resetReqRowsCount() {
 		this.reqRowsCount = -1;
 	}
+	
+	private void checkRange() {
+		int rows = getRows();
+		if (getRowCount() <= getFirst() + getRows()) {
+			setFirst(0);
+			setScrollPos("0,0," + rows);
+		}
+	}
 }