bufix media

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

diff --git a/source/mircoders/module/ModuleTopics.java b/source/mircoders/module/ModuleTopics.java
index 2f30f64..e52a7c6 100755 (executable)
--- a/source/mircoders/module/ModuleTopics.java
+++ b/source/mircoders/module/ModuleTopics.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,44 +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.util.Map;
 
-import freemarker.template.SimpleList;
-
 import mir.entity.Entity;
 import mir.entity.EntityList;
+import mir.log.LoggerWrapper;
 import mir.module.AbstractModule;
-import mir.module.ModuleException;
+import mir.module.ModuleExc;
+import mir.module.ModuleFailure;
 import mir.storage.StorageObject;
-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;
-
-/*
- *  ThemenModule -
- *
- *
- * @author RK
- */
 
 public class ModuleTopics extends AbstractModule {
 
@@ -65,30 +47,21 @@ public class ModuleTopics extends AbstractModule {
     this.theStorage = theStorage;
   }
 
-  public SimpleList getTopicsAsSimpleList() throws ModuleException {
-    try {
-      return ((DatabaseTopics) theStorage).getPopupData();
-    }
-    catch (StorageObjectFailure e) {
-      throw new ModuleException(e.toString());
-    }
-  }
-
   /**
    *  Method getTopicList
    *
    *  @return SimpleList of all Topics sorted by title
    *
    */
-  public EntityList getTopicsList() {
-    EntityList returnList = null;
+  public EntityList getTopicsList() throws ModuleExc, ModuleFailure {
     try {
-      returnList = getByWhereClause("", "title", -1);
+      return getByWhereClause("", "title", -1);
     }
-    catch (Exception e) {
-      logger.warn("ModuleTopics.getTopicsList: topics could not be fetched: " + e.getMessage());
+    catch (Throwable e) {
+      logger.error("ModuleTopics.getTopicsList: topics could not be fetched: " + e.getMessage());
+
+      throw new ModuleFailure("ModuleTopics.getTopicsList: topics could not be fetched: " + e.getMessage(), e);
     }
-    return returnList;
   }
 
   /**
@@ -98,22 +71,19 @@ public class ModuleTopics extends AbstractModule {
    * @return Id des eingef?gten Objekts
    * @exception ModuleException
    */
-  public String set(Map theValues) throws ModuleException {
+  public String set(Map theValues) throws ModuleExc, ModuleFailure {
     try {
       Entity theEntity = theStorage.selectById((String) theValues.get("id"));
       if (theEntity == null) {
-        throw new ModuleException("No topic with id  " + theValues.get("id") + " found");
+        throw new ModuleExc("No topic with id  " + theValues.get("id") + " found");
       }
       theEntity.setValues(theValues);
       theEntity.update();
 
       return theEntity.getId();
     }
-    catch (StorageObjectFailure e) {
-      throw new ModuleException(e.toString());
-    }
-    catch (StorageObjectExc e) {
-      throw new ModuleException(e.toString());
+    catch (Throwable e) {
+      throw new ModuleFailure(e);
     }
   }