fixed / clean ups

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

diff --git a/source/mircoders/storage/DatabaseBreaking.java b/source/mircoders/storage/DatabaseBreaking.java
index 97959eb..a0a6849 100755 (executable)
--- a/source/mircoders/storage/DatabaseBreaking.java
+++ b/source/mircoders/storage/DatabaseBreaking.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2001, 2002  The Mir-coders group
+ * Copyright (C) 2001, 2002 The Mir-coders group
  *
  * This file is part of Mir.
  *
@@ -18,29 +18,22 @@
  * 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.
+ * 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.lang.*;
-import java.sql.*;
-import java.io.*;
-import java.util.*;
-
-import freemarker.template.*;
-
-import mir.storage.*;
-import mir.entity.*;
-import mir.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
@@ -55,24 +48,18 @@ public class DatabaseBreaking extends Database implements StorageObject{
   // 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 DatabaseBreaking getInstance() 
-    throws StorageObjectException {
+  public synchronized static DatabaseBreaking getInstance() throws StorageObjectFailure {
     if (instance == null) {
       instance = new DatabaseBreaking();
-      instance.myselfDatabase = instance;
     }
     return instance;
   }
 
-  private DatabaseBreaking() throws StorageObjectException
+  private DatabaseBreaking() throws StorageObjectFailure
   {
     super();
-    //this.cache = new DatabaseCache(4);
-    this.theTable="breaking";
-    try {
-      this.theEntityClass = Class.forName("mircoders.entity.EntityBreaking");
-    }
-    catch (Exception e) { throw new StorageObjectException(e.toString()); }
+    logger = new LoggerWrapper("Database.Breaking");
+    this.mainTable="breaking";
   }