merged with 1.1

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

diff --git a/source/mircoders/storage/DatabaseUsers.java b/source/mircoders/storage/DatabaseUsers.java
index 03e38d7..29dddac 100755 (executable)
--- a/source/mircoders/storage/DatabaseUsers.java
+++ b/source/mircoders/storage/DatabaseUsers.java
@@ -1,48 +1,71 @@
-package mircoders.storage;
-
-import java.lang.*;
-import java.sql.*;
-import java.io.*;
-import java.util.*;
+/*
+ * 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.
+ */
 
-import freemarker.template.*;
+package mircoders.storage;
 
-import webdb.storage.*;
-import webdb.entity.*;
-import webdb.misc.*;
+import mir.log.LoggerWrapper;
+import mir.storage.Database;
+import mir.storage.StorageObject;
+import mir.storage.StorageObjectFailure;
 
 /**
- * <b>Diese Klasse implementiert die Datenbankverbindung zur MetaObjekt-Tabelle
- *
  *
+ * <p>Title: </p>
+ * <p>Description: </p>
+ * <p>Copyright: Copyright (c) 2003</p>
+ * <p>Company: </p>
+ * @author not attributable
+ * @version 1.0
  */
 
 public class DatabaseUsers extends Database implements StorageObject{
 
-       private static DatabaseUsers instance;
-
-       public static DatabaseUsers getInstance() throws StorageObjectException {
-               if (instance == null) {
-                       instance = new DatabaseUsers();
-                       instance.myselfDatabase = instance;
-               }
-               return instance;
-       }
-
-       private DatabaseUsers() throws StorageObjectException
-       {
-               super();
-               this.hasTimestamp = false;
-               this.theTable="webdb_users";
-               try {
-                       this.theEntityClass = Class.forName("mir.entity.EntityUsers");
-               }
-               catch (Exception e) {
-                       throw new StorageObjectException(e.toString());
-               }
-       }
-
-       public SimpleList getPopupData() {
-               return getPopupData("login",true);
-       }
+  private static DatabaseUsers 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 DatabaseUsers getInstance() {
+    if (instance == null) {
+      instance = new DatabaseUsers();
+    }
+    return instance;
+  }
+
+  private DatabaseUsers() throws StorageObjectFailure {
+    super();
+
+    logger = new LoggerWrapper("Database.Users");
+
+    hasTimestamp = false;
+    theTable = "webdb_users";
+    theEntityClass = mircoders.entity.EntityUsers.class;
+  }
 }