merged 1.1 branch into head

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

diff --git a/source/mircoders/servlet/ServletModuleOtherMedia.java b/source/mircoders/servlet/ServletModuleOtherMedia.java
index d447c09..6a65fca 100755 (executable)
--- a/source/mircoders/servlet/ServletModuleOtherMedia.java
+++ b/source/mircoders/servlet/ServletModuleOtherMedia.java
@@ -30,40 +30,19 @@
 
 package mircoders.servlet;
 
-import mir.log.LoggerWrapper;
-import mir.servlet.ServletModule;
 import mircoders.module.ModuleUploadedMedia;
 import mircoders.storage.DatabaseOther;
 
 /**
- *
- * <p>Title: </p>
- * <p>Description: </p>
- * <p>Copyright: Copyright (c) 2003</p>
- * <p>Company: </p>
- * @author the mir coders
- * @version 1.0
+ * Admin ServletModule to manage "other" (i.e. non-audio, video or image) media uploads
  */
 
 public class ServletModuleOtherMedia extends ServletModuleUploadedMedia {
-  private static ServletModuleOtherMedia instance = new ServletModuleOtherMedia();
-
-  public static ServletModule getInstance() {
-    return instance;
-  }
-
-  private ServletModuleOtherMedia() {
-    super();
-    logger = new LoggerWrapper("ServletModule.OtherMedia");
-    moduleName = "OtherMedia";
+  public ServletModuleOtherMedia() {
+    super("OtherMedia");
 
-    try {
-      definition = "otherMedia";
-      mainModule = new ModuleUploadedMedia(DatabaseOther.getInstance());
-    }
-    catch (Throwable e) {
-      logger.error("servletmodule otherMedia could not be initialized: " + e.getMessage());
-    }
+    definition = "otherMedia";
+    mainModule = new ModuleUploadedMedia(DatabaseOther.getInstance());
   }
 }