exception + misc. cleanup

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

diff --git a/source/mircoders/module/ModuleTopics.java b/source/mircoders/module/ModuleTopics.java
index 901dde5..e8efdfd 100755 (executable)
--- a/source/mircoders/module/ModuleTopics.java
+++ b/source/mircoders/module/ModuleTopics.java
@@ -37,7 +37,8 @@ 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;
@@ -59,12 +60,12 @@ public class ModuleTopics extends AbstractModule {
     this.theStorage = theStorage;
   }
 
-  public SimpleList getTopicsAsSimpleList() throws ModuleException {
+  public SimpleList getTopicsAsSimpleList() throws ModuleExc, ModuleFailure {
     try {
       return ((DatabaseTopics) theStorage).getPopupData();
     }
-    catch (StorageObjectFailure e) {
-      throw new ModuleException(e.toString());
+    catch (Throwable e) {
+      throw new ModuleFailure(e);
     }
   }
 
@@ -74,15 +75,15 @@ public class ModuleTopics extends AbstractModule {
    *  @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;
   }
 
   /**
@@ -92,22 +93,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);
     }
   }