[MMBASE CVS] contributions/CMSContainer/cmsc/edit-webapp/src/java/com/finalist/cmsc/paging PagingUtils.java PagingStatusHolder.java

[mguo]

Update of 
/var/cvs/contributions/CMSContainer/cmsc/edit-webapp/src/java/com/finalist/cmsc/paging
In directory 
james.mmbase.org:/tmp/cvs-serv5045/cmsc/edit-webapp/src/java/com/finalist/cmsc/paging

Modified Files:
        PagingUtils.java 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: PagingUtils.java
===================================================================
RCS file: 
/var/cvs/contributions/CMSContainer/cmsc/edit-webapp/src/java/com/finalist/cmsc/paging/PagingUtils.java,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -b -r1.8 -r1.9


Index: PagingStatusHolder.java
===================================================================
RCS file: 
/var/cvs/contributions/CMSContainer/cmsc/edit-webapp/src/java/com/finalist/cmsc/paging/PagingStatusHolder.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -b -r1.5 -r1.6
--- PagingStatusHolder.java     28 Jul 2008 14:51:42 -0000      1.5
+++ PagingStatusHolder.java     30 Jul 2008 09:47:27 -0000      1.6
@@ -72,8 +72,8 @@
       this.listSize = listSize;
    }
 
-   public int getOffset(){
-      return page*getPageSize();      
+   public int getOffset() {
+      return page * getPageSize();
    }
 
    public String getDir() {
@@ -85,10 +85,10 @@
    }
 
    public void setDefaultSort(String column, String direction) {
-      if(StringUtils.isBlank(this.sort)&& StringUtils.isNotBlank(column)){
+      if (StringUtils.isBlank(this.sort) && StringUtils.isNotBlank(column)) {
          this.setSort(column);
 
-         String dir = StringUtils.isNotBlank(direction)?direction : "asc";
+         String dir = StringUtils.isNotBlank(direction) ? direction : "asc";
          this.setDir(dir);
       }
    }
@@ -100,12 +100,25 @@
    }
    
    public String getSortToken() {
-               String token = "";
+      if (null == sort) {
+         return "";
+      }
+
+      StringBuffer token = new StringBuffer("");
+
+      if (sort.contains(",")) {
+         String[] sorts = StringUtils.split(sort,",");
                
-               if (StringUtils.isNotBlank(sort)) {
-                       token = String.format("order by %s %s", sort, 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));
                }
                
-               return token;
+      return token.toString();
        }
 }
_______________________________________________
Cvs mailing list
Cvs@lists.mmbase.org
http://lists.mmbase.org/mailman/listinfo/cvs