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

diff --git a/bundles/org.simantics.db.impl/src/org/simantics/db/impl/query/PrincipalTypes.java b/bundles/org.simantics.db.impl/src/org/simantics/db/impl/query/PrincipalTypes.java
index 25e2b6fe3..60fe07411 100644
--- a/bundles/org.simantics.db.impl/src/org/simantics/db/impl/query/PrincipalTypes.java
+++ b/bundles/org.simantics.db.impl/src/org/simantics/db/impl/query/PrincipalTypes.java
@@ -11,9 +11,6 @@
  *******************************************************************************/
 package org.simantics.db.impl.query;
 
-import gnu.trove.procedure.TIntProcedure;
-import gnu.trove.set.hash.TIntHashSet;
-
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.concurrent.Semaphore;
@@ -23,23 +20,24 @@ import org.simantics.db.impl.procedure.IntProcedureAdapter;
 import org.simantics.db.impl.procedure.InternalProcedure;
 import org.simantics.db.procedure.ListenerBase;
 
-final public class PrincipalTypes extends CollectionUnaryQuery<IntProcedure> {
+import gnu.trove.procedure.TIntProcedure;
+import gnu.trove.set.hash.TIntHashSet;
 
-//	public ArrayList<IntProcedure> procs = null;
+final public class PrincipalTypes extends CollectionUnaryQuery<IntProcedure> {
 
 	private PrincipalTypes(final int resource) {
 		super(resource);
 	}
 
 	final static PrincipalTypes entry(final QueryProcessor provider, final int r) {
-		return (PrincipalTypes)provider.principalTypesMap.get(r);
+		return (PrincipalTypes)provider.cache.principalTypesMap.get(r);
 	}
 
 	final static void runner(ReadGraphImpl graph, final int r, final CacheEntry parent, final ListenerBase listener, final IntProcedure procedure) {
 
     	QueryProcessor processor = graph.processor;
 		
-		PrincipalTypes entry = (PrincipalTypes)processor.principalTypesMap.get(r); 
+		PrincipalTypes entry = (PrincipalTypes)processor.cache.principalTypesMap.get(r); 
 		if(entry == null) {
 
 			entry = new PrincipalTypes(r);
@@ -81,17 +79,17 @@ final public class PrincipalTypes extends CollectionUnaryQuery<IntProcedure> {
 
 	@Override
 	public UnaryQuery<IntProcedure> getEntry(QueryProcessor provider) {
-		return provider.principalTypesMap.get(id);
+		return provider.cache.principalTypesMap.get(id);
 	}
 
 	@Override
 	public void putEntry(QueryProcessor provider) {
-		provider.principalTypesMap.put(id, this);
+		provider.cache.principalTypesMap.put(id, this);
 	}
 
 	@Override
 	final public void removeEntry(QueryProcessor provider) {
-		provider.principalTypesMap.remove(id);
+		provider.cache.principalTypesMap.remove(id);
 	}
 
 	static class Koss {