[richfaces-svn-commits] JBoss Rich Faces SVN: r116 - in trunk/richfaces/datascroller/src/main/java/org/richfaces: renderkit/html and 1 other directory.
Author: d.bulahov
Date: 2007-03-22 10:40:52 -0400 (Thu, 22 Mar 2007)
New Revision: 116
Modified:
trunk/richfaces/datascroller/src/main/java/org/richfaces/component/UIDatascroller.java
trunk/richfaces/datascroller/src/main/java/org/richfaces/renderkit/html/DataScrollerRenderer.java
Log:
http://jira.jboss.com/jira/browse/RF-28 fixed
Modified:
trunk/richfaces/datascroller/src/main/java/org/richfaces/component/UIDatascroller.java
===================================================================
---
trunk/richfaces/datascroller/src/main/java/org/richfaces/component/UIDatascroller.java 2007-03-21
17:59:16 UTC (rev 115)
+++
trunk/richfaces/datascroller/src/main/java/org/richfaces/component/UIDatascroller.java 2007-03-22
14:40:52 UTC (rev 116)
@@ -342,7 +342,9 @@
throw new FacesException("Missing 'rows' attribute on component
'"
+ uiData.getId() + "'");
}
- uiData.setFirst(page * rows);
+ if (page>0){
+ uiData.setFirst(page * rows);
+ }
}
/**
@@ -354,7 +356,7 @@
int pageCount;
if (rows > 0) {
pageCount = rows <= 0 ? 1 : getRowCount() / rows;
- if (getRowCount() % rows > 0) {
+ if (getRowCount() % rows >= 0) {
pageCount++;
}
}
Modified:
trunk/richfaces/datascroller/src/main/java/org/richfaces/renderkit/html/DataScrollerRenderer.java
===================================================================
---
trunk/richfaces/datascroller/src/main/java/org/richfaces/renderkit/html/DataScrollerRenderer.java 2007-03-21
17:59:16 UTC (rev 115)
+++
trunk/richfaces/datascroller/src/main/java/org/richfaces/renderkit/html/DataScrollerRenderer.java 2007-03-22
14:40:52 UTC (rev 116)
@@ -60,6 +60,7 @@
scroller.setHandleValue(Integer.toString(scroller.getPageCount()));
}
else{
+
scroller.setPageIndex(Integer.parseInt(scroller.getHandleValue())-1);
}
@@ -151,7 +152,7 @@
start = 0;
}
- for (int i = start, size = start + pages, j = 1; i < size; i++, j++) {
+ for (int i = start, size = start + pages; i < size; i++) {
//String styleClass;
//String style;
@@ -186,7 +187,7 @@
//out.writeAttribute("class", "dr-dscr-inact rich-datascr-inact
"+scroller.getStyleClass(), null);
out.writeAttribute("class", "dr-dscr-inact rich-datascr-inact",
null);
//out.writeAttribute("style", ""+scroller.getStyle(),
null);
- out.writeAttribute("onclick", getOnClick(context,
component,Integer.toString(j)) , null);
+ out.writeAttribute("onclick", getOnClick(context,
component,Integer.toString(i+1)) , null);
}
out.writeText(Integer.toString(i + 1), null);
//renderChild(context, link);