rebuilding head

[mir.git] / source / mir / storage / store / StoreContainerType.java

diff --git a/source/mir/storage/store/StoreContainerType.java b/source/mir/storage/store/StoreContainerType.java
index 9443e08..8e8bbcb 100755 (executable)
--- a/source/mir/storage/store/StoreContainerType.java
+++ b/source/mir/storage/store/StoreContainerType.java
@@ -18,13 +18,13 @@
  * 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  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.  
+ * 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 mir.storage.store;
@@ -47,9 +47,6 @@ package mir.storage.store;
 import java.util.HashMap;
 import java.util.Map;
 
-import mir.config.MirPropertiesConfiguration;
-import mir.config.MirPropertiesConfiguration.PropertiesConfigExc;
-import mir.log.LoggerWrapper;
 import mir.misc.StringUtil;
 
 public class StoreContainerType {
@@ -63,8 +60,6 @@ public class StoreContainerType {
   private static ObjectStore o_store = ObjectStore.getInstance();
   private Class stocClass = null;
   private int stocType = STOC_TYPE_UNKNOWN;
-  private MirPropertiesConfiguration configuration;
-  private LoggerWrapper logger;
 
   static {
     uniqueTypes[STOC_TYPE_ENTITY] = new HashMap();
@@ -76,12 +71,6 @@ public class StoreContainerType {
   private StoreContainerType(Class stocClass, int stocType) {
     this.stocClass = stocClass;
     this.stocType = stocType;
-    logger = new LoggerWrapper("Database");
-    try {
-                       configuration = MirPropertiesConfiguration.instance();
-               } catch (PropertiesConfigExc e) {
-                       e.printStackTrace(logger.asPrintWriter(LoggerWrapper.ERROR_MESSAGE));
-               }
   }
 
   public static StoreContainerType valueOf(Class stoc_class, int stoc_type) {
@@ -115,7 +104,7 @@ public class StoreContainerType {
     String confProperty = "StoreContainer." + stringForStoreType(stocType) +
         ".DefaultSize";
     return
-        StringUtil.parseInt(configuration.getString(confProperty), 10);
+        StringUtil.parseInt(o_store.getConfProperty(confProperty), 10);
   }
 
   public String toString() {