Merge branch 'master' into private/db-threads

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

diff --git a/bundles/org.simantics.db.impl/src/org/simantics/db/impl/query/TypeHierarchy.java b/bundles/org.simantics.db.impl/src/org/simantics/db/impl/query/TypeHierarchy.java
index 5c5d6cb093d1f3e3a90f10c30fb2560ff35b5bc5..6a96e11eaf65f857789740f77caa5e22ec48de91 100644 (file)
--- a/bundles/org.simantics.db.impl/src/org/simantics/db/impl/query/TypeHierarchy.java
+++ b/bundles/org.simantics.db.impl/src/org/simantics/db/impl/query/TypeHierarchy.java
@@ -29,7 +29,7 @@ final public class TypeHierarchy extends UnaryQuery<InternalProcedure<IntSet>> {
     
     final static void runner(ReadGraphImpl graph, final int r, final CacheEntry parent, final QueryProcessor provider, final ListenerBase listener, final InternalProcedure<IntSet> procedure) {
 
-       TypeHierarchy entry = (TypeHierarchy)provider.typeHierarchyMap.get(r);
+       TypeHierarchy entry = (TypeHierarchy)provider.cache.typeHierarchyMap.get(r);
         if(entry == null) {
 
                entry = new TypeHierarchy(r);
@@ -60,7 +60,7 @@ final public class TypeHierarchy extends UnaryQuery<InternalProcedure<IntSet>> {
     final public static void queryEach(ReadGraphImpl graph, final int r, final QueryProcessor provider, final CacheEntry parent, final ListenerBase listener, final InternalProcedure<IntSet> procedure) {
         
         if(parent == null && listener == null) {
-               TypeHierarchy entry = (TypeHierarchy)provider.typeHierarchyMap.get(r);
+               TypeHierarchy entry = (TypeHierarchy)provider.cache.typeHierarchyMap.get(r);
                if(entry != null && entry.isReady()) { 
                        entry.performFromCache(graph, provider, procedure);
                        return;
@@ -73,17 +73,17 @@ final public class TypeHierarchy extends UnaryQuery<InternalProcedure<IntSet>> {
        
        @Override
        public UnaryQuery<InternalProcedure<IntSet>> getEntry(QueryProcessor provider) {
-        return provider.typeHierarchyMap.get(id);
+        return provider.cache.typeHierarchyMap.get(id);
        }
        
        @Override
        public void putEntry(QueryProcessor provider) {
-        provider.typeHierarchyMap.put(id, this);
+        provider.cache.typeHierarchyMap.put(id, this);
        }
 
        @Override
        final public void removeEntry(QueryProcessor provider) {
-               provider.typeHierarchyMap.remove(id);
+               provider.cache.typeHierarchyMap.remove(id);
        }
 
        @Override