X-Git-Url: https://gerrit.simantics.org/r/gitweb?a=blobdiff_plain;f=bundles%2Forg.simantics.db.impl%2Fsrc%2Forg%2Fsimantics%2Fdb%2Fimpl%2Fquery%2FAssertedPredicates.java;h=98833067faf81050f879e2ec6b3594e7ec363426;hb=a1dd54cd8e3595e66c83ad0e2d935470a3567481;hp=af8858e5a9954ba59415d1f915c204ec653cdfbf;hpb=627664d06302d454ea3b3fe14d13bb5ab739d666;p=simantics%2Fplatform.git

diff --git a/bundles/org.simantics.db.impl/src/org/simantics/db/impl/query/AssertedPredicates.java b/bundles/org.simantics.db.impl/src/org/simantics/db/impl/query/AssertedPredicates.java
index af8858e5a..98833067f 100644
--- a/bundles/org.simantics.db.impl/src/org/simantics/db/impl/query/AssertedPredicates.java
+++ b/bundles/org.simantics.db.impl/src/org/simantics/db/impl/query/AssertedPredicates.java
@@ -22,8 +22,6 @@ import org.simantics.db.procedure.ListenerBase;
 
 final public class AssertedPredicates extends CollectionUnaryQuery<IntProcedure> {
 	
-//	public ArrayList<IntProcedure> procs = null;
-	
     public AssertedPredicates(final int r) {
         super(r);
     }
@@ -34,7 +32,7 @@ final public class AssertedPredicates extends CollectionUnaryQuery<IntProcedure>
     
     final static void runner(ReadGraphImpl graph, final int r, final QueryProcessor provider, final CacheEntry parent, final ListenerBase listener, final IntProcedure procedure) {
 
-        AssertedPredicates entry = (AssertedPredicates)provider.assertedPredicatesMap.get(r);
+        AssertedPredicates entry = (AssertedPredicates)provider.cache.assertedPredicatesMap.get(r);
         if(entry == null) {
         	
         	entry = new AssertedPredicates(r);
@@ -64,7 +62,7 @@ final public class AssertedPredicates 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) {
-        	AssertedPredicates entry = (AssertedPredicates)provider.assertedPredicatesMap.get(r);
+        	AssertedPredicates entry = (AssertedPredicates)provider.cache.assertedPredicatesMap.get(r);
         	if(entry != null && entry.isReady()) { 
         		entry.performFromCache(graph, provider, procedure);
         		return;
@@ -77,17 +75,17 @@ final public class AssertedPredicates extends CollectionUnaryQuery<IntProcedure>
 
     @Override
     public UnaryQuery<IntProcedure> getEntry(QueryProcessor provider) {
-        return provider.assertedPredicatesMap.get(id);
+        return provider.cache.assertedPredicatesMap.get(id);
     }
  	
  	@Override
  	public void putEntry(QueryProcessor provider) {
-        provider.assertedPredicatesMap.put(id, this);
+        provider.cache.assertedPredicatesMap.put(id, this);
  	}
 
  	@Override
  	final public void removeEntry(QueryProcessor provider) {
- 	    provider.assertedPredicatesMap.remove(id);
+ 	    provider.cache.assertedPredicatesMap.remove(id);
  	}
  	
  	void computeInheritedAssertions(ReadGraphImpl graph, int type, final QueryProcessor queryProvider, final IntProcedure proc, final boolean store) {