Mir goes GPL

[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 92ae95c..dc16529 100755 (executable)
--- a/source/mir/storage/store/StoreIdentifier.java
+++ b/source/mir/storage/store/StoreIdentifier.java
@@ -1,3 +1,34 @@
+/*
+ * Copyright (C) 2001, 2002  The Mir-coders group
+ *
+ * This file is part of Mir.
+ *
+ * Mir is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * Mir is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with Mir; if not, write to the Free Software
+ * 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.
+ */
+
 package mir.storage.store;
 
 /**
@@ -14,6 +45,7 @@ package mir.storage.store;
  */
 import java.util.*;
 import mir.misc.Logfile;
+import mir.entity.*;
 
 public class StoreIdentifier {
 
@@ -34,10 +66,20 @@ public class StoreIdentifier {
        private StoreIdentifier() {}
 
        public StoreIdentifier(StorableObject reference, int storeType, String uniqueIdentifier) {
-    this(reference.getClass(), uniqueIdentifier);
+    Class theClass;
+    if (reference instanceof EntityList)
+      theClass=((EntityList)reference).getStorage().getEntityClass();
+    else
+      theClass=reference.getClass();
+    this.uniqueIdentifier=uniqueIdentifier;
+               this.stocType = StoreContainerType.valueOf(theClass, storeType);
                this.reference=reference;
        }
 
+  public StoreIdentifier(StorableObject reference, String uniqueIdentifier) {
+    this(reference, StoreContainerType.STOC_TYPE_ENTITY, uniqueIdentifier);
+  }
+
   public StoreIdentifier(Class theClass, String uniqueIdentifier) {
     this(theClass, StoreContainerType.STOC_TYPE_ENTITY,uniqueIdentifier);
   }
@@ -109,8 +151,9 @@ public class StoreIdentifier {
        public boolean equals(Object sid) {
     if ( !(sid instanceof StoreIdentifier) ) return false;
     if ( ((StoreIdentifier)sid).getStoreContainerType()==stocType &&
-         ((StoreIdentifier)sid).getUniqueIdentifier().equals(uniqueIdentifier) )
-                               return true;
+         ((StoreIdentifier)sid).getUniqueIdentifier().equals(uniqueIdentifier) ) {
+      return true;
+    }
                return false;
        }