merged 1.1 branch into head

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

diff --git a/source/mircoders/servlet/ServletModuleMediafolder.java b/source/mircoders/servlet/ServletModuleMediafolder.java
index 4ca4ae6..2ee7615 100755 (executable)
--- a/source/mircoders/servlet/ServletModuleMediafolder.java
+++ b/source/mircoders/servlet/ServletModuleMediafolder.java
@@ -29,36 +29,20 @@
  */
 package mircoders.servlet;
 
-import mir.log.LoggerWrapper;
-import mir.misc.StringUtil;
-import mir.servlet.ServletModule;
-import mircoders.module.ModuleMediafolder;
-import mircoders.storage.DatabaseMediafolder;
-
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
 import java.util.GregorianCalendar;
 import java.util.Map;
 
-/**
- *
- */
-public class ServletModuleMediafolder extends ServletModule
-{
-  public static ServletModule getInstance() { return instance; }
-  private static ServletModuleMediafolder instance = new ServletModuleMediafolder();
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
 
-  private ServletModuleMediafolder() {
-    super();
-    logger = new LoggerWrapper("ServletModule.Mediafolder");
+import mir.misc.StringUtil;
+import mir.servlet.AdminServletModule;
+import mircoders.module.ModuleMediafolder;
 
-    try {
-      definition = "mediaFolder";
-      mainModule = new ModuleMediafolder();
-    }
-    catch (Throwable t) {
-      logger.error("Failed to initialize ServletModuleMediafolder: " + t.toString());
-    }
+public class ServletModuleMediafolder extends AdminServletModule {
+  public ServletModuleMediafolder() {
+    definition = "mediaFolder";
+    mainModule = new ModuleMediafolder();
   }
 
   protected void initializeNewObject(Map aNewObject, HttpServletRequest aRequest, HttpServletResponse aResponse) {