media_id -> to_media

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

diff --git a/source/mircoders/module/ModuleMediafolder.java b/source/mircoders/module/ModuleMediafolder.java
index 28420d2..4609e06 100755 (executable)
--- a/source/mircoders/module/ModuleMediafolder.java
+++ b/source/mircoders/module/ModuleMediafolder.java
@@ -18,15 +18,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 ModuleMediafolder extends AbstractModule
 {
@@ -36,15 +35,19 @@ public class ModuleMediafolder extends AbstractModule
 
        public ModuleMediafolder(StorageObject theStorage)
        {
-               if (theLog == null) theLog = Logfile.getInstance(Configuration.getProperty("Home") + Configuration.getProperty("Module.Mediafolder.Logfile"));
+               if (theLog == null) theLog = Logfile.getInstance(MirConfig.getProp("Home") + MirConfig.getProp("Module.Mediafolder.Logfile"));
                if (theStorage == null) theLog.printWarning("StorageObject was null!");
                this.theStorage = theStorage;
        }
 
        // Methoden
 
-               public SimpleList getPopupData() {
-                       return ((DatabaseMediafolder)theStorage).getPopupData();
+               public SimpleList getPopupData() throws ModuleException {
+      try {
+                         return ((DatabaseMediafolder)theStorage).getPopupData();
+      } catch (Exception e) {
+        throw new ModuleException(e.toString());
+      }
                }