some code cleanup. removed unnecessary semikolons, unused vars, etc.

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

diff --git a/source/mircoders/storage/DatabaseMediaType.java b/source/mircoders/storage/DatabaseMediaType.java
index 6291d46..b8f3397 100755 (executable)
--- a/source/mircoders/storage/DatabaseMediaType.java
+++ b/source/mircoders/storage/DatabaseMediaType.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,21 +18,19 @@
  * 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 mir.log.LoggerWrapper;
 import mir.storage.Database;
-import mir.storage.StorageObject;
 import mir.storage.StorageObjectFailure;
 
 /**
@@ -42,18 +40,12 @@ import mir.storage.StorageObjectFailure;
  *
  */
 
-public class DatabaseMediaType extends Database implements StorageObject{
-
+public class DatabaseMediaType extends Database {
   private static DatabaseMediaType 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 DatabaseMediaType getInstance() 
-    throws StorageObjectFailure {
+  public synchronized static DatabaseMediaType getInstance() {
     if (instance == null) {
       instance = new DatabaseMediaType();
-      instance.myselfDatabase = instance;
     }
     return instance;
   }
@@ -61,13 +53,10 @@ public class DatabaseMediaType extends Database implements StorageObject{
   private DatabaseMediaType() throws StorageObjectFailure
   {
     super();
-    this.hasTimestamp = false;
-    //this.cache = new DatabaseCache(20);
-    this.theTable="media_type";
-    try {
-      this.theEntityClass = Class.forName("mir.entity.GenericEntity");
-    }
-    catch (Exception e) { throw new StorageObjectFailure(e); }
+
+    logger = new LoggerWrapper("Database.MediaType");
+    mainTable="media_type";
+    entityClass = mir.entity.GenericEntity.class;
   }
 
 }