major cleanup:

[mir.git] / source / mircoders / servlet / ServletModuleComment.java

diff --git a/source/mircoders/servlet/ServletModuleComment.java b/source/mircoders/servlet/ServletModuleComment.java
index 2c74318..251c37c 100755 (executable)
--- a/source/mircoders/servlet/ServletModuleComment.java
+++ b/source/mircoders/servlet/ServletModuleComment.java
@@ -75,11 +75,6 @@ public class ServletModuleComment extends ServletModule
   private ServletModuleComment() {\r
     logger = new LoggerWrapper("ServletModule.Comment");\r
     try {\r
-      configuration = MirPropertiesConfiguration.instance();\r
-      templateListString = configuration.getString("ServletModule.Comment.ListTemplate");\r
-      templateObjektString = configuration.getString("ServletModule.Comment.ObjektTemplate");\r
-      templateConfirmString = configuration.getString("ServletModule.Comment.ConfirmTemplate");\r
-\r
       mainModule = new ModuleComment(DatabaseComment.getInstance());\r
       moduleContent = new ModuleContent(DatabaseContent.getInstance());\r
     }\r
@@ -140,7 +135,7 @@ public class ServletModuleComment extends ServletModule
       responseData.put("returnurl", requestParser.getParameter("returnurl"));\r
       responseData.put("thisurl", urlBuilder.getQuery());\r
 \r
-      ServletHelper.generateResponse(aResponse.getWriter(), responseData, templateObjektString);\r
+      ServletHelper.generateResponse(aResponse.getWriter(), responseData, editGenerator);\r
     }\r
     catch (Throwable e) {\r
       throw new ServletModuleFailure(e);\r
@@ -261,7 +256,6 @@ public class ServletModuleComment extends ServletModule
     HTTPRequestParser requestParser = new HTTPRequestParser(aRequest);\r
     URLBuilder urlBuilder = new URLBuilder();\r
     EntityAdapterModel model;\r
-    int nrCommentsPerPage = 20;\r
     int count;\r
 \r
     try {\r
@@ -270,8 +264,8 @@ public class ServletModuleComment extends ServletModule
 \r
       Object commentList =\r
           new CachingRewindableIterator(\r
-            new EntityIteratorAdapter( aWhereClause, anOrderByClause, nrCommentsPerPage,\r
-              MirGlobal.localizer().dataModel().adapterModel(), "comment", nrCommentsPerPage, anOffset)\r
+            new EntityIteratorAdapter( aWhereClause, anOrderByClause, nrEntitiesPerListPage,\r
+              MirGlobal.localizer().dataModel().adapterModel(), "comment", nrEntitiesPerListPage, anOffset)\r
       );\r
 \r
       responseData.put("nexturl", null);\r
@@ -300,22 +294,22 @@ public class ServletModuleComment extends ServletModule
       responseData.put("offset" , new Integer(anOffset).toString());\r
       responseData.put("thisurl" , urlBuilder.getQuery());\r
 \r
-      if (count>=anOffset+nrCommentsPerPage) {\r
-        urlBuilder.setValue("offset", anOffset + nrCommentsPerPage);\r
+      if (count>=anOffset+nrEntitiesPerListPage) {\r
+        urlBuilder.setValue("offset", anOffset + nrEntitiesPerListPage);\r
         responseData.put("nexturl" , urlBuilder.getQuery());\r
       }\r
 \r
       if (anOffset>0) {\r
-        urlBuilder.setValue("offset", Math.max(anOffset - nrCommentsPerPage, 0));\r
+        urlBuilder.setValue("offset", Math.max(anOffset - nrEntitiesPerListPage, 0));\r
         responseData.put("prevurl" , urlBuilder.getQuery());\r
       }\r
 \r
       responseData.put("comments", commentList);\r
       responseData.put("from" , Integer.toString(anOffset+1));\r
       responseData.put("count", Integer.toString(count));\r
-      responseData.put("to", Integer.toString(Math.min(anOffset+nrCommentsPerPage, count)));\r
+      responseData.put("to", Integer.toString(Math.min(anOffset+nrEntitiesPerListPage, count)));\r
 \r
-      ServletHelper.generateResponse(aResponse.getWriter(), responseData, "commentlist.template");\r
+      ServletHelper.generateResponse(aResponse.getWriter(), responseData, listGenerator);\r
     }\r
     catch (Throwable e) {\r
       throw new ServletModuleFailure(e);\r