organising imports

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

diff --git a/source/mircoders/module/ModuleComment.java b/source/mircoders/module/ModuleComment.java
index f809b0f..89a8bf0 100755 (executable)
--- a/source/mircoders/module/ModuleComment.java
+++ b/source/mircoders/module/ModuleComment.java
@@ -1,21 +1,48 @@
-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 mir.servlet.*;
-import mir.module.*;
-import mir.entity.*;
-import mir.misc.*;
-import mir.storage.*;
+import java.util.Map;
 
-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;
 
 
 /*
@@ -26,38 +53,59 @@ 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;
   }
 
   // Methoden
-  public SimpleList getCommentAsSimpleList() {
-    return ((DatabaseComment)theStorage).getPopupData();
+  public SimpleList getCommentAsSimpleList() throws ModuleException {
+    try {
+      return ((DatabaseComment)theStorage).getPopupData();
+    }
+    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();
-      //set content to unproduced
-      DatabaseContent.getInstance().setUnproduced("id=" + theEntity.getValue("to_media"));
       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());
     }
   }