code cleaning, new config

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

diff --git a/source/mircoders/servlet/ServletModuleTopics.java b/source/mircoders/servlet/ServletModuleTopics.java
index 54dcada..4e480bd 100755 (executable)
--- a/source/mircoders/servlet/ServletModuleTopics.java
+++ b/source/mircoders/servlet/ServletModuleTopics.java
@@ -31,25 +31,15 @@
 
 package mircoders.servlet;
 
-import java.io.*;
-import java.sql.*;
-import java.util.*;
-import javax.servlet.*;
-import javax.servlet.http.*;
-
-import mir.servlet.*;
-import mir.module.*;
-import mir.misc.*;
-import mir.entity.*;
-import mir.storage.*;
-
-import mircoders.entity.*;
-import mircoders.storage.*;
-import mircoders.module.*;
+import mir.log.LoggerWrapper;
+import mir.servlet.ServletModule;
+import mir.storage.StorageObjectFailure;
+import mircoders.module.ModuleTopics;
+import mircoders.storage.DatabaseTopics;
 
 /*
- *  ServletModuleThemen -
- *  liefert HTML fuer Themen
+ *  ServletModuleTopics
+ *
  *
  *
  * @author RK
@@ -57,20 +47,23 @@ import mircoders.module.*;
 
 public class ServletModuleTopics extends ServletModule
 {
-
-  // Singelton / Kontruktor
+// Singelton / Constructor
   private static ServletModuleTopics instance = new ServletModuleTopics();
   public static ServletModule getInstance() { return instance; }
 
   private ServletModuleTopics() {
-         theLog = Logfile.getInstance(MirConfig.getProp("Home") + MirConfig.getProp("ServletModule.Themen.Logfile"));
-          templateListString = MirConfig.getProp("ServletModule.Themen.ListTemplate");
-         templateObjektString = MirConfig.getProp("ServletModule.Themen.ObjektTemplate");
-         templateConfirmString = MirConfig.getProp("ServletModule.Themen.ConfirmTemplate");
+    super();
+    logger = new LoggerWrapper("ServletModule.Topics");
+
+    templateListString = configuration.getString("ServletModule.Themen.ListTemplate");
+    templateObjektString = configuration.getString("ServletModule.Themen.ObjektTemplate");
+    templateConfirmString = configuration.getString("ServletModule.Themen.ConfirmTemplate");
+
     try {
       mainModule = new ModuleTopics(DatabaseTopics.getInstance());
-    } catch (StorageObjectException e) {
-      theLog.printDebugInfo("servletmoduletopics konnte nicht initialisiert werden");
+    }
+    catch (StorageObjectFailure e) {
+      logger.error("Initialization of ServletModuleTopics failed!: " + e.getMessage());
     }
   }
-}
+}
\ No newline at end of file