first cut of merge of STABLE-pre1_0 into HEAD. I won't even guarantee that it

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

diff --git a/source/mircoders/module/ModuleImages.java b/source/mircoders/module/ModuleImages.java
index e5c37a5..01e8e5f 100755 (executable)
--- a/source/mircoders/module/ModuleImages.java
+++ b/source/mircoders/module/ModuleImages.java
@@ -24,7 +24,7 @@ public class ModuleImages extends AbstractModule {
 
        public ModuleImages(StorageObject theStorage) {
 
-               if (theLog == null) theLog = Logfile.getInstance(this.getClass().getName());
+               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;
 
@@ -32,10 +32,15 @@ public class ModuleImages extends AbstractModule {
 
        // Methoden
 
-               public SimpleList getBilderAsSimpleList() {
+               public SimpleList getBilderAsSimpleList()
+      throws ModuleException {
 
                //  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());
+      }
                }
 
 }