Update of
/var/cvs/contributions/CMSContainer/cmsc/edit-webapp/src/java/com/finalist/cmsc/paging
In directory
james.mmbase.org:/tmp/cvs-serv32096/cmsc/edit-webapp/src/java/com/finalist/cmsc/paging
Modified Files:
PagingStatusHolder.java
Log Message:
CMSC-996 code improve.
See also:
http://cvs.mmbase.org/viewcvs/contributions/CMSContainer/cmsc/edit-webapp/src/java/com/finalist/cmsc/paging
See also: http://www.mmbase.org/jira/browse/CMSC-996
Index: PagingStatusHolder.java
===================================================================
RCS file:
/var/cvs/contributions/CMSContainer/cmsc/edit-webapp/src/java/com/finalist/cmsc/paging/PagingStatusHolder.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -b -r1.6 -r1.7
--- PagingStatusHolder.java 30 Jul 2008 09:47:27 -0000 1.6
+++ PagingStatusHolder.java 31 Jul 2008 02:28:24 -0000 1.7
@@ -1,7 +1,7 @@
package com.finalist.cmsc.paging;
-import org.apache.commons.lang.StringUtils;
import com.finalist.cmsc.mmbase.PropertiesUtil;
+import org.apache.commons.lang.StringUtils;
public class PagingStatusHolder {
private int page;
@@ -26,17 +26,17 @@
}
if (listSize < getPageSize()) {
- return 1;
+ pageCount = 1;
}
+ else {
+ pageCount = listSize / getPageSize();
- int remainder = listSize % getPageSize();
-
- if (0 == remainder) {
- return listSize / getPageSize();
+ if (0 != listSize % getPageSize()) {
+ pageCount++;
}
- else {
- return listSize / getPageSize() + 1;
}
+
+ return pageCount;
}
public int getPageSize() {
@@ -109,14 +109,14 @@
if (sort.contains(",")) {
String[] sorts = StringUtils.split(sort,",");
- token.append(String.format("order by %s %s", sorts[0], dir));
+ token.append(String.format(" order by %s %s", sorts[0], dir));
for (int i = 1; i < sorts.length; i++) {
token.append(String.format(" , %s %s", sorts[i], dir));
}
}
else {
- token.append(String.format("order by %s %s", sort, dir));
+ token.append(String.format(" order by %s %s", sort, dir));
}
return token.toString();
_______________________________________________
Cvs mailing list
[email protected]
http://lists.mmbase.org/mailman/listinfo/cvs
