merged with 1.1

[mir.git] / source / mircoders / storage / DatabaseImageLayout.java

diff --git a/source/mircoders/storage/DatabaseImageLayout.java b/source/mircoders/storage/DatabaseImageLayout.java
index 1fac5a3..641f903 100755 (executable)
--- a/source/mircoders/storage/DatabaseImageLayout.java
+++ b/source/mircoders/storage/DatabaseImageLayout.java
@@ -30,11 +30,9 @@
 
 package mircoders.storage;
 
-import mir.log.LoggerWrapper;
-import mir.storage.Database;
+import mir.log.LoggerWrapper;\r
+import mir.storage.Database;\r
 import mir.storage.StorageObject;
-import mir.storage.StorageObjectFailure;
-import freemarker.template.SimpleList;
 
 /**
  * <b>Diese Klasse implementiert die Datenbankverbindung zur MetaObjekt-Tabelle
@@ -45,7 +43,6 @@ import freemarker.template.SimpleList;
 public class DatabaseImageLayout extends Database implements StorageObject{
 
   private static DatabaseImageLayout instance;
-  private static SimpleList publisherPopupData;
 
   // the following *has* to be sychronized cause this static method
   // could get preemted and we could end up with 2 instances of DatabaseFoo..
@@ -64,9 +61,4 @@ public class DatabaseImageLayout extends Database implements StorageObject{
     hasTimestamp = false;
     theTable = "img_layout";
   }
-
-  public SimpleList getPopupData() throws StorageObjectFailure {
-    return getPopupData("name", true);
-  }
-
 }