1.1 restoration

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

diff --git a/source/mircoders/module/ModuleMediafolder.java b/source/mircoders/module/ModuleMediafolder.java
index f9a2bab..0dfb7de 100755 (executable)
--- a/source/mircoders/module/ModuleMediafolder.java
+++ b/source/mircoders/module/ModuleMediafolder.java
@@ -38,28 +38,24 @@ package mircoders.module;
  * @version
  */
 
-import mir.log.LoggerWrapper;\r
-import mir.module.AbstractModule;\r
-import mir.module.ModuleExc;\r
-import mir.module.ModuleFailure;\r
-import mir.storage.StorageObject;\r
+import mir.log.LoggerWrapper;
+import mir.module.AbstractModule;
+import mir.module.ModuleExc;
+import mir.module.ModuleFailure;
+import mir.storage.StorageObject;
 import mir.util.JDBCStringRoutines;
+import mircoders.storage.DatabaseMediafolder;
 
-
-public class ModuleMediafolder extends AbstractModule
-{
+public class ModuleMediafolder extends AbstractModule {
   static LoggerWrapper logger = new LoggerWrapper("Module.Mediafolder");
 
-  public ModuleMediafolder(StorageObject aStorage)
-  {
-    if (aStorage == null)
-      logger.warn("ModuleMediafolder: StorageObject was null!");
-
-    theStorage = aStorage;
+  public ModuleMediafolder() {
+    super(DatabaseMediafolder.getInstance());
   }
+
   public String mediaFolderIdForName(String aName) throws ModuleExc, ModuleFailure {
     try {
-      return theStorage.executeFreeSingleValueSql("select id from media_folder where name = '" + JDBCStringRoutines.escapeStringLiteral(aName) + "'");
+      return storage.executeFreeSingleValueSql("select id from media_folder where name = '" + JDBCStringRoutines.escapeStringLiteral(aName) + "'");
     }
     catch (Throwable t) {
       throw new ModuleFailure(t);