First changes

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

diff --git a/bundles/org.simantics.db.impl/src/org/simantics/db/impl/query/Objects.java b/bundles/org.simantics.db.impl/src/org/simantics/db/impl/query/Objects.java
index 0b3e1be34d3e8f16a135df845e95ebdbe4fc7ccb..a35826341360c015e65578e71b3fd36690c43a3a 100644 (file)
--- a/bundles/org.simantics.db.impl/src/org/simantics/db/impl/query/Objects.java
+++ b/bundles/org.simantics.db.impl/src/org/simantics/db/impl/query/Objects.java
@@ -49,11 +49,11 @@ final public class Objects extends CollectionBinaryQuery<IntProcedure> {
        }
 
        final static Objects entry(final QueryProcessor provider, final int r1, final int r2) {
-               return (Objects)provider.objectsMap.get(r1,r2);
+               return (Objects)provider.cache.objectsMap.get(r1,r2);
        }
 
        final static Collection<Objects> entries(final QueryProcessor processor, final int r1) {
-               return processor.objectsMap.values(r1);
+               return processor.cache.objectsMap.values(r1);
        }
 
        public final static void runner(ReadGraphImpl graph, final int r1, final int r2, CacheEntry parent, ListenerBase listener, final IntProcedure procedure) {
@@ -65,7 +65,7 @@ final public class Objects extends CollectionBinaryQuery<IntProcedure> {
 
                QueryProcessor processor = graph.processor;
 
-               Objects entry = (Objects)processor.objectsMap.get(r1,r2);
+               Objects entry = (Objects)processor.cache.objectsMap.get(r1,r2);
                if(entry == null) {
 
                        entry = new Objects(r1, r2);
@@ -143,7 +143,7 @@ final public class Objects extends CollectionBinaryQuery<IntProcedure> {
 
         QueryProcessor processor = graph.processor;
 
-        Objects entry = (Objects)processor.objectsMap.get(r1,r2);
+        Objects entry = (Objects)processor.cache.objectsMap.get(r1,r2);
         if(entry == null) {
 
             entry = new Objects(r1, r2);
@@ -167,7 +167,7 @@ final public class Objects extends CollectionBinaryQuery<IntProcedure> {
        
        @Override
        public BinaryQuery<IntProcedure> getEntry(QueryProcessor provider) {
-               return provider.objectsMap.get(id);
+               return provider.cache.objectsMap.get(id);
        }
 
        @Override
@@ -177,12 +177,12 @@ final public class Objects extends CollectionBinaryQuery<IntProcedure> {
                                System.err.println("put " + this);
                        }
                }
-               provider.objectsMap.put(id, this);
+               provider.cache.objectsMap.put(id, this);
        }
 
        @Override
        final public void removeEntry(QueryProcessor provider) {
-               provider.objectsMap.remove(id);
+               provider.cache.objectsMap.remove(id);
        }
 
        final static private IntArray getAssertionMap(ReadGraphImpl graph, final int r1, final int r2, final Objects entry) {
@@ -853,11 +853,11 @@ final public class Objects extends CollectionBinaryQuery<IntProcedure> {
        }
 
        @Override
-       public void performFromCache(ReadGraphImpl graph, QueryProcessor provider, final IntProcedure procedure) {
+       public Object performFromCache(ReadGraphImpl graph, QueryProcessor provider, final IntProcedure procedure) {
 
                assert(isReady());
 
-               if(handleException(graph, procedure)) return;
+               if(handleException(graph, procedure)) return getResult();
 
                final IntArray value = (IntArray)getResult();
                if(value.data == null) {
@@ -867,6 +867,8 @@ final public class Objects extends CollectionBinaryQuery<IntProcedure> {
                }
 
                procedure.finished(graph);
+               
+               return value;
 
        }