1.1 restoration

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

diff --git a/source/mircoders/servlet/ServletModuleLocalizer.java b/source/mircoders/servlet/ServletModuleLocalizer.java
index d6cd208..39370af 100755 (executable)
--- a/source/mircoders/servlet/ServletModuleLocalizer.java
+++ b/source/mircoders/servlet/ServletModuleLocalizer.java
@@ -29,15 +29,6 @@
  */
 package mircoders.servlet;
 
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.Vector;
-
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-
-import mir.entity.adapter.EntityAdapter;
 import mir.log.LoggerWrapper;
 import mir.servlet.ServletModule;
 import mir.servlet.ServletModuleExc;
@@ -45,11 +36,15 @@ import mir.util.StringRoutines;
 import mircoders.entity.EntityComment;
 import mircoders.entity.EntityContent;
 import mircoders.global.MirGlobal;
-import mircoders.localizer.MirAdminInterfaceLocalizer;
 import mircoders.module.ModuleComment;
 import mircoders.module.ModuleContent;
-import mircoders.storage.DatabaseComment;
-import mircoders.storage.DatabaseContent;
+
+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);
             }
           }
@@ -99,15 +94,12 @@ public class ServletModuleLocalizer extends ServletModule {
    *
    * See also
    * {@link mircoders.localizer.MirAdminInterfaceLocalizer#simpleArticleOperations()}
-   * {@link mircoders.localizer.MirAdminInterfaceLocalizer$MirSimpleEntityOperation()}
    *
    * @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) {
-    MirAdminInterfaceLocalizer.MirSimpleEntityOperation operation;
-    EntityAdapter comment;
     EntityComment entity;
 
     try {
@@ -134,7 +126,7 @@ public class ServletModuleLocalizer extends ServletModule {
 
     performCommentOperation(aRequest, commentIdString, operationString);
 
-    redirect(aResponse, returnUrlString);
+    ServletHelper.redirect(aResponse, returnUrlString);
   }
 
   public void commentoperationbatch(HttpServletRequest aRequest, HttpServletResponse aResponse) throws ServletModuleExc {
@@ -161,12 +153,10 @@ public class ServletModuleLocalizer extends ServletModule {
       }
     }
 
-    redirect(aResponse, returnUrlString);
+    ServletHelper.redirect(aResponse, returnUrlString);
   }
 
   public void performArticleOperation(HttpServletRequest aRequest, String anId, String anOperation) {
-    MirAdminInterfaceLocalizer.MirSimpleEntityOperation operation;
-    EntityAdapter article;
     EntityContent entity;
 
     try {
@@ -192,7 +182,7 @@ public class ServletModuleLocalizer extends ServletModule {
     String returnUrlString = aRequest.getParameter("returnurl");
 
     performArticleOperation(aRequest, articleIdString, operationString);
-    redirect(aResponse, returnUrlString);
+    ServletHelper.redirect(aResponse, returnUrlString);
   }
 
   public void articleoperationbatch(HttpServletRequest aRequest, HttpServletResponse aResponse) throws ServletModuleExc {
@@ -219,7 +209,7 @@ public class ServletModuleLocalizer extends ServletModule {
       }
     }
 
-    redirect(aResponse, returnUrlString);
+    ServletHelper.redirect(aResponse, returnUrlString);
   }
 
   public List getAdministerOperations() throws ServletModuleExc {