First changes

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

diff --git a/bundles/org.simantics.db.impl/src/org/simantics/db/impl/query/Types.java b/bundles/org.simantics.db.impl/src/org/simantics/db/impl/query/Types.java
index 49cb5c4c61ac0fabb59d01cf326d96c7ba1ad0b1..0f49188506099bfb4a13c64faffb05daea1c02c3 100644 (file)
--- a/bundles/org.simantics.db.impl/src/org/simantics/db/impl/query/Types.java
+++ b/bundles/org.simantics.db.impl/src/org/simantics/db/impl/query/Types.java
@@ -29,12 +29,12 @@ final public class Types extends UnaryQuery<InternalProcedure<IntSet>> {
     }
     
     final static Types entry(final QueryProcessor provider, final int r) {
-        return (Types)provider.typesMap.get(r);
+        return (Types)provider.cache.typesMap.get(r);
     }
     
    final static void runner(ReadGraphImpl graph, final int r, final QueryProcessor provider, Types cached, final CacheEntry parent, final ListenerBase listener, final InternalProcedure<IntSet> procedure) {
 
-       Types entry = cached != null ? cached : (Types)provider.typesMap.get(r); 
+       Types entry = cached != null ? cached : (Types)provider.cache.typesMap.get(r); 
         if(entry == null) {
                
                entry = new Types(r);
@@ -56,7 +56,7 @@ final public class Types extends UnaryQuery<InternalProcedure<IntSet>> {
     
     final static IntSet runner2(ReadGraphImpl graph, final int r, final QueryProcessor provider, final CacheEntry parent) throws Throwable {
 
-       Types entry = (Types)provider.typesMap.get(r); 
+       Types entry = (Types)provider.cache.typesMap.get(r); 
         if(entry == null) {
                
                entry = new Types(r);
@@ -79,7 +79,7 @@ final public class Types extends UnaryQuery<InternalProcedure<IntSet>> {
     
     final public static void queryEach(ReadGraphImpl graph, final int r, final QueryProcessor provider, final CacheEntry parent, final ListenerBase listener, final InternalProcedure<IntSet> procedure) {
         
-       final Types entry = (Types)provider.typesMap.get(r);
+       final Types entry = (Types)provider.cache.typesMap.get(r);
        
        if(parent == null && listener == null) {
                if(entry != null && entry.isReady()) { 
@@ -95,7 +95,7 @@ final public class Types extends UnaryQuery<InternalProcedure<IntSet>> {
     final public static IntSet queryEach2(ReadGraphImpl graph, final int r, final QueryProcessor provider, final CacheEntry parent) throws Throwable {
         
         if(parent == null) {
-            Types entry = (Types)provider.typesMap.get(r);
+            Types entry = (Types)provider.cache.typesMap.get(r);
             if(entry != null && entry.isReady()) {
                 return (IntSet)entry.get(graph, provider, null);
             }
@@ -107,17 +107,17 @@ final public class Types extends UnaryQuery<InternalProcedure<IntSet>> {
     
        @Override
        public UnaryQuery<InternalProcedure<IntSet>> getEntry(QueryProcessor provider) {
-        return provider.typesMap.get(id);
+        return provider.cache.typesMap.get(id);
        }
        
        @Override
        public void putEntry(QueryProcessor provider) {
-        provider.typesMap.put(id, this);
+        provider.cache.typesMap.put(id, this);
        }
 
        @Override
        final public void removeEntry(QueryProcessor provider) {
-               provider.typesMap.remove(id);
+               provider.cache.typesMap.remove(id);
        }
 
        @Override