X-Git-Url: http://erislabs.net/gitweb/?a=blobdiff_plain;f=source%2Fmircoders%2Fmodule%2FModuleTopics.java;h=ffa4a89587149e778c9d8b12189be9d523adc580;hb=d90c1bbdd5e1823253436f24dce80de4f0abbfcb;hp=ea38e259e698f88a10d8d589900b32cdce0520f1;hpb=8563841098b6ab3e6233f61519e58b41dcc30266;p=mir.git

diff --git a/source/mircoders/module/ModuleTopics.java b/source/mircoders/module/ModuleTopics.java
index ea38e259..ffa4a895 100755
--- a/source/mircoders/module/ModuleTopics.java
+++ b/source/mircoders/module/ModuleTopics.java
@@ -31,23 +31,25 @@
 
 package mircoders.module;
 
+import java.util.HashMap;
+
 import freemarker.template.SimpleList;
+
 import mir.entity.Entity;
 import mir.entity.EntityList;
-import mir.misc.Logfile;
-import mir.misc.MirConfig;
 import mir.module.AbstractModule;
 import mir.module.ModuleException;
 import mir.storage.StorageObject;
-import mir.storage.StorageObjectException;
+import mir.storage.StorageObjectExc;
+import mir.storage.StorageObjectFailure;
+import mir.log.*;
+
 import mircoders.entity.EntityContent;
 import mircoders.entity.EntityTopics;
 import mircoders.storage.DatabaseContent;
 import mircoders.storage.DatabaseContentToTopics;
 import mircoders.storage.DatabaseTopics;
 
-import java.util.HashMap;
-
 /*
  *  ThemenModule -
  *
@@ -57,24 +59,21 @@ import java.util.HashMap;
 
 public class ModuleTopics extends AbstractModule {
 
-  static Logfile theLog;
+  static LoggerWrapper logger = new LoggerWrapper("Module.Topics");
 
   public ModuleTopics(StorageObject theStorage) {
     this.theStorage = theStorage;
-    if (theLog == null)
-      theLog = Logfile.getInstance(MirConfig.getProp("Home") + MirConfig.getProp("Module.Themen.Logfile"));
   }
 
   public SimpleList getTopicsAsSimpleList() throws ModuleException {
     try {
       return ((DatabaseTopics) theStorage).getPopupData();
     }
-    catch (StorageObjectException e) {
+    catch (StorageObjectFailure e) {
       throw new ModuleException(e.toString());
     }
   }
 
-
   /**
    *  Method getTopicList
    *
@@ -87,7 +86,7 @@ public class ModuleTopics extends AbstractModule {
       returnList = getByWhereClause("", "title", -1);
     }
     catch (Exception e) {
-      theLog.printWarning("--getTopicsList: topics could not be fetched");
+      logger.warn("--getTopicsList: topics could not be fetched: " + e.getMessage());
     }
     return returnList;
   }
@@ -96,7 +95,7 @@ public class ModuleTopics extends AbstractModule {
    * Overrides the AbstractModule.set(),
    * All dependent ContentEntities are set unproduced.
    * @param theValues Hash mit Spalte/Wert-Paaren
-   * @return Id des eingefügten Objekts
+   * @return Id des eingef?gten Objekts
    * @exception ModuleException
    */
   public String set(HashMap theValues) throws ModuleException {
@@ -117,7 +116,10 @@ public class ModuleTopics extends AbstractModule {
       theEntity.update();
       return theEntity.getId();
     }
-    catch (StorageObjectException e) {
+    catch (StorageObjectFailure e) {
+      e.printStackTrace(System.err);
+      throw new ModuleException(e.toString());
+    } catch (StorageObjectExc e) {
       e.printStackTrace(System.err);
       throw new ModuleException(e.toString());
     }