rebuilding head

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

diff --git a/source/mircoders/storage/DatabaseImages.java b/source/mircoders/storage/DatabaseImages.java
index 7e1f030..33a0769 100755 (executable)
--- a/source/mircoders/storage/DatabaseImages.java
+++ b/source/mircoders/storage/DatabaseImages.java
@@ -18,13 +18,13 @@
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  *
  * In addition, as a special exception, The Mir-coders gives permission to link
- * the code of this program with  any library licensed under the Apache Software License, 
- * The Sun (tm) Java Advanced Imaging library (JAI), The Sun JIMI library 
- * (or with modified versions of the above that use the same license as the above), 
- * and distribute linked combinations including the two.  You must obey the 
- * GNU General Public License in all respects for all of the code used other than 
- * the above mentioned libraries.  If you modify this file, you may extend this 
- * exception to your version of the file, but you are not obligated to do so.  
+ * the code of this program with  any library licensed under the Apache Software License,
+ * The Sun (tm) Java Advanced Imaging library (JAI), The Sun JIMI library
+ * (or with modified versions of the above that use the same license as the above),
+ * and distribute linked combinations including the two.  You must obey the
+ * GNU General Public License in all respects for all of the code used other than
+ * the above mentioned libraries.  If you modify this file, you may extend this
+ * exception to your version of the file, but you are not obligated to do so.
  * If you do not wish to do so, delete this exception statement from your version.
  */
 
@@ -38,7 +38,6 @@ import mir.misc.StringUtil;
 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
@@ -49,15 +48,10 @@ import freemarker.template.SimpleList;
 public class DatabaseImages extends Database implements StorageObject{
 
   private static DatabaseImages 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..
-  // see the "Singletons with needles and thread" article at JavaWorld -mh
   public synchronized static DatabaseImages getInstance() {
     if (instance == null) {
       instance = new DatabaseImages();
-      instance.myselfDatabase = instance;
     }
     return instance;
   }
@@ -68,36 +62,29 @@ public class DatabaseImages extends Database implements StorageObject{
     logger = new LoggerWrapper("Database.Images");
 
     hasTimestamp = true;
-    theTable = "images";
-    theCoreTable = "media";
+    mainTable = "images";
+    primaryKeySequence = "media_id_seq";
     theEntityClass = mircoders.entity.EntityImages.class;
   }
 
-  public SimpleList getPopupData() throws StorageObjectFailure {
-    return getPopupData("title", true);
-  }
-
   public void update(Entity theEntity) throws StorageObjectFailure {
-    String date = theEntity.getValue("date");
+    String date = theEntity.getFieldValue("date");
     if (date == null) {
       date = StringUtil.date2webdbDate(new GregorianCalendar());
-      theEntity.setValueForProperty("date", date);
+      theEntity.setFieldValue("date", date);
     }
 
     super.update(theEntity);
   }
 
   public String insert(Entity theEntity) throws StorageObjectFailure {
-    String date = theEntity.getValue("date");
+    String date = theEntity.getFieldValue("date");
 
     if (date == null) {
       date = StringUtil.date2webdbDate(new GregorianCalendar());
-      theEntity.setValueForProperty("date", date);
+      theEntity.setFieldValue("date", date);
     }
 
     return super.insert(theEntity);
   }
-
-  // initialisierungen aus den statischen Tabellen
-
 }