rebuilding head

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

diff --git a/source/mircoders/storage/DatabaseImageColor.java b/source/mircoders/storage/DatabaseImageColor.java
index f857d70..6881eba 100755 (executable)
--- a/source/mircoders/storage/DatabaseImageColor.java
+++ b/source/mircoders/storage/DatabaseImageColor.java
@@ -33,8 +33,6 @@ package mircoders.storage;
 import mir.log.LoggerWrapper;
 import mir.storage.Database;
 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 DatabaseImageColor extends Database implements StorageObject{
 
   private static DatabaseImageColor 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..
@@ -61,10 +58,7 @@ public class DatabaseImageColor extends Database implements StorageObject{
     super();
     logger = new LoggerWrapper("Database.ImageColor");
     hasTimestamp = false;
-    theTable = "img_color";
+    mainTable = "img_color";
   }
 
-  public SimpleList getPopupData() throws StorageObjectFailure {
-    return getPopupData("name", true);
-  }
 }