Merge branch 'db-threads' into private/db-threads

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

diff --git a/bundles/org.simantics.db.impl/src/org/simantics/db/impl/query/DirectPredicates.java b/bundles/org.simantics.db.impl/src/org/simantics/db/impl/query/DirectPredicates.java
index 606afa430c1e35e870aaed5e35abbb51612aa0ef..117448b5be8032157c1f696c7df23643f3de47c3 100644 (file)
--- a/bundles/org.simantics.db.impl/src/org/simantics/db/impl/query/DirectPredicates.java
+++ b/bundles/org.simantics.db.impl/src/org/simantics/db/impl/query/DirectPredicates.java
@@ -26,13 +26,13 @@ final public class DirectPredicates extends CollectionUnaryQuery<IntProcedure> {
 
        final static DirectPredicates entry(final QueryProcessor provider, final int r) {
 
-               return (DirectPredicates)provider.directPredicatesMap.get(r);
+               return (DirectPredicates)provider.cache.directPredicatesMap.get(r);
 
        }
 
        final static void runner(ReadGraphImpl graph, final int r, final QueryProcessor provider, final CacheEntry parent, final ListenerBase listener, final IntProcedure procedure) {
 
-               DirectPredicates entry = (DirectPredicates)provider.directPredicatesMap.get(r);
+               DirectPredicates entry = (DirectPredicates)provider.cache.directPredicatesMap.get(r);
                if(entry == null) {
 
                        entry = new DirectPredicates(r);
@@ -63,7 +63,7 @@ final public class DirectPredicates extends CollectionUnaryQuery<IntProcedure> {
        final public static void queryEach(ReadGraphImpl graph, final int r, final QueryProcessor provider, final CacheEntry parent, final ListenerBase listener, final IntProcedure procedure) {
 
                if(parent == null && listener == null) {
-                       DirectPredicates entry = (DirectPredicates)provider.directPredicatesMap.get(r);
+                       DirectPredicates entry = (DirectPredicates)provider.cache.directPredicatesMap.get(r);
                        if(entry != null && entry.isReady()) { 
                                entry.performFromCache(graph, provider, procedure);
                                return;
@@ -86,17 +86,17 @@ final public class DirectPredicates extends CollectionUnaryQuery<IntProcedure> {
        
        @Override
        public UnaryQuery<IntProcedure> getEntry(QueryProcessor provider) {
-               return provider.directPredicatesMap.get(id);
+               return provider.cache.directPredicatesMap.get(id);
        }
 
        @Override
        public void putEntry(QueryProcessor provider) {
-               provider.directPredicatesMap.put(id, this);
+               provider.cache.directPredicatesMap.put(id, this);
        }
 
        @Override
        final public void removeEntry(QueryProcessor provider) {
-               provider.directPredicatesMap.remove(id);
+               provider.cache.directPredicatesMap.remove(id);
        }
 
        @Override