Merge branch 'master' into private/db-threads

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

diff --git a/bundles/org.simantics.db.impl/src/org/simantics/db/impl/query/OrderedSet.java b/bundles/org.simantics.db.impl/src/org/simantics/db/impl/query/OrderedSet.java
index 65cfb007ce4e040f8014696dec1694ad58c678df..c693d2a91f0e38add060c1be564f97252e806a56 100644 (file)
--- a/bundles/org.simantics.db.impl/src/org/simantics/db/impl/query/OrderedSet.java
+++ b/bundles/org.simantics.db.impl/src/org/simantics/db/impl/query/OrderedSet.java
@@ -21,21 +21,19 @@ import org.simantics.db.procedure.ListenerBase;
 
 final public class OrderedSet extends CollectionUnaryQuery<IntProcedure> {
        
-//     public ArrayList<IntProcedure> procs = null;
-
        public OrderedSet(final int r) {
         super(r);
     }
 
     final static OrderedSet entry(final QueryProcessor provider, final int r) {
         
-        return (OrderedSet)provider.orderedSetMap.get(r);
+        return (OrderedSet)provider.cache.orderedSetMap.get(r);
 
     }
        
     final static void runner(ReadGraphImpl graph, final int r, final QueryProcessor provider, OrderedSet cached, final CacheEntry parent, ListenerBase listener, final IntProcedure procedure) {
         
-       OrderedSet entry = cached != null ? cached : (OrderedSet)provider.orderedSetMap.get(r); 
+       OrderedSet entry = cached != null ? cached : (OrderedSet)provider.cache.orderedSetMap.get(r); 
         if(entry == null) {
                
                entry = new OrderedSet(r);
@@ -67,7 +65,7 @@ final public class OrderedSet extends CollectionUnaryQuery<IntProcedure> {
         
        assert(r != 0);
        
-       final OrderedSet entry = (OrderedSet)provider.orderedSetMap.get(r);
+       final OrderedSet entry = (OrderedSet)provider.cache.orderedSetMap.get(r);
        
        if(parent == null && !(listener != null)) {
                if(entry != null && entry.isReady()) { 
@@ -82,17 +80,17 @@ final public class OrderedSet extends CollectionUnaryQuery<IntProcedure> {
 
     @Override
     public UnaryQuery<IntProcedure> getEntry(QueryProcessor provider) {
-        return provider.orderedSetMap.get(id);
+        return provider.cache.orderedSetMap.get(id);
     }
        
        @Override
        public void putEntry(QueryProcessor provider) {
-           provider.orderedSetMap.put(id, this);
+           provider.cache.orderedSetMap.put(id, this);
        }
 
        @Override
        final public void removeEntry(QueryProcessor provider) {
-        provider.orderedSetMap.remove(id);
+        provider.cache.orderedSetMap.remove(id);
        }
     
        private int current = 0;