Merge branch 'master' into private/db-threads

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

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 31b0f3e90e977c9d7d496739e9f9cafdaae19ccf..98833067faf81050f879e2ec6b3594e7ec363426 100644 (file)
--- 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
@@ -11,19 +11,17 @@
  *******************************************************************************/
 package org.simantics.db.impl.query;
 
-import java.util.ArrayList;
 import java.util.concurrent.Semaphore;
 
 import org.simantics.db.RelationInfo;
 import org.simantics.db.impl.graph.ReadGraphImpl;
-import org.simantics.db.impl.procedure.IntProcedureAdapter;import org.simantics.db.impl.procedure.InternalProcedure;
+import org.simantics.db.impl.procedure.IntProcedureAdapter;
+import org.simantics.db.impl.procedure.InternalProcedure;
 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) {