cleanup + misc. fixes

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

diff --git a/source/mircoders/servlet/ServletModuleAdmin.java b/source/mircoders/servlet/ServletModuleAdmin.java
index 2057259..737bc01 100755 (executable)
--- a/source/mircoders/servlet/ServletModuleAdmin.java
+++ b/source/mircoders/servlet/ServletModuleAdmin.java
@@ -29,32 +29,23 @@
  */
 package mircoders.servlet;
 
-import java.io.IOException;
-import java.io.Writer;
-import java.util.Map;
-import java.util.List;
-
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-
-import mir.entity.adapter.EntityIteratorAdapter;
 import mir.entity.adapter.EntityAdapterEngine;
-import mir.log.LoggerWrapper;
-import mir.servlet.ServletModule;
+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) {
@@ -113,18 +104,21 @@ 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 templateData = ServletHelper.makeGenerationData(aRequest, aResponse, getLocales(aRequest),
           "bundles/admin", "etc/bundles/adminlocal");
 
-      List messages = EntityAdapterEngine.retrieveAdapterList(model, "internalMessage", "", "webdb_create desc", 10, 0);
+      List messages = EntityAdapterEngine.retrieveAdapterList(getModel(),
+          "internalMessage", "", "webdb_create desc", 10, 0);
 
       templateData.put("messages", messages);
 
-      templateData.put("fileeditentries", ((ServletModuleFileEdit) ServletModuleFileEdit.getInstance()).getEntries());
-      templateData.put("administeroperations", ((ServletModuleLocalizer) ServletModuleLocalizer.getInstance()).getAdministerOperations());
+      templateData.put("fileeditentries",
+          ServletHelper.getServletModuleFileEdit().getEntries());
+      templateData.put("administeroperations",
+          ServletHelper.getServletModuleLocalizer().getAdministerOperations());
 
       templateData.put("searchvalue", null);
       templateData.put("searchfield", null);