First changes

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

diff --git a/bundles/org.simantics.db.impl/src/org/simantics/db/impl/query/URIToResource.java b/bundles/org.simantics.db.impl/src/org/simantics/db/impl/query/URIToResource.java
index e5a14f77cd480102dad8cda01f65b41166c1f109..1098ed31398bb1ce8a88680416f1179ff10eec52 100644 (file)
--- a/bundles/org.simantics.db.impl/src/org/simantics/db/impl/query/URIToResource.java
+++ b/bundles/org.simantics.db.impl/src/org/simantics/db/impl/query/URIToResource.java
@@ -30,14 +30,14 @@ public class URIToResource extends StringQuery<InternalProcedure<Integer>> {
     }
     
     final static URIToResource entry(final QueryProcessor provider, final String id) {
-        return (URIToResource)provider.uriToResourceMap.get(id);
+        return (URIToResource)provider.cache.uriToResourceMap.get(id);
     }
 
     final static void runner(ReadGraphImpl graph, final String id, CacheEntry parent, final ListenerBase listener, final InternalProcedure<Integer> procedure) {
 
        QueryProcessor processor = graph.processor;
        
-        URIToResource entry = (URIToResource)processor.uriToResourceMap.get(id); 
+        URIToResource entry = (URIToResource)processor.cache.uriToResourceMap.get(id); 
         if(entry == null) {
 
                entry = new URIToResource(id);
@@ -81,17 +81,17 @@ public class URIToResource extends StringQuery<InternalProcedure<Integer>> {
      
     @Override
     public URIToResource getEntry(QueryProcessor provider) {
-        return provider.uriToResourceMap.get(id);
+        return provider.cache.uriToResourceMap.get(id);
     }
     
     @Override
     public void putEntry(QueryProcessor provider) {
-        provider.uriToResourceMap.put(id, this);
+        provider.cache.uriToResourceMap.put(id, this);
     }
 
     @Override
     final public void removeEntry(QueryProcessor provider) {
-        provider.uriToResourceMap.remove(id);
+        provider.cache.uriToResourceMap.remove(id);
     }
 
     private void lookup(ReadGraphImpl graph, final QueryProcessor processor, final InternalProcedure<Integer> procedure, final String namespace, final String name) {
@@ -141,8 +141,9 @@ public class URIToResource extends StringQuery<InternalProcedure<Integer>> {
                     }
                 }
                 
-                if(entry != null) entry.addOrSet(graph, graph.processor, new Integer(0));
-                procedure.execute(graph, new Integer(0));
+                Integer zero = 0;
+                if(entry != null) entry.addOrSet(graph, graph.processor, zero);
+                procedure.execute(graph, zero);
 
             }