merged 1.1 branch into head

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

diff --git a/source/mircoders/servlet/ServletModuleAdmin.java b/source/mircoders/servlet/ServletModuleAdmin.java
index 568983b..aa1d879 100755 (executable)
--- a/source/mircoders/servlet/ServletModuleAdmin.java
+++ b/source/mircoders/servlet/ServletModuleAdmin.java
@@ -29,29 +29,23 @@
  */
 package mircoders.servlet;
 
-import java.io.IOException;
-import java.io.Writer;
-import java.util.Map;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-
-import mir.entity.adapter.EntityIteratorAdapter;
-import mir.log.LoggerWrapper;
-import mir.servlet.ServletModule;
+import mir.entity.adapter.EntityAdapterEngine;
+import mir.servlet.AdminServletModule;
 import mir.servlet.ServletModuleExc;
 import mir.servlet.ServletModuleFailure;
-import mir.util.CachingRewindableIterator;
 import mir.util.URLBuilder;
 import mircoders.global.MirGlobal;
 
-public class ServletModuleAdmin extends ServletModule
-{
-  private static ServletModuleAdmin instance = new ServletModuleAdmin();
-  public static ServletModule getInstance() { return instance; }
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+import java.io.IOException;
+import java.io.Writer;
+import java.util.List;
+import java.util.Map;
 
-  private ServletModuleAdmin() {
-    logger = new LoggerWrapper("ServletModule.Admin");
-    defaultAction = "start";
+public class ServletModuleAdmin extends AdminServletModule {
+  public void defaultAction(HttpServletRequest aRequest, HttpServletResponse aResponse) {
+    start(aRequest, aResponse);
   }
 
   public void superusermenu(HttpServletRequest aRequest, HttpServletResponse aResponse) {
@@ -110,32 +104,36 @@ public class ServletModuleAdmin extends ServletModule
   }
 
   public void start(HttpServletRequest aRequest, HttpServletResponse aResponse) {
-    String defaultStartTemplate = configuration.getString("Mir.StartTemplate");
+    String defaultStartTemplate = getConfiguration().getString("Mir.StartTemplate");
 
     try {
-      Map mergeData = ServletHelper.makeGenerationData(aRequest, aResponse, getLocales(aRequest),
+      Map templateData = ServletHelper.makeGenerationData(aRequest, aResponse, getLocales(aRequest),
           "bundles/admin", "etc/bundles/adminlocal");
-      mergeData.put("messages",
-                    new CachingRewindableIterator(
-          new EntityIteratorAdapter("", "webdb_create desc", 10,
-                                    MirGlobal.localizer().dataModel().adapterModel(), "internalMessage", 10, 0)));
-
-      mergeData.put("fileeditentries", ( (ServletModuleFileEdit) ServletModuleFileEdit.getInstance()).getEntries());
-      mergeData.put("administeroperations", ( (ServletModuleLocalizer) ServletModuleLocalizer.getInstance()).getAdministerOperations());
-
-      mergeData.put("searchvalue", null);
-      mergeData.put("searchfield", null);
-      mergeData.put("searchispublished", null);
-      mergeData.put("searcharticletype", null);
-      mergeData.put("searchorder", null);
-      mergeData.put("selectarticleurl", null);
-      mergeData.put("recipes", MirGlobal.localizer().producers().getRecipeNames());
+
+      List messages = EntityAdapterEngine.retrieveAdapterList(getModel(),
+          "internalMessage", "", "webdb_create desc", 10, 0);
+
+      templateData.put("messages", messages);
+
+      templateData.put("fileeditentries",
+          ServletHelper.getServletModuleFileEdit().getEntries());
+      templateData.put("administeroperations",
+          ServletHelper.getServletModuleLocalizer().getAdministerOperations());
+
+      templateData.put("searchvalue", null);
+      templateData.put("searchfield", null);
+      templateData.put("searchispublished", null);
+      templateData.put("searcharticletype", null);
+      templateData.put("searchorder", null);
+      templateData.put("searchtopic", null);
+      templateData.put("selectarticleurl", null);
+      templateData.put("recipes", MirGlobal.localizer().producers().getRecipeNames());
 
       String startTemplate = MirGlobal.localizer().adminInterface().getAdminPageGenerator(
-          "admin.start", mergeData,
+          "admin.start", templateData,
           ServletHelper.getUserAdapter(aRequest), defaultStartTemplate);
 
-      ServletHelper.generateResponse(aResponse.getWriter(), mergeData, startTemplate);
+      ServletHelper.generateResponse(aResponse.getWriter(), templateData, startTemplate);
     }
     catch (Exception e) {
       throw new ServletModuleFailure(e);