1.1 restoration

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

diff --git a/source/mircoders/module/ModuleComment.java b/source/mircoders/module/ModuleComment.java
index 3579184..a66d4cc 100755 (executable)
--- a/source/mircoders/module/ModuleComment.java
+++ b/source/mircoders/module/ModuleComment.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2001, 2002  The Mir-coders group
+ * Copyright (C) 2001, 2002 The Mir-coders group
  *
  * This file is part of Mir.
  *
@@ -18,33 +18,26 @@
  * 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.
+ * the code of this program with  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.
  */
-
 package mircoders.module;
 
-import java.io.PrintWriter;
-import java.util.Map;
-
 import mir.entity.Entity;
-import mir.log.LoggerToWriterAdapter;
 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 mir.module.ModuleExc;
+import mir.module.ModuleFailure;
 import mircoders.storage.DatabaseComment;
 import mircoders.storage.DatabaseContent;
-import freemarker.template.SimpleList;
+
+import java.util.Map;
 
 
 /*
@@ -57,58 +50,44 @@ public class ModuleComment extends AbstractModule
 {
   static LoggerWrapper logger = new LoggerWrapper("Module.Comment");
 
-  // Contructor
-  public ModuleComment(StorageObject theStorage)
+  public ModuleComment()
   {
-    if (theStorage == null) logger.warn("StorageObject was null!");
-    this.theStorage = theStorage;
-  }
-
-  // Methoden
-  public SimpleList getCommentAsSimpleList() throws ModuleException {
-    try {
-      return ((DatabaseComment)theStorage).getPopupData();
-    }
-    catch (StorageObjectFailure e) {
-      throw new ModuleException(e.toString());
-    }
+    super(DatabaseComment.getInstance());
   }
 
-  public void deleteById (String anId) throws ModuleException {
+  public void deleteById (String anId) throws ModuleExc, ModuleFailure {
     try {
-      Entity theEntity = theStorage.selectById((String)anId);
+      Entity theEntity = storage.selectById((String)anId);
       if (theEntity != null)
-        DatabaseContent.getInstance().setUnproduced("id=" + theEntity.getValue("to_media"));
+        DatabaseContent.getInstance().setUnproduced("id=" + theEntity.getFieldValue("to_media"));
 
       super.deleteById(anId);
     }
-    catch (StorageObjectFailure e){
-      throw new ModuleException(e.toString());
-    } catch (StorageObjectExc e) {
-      throw new ModuleException(e.toString());
+    catch (Throwable e) {
+      throw new ModuleFailure(e);
     }
   }
 
   /**
-   * setValues in the Entity and updates them on the StorageObject
+   *
+   * @param theValues
+   * @return
+   * @throws ModuleExc
+   * @throws ModuleFailure
    */
-  public String set(Map theValues) throws ModuleException {
+
+  public String set(Map theValues) throws ModuleExc, ModuleFailure {
     try {
-      Entity theEntity = theStorage.selectById((String)theValues.get("id"));
+      Entity theEntity = storage.selectById((String)theValues.get("id"));
       if (theEntity == null)
-         throw new ModuleException("No Object in the database with id " + theValues.get("id"));
-      DatabaseContent.getInstance().setUnproduced("id=" + theEntity.getValue("to_media"));
-      theEntity.setValues(theValues);
+         throw new ModuleExc("No Object in the database with id " + theValues.get("id"));
+      DatabaseContent.getInstance().setUnproduced("id=" + theEntity.getFieldValue("to_media"));
+      theEntity.setFieldValues(theValues);
       theEntity.update();
       return theEntity.getId();
     }
-    catch (StorageObjectFailure e){
-      logger.error("ModuleComment.set: " + e.getMessage());
-      e.printStackTrace(logger.asPrintWriter(logger.DEBUG_MESSAGE));
-
-      throw new ModuleException(e.toString());
-    } catch (StorageObjectExc e) {
-      throw new ModuleException(e.toString());
+    catch (Throwable e) {
+      throw new ModuleFailure(e);
     }
   }
 }