code cleaning, new config

[mir.git] / source / mircoders / module / ModuleSchwerpunkt.java

diff --git a/source/mircoders/module/ModuleSchwerpunkt.java b/source/mircoders/module/ModuleSchwerpunkt.java
index 4f2330d..6b9df4e 100755 (executable)
--- a/source/mircoders/module/ModuleSchwerpunkt.java
+++ b/source/mircoders/module/ModuleSchwerpunkt.java
@@ -1,24 +1,46 @@
-package mircoders.module;
-
-import java.io.*;
-import java.lang.*;
-import java.util.*;
-import java.sql.*;
-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 freemarker.template.*;
+package mircoders.module;
 
-import webdb.servlet.*;
-import webdb.module.*;
-import webdb.entity.*;
-import webdb.misc.*;
-import webdb.storage.*;
+import mir.log.LoggerWrapper;
+import mir.module.AbstractModule;
+import mir.module.ModuleException;
+import mir.storage.StorageObject;
+import mir.storage.StorageObjectFailure;
+import mircoders.storage.DatabaseFeature;
+import freemarker.template.SimpleList;
 
-import mir.entity.*;
-import mir.storage.*;
 /*
- *  SchwerpunktObjekt -
+ *  Feature -
  *
  *
  * @author RK
@@ -26,20 +48,20 @@ import mir.storage.*;
 
 public class ModuleSchwerpunkt extends AbstractModule
 {
-               static Logfile theLog;
+  static LoggerWrapper logger = new LoggerWrapper("Module.Feature");
 
-               public ModuleSchwerpunkt(StorageObject theStorage) {
+  public ModuleSchwerpunkt(StorageObject theStorage) {
 
-                       this.theStorage = theStorage;
+    this.theStorage = theStorage;
+  }
 
-       if (theLog == null)
-       theLog = Logfile.getInstance(Configuration.getProperty("Home") + Configuration.getProperty("Module.Schwerpunkt.Logfile"));
-
-               }
-
-               public SimpleList getSchwerpunktAsSimpleList() {
-                       return ((DatabaseFeature)theStorage).getPopupData();
-               }
+  public SimpleList getSchwerpunktAsSimpleList() throws ModuleException {
+    try {
+      return ((DatabaseFeature)theStorage).getPopupData();
+    }
+    catch (StorageObjectFailure e) {
+      throw new ModuleException(e.toString());
+    }
+  }
 }
 
-