Merge branch 'master' into private/db-threads

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

diff --git a/bundles/org.simantics.db.impl/src/org/simantics/db/impl/query/RelationInfoQuery.java b/bundles/org.simantics.db.impl/src/org/simantics/db/impl/query/RelationInfoQuery.java
index d32da5be54bfcf324f4555ff1740cb5cd258a3c6..f2081d35f767c9fced6b3814feb2393b0b68bca2 100644 (file)
--- a/bundles/org.simantics.db.impl/src/org/simantics/db/impl/query/RelationInfoQuery.java
+++ b/bundles/org.simantics.db.impl/src/org/simantics/db/impl/query/RelationInfoQuery.java
@@ -11,7 +11,6 @@
  *******************************************************************************/
 package org.simantics.db.impl.query;
 
-import java.util.ArrayList;
 import java.util.concurrent.Semaphore;
 import java.util.concurrent.atomic.AtomicBoolean;
 
@@ -23,8 +22,6 @@ import org.simantics.db.procedure.ListenerBase;
 import org.simantics.db.request.RequestFlags;
 
 final public class RelationInfoQuery extends UnaryQuery<InternalProcedure<RelationInfo>> {
-    
-//     public ArrayList<InternalProcedure<RelationInfo>> procs = null;
 
        private RelationInfoQuery(final int resource) {
         super(resource);
@@ -32,7 +29,7 @@ final public class RelationInfoQuery extends UnaryQuery<InternalProcedure<Relati
     
     final static RelationInfo runner(ReadGraphImpl graph, final int r, final QueryProcessor provider, final CacheEntry parent, final ListenerBase listener, final InternalProcedure<RelationInfo> procedure) {
 
-       RelationInfoQuery entry = (RelationInfoQuery)provider.relationInfoMap.get(r);
+       RelationInfoQuery entry = (RelationInfoQuery)provider.cache.relationInfoMap.get(r);
         if(entry == null) {
                
                entry = new RelationInfoQuery(r);
@@ -67,7 +64,7 @@ final public class RelationInfoQuery extends UnaryQuery<InternalProcedure<Relati
     
     final public static RelationInfo queryEach(ReadGraphImpl graph, final int r, final QueryProcessor provider, final CacheEntry parent, final ListenerBase listener, final InternalProcedure<RelationInfo> procedure) {
         
-       RelationInfoQuery entry = (RelationInfoQuery)provider.relationInfoMap.get(r);
+       RelationInfoQuery entry = (RelationInfoQuery)provider.cache.relationInfoMap.get(r);
        if(entry != null && entry.isReady()) {
                entry.performFromCache(graph, provider, procedure);
                return entry.getResult();
@@ -80,7 +77,7 @@ final public class RelationInfoQuery extends UnaryQuery<InternalProcedure<Relati
     final public static RelationInfoQuery probe(ReadGraphImpl graph, int resource) {
         
         final int thread = graph.thread(resource);
-       RelationInfoQuery entry = (RelationInfoQuery)graph.processor.relationInfoMap.get(resource);
+       RelationInfoQuery entry = (RelationInfoQuery)graph.processor.cache.relationInfoMap.get(resource);
        if(entry != null && entry.isReady()) {
                return entry;
        } else {
@@ -91,17 +88,17 @@ final public class RelationInfoQuery extends UnaryQuery<InternalProcedure<Relati
 
     @Override
        public UnaryQuery<InternalProcedure<RelationInfo>> getEntry(QueryProcessor provider) {
-        return provider.relationInfoMap.get(id);
+        return provider.cache.relationInfoMap.get(id);
        }
        
        @Override
        public void putEntry(QueryProcessor provider) {
-        provider.relationInfoMap.put(id, this);
+        provider.cache.relationInfoMap.put(id, this);
        }
 
        @Override
        final public void removeEntry(QueryProcessor provider) {
-               provider.relationInfoMap.remove(id);
+               provider.cache.relationInfoMap.remove(id);
        }
 
        private void computeAssertions(ReadGraphImpl graph, final boolean isFinal, final boolean isFunctional, final QueryProcessor queryProvider, final InternalProcedure<RelationInfo> proc) {