fixing scaling images -> nullpointer, patch by yossarian

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

diff --git a/source/mircoders/storage/DatabaseImageType.java b/source/mircoders/storage/DatabaseImageType.java
index 377f1f7..304d65f 100755 (executable)
--- a/source/mircoders/storage/DatabaseImageType.java
+++ b/source/mircoders/storage/DatabaseImageType.java
@@ -31,22 +31,10 @@ 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
- *
- *
- */
-
-public class DatabaseImageType extends Database implements StorageObject{
+public class DatabaseImageType extends Database {
   private static DatabaseImageType instance;
 
-  // the following *has* to be sychronized cause this static method
-  // could get preemted and we could end up with 2 instances of DatabaseFoo..
-  // see the "Singletons with needles and thread" article at JavaWorld -mh
   public synchronized static DatabaseImageType getInstance() {
     if (instance == null) {
       instance = new DatabaseImageType();
@@ -56,14 +44,8 @@ public class DatabaseImageType extends Database implements StorageObject{
 
   private DatabaseImageType() {
     super();
-    logger = new LoggerWrapper("Database.ImageType");
 
-    hasTimestamp = false;
-    theTable = "img_type";
-  }
-
-  public SimpleList getPopupData() throws StorageObjectFailure {
-    return getPopupData("name", true);
+    logger = new LoggerWrapper("Database.ImageType");
+    mainTable = "img_type";
   }
-
 }