projects
/
mir.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
small bugfixx at comment-module
[mir.git]
/
source
/
mircoders
/
module
/
ModuleImages.java
diff --git
a/source/mircoders/module/ModuleImages.java
b/source/mircoders/module/ModuleImages.java
index
5910da8
..
01e8e5f
100755
(executable)
--- a/
source/mircoders/module/ModuleImages.java
+++ b/
source/mircoders/module/ModuleImages.java
@@
-9,15
+9,14
@@
import javax.servlet.http.*;
import freemarker.template.*;
import freemarker.template.*;
-import webdb.servlet.*;
-import webdb.module.*;
-import webdb.entity.*;
-import webdb.misc.*;
-import webdb.storage.*;
-
+import mir.servlet.*;
+import mir.module.*;
import mir.entity.*;
import mir.entity.*;
+import mir.misc.*;
import mir.storage.*;
import mir.storage.*;
+import mircoders.storage.*;
+
public class ModuleImages extends AbstractModule {
static Logfile theLog;
public class ModuleImages extends AbstractModule {
static Logfile theLog;
@@
-25,7
+24,7
@@
public class ModuleImages extends AbstractModule {
public ModuleImages(StorageObject theStorage) {
public ModuleImages(StorageObject theStorage) {
- if (theLog == null) theLog = Logfile.getInstance(
Configuration.getProperty("Home")+Configuration.getProperty
("Module.Bilder.Logfile"));
+ if (theLog == null) theLog = Logfile.getInstance(
MirConfig.getProp("Home")+MirConfig.getProp
("Module.Bilder.Logfile"));
if (theStorage == null) theLog.printWarning("StorageObject was null!");
this.theStorage = theStorage;
if (theStorage == null) theLog.printWarning("StorageObject was null!");
this.theStorage = theStorage;
@@
-33,10
+32,15
@@
public class ModuleImages extends AbstractModule {
// Methoden
// Methoden
- public SimpleList getBilderAsSimpleList() {
+ public SimpleList getBilderAsSimpleList()
+ throws ModuleException {
// String sql = "select id, name from Bilder order by name";
// String sql = "select id, name from Bilder order by name";
- return ((DatabaseImages)theStorage).getPopupData();
+ try {
+ return ((DatabaseImages)theStorage).getPopupData();
+ } catch (StorageObjectException e) {
+ throw new ModuleException(e.toString());
+ }
}
}
}
}