[MMBASE SCM] r37595 - in CMSContainer/trunk/CMSContainer/cmsc/contentrepository/src/java/com/finalist/cmsc/repository: . forms

[kevinshen]

Author: kevinshen
Date: 2009-08-07 10:48:33 +0200 (Fri, 07 Aug 2009)
New Revision: 37595

Modified:
   
CMSContainer/trunk/CMSContainer/cmsc/contentrepository/src/java/com/finalist/cmsc/repository/SimpleContentUtil.java
   
CMSContainer/trunk/CMSContainer/cmsc/contentrepository/src/java/com/finalist/cmsc/repository/forms/SimpleContentAction.java
Log:
CMSC-1476 3 Based on the FD, implement simple editor overview page including: 
head/body/foot page, the main page frame and css

Modified: 
CMSContainer/trunk/CMSContainer/cmsc/contentrepository/src/java/com/finalist/cmsc/repository/SimpleContentUtil.java
===================================================================
--- 
CMSContainer/trunk/CMSContainer/cmsc/contentrepository/src/java/com/finalist/cmsc/repository/SimpleContentUtil.java
 2009-08-07 08:28:34 UTC (rev 37594)
+++ 
CMSContainer/trunk/CMSContainer/cmsc/contentrepository/src/java/com/finalist/cmsc/repository/SimpleContentUtil.java
 2009-08-07 08:48:33 UTC (rev 37595)
@@ -133,13 +133,6 @@
 
       SearchUtil.addEqualConstraint(query, nodeManager, 
ContentElementUtil.CREATOR_FIELD, cloud.getUser().getIdentifier());
       query.setDistinct(true);
-      // Set the maximum result size.
-      String resultsPerPage = PropertiesUtil
-            .getProperty(REPOSITORY_SEARCH_RESULTS_PER_PAGE);
-      if (resultsPerPage == null || !resultsPerPage.matches("\\d+")) {
-         resultsPerPage = DEFAULT_SIZE_PER_PAGE;
-      }
-      query.setMaxNumber(Integer.parseInt(resultsPerPage));
       return query;
    }
 

Modified: 
CMSContainer/trunk/CMSContainer/cmsc/contentrepository/src/java/com/finalist/cmsc/repository/forms/SimpleContentAction.java
===================================================================
--- 
CMSContainer/trunk/CMSContainer/cmsc/contentrepository/src/java/com/finalist/cmsc/repository/forms/SimpleContentAction.java
 2009-08-07 08:28:34 UTC (rev 37594)
+++ 
CMSContainer/trunk/CMSContainer/cmsc/contentrepository/src/java/com/finalist/cmsc/repository/forms/SimpleContentAction.java
 2009-08-07 08:48:33 UTC (rev 37595)
@@ -36,7 +36,7 @@
 public abstract class SimpleContentAction extends PagerAction {
 
    private static final Logger log = 
Logging.getLoggerInstance(SimpleContentAction.class.getName());
-
+  
    protected static final String SYSTEM_SIMPLEEDITOR_CONTENTTYPES = 
"system.simpleeditor.contenttypes";
 
    @Override
@@ -54,9 +54,9 @@
       int resultCount = 0;
       NodeList results = cloud.createNodeList();
       NodeManager nodeManager = 
cloud.getNodeManager(SimpleContentUtil.CONTENT_TYPE);
-      NodeQuery query = SimpleContentUtil.createQuery(cloud, nodeManager);
 
-      doAction(query, form, request, cloud);
+      NodeQuery query = SimpleContentUtil.createQuery(cloud,nodeManager);
+      doAction(query,form,request,cloud);
 
       if (StringUtils.isNotEmpty(simpleContentForm.getTitle())) {
 
@@ -89,23 +89,19 @@
             reverse = true;
          }
          resultCount = results.size();
-         Collections
-               .sort(results, new 
NodeGUITypeComparator(query.getCloud().getLocale(), reverse));
-         int toIndex = results.size() < (offset + maxNumber) ? results.size()
-               : (offset + maxNumber);
-         results = results.subNodeList(offset, toIndex);
+         Collections.sort(results, new 
NodeGUITypeComparator(query.getCloud().getLocale(), reverse));
+         int toIndex = results.size()<(offset*maxNumber+maxNumber)? 
results.size(): (offset*maxNumber+maxNumber);
+         results = results.subNodeList(offset*maxNumber, toIndex);
+
       }
       else {
-         SimpleContentUtil.setOrder(query, nodeManager, 
simpleContentForm.getOrder(),
-               simpleContentForm.getDirection());
-         // query.setMaxNumber(maxNumber);
-         SimpleContentUtil.setOffset(query, simpleContentForm.getOffset());
+         SimpleContentUtil.setOrder(query, nodeManager, 
simpleContentForm.getOrder(), simpleContentForm.getDirection());
+         query.setMaxNumber(maxNumber);
+         SimpleContentUtil.setOffset(query,simpleContentForm.getOffset());
+
          resultCount = Queries.count(query);
          results = query.getNodeManager().getList(query);
       }
-
-      resultCount = Queries.count(query);
-      results = query.getNodeManager().getList(query);
       simpleContentForm.setResultCount(resultCount);
       simpleContentForm.setResults(results);
 

_______________________________________________
Cvs mailing list
Cvs@lists.mmbase.org
http://lists.mmbase.org/mailman/listinfo/cvs