rebuilding head

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

diff --git a/source/mircoders/servlet/ServletModuleLocalizer.java b/source/mircoders/servlet/ServletModuleLocalizer.java
index 26c3e4b..39370af 100755 (executable)
--- a/source/mircoders/servlet/ServletModuleLocalizer.java
+++ b/source/mircoders/servlet/ServletModuleLocalizer.java
@@ -29,27 +29,22 @@
  */
 package mircoders.servlet;
 
-import java.util.HashMap;\r
-import java.util.List;\r
-import java.util.Map;\r
-import java.util.Vector;\r
-import javax.servlet.http.HttpServletRequest;\r
-import javax.servlet.http.HttpServletResponse;\r
-\r
-import mir.entity.adapter.EntityAdapter;\r
-import mir.log.LoggerWrapper;\r
-import mir.servlet.ServletModule;\r
-import mir.servlet.ServletModuleExc;\r
-import mir.util.StringRoutines;\r
-import mircoders.entity.EntityComment;\r
-import mircoders.entity.EntityContent;\r
-import mircoders.entity.EntityUsers;\r
-import mircoders.global.MirGlobal;\r
-import mircoders.localizer.MirAdminInterfaceLocalizer;\r
-import mircoders.module.ModuleComment;\r
-import mircoders.module.ModuleContent;\r
-import mircoders.storage.DatabaseComment;\r
-import mircoders.storage.DatabaseContent;
+import mir.log.LoggerWrapper;
+import mir.servlet.ServletModule;
+import mir.servlet.ServletModuleExc;
+import mir.util.StringRoutines;
+import mircoders.entity.EntityComment;
+import mircoders.entity.EntityContent;
+import mircoders.global.MirGlobal;
+import mircoders.module.ModuleComment;
+import mircoders.module.ModuleContent;
+
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.Vector;
 
 public class ServletModuleLocalizer extends ServletModule {
   private static ServletModuleLocalizer instance = new ServletModuleLocalizer();
@@ -63,8 +58,8 @@ public class ServletModuleLocalizer extends ServletModule {
     try {
       logger = new LoggerWrapper("ServletModule.Localizer");
 
-      contentModule = new ModuleContent(DatabaseContent.getInstance());
-      commentModule = new ModuleComment(DatabaseComment.getInstance());
+      contentModule = new ModuleContent();
+      commentModule = new ModuleComment();
 
       administerOperations = new Vector();
 
@@ -81,8 +76,8 @@ public class ServletModuleLocalizer extends ServletModule {
             }
             else {
               Map entry = new HashMap();
-              entry.put("name", (String) parts.get(0));
-              entry.put("url", (String) parts.get(1));
+              entry.put("name", parts.get(0));
+              entry.put("url", parts.get(1));
               administerOperations.add(entry);
             }
           }
@@ -92,21 +87,28 @@ public class ServletModuleLocalizer extends ServletModule {
     catch (Exception e) {
       logger.error("ServletModuleLocalizer could not be initialized: " + e.getMessage());
     }
-
-
   }
 
-  public void performCommentOperation(EntityUsers aUser, String anId, String anOperation) {
-    MirAdminInterfaceLocalizer.MirSimpleEntityOperation operation;
-    EntityAdapter comment;
+  /**
+   * Performs a localizer operation on an article.
+   *
+   * See also
+   * {@link mircoders.localizer.MirAdminInterfaceLocalizer#simpleArticleOperations()}
+   *
+   * @param aRequest       The originating request
+   * @param anId           The id of the article
+   * @param anOperation    The identifier of the operation to perform
+   */
+  public void performCommentOperation(HttpServletRequest aRequest, String anId, String anOperation) {
     EntityComment entity;
 
     try {
       entity = (EntityComment) commentModule.getById(anId);
 
       if (entity != null) {
-        MirGlobal.performCommentOperation(aUser, entity, anOperation);
+        MirGlobal.performCommentOperation(ServletHelper.getUser(aRequest), entity, anOperation);
         logger.info("Operation " + anOperation + " successfully performed on comment " + anId);
+        logAdminUsage(aRequest, "comment."+anId, "operation " + anOperation + " performed");
       }
       else {
         logger.error("Error while performing " + anOperation + " on comment " + anId + ": comment is null");
@@ -122,9 +124,9 @@ public class ServletModuleLocalizer extends ServletModule {
     String operationString = aRequest.getParameter("operation");
     String returnUrlString = aRequest.getParameter("returnurl");
 
-    performCommentOperation(ServletHelper.getUser(aRequest), commentIdString, operationString);
+    performCommentOperation(aRequest, commentIdString, operationString);
 
-    redirect(aResponse, returnUrlString);
+    ServletHelper.redirect(aResponse, returnUrlString);
   }
 
   public void commentoperationbatch(HttpServletRequest aRequest, HttpServletResponse aResponse) throws ServletModuleExc {
@@ -145,26 +147,25 @@ public class ServletModuleLocalizer extends ServletModule {
             String commentIdString = (String) parts.get(0);
             String operationString = (String) parts.get(1);
 
-            performCommentOperation(ServletHelper.getUser(aRequest), commentIdString, operationString);
+            performCommentOperation(aRequest, commentIdString, operationString);
           }
         }
       }
     }
 
-    redirect(aResponse, returnUrlString);
+    ServletHelper.redirect(aResponse, returnUrlString);
   }
 
-  public void performArticleOperation(EntityUsers aUser, String anId, String anOperation) {
-    MirAdminInterfaceLocalizer.MirSimpleEntityOperation operation;
-    EntityAdapter article;
+  public void performArticleOperation(HttpServletRequest aRequest, String anId, String anOperation) {
     EntityContent entity;
 
     try {
       entity = (EntityContent) contentModule.getById(anId);
 
       if (entity != null) {
-        MirGlobal.performArticleOperation(aUser, entity, anOperation);
+        MirGlobal.performArticleOperation(ServletHelper.getUser(aRequest), entity, anOperation);
         logger.info("Operation " + anOperation + " successfully performed on article " + anId);
+        logAdminUsage(aRequest, "article." + anId, "operation " + anOperation + " performed");
       }
       else {
         logger.error("Error while performing " + anOperation + " on article " + anId + ": article is null");
@@ -180,8 +181,8 @@ public class ServletModuleLocalizer extends ServletModule {
     String operationString = aRequest.getParameter("operation");
     String returnUrlString = aRequest.getParameter("returnurl");
 
-    performArticleOperation(ServletHelper.getUser(aRequest), articleIdString, operationString);
-    redirect(aResponse, returnUrlString);
+    performArticleOperation(aRequest, articleIdString, operationString);
+    ServletHelper.redirect(aResponse, returnUrlString);
   }
 
   public void articleoperationbatch(HttpServletRequest aRequest, HttpServletResponse aResponse) throws ServletModuleExc {
@@ -202,13 +203,13 @@ public class ServletModuleLocalizer extends ServletModule {
             String articleIdString = (String) parts.get(0);
             String operationString = (String) parts.get(1);
 
-            performArticleOperation(ServletHelper.getUser(aRequest), articleIdString, operationString);
+            performArticleOperation(aRequest, articleIdString, operationString);
           }
         }
       }
     }
 
-    redirect(aResponse, returnUrlString);
+    ServletHelper.redirect(aResponse, returnUrlString);
   }
 
   public List getAdministerOperations() throws ServletModuleExc {