1.1 restoration

[mir.git] / source / mir / entity / AbstractEntity.java

diff --git a/source/mir/entity/AbstractEntity.java b/source/mir/entity/AbstractEntity.java
index dcd493b..a4e6585 100755 (executable)
--- a/source/mir/entity/AbstractEntity.java
+++ b/source/mir/entity/AbstractEntity.java
@@ -45,25 +45,16 @@ import mir.storage.StorageObjectFailure;
  * Base class the entities are derived from. Provides base functionality of
  * an entity.
  *
- * @version $Id: AbstractEntity.java,v 1.8.2.2 2004/02/08 21:05:00 zapata Exp $
+ * @version $Id: AbstractEntity.java,v 1.8.2.3 2004/11/21 22:07:13 zapata Exp $
  */
 
 public class AbstractEntity implements Entity {
-  protected static MirPropertiesConfiguration configuration;
+  protected static MirPropertiesConfiguration configuration = MirPropertiesConfiguration.instance();
 
   protected Map values;
   protected StorageObject storageObject;
   protected LoggerWrapper logger;
 
-  static {
-    try {
-      configuration = MirPropertiesConfiguration.instance();
-    }
-    catch (PropertiesConfigExc e) {
-      throw new RuntimeException(e.getMessage());
-    }
-  }
-
   public AbstractEntity() {
     logger = new LoggerWrapper("Entity");
 
@@ -74,7 +65,6 @@ public class AbstractEntity implements Entity {
    * Constructor
    * @param StorageObject The StorageObject of the Entity.
    */
-
   public AbstractEntity(StorageObject StorageObject) {
     this();
 
@@ -159,7 +149,7 @@ public class AbstractEntity implements Entity {
    * Returns the field names of the Entity
    */
   public List getFieldNames() throws StorageObjectFailure {
-    return storageObject.getFields();
+    return storageObject.getFieldNames();
   }
 
   /** Returns whether fieldName is a valid field name of this Entity.