Merged changes from feature/scl to master.

[simantics/platform.git] / bundles / org.simantics.scl.compiler / src / org / cojen / util / WeakIdentityMap.java

diff --git a/bundles/org.simantics.scl.compiler/src/org/cojen/util/WeakIdentityMap.java b/bundles/org.simantics.scl.compiler/src/org/cojen/util/WeakIdentityMap.java
index 70030ab88d24888d07bafaf1d07124c221f6791f..b771a982fb3b5d77c7a902ff974f1045e62127a4 100644 (file)
--- a/bundles/org.simantics.scl.compiler/src/org/cojen/util/WeakIdentityMap.java
+++ b/bundles/org.simantics.scl.compiler/src/org/cojen/util/WeakIdentityMap.java
@@ -208,7 +208,7 @@ public class WeakIdentityMap<K, V> extends AbstractMap<K, V> implements Map<K, V
 
     public boolean containsKey(Object key) {
         if (key == null) {
-            key = KeyFactory.NULL;
+            key = ReferencedValueHashMap.NULL;
         }
 
         Entry[] tab = this.table;
@@ -239,7 +239,7 @@ public class WeakIdentityMap<K, V> extends AbstractMap<K, V> implements Map<K, V
 
     public V get(Object key) {
         if (key == null) {
-            key = KeyFactory.NULL;
+            key = ReferencedValueHashMap.NULL;
         }
 
         Entry<K, V>[] tab = this.table;
@@ -329,7 +329,7 @@ public class WeakIdentityMap<K, V> extends AbstractMap<K, V> implements Map<K, V
 
     public V put(K key, V value) {
         if (key == null) {
-            key = (K) KeyFactory.NULL;
+            key = (K) ReferencedValueHashMap.NULL;
         }
 
         cleanup();
@@ -378,7 +378,7 @@ public class WeakIdentityMap<K, V> extends AbstractMap<K, V> implements Map<K, V
 
     public V remove(Object key) {
         if (key == null) {
-            key = KeyFactory.NULL;
+            key = ReferencedValueHashMap.NULL;
         }
 
         Entry<K, V>[] tab = this.table;
@@ -637,7 +637,7 @@ public class WeakIdentityMap<K, V> extends AbstractMap<K, V> implements Map<K, V
 
         public K getKey() {
             K key = Entry.this.get();
-            return key == KeyFactory.NULL ? null : key;
+            return key == ReferencedValueHashMap.NULL ? null : key;
         }
 
         public V getValue() {
@@ -661,7 +661,7 @@ public class WeakIdentityMap<K, V> extends AbstractMap<K, V> implements Map<K, V
             Object thisKey = get();
             if (thisKey == null) {
                 return false;
-            } else if (thisKey == KeyFactory.NULL) {
+            } else if (thisKey == ReferencedValueHashMap.NULL) {
                 thisKey = null;
             }
             return (thisKey == e.getKey()) &&