X-Git-Url: http://erislabs.net/gitweb/?a=blobdiff_plain;ds=sidebyside;f=source%2Fmircoders%2Fstorage%2FDatabaseImages.java;h=7a6f15c444e421220245be4d491f95f1cbbbaf97;hb=f5ddd64c4b6a071d8f0bd2f08e95dbf98c7713fb;hp=b14b0c02d513e81f8e313f5de68d28b6c7dd1e55;hpb=3a661e8f0f659ab5ed2ac0e4d982ac0b398d11f1;p=mir.git

diff --git a/source/mircoders/storage/DatabaseImages.java b/source/mircoders/storage/DatabaseImages.java
index b14b0c02..7a6f15c4 100755
--- a/source/mircoders/storage/DatabaseImages.java
+++ b/source/mircoders/storage/DatabaseImages.java
@@ -1,3 +1,34 @@
+/*
+ * 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 the com.oreilly.servlet library, 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.lang.*;
@@ -22,7 +53,11 @@ public class DatabaseImages extends Database implements StorageObject{
 	private static DatabaseImages instance;
 	private static SimpleList publisherPopupData;
 
-	public static DatabaseImages getInstance() throws StorageObjectException
+  // 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()
+    throws StorageObjectException
 	{
 		if (instance == null) {
 			instance = new DatabaseImages();
@@ -38,18 +73,17 @@ public class DatabaseImages extends Database implements StorageObject{
 		this.theTable="images";
 		this.theCoreTable="media";
 		try {
-			this.theEntityClass = Class.forName("mir.entity.EntityImage");
+			this.theEntityClass = Class.forName("mircoders.entity.EntityImages");
 		}
 		catch (Exception e) { throw new StorageObjectException(e.toString());	}
 	}
 
-	public SimpleList getPopupData() {
+	public SimpleList getPopupData() throws StorageObjectException {
 		return getPopupData("title",true);
 	}
 
 	public void update(Entity theEntity) throws StorageObjectException
 	{
-		theEntity.setValueForProperty("to_media_type","1");
 		String date = theEntity.getValue("date");
 		if (date==null){
 			date = StringUtil.date2webdbDate(new GregorianCalendar());
@@ -62,7 +96,6 @@ public class DatabaseImages extends Database implements StorageObject{
 
 	public String insert(Entity theEntity) throws StorageObjectException
 	{
-		theEntity.setValueForProperty("to_media_type","1");
 		String date = theEntity.getValue("date");
 		if (date==null){
 			date = StringUtil.date2webdbDate(new GregorianCalendar());