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

diff --git a/bundles/org.simantics.db.impl/src/org/simantics/db/impl/query/NamespaceIndex.java b/bundles/org.simantics.db.impl/src/org/simantics/db/impl/query/NamespaceIndex.java
index 526728003..a0a8c19cb 100644
--- a/bundles/org.simantics.db.impl/src/org/simantics/db/impl/query/NamespaceIndex.java
+++ b/bundles/org.simantics.db.impl/src/org/simantics/db/impl/query/NamespaceIndex.java
@@ -25,8 +25,6 @@ import org.simantics.db.impl.procedure.InternalProcedure;
 import org.simantics.db.procedure.ListenerBase;
 
 final public class NamespaceIndex extends StringQuery<InternalProcedure<TObjectIntHashMap<String>>> {
-    
-//	public ArrayList<InternalProcedure<TObjectIntHashMap<String>>> procs = null;
 	
     private NamespaceIndex(final String id) {
         super(id);
@@ -34,7 +32,7 @@ final public class NamespaceIndex extends StringQuery<InternalProcedure<TObjectI
     
     final static void runner(ReadGraphImpl graph, final String id, final QueryProcessor provider, NamespaceIndex cached, final CacheEntry parent, final ListenerBase listener, final InternalProcedure<TObjectIntHashMap<String>> procedure) {
 
-    	NamespaceIndex entry = cached != null ? cached : (NamespaceIndex)provider.namespaceIndexMap22.get(id); 
+    	NamespaceIndex entry = cached != null ? cached : (NamespaceIndex)provider.cache.namespaceIndexMap22.get(id); 
         if(entry == null) {
         	
         	entry = new NamespaceIndex(id);
@@ -64,7 +62,7 @@ final public class NamespaceIndex extends StringQuery<InternalProcedure<TObjectI
     
     final public static void queryEach(ReadGraphImpl graph, final String id, final QueryProcessor provider, final CacheEntry parent, final ListenerBase listener, final InternalProcedure<TObjectIntHashMap<String>> procedure) {
 
-    	final NamespaceIndex entry = (NamespaceIndex)provider.namespaceIndexMap22.get(id);
+    	final NamespaceIndex entry = (NamespaceIndex)provider.cache.namespaceIndexMap22.get(id);
         
     	if(parent == null && listener == null && entry != null && entry.isReady()) {
     		entry.performFromCache(graph, provider, procedure);
@@ -77,17 +75,17 @@ final public class NamespaceIndex extends StringQuery<InternalProcedure<TObjectI
      
  	@Override
  	public NamespaceIndex getEntry(QueryProcessor provider) {
-        return provider.namespaceIndexMap22.get(id);
+        return provider.cache.namespaceIndexMap22.get(id);
  	}
  	
  	@Override
  	public void putEntry(QueryProcessor provider) {
-        provider.namespaceIndexMap22.put(id, this);
+        provider.cache.namespaceIndexMap22.put(id, this);
  	}
 
  	@Override
  	final public void removeEntry(QueryProcessor provider) {
- 		provider.namespaceIndexMap22.remove(id);
+ 		provider.cache.namespaceIndexMap22.remove(id);
  	}
  	
 	final private void index(ReadGraphImpl graph, final QueryProcessor provider, int root, final InternalProcedure<TObjectIntHashMap<String>> procedure) {