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 1905b8d..4e480bd 100755 (executable)
--- a/source/mircoders/servlet/ServletModuleTopics.java
+++ b/source/mircoders/servlet/ServletModuleTopics.java
@@ -1,24 +1,45 @@
-package mircoders.servlet;
-
-import java.io.*;
-import java.sql.*;
-import java.util.*;
-import javax.servlet.*;
-import javax.servlet.http.*;
+/*
+ * Copyright (C) 2001, 2002  The Mir-coders group
+ *
+ * This file is part of Mir.
+ *
+ * Mir is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * Mir is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with Mir; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ *
+ * In addition, as a special exception, The Mir-coders gives permission to link
+ * the code of this program with the com.oreilly.servlet library, any library
+ * licensed under the Apache Software License, The Sun (tm) Java Advanced
+ * Imaging library (JAI), The Sun JIMI library (or with modified versions of
+ * the above that use the same license as the above), and distribute linked
+ * combinations including the two.  You must obey the GNU General Public
+ * License in all respects for all of the code used other than the above
+ * mentioned libraries.  If you modify this file, you may extend this exception
+ * to your version of the file, but you are not obligated to do so.  If you do
+ * not wish to do so, delete this exception statement from your version.
+ */
 
-import mir.servlet.*;
-import mir.module.*;
-import mir.misc.*;
-import mir.entity.*;
-import mir.storage.*;
+package mircoders.servlet;
 
-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
@@ -26,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(Configuration.getProperty("Home") + Configuration.getProperty("ServletModule.Themen.Logfile"));
-          templateListString = Configuration.getProperty("ServletModule.Themen.ListTemplate");
-         templateObjektString = Configuration.getProperty("ServletModule.Themen.ObjektTemplate");
-         templateConfirmString = Configuration.getProperty("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