Merge branch 'master' into private/db-threads

[simantics/platform.git] / bundles / org.simantics.db.impl / src / org / simantics / db / impl / query / SuperTypes.java

diff --git a/bundles/org.simantics.db.impl/src/org/simantics/db/impl/query/SuperTypes.java b/bundles/org.simantics.db.impl/src/org/simantics/db/impl/query/SuperTypes.java
index 0489546c55d6caa5fdd50f5537bf321302db4f7f..1fce568707564691fe7420ef072af0c8f0b7924e 100644 (file)
--- a/bundles/org.simantics.db.impl/src/org/simantics/db/impl/query/SuperTypes.java
+++ b/bundles/org.simantics.db.impl/src/org/simantics/db/impl/query/SuperTypes.java
@@ -20,8 +20,6 @@ import org.simantics.db.impl.procedure.InternalProcedure;
 import org.simantics.db.procedure.ListenerBase;
 
 final public class SuperTypes extends UnaryQuery<InternalProcedure<IntSet>> {
-    
-//     public ArrayList<InternalProcedure<IntSet>> procs = null;
        
     private SuperTypes(final int resource) {
         super(resource);
@@ -29,7 +27,7 @@ final public class SuperTypes extends UnaryQuery<InternalProcedure<IntSet>> {
     
     final static SuperTypes runner(ReadGraphImpl graph, final int r, final CacheEntry parent, final QueryProcessor provider, final ListenerBase listener, final InternalProcedure<IntSet> procedure) {
 
-       SuperTypes entry = (SuperTypes)provider.superTypesMap.get(r);
+       SuperTypes entry = (SuperTypes)provider.cache.superTypesMap.get(r);
         if(entry == null) {
                
                entry = new SuperTypes(r);
@@ -64,7 +62,7 @@ final public class SuperTypes extends UnaryQuery<InternalProcedure<IntSet>> {
     final public static SuperTypes queryEach(ReadGraphImpl graph, final int r, final QueryProcessor provider, final CacheEntry parent, final ListenerBase listener, final InternalProcedure<IntSet> procedure) {
     
         if(parent == null && listener == null) {
-               SuperTypes entry = (SuperTypes)provider.superTypesMap.get(r);
+               SuperTypes entry = (SuperTypes)provider.cache.superTypesMap.get(r);
                if(entry != null && entry.isReady()) { 
                        entry.performFromCache(graph, provider, procedure);
                        return entry;
@@ -77,17 +75,17 @@ final public class SuperTypes extends UnaryQuery<InternalProcedure<IntSet>> {
        
        @Override
        public UnaryQuery<InternalProcedure<IntSet>> getEntry(QueryProcessor provider) {
-        return provider.superTypesMap.get(id);
+        return provider.cache.superTypesMap.get(id);
        }
        
        @Override
        public void putEntry(QueryProcessor provider) {
-        provider.superTypesMap.put(id, this);
+        provider.cache.superTypesMap.put(id, this);
        }
 
        @Override
        final public void removeEntry(QueryProcessor provider) {
-               provider.superTypesMap.remove(id);
+               provider.cache.superTypesMap.remove(id);
        }
 
        @Override