merged 1.1 branch into head

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

diff --git a/source/mircoders/storage/DatabaseBreaking.java b/source/mircoders/storage/DatabaseBreaking.java
index a0a6849..aa476d5 100755 (executable)
--- a/source/mircoders/storage/DatabaseBreaking.java
+++ b/source/mircoders/storage/DatabaseBreaking.java
@@ -32,35 +32,22 @@ package mircoders.storage;
 
 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
- *
- *
- */
-
-public class DatabaseBreaking extends Database implements StorageObject{
+import mir.storage.DatabaseFailure;
 
+public class DatabaseBreaking extends Database {
   private static DatabaseBreaking 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 DatabaseBreaking getInstance() throws StorageObjectFailure {
+  public synchronized static DatabaseBreaking getInstance() throws DatabaseFailure {
     if (instance == null) {
       instance = new DatabaseBreaking();
     }
     return instance;
   }
 
-  private DatabaseBreaking() throws StorageObjectFailure
-  {
+  private DatabaseBreaking() throws DatabaseFailure {
     super();
+
     logger = new LoggerWrapper("Database.Breaking");
-    this.mainTable="breaking";
+    mainTable="breaking";
   }
-
-
 }