X-Git-Url: http://erislabs.net/gitweb/?a=blobdiff_plain;f=source%2Fmircoders%2Fmodule%2FModuleMediafolder.java;h=6a7ead452b36fefd322d44b1cec613c7ba91eb33;hb=1bb7abb8f82c9bc0287fb3e226a0ea5d805db2df;hp=5b05e2b8dee20d6ff1b5c5cdd9ffe2e9a9eac4fb;hpb=77b8f79d3873d20aa10bb775e03047cd6a9de0bf;p=mir.git

diff --git a/source/mircoders/module/ModuleMediafolder.java b/source/mircoders/module/ModuleMediafolder.java
index 5b05e2b8..6a7ead45 100755
--- a/source/mircoders/module/ModuleMediafolder.java
+++ b/source/mircoders/module/ModuleMediafolder.java
@@ -42,7 +42,8 @@ package mircoders.module;
 
 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 mircoders.storage.DatabaseMediafolder;
 import freemarker.template.SimpleList;
@@ -54,19 +55,22 @@ public class ModuleMediafolder extends AbstractModule
 
 // Kontruktor
 
-  public ModuleMediafolder(StorageObject theStorage)
+  public ModuleMediafolder(StorageObject aStorage)
   {
-    if (theStorage == null) logger.warn("ModuleMediafolder: StorageObject was null!");
-    this.theStorage = theStorage;
+    if (aStorage == null)
+      logger.warn("ModuleMediafolder: StorageObject was null!");
+
+    theStorage = aStorage;
   }
 
 // Methoden
 
-  public SimpleList getPopupData() throws ModuleException {
+  public SimpleList getPopupData() throws ModuleExc, ModuleFailure {
     try {
       return ((DatabaseMediafolder)theStorage).getPopupData();
-    } catch (Exception e) {
-      throw new ModuleException(e.toString());
+    }
+    catch (Throwable e) {
+      throw new ModuleFailure(e);
     }
   }