first cut of merge of STABLE-pre1_0 into HEAD. I won't even guarantee that it

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

diff --git a/source/mircoders/storage/DatabaseFeature.java b/source/mircoders/storage/DatabaseFeature.java
index 43293eb..c907167 100755 (executable)
--- a/source/mircoders/storage/DatabaseFeature.java
+++ b/source/mircoders/storage/DatabaseFeature.java
@@ -19,33 +19,33 @@ import mir.misc.*;
 
 public class DatabaseFeature extends Database implements StorageObject{
 
-       private static DatabaseFeature instance;
-
-       public static DatabaseFeature getInstance() throws StorageObjectException {
-                       if (instance == null) {
-               instance = new DatabaseFeature();
-               instance.myselfDatabase = instance;
-                       }
-               return instance;
-       }
-
-       private DatabaseFeature() throws StorageObjectException
-       {
-               super();
-               this.cache = new HashMap();
-               this.hasTimestamp = false;
-               this.theTable="feature";
-
-               try {
-                               this.theEntityClass = Class.forName("mircoders.entity.EntityFeature");
-               }
-               catch (Exception e) {
-                               throw new StorageObjectException(e.toString());
-               }
-       }
-
-       public SimpleList getPopupData() {
-               return getPopupData("title",true);
-       }
+  private static DatabaseFeature instance;
+
+  public static DatabaseFeature getInstance() throws StorageObjectException {
+      if (instance == null) {
+    instance = new DatabaseFeature();
+    instance.myselfDatabase = instance;
+      }
+    return instance;
+  }
+
+  private DatabaseFeature() throws StorageObjectException
+  {
+    super();
+    //this.cache = new DatabaseCache(10);
+    this.hasTimestamp = false;
+    this.theTable="feature";
+
+    try {
+        this.theEntityClass = Class.forName("mircoders.entity.EntityFeature");
+    }
+    catch (Exception e) {
+        throw new StorageObjectException(e.toString());
+    }
+  }
+
+  public SimpleList getPopupData() throws StorageObjectException {
+    return getPopupData("title",true);
+  }
 
 }