X-Git-Url: http://erislabs.net/gitweb/?a=blobdiff_plain;ds=sidebyside;f=source%2Fmircoders%2Fstorage%2FDatabaseOther.java;h=712f542f3b9454962491b7b7acfd93d0d12e9b32;hb=4451d4c8c25d46e9c405e966ff6bd016a1512f4f;hp=e800175187ebd6afbca60d6f7bc2b2ce2607c184;hpb=c6a2204d8d75293256fd17c07e54971d7672359a;p=mir.git

diff --git a/source/mircoders/storage/DatabaseOther.java b/source/mircoders/storage/DatabaseOther.java
index e8001751..712f542f 100755
--- a/source/mircoders/storage/DatabaseOther.java
+++ b/source/mircoders/storage/DatabaseOther.java
@@ -1,74 +1,97 @@
-package mircoders.storage;
-
-import java.lang.*;
-import java.sql.*;
-import java.io.*;
-import java.util.*;
-
-import freemarker.template.*;
-
-import mir.storage.*;
-import mir.entity.*;
-import mir.misc.*;
-
-/**
- * <b>Diese Klasse implementiert die Datenbankverbindung zur MetaObjekt-Tabelle
- *
- *
- */
-
-public class DatabaseOther extends Database implements StorageObject{
-
-	private static DatabaseOther instance;
-	private static SimpleList publisherPopupData;
-
-	public static DatabaseOther getInstance() throws StorageObjectException
-	{
-		if (instance == null) {
-			instance = new DatabaseOther();
-			instance.myselfDatabase = instance;
-		}
-		return instance;
-	}
-
-	private DatabaseOther() throws StorageObjectException
-	{
-		super();
-		this.hasTimestamp = true;
-		this.theTable="other_media";
-		this.theCoreTable="media";
-		try {
-			this.theEntityClass = Class.forName("mircoders.entity.EntityOther");
-		}
-		catch (Exception e) { throw new StorageObjectException(e.toString());	}
-	}
-
-	public SimpleList getPopupData() throws StorageObjectException {
-		return getPopupData("title",true);
-	}
-
-	public void update(Entity theEntity) throws StorageObjectException
-	{
-		String date = theEntity.getValue("date");
-		if (date==null){
-			date = StringUtil.date2webdbDate(new GregorianCalendar());
-			theEntity.setValueForProperty("date",date);
-		}
-
-		super.update(theEntity);
-	}
-
-
-	public String insert(Entity theEntity) throws StorageObjectException
-	{
-		String date = theEntity.getValue("date");
-		if (date==null){
-			date = StringUtil.date2webdbDate(new GregorianCalendar());
-			theEntity.setValueForProperty("date",date);
-		}
-		return super.insert(theEntity);
-	}
-
-	// initialisierungen aus den statischen Tabellen
-
-}
+/*
+ * Copyright (C) 2001, 2002 The Mir-coders group
+ *
+ * This file is part of Mir.
+ *
+ * Mir is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * Mir is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with Mir; if not, write to the Free Software
+ * 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.
+ * If you do not wish to do so, delete this exception statement from your version.
+ */
+package mircoders.storage;
+
+
+import java.util.GregorianCalendar;
+
+import mir.entity.Entity;
+import mir.log.LoggerWrapper;
+import mir.misc.StringUtil;
+import mir.storage.Database;
+import mir.storage.StorageObject;
+import mir.storage.StorageObjectFailure;
+
+/**
+ *
+ * <p>Title: </p>
+ * <p>Description: </p>
+ * <p>Copyright: Copyright (c) 2003</p>
+ * <p>Company: </p>
+ * @author not attributable
+ * @version 1.0
+ */
+
+public class DatabaseOther extends Database implements StorageObject{
+  private static DatabaseOther 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 DatabaseOther getInstance() {
+    if (instance == null) {
+      instance = new DatabaseOther();
+    }
+    return instance;
+  }
+
+  private DatabaseOther() {
+    super();
+
+    logger = new LoggerWrapper("Database.OtherMedia");
+
+    hasTimestamp = true;
+    theTable = "other_media";
+    theCoreTable = "media";
+    theEntityClass = mircoders.entity.EntityOther.class;
+  }
+
+  public void update(Entity theEntity) throws StorageObjectFailure {
+    String date = theEntity.getValue("date");
+    if (date == null) {
+      date = StringUtil.date2webdbDate(new GregorianCalendar());
+      theEntity.setValueForProperty("date", date);
+    }
+
+    super.update(theEntity);
+  }
+
+  public String insert(Entity theEntity) throws StorageObjectFailure {
+    String date = theEntity.getValue("date");
+    if (date == null) {
+      date = StringUtil.date2webdbDate(new GregorianCalendar());
+      theEntity.setValueForProperty("date", date);
+    }
+    return super.insert(theEntity);
+  }
+
+  // initialisierungen aus den statischen Tabellen
+
+}