merged 1.1 branch into head

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

diff --git a/source/mir/storage/store/StoreIdentifier.java b/source/mir/storage/store/StoreIdentifier.java
index 358a5c5..dc00801 100755 (executable)
--- a/source/mir/storage/store/StoreIdentifier.java
+++ b/source/mir/storage/store/StoreIdentifier.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2001, 2002 The Mir-coders group
+ * Copyright (C) 2001-2006 The Mir-coders group
  *
  * This file is part of Mir.
  *
@@ -19,8 +19,6 @@
  *
  * 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
@@ -41,16 +39,14 @@ package mir.storage.store;
  * @author        rk
  * @version 1.0
  */
-import java.util.Iterator;
-import java.util.Set;
-
 import mir.entity.EntityList;
 import mir.log.LoggerWrapper;
 
-public class StoreIdentifier {
+import java.util.Iterator;
+import java.util.Set;
 
-  /** @todo check if invalidating already to avoid deadlocks
-   *  what about concurrency? */
+public class StoreIdentifier {
+  /** todo check if invalidating already to avoid deadlocks what about concurrency? */
 
   private static ObjectStore o_store = ObjectStore.getInstance();
 
@@ -60,11 +56,7 @@ public class StoreIdentifier {
   private long timesUsed;
   private boolean invalidating = false;
 
-  protected LoggerWrapper logger = new LoggerWrapper("Database.ObjectStore");
-
-  /** @todo initialize logfile  */
-
-  private StoreIdentifier() {}
+  protected static LoggerWrapper logger = new LoggerWrapper("Database.ObjectStore");
 
   public StoreIdentifier(StorableObject reference, int storeType,
                          String uniqueIdentifier) {
@@ -91,12 +83,6 @@ public class StoreIdentifier {
     this.stocType = StoreContainerType.valueOf(theClass, storeType);
   }
 
-  /**
-   *  Method:       ivalidate
-   *  Description:
-   *
-   *  @return
-   */
   public void invalidate() {
     logger.info("Invalidating: " + toString());
     // avoid deadlock due to propagation.
@@ -180,6 +166,4 @@ public class StoreIdentifier {
       id.append(" (" + timesUsed).append(") times used.");
     return id.toString();
   }
-
-
 }
\ No newline at end of file