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

diff --git a/bundles/org.simantics.db.impl/src/org/simantics/db/impl/query/SuperRelations.java b/bundles/org.simantics.db.impl/src/org/simantics/db/impl/query/SuperRelations.java
index e76f702e1..fc3cbebab 100644
--- a/bundles/org.simantics.db.impl/src/org/simantics/db/impl/query/SuperRelations.java
+++ b/bundles/org.simantics.db.impl/src/org/simantics/db/impl/query/SuperRelations.java
@@ -22,8 +22,6 @@ import org.simantics.db.impl.procedure.InternalProcedure;
 import org.simantics.db.procedure.ListenerBase;
 
 final public class SuperRelations extends UnaryQuery<InternalProcedure<IntSet>> {
-	
-//	public ArrayList<InternalProcedure<IntSet>> procs = null;
     
     private SuperRelations(final int resource) {
         super(resource);
@@ -31,13 +29,13 @@ final public class SuperRelations extends UnaryQuery<InternalProcedure<IntSet>>
     
     final static SuperRelations entry(final QueryProcessor provider, final int r) {
         
-        return (SuperRelations)provider.superRelationsMap.get(r);
+        return (SuperRelations)provider.cache.superRelationsMap.get(r);
 
     }
 
     final static IntSet runner(ReadGraphImpl graph, final int r, final QueryProcessor provider, final CacheEntry parent, final ListenerBase listener, final InternalProcedure<IntSet> procedure) {
 
-        SuperRelations entry = (SuperRelations)provider.superRelationsMap.get(r);
+        SuperRelations entry = (SuperRelations)provider.cache.superRelationsMap.get(r);
         if(entry == null) {
 
         	entry = new SuperRelations(r);
@@ -60,7 +58,7 @@ final public class SuperRelations extends UnaryQuery<InternalProcedure<IntSet>>
     
     final static IntSet runner2(ReadGraphImpl graph, final int r, final QueryProcessor provider, final CacheEntry parent, final ListenerBase listener, final InternalProcedure<IntSet> procedure) throws Throwable {
 
-        SuperRelations entry = (SuperRelations)provider.superRelationsMap.get(r);
+        SuperRelations entry = (SuperRelations)provider.cache.superRelationsMap.get(r);
         if(entry == null) {
 
             entry = new SuperRelations(r);
@@ -84,7 +82,7 @@ final public class SuperRelations 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) {
 
         if(parent == null && listener == null) {
-        	SuperRelations entry = (SuperRelations)provider.superRelationsMap.get(r);
+        	SuperRelations entry = (SuperRelations)provider.cache.superRelationsMap.get(r);
         	if(entry != null && entry.isReady()) {
         	    entry.performFromCache(graph, provider, procedure);
         	    return;
@@ -98,7 +96,7 @@ final public class SuperRelations extends UnaryQuery<InternalProcedure<IntSet>>
     final public static IntSet queryEach2(ReadGraphImpl graph, final int r, final QueryProcessor provider, final CacheEntry parent, final ListenerBase listener, final InternalProcedure<IntSet> procedure) throws Throwable {
 
         if(parent == null && listener == null) {
-            SuperRelations entry = (SuperRelations)provider.superRelationsMap.get(r);
+            SuperRelations entry = (SuperRelations)provider.cache.superRelationsMap.get(r);
             if(entry != null && entry.isReady()) {
                 return (IntSet)entry.get(graph, provider, procedure);
             }
@@ -110,17 +108,17 @@ final public class SuperRelations extends UnaryQuery<InternalProcedure<IntSet>>
     
  	@Override
  	public UnaryQuery<InternalProcedure<IntSet>> getEntry(QueryProcessor provider) {
-        return provider.superRelationsMap.get(id);
+        return provider.cache.superRelationsMap.get(id);
  	}
  	
  	@Override
  	public void putEntry(QueryProcessor provider) {
-        provider.superRelationsMap.put(id, this);
+        provider.cache.superRelationsMap.put(id, this);
  	}
 
  	@Override
  	final public void removeEntry(QueryProcessor provider) {
- 		provider.superRelationsMap.remove(id);
+ 		provider.cache.superRelationsMap.remove(id);
  	}
  	
  	static int histoCounter = 0;