[richfaces-svn-commits] JBoss Rich Faces SVN: r4715 - trunk/sandbox/ui/columns/src/main/java/org/richfaces/taglib/html/facelets.

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

Author: andrei_exadel
Date: 2007-12-11 10:14:38 -0500 (Tue, 11 Dec 2007)
New Revision: 4715

Modified:
   trunk/sandbox/ui/columns/src/main/java/org/richfaces/taglib/html/facelets/ColumnsHandler.java
Log:
RF-1201

Modified: trunk/sandbox/ui/columns/src/main/java/org/richfaces/taglib/html/facelets/ColumnsHandler.java
===================================================================
--- trunk/sandbox/ui/columns/src/main/java/org/richfaces/taglib/html/facelets/ColumnsHandler.java	2007-12-11 15:01:58 UTC (rev 4714)
+++ trunk/sandbox/ui/columns/src/main/java/org/richfaces/taglib/html/facelets/ColumnsHandler.java	2007-12-11 15:14:38 UTC (rev 4715)
@@ -159,9 +159,12 @@
     private void correctFirst(FaceletContext ctx) {
 	if (items != null) {
 	    if (_begin > 0 && (_index < _begin)) {
-		while ((_index < _begin) && hasNext()) {
+		while ((_index < _begin && hasNext())) {
 		    next(ctx);
 		}
+		if (!hasNext()) {
+		    _index = 0;
+		}
 	    }
 	}
     }
@@ -453,26 +456,6 @@
 
     }
 
-    /**
-     * Sets attribute to column
-     * 
-     * @param attr
-     * @param column
-     * @param ctx
-     */
-    private void setColumnAttribute(TagAttribute attr, UIComponent column,
-	    FaceletContext ctx) {
-	if (attr != null) {
-	    if (attr.isLiteral()) {
-		column.setValueExpression(attr.getLocalName(), attr
-			.getValueExpression(ctx, String.class));
-	    } else {
-		column.setValueExpression(attr.getLocalName(), attr
-			.getValueExpression(ctx, ValueExpression.class));
-	    }
-	}
-    }
-
 }
 
 /**