X-Git-Url: https://gerrit.simantics.org/r/gitweb?a=blobdiff_plain;f=bundles%2Forg.simantics.db.impl%2Fsrc%2Forg%2Fsimantics%2Fdb%2Fimpl%2Fquery%2FPredicates.java;h=312522007e4f53483490e08554fb4773dd86e64a;hb=a1dd54cd8e3595e66c83ad0e2d935470a3567481;hp=960cdb6c02aba26fe709af0fac79e1c4c28412ae;hpb=0ae2b770234dfc3cbb18bd38f324125cf0faca07;p=simantics%2Fplatform.git

diff --git a/bundles/org.simantics.db.impl/src/org/simantics/db/impl/query/Predicates.java b/bundles/org.simantics.db.impl/src/org/simantics/db/impl/query/Predicates.java
index 960cdb6c0..312522007 100644
--- a/bundles/org.simantics.db.impl/src/org/simantics/db/impl/query/Predicates.java
+++ b/bundles/org.simantics.db.impl/src/org/simantics/db/impl/query/Predicates.java
@@ -21,8 +21,6 @@ import org.simantics.db.procedure.ListenerBase;
 import org.simantics.db.request.RequestFlags;
 
 final public class Predicates extends UnaryQuery<IntProcedure> {
-	
-//	public ArrayList<IntProcedure> procs;
 
 	public Predicates(final int r) {
         super(r);
@@ -34,13 +32,13 @@ final public class Predicates extends UnaryQuery<IntProcedure> {
     
     final static Predicates entry(final QueryProcessor provider, final int r) {
         
-        return (Predicates)provider.predicatesMap.get(r);
+        return (Predicates)provider.cache.predicatesMap.get(r);
 
     }
     
     final static void runner(ReadGraphImpl graph, final int r, final QueryProcessor provider, Predicates cached, final CacheEntry parent, final ListenerBase listener, final IntProcedure procedure) {
 
-    	Predicates entry = cached != null ? cached : (Predicates)provider.predicatesMap.get(r); 
+    	Predicates entry = cached != null ? cached : (Predicates)provider.cache.predicatesMap.get(r); 
         if(entry == null) {
         	
         	entry = new Predicates(r);
@@ -66,7 +64,7 @@ final public class Predicates extends UnaryQuery<IntProcedure> {
 
     final static IntSet runner2(ReadGraphImpl graph, final int r, final QueryProcessor provider, final CacheEntry parent) throws Throwable {
 
-    	Predicates entry = (Predicates)provider.predicatesMap.get(r); 
+    	Predicates entry = (Predicates)provider.cache.predicatesMap.get(r); 
         if(entry == null) {
         	
         	entry = new Predicates(r);
@@ -95,7 +93,7 @@ final public class Predicates extends UnaryQuery<IntProcedure> {
         
     	assert(r != 0);
     	
-    	final Predicates entry = (Predicates)provider.predicatesMap.get(r);
+    	final Predicates entry = (Predicates)provider.cache.predicatesMap.get(r);
     	
     	if(parent == null && listener == null) {
         	if(entry != null && entry.isReady()) { 
@@ -111,7 +109,7 @@ final public class Predicates extends UnaryQuery<IntProcedure> {
     final public static IntSet queryEach2(ReadGraphImpl graph, final int r, final QueryProcessor provider, final CacheEntry parent) throws Throwable {
         
     	if(parent == null) {
-        	final Predicates entry = (Predicates)provider.predicatesMap.get(r);
+        	final Predicates entry = (Predicates)provider.cache.predicatesMap.get(r);
         	if(entry != null && entry.isReady()) {
         		return (IntSet)entry.get(graph, provider, null);
         	}
@@ -123,17 +121,17 @@ final public class Predicates extends UnaryQuery<IntProcedure> {
     
     @Override
     public UnaryQuery<IntProcedure> getEntry(QueryProcessor provider) {
-        return provider.predicatesMap.get(id);
+        return provider.cache.predicatesMap.get(id);
     }
  	
  	@Override
  	public void putEntry(QueryProcessor provider) {
- 	    provider.predicatesMap.put(id, this);
+ 	    provider.cache.predicatesMap.put(id, this);
  	}
 
  	@Override
  	final public void removeEntry(QueryProcessor provider) {
-        provider.predicatesMap.remove(id);
+        provider.cache.predicatesMap.remove(id);
  	}
     
     final private void forAssertions(ReadGraphImpl graph, final QueryProcessor queryProvider, final IntProcedure procedure, final boolean store) {