First changes

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

diff --git a/bundles/org.simantics.db.impl/src/org/simantics/db/impl/query/DirectObjects.java b/bundles/org.simantics.db.impl/src/org/simantics/db/impl/query/DirectObjects.java
index 2c106476ef263cf36c1a23835d7bc5fbd24152e0..360e067fa28754aaee943b088e55ae25548b8166 100644 (file)
--- a/bundles/org.simantics.db.impl/src/org/simantics/db/impl/query/DirectObjects.java
+++ b/bundles/org.simantics.db.impl/src/org/simantics/db/impl/query/DirectObjects.java
@@ -37,12 +37,12 @@ final public class DirectObjects extends CollectionBinaryQuery<IntProcedure> {
 
        final static DirectObjects entry(final QueryProcessor provider, final int r1, final int r2) {
 
-               return (DirectObjects)provider.directObjectsMap.get(id(r1,r2));
+               return (DirectObjects)provider.cache.directObjectsMap.get(id(r1,r2));
 
        }
        
        final static Collection<DirectObjects> entries(final QueryProcessor processor, final int r1) {
-               DoubleKeyQueryHashMap<IntProcedure> hash = processor.directObjectsMap;
+               DoubleKeyQueryHashMap<IntProcedure> hash = processor.cache.directObjectsMap;
                return hash.values(r1);
        }
 
@@ -50,7 +50,7 @@ final public class DirectObjects extends CollectionBinaryQuery<IntProcedure> {
 
        QueryProcessor processor = graph.processor;
                
-               DirectObjects entry = (DirectObjects)processor.directObjectsMap.get(id(r1,r2));
+               DirectObjects entry = (DirectObjects)processor.cache.directObjectsMap.get(id(r1,r2));
                if(entry == null) {
                        
                entry = new DirectObjects(r1, r2);
@@ -93,17 +93,17 @@ final public class DirectObjects extends CollectionBinaryQuery<IntProcedure> {
 
        @Override
        public BinaryQuery<IntProcedure> getEntry(QueryProcessor provider) {
-               return provider.directObjectsMap.get(id);
+               return provider.cache.directObjectsMap.get(id);
        }
 
        @Override
        public void putEntry(QueryProcessor provider) {
-               provider.directObjectsMap.put(id, this);
+               provider.cache.directObjectsMap.put(id, this);
        }
 
        @Override
        final public void removeEntry(QueryProcessor provider) {
-               provider.directObjectsMap.remove(id);
+               provider.cache.directObjectsMap.remove(id);
        }
 
        @Override
@@ -155,10 +155,11 @@ final public class DirectObjects extends CollectionBinaryQuery<IntProcedure> {
        }
 
        @Override
-       public void performFromCache(ReadGraphImpl graph, QueryProcessor provider, IntProcedure procedure) {
+       public Object performFromCache(ReadGraphImpl graph, QueryProcessor provider, IntProcedure procedure) {
 
                assert(isReady());
                computeForEach(graph, provider, procedure, false);
+               return null;
 
        }