projects
/
mir.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
exception + misc. cleanup
[mir.git]
/
source
/
mircoders
/
module
/
ModuleMediafolder.java
diff --git
a/source/mircoders/module/ModuleMediafolder.java
b/source/mircoders/module/ModuleMediafolder.java
index
5b05e2b
..
6a7ead4
100755
(executable)
--- 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.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;
import mir.storage.StorageObject;
import mircoders.storage.DatabaseMediafolder;
import freemarker.template.SimpleList;
@@
-54,19
+55,22
@@
public class ModuleMediafolder extends AbstractModule
// Kontruktor
// Kontruktor
- public ModuleMediafolder(StorageObject
the
Storage)
+ public ModuleMediafolder(StorageObject
a
Storage)
{
{
- if (theStorage == null) logger.warn("ModuleMediafolder: StorageObject was null!");
- this.theStorage = theStorage;
+ if (aStorage == null)
+ logger.warn("ModuleMediafolder: StorageObject was null!");
+
+ theStorage = aStorage;
}
// Methoden
}
// Methoden
- public SimpleList getPopupData() throws ModuleExc
eption
{
+ public SimpleList getPopupData() throws ModuleExc
, ModuleFailure
{
try {
return ((DatabaseMediafolder)theStorage).getPopupData();
try {
return ((DatabaseMediafolder)theStorage).getPopupData();
- } catch (Exception e) {
- throw new ModuleException(e.toString());
+ }
+ catch (Throwable e) {
+ throw new ModuleFailure(e);
}
}
}
}