X-Git-Url: http://erislabs.net/gitweb/?a=blobdiff_plain;ds=inline;f=source%2Fmircoders%2Fmodule%2FModuleComment.java;h=89a8bf0702a6b9c473882721fe24346d650d5e75;hb=77b8f79d3873d20aa10bb775e03047cd6a9de0bf;hp=0d1be1356d1f9552e0dbe4cf48f6de96854e759a;hpb=8563841098b6ab3e6233f61519e58b41dcc30266;p=mir.git

diff --git a/source/mircoders/module/ModuleComment.java b/source/mircoders/module/ModuleComment.java
index 0d1be135..89a8bf07 100755
--- a/source/mircoders/module/ModuleComment.java
+++ b/source/mircoders/module/ModuleComment.java
@@ -31,22 +31,18 @@
 
 package mircoders.module;
 
-import java.io.*;
-import java.lang.*;
-import java.util.*;
-import java.sql.*;
-import javax.servlet.*;
-import javax.servlet.http.*;
+import java.util.Map;
 
-import freemarker.template.*;
-
-import mir.servlet.*;
-import mir.module.*;
-import mir.entity.*;
-import mir.misc.*;
-import mir.storage.*;
-
-import mircoders.storage.*;
+import mir.entity.Entity;
+import mir.log.LoggerWrapper;
+import mir.module.AbstractModule;
+import mir.module.ModuleException;
+import mir.storage.StorageObject;
+import mir.storage.StorageObjectExc;
+import mir.storage.StorageObjectFailure;
+import mircoders.storage.DatabaseComment;
+import mircoders.storage.DatabaseContent;
+import freemarker.template.SimpleList;
 
 
 /*
@@ -57,13 +53,12 @@ import mircoders.storage.*;
 
 public class ModuleComment extends AbstractModule
 {
-  static Logfile theLog;
+  static LoggerWrapper logger = new LoggerWrapper("Module.Comment");
 
   // Contructor
   public ModuleComment(StorageObject theStorage)
   {
-    if (theLog == null) theLog = Logfile.getInstance(MirConfig.getProp("Home") + MirConfig.getProp("Module.Comment.Logfile"));
-    if (theStorage == null) theLog.printWarning("StorageObject was null!");
+    if (theStorage == null) logger.warn("StorageObject was null!");
     this.theStorage = theStorage;
   }
 
@@ -71,25 +66,46 @@ public class ModuleComment extends AbstractModule
   public SimpleList getCommentAsSimpleList() throws ModuleException {
     try {
       return ((DatabaseComment)theStorage).getPopupData();
-    } catch (StorageObjectException e) {
+    }
+    catch (StorageObjectFailure e) {
       throw new ModuleException(e.toString());
     }
   }
-  
+
+  public void deleteById (String anId) throws ModuleException {
+    try {
+      Entity theEntity = theStorage.selectById((String)anId);
+      if (theEntity != null)
+        DatabaseContent.getInstance().setUnproduced("id=" + theEntity.getValue("to_media"));
+
+      super.deleteById(anId);
+    }
+    catch (StorageObjectFailure e){
+      throw new ModuleException(e.toString());
+    } catch (StorageObjectExc e) {
+      throw new ModuleException(e.toString());
+    }
+  }
+
   /**
    * setValues in the Entity and updates them on the StorageObject
    */
-  public String set(HashMap theValues) throws ModuleException {
+  public String set(Map theValues) throws ModuleException {
     try {
       Entity theEntity = theStorage.selectById((String)theValues.get("id"));
       if (theEntity == null)
-         throw new ModuleException("No Objekt with id in Database id: " + theValues.get("id"));
+         throw new ModuleException("No Object in the database with id " + theValues.get("id"));
       DatabaseContent.getInstance().setUnproduced("id=" + theEntity.getValue("to_media"));
       theEntity.setValues(theValues);
       theEntity.update();
       return theEntity.getId();
-    } catch (StorageObjectException e){
-      e.printStackTrace(System.err);
+    }
+    catch (StorageObjectFailure e){
+      logger.error("ModuleComment.set: " + e.getMessage());
+      e.printStackTrace(logger.asPrintWriter(LoggerWrapper.DEBUG_MESSAGE));
+
+      throw new ModuleException(e.toString());
+    } catch (StorageObjectExc e) {
       throw new ModuleException(e.toString());
     }
   }