code cleaning, new config

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

diff --git a/source/mircoders/servlet/ServletModuleMediafolder.java b/source/mircoders/servlet/ServletModuleMediafolder.java
index a07eed8..9f7a1f8 100755 (executable)
--- a/source/mircoders/servlet/ServletModuleMediafolder.java
+++ b/source/mircoders/servlet/ServletModuleMediafolder.java
@@ -33,50 +33,56 @@ package mircoders.servlet;
 
 /**
  * Title:        Mir
- * Description:  liefert Webseiten zur Verwaltung von Mediafoldern aus.
+ * Description:
  * @author       rk
  * @version      02
  */
 
-import java.util.*;
-import javax.servlet.http.*;
-import freemarker.template.*;
+import java.util.GregorianCalendar;
 
-import mir.servlet.*;
-import mir.misc.*;
-import mir.storage.*;
-import mircoders.storage.*;
-import mircoders.module.*;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+
+import mir.log.LoggerWrapper;
+import mir.misc.StringUtil;
+import mir.servlet.ServletModule;
+import mir.servlet.ServletModuleException;
+import mir.storage.StorageObjectFailure;
+import mircoders.module.ModuleMediafolder;
+import mircoders.storage.DatabaseMediafolder;
+import freemarker.template.SimpleHash;
+import freemarker.template.SimpleScalar;
 
 
 public class ServletModuleMediafolder extends ServletModule
 {
+  public static ServletModule getInstance() { return instance; }
+  private static ServletModuleMediafolder instance = new ServletModuleMediafolder();
+
+  private ServletModuleMediafolder() {
+    super();
+    logger = new LoggerWrapper("ServletModule.Mediafolder");
 
-       // Singelton / Kontruktor
-       public static ServletModule getInstance() { return instance; }
-       private static ServletModuleMediafolder instance = new ServletModuleMediafolder();
+    templateListString = configuration.getString("ServletModule.Mediafolder.ListTemplate");
+    templateObjektString = configuration.getString("ServletModule.Mediafolder.ObjektTemplate");
+    templateConfirmString = configuration.getString("ServletModule.Mediafolder.ConfirmTemplate");
 
-       private ServletModuleMediafolder() {
-               theLog = Logfile.getInstance(MirConfig.getProp("Home") + MirConfig.getProp("ServletModule.Mediafolder.Logfile"));
-               templateListString = MirConfig.getProp("ServletModule.Mediafolder.ListTemplate");
-               templateObjektString = MirConfig.getProp("ServletModule.Mediafolder.ObjektTemplate");
-               templateConfirmString = MirConfig.getProp("ServletModule.Mediafolder.ConfirmTemplate");
-               try {
-                       mainModule = new ModuleMediafolder(DatabaseMediafolder.getInstance());
-               }
-               catch (StorageObjectException e) {
-                       theLog.printDebugInfo("ServletModuleMediafolder konnte nicht initialisiert werden");
-               }
-       }
+    try {
+      mainModule = new ModuleMediafolder(DatabaseMediafolder.getInstance());
+    }
+    catch (StorageObjectFailure e) {
+      logger.error("Failed to initialize ServletModuleMediafolder: " + e.getMessage());
+    }
+  }
 
-       public void add(HttpServletRequest req, HttpServletResponse res) throws ServletModuleException
-       {
-                       SimpleHash mergeData = new SimpleHash();
-                       mergeData.put("new", "1");
-                       String now = StringUtil.date2webdbDate(new GregorianCalendar());
-                       // date auf now
-                       mergeData.put("date", new SimpleScalar(now));
-                       deliver(req, res, mergeData, templateObjektString);
-       }
+  public void add(HttpServletRequest req, HttpServletResponse res) throws ServletModuleException
+  {
+    SimpleHash mergeData = new SimpleHash();
+    mergeData.put("new", "1");
+    String now = StringUtil.date2webdbDate(new GregorianCalendar());
+// date auf now
+    mergeData.put("date", new SimpleScalar(now));
+    deliver(req, res, mergeData, templateObjektString);
+  }
 
 }
\ No newline at end of file