X-Git-Url: http://erislabs.net/gitweb/?a=blobdiff_plain;f=source%2Fmircoders%2Fmodule%2FModuleImages.java;h=01e8e5f0953345067ebc5507ea0ca2613b2b64bf;hb=fe2f45c4b11b31b45f13f3abaab8c5ba0363d345;hp=5910da88ee683e58f6a20dfc0238c44ad4b1e637;hpb=635db236fe78484b5f7f0158ad8054b189bf7a79;p=mir.git

diff --git a/source/mircoders/module/ModuleImages.java b/source/mircoders/module/ModuleImages.java
index 5910da88..01e8e5f0 100755
--- a/source/mircoders/module/ModuleImages.java
+++ b/source/mircoders/module/ModuleImages.java
@@ -9,15 +9,14 @@ import javax.servlet.http.*;
 
 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.misc.*;
 import mir.storage.*;
 
+import mircoders.storage.*;
+
 public class ModuleImages extends AbstractModule {
 	static Logfile theLog;
 
@@ -25,7 +24,7 @@ public class ModuleImages extends AbstractModule {
 
 	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;
 
@@ -33,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());
+      }
 		}
 
 }