X-Git-Url: https://gerrit.simantics.org/r/gitweb?a=blobdiff_plain;f=bundles%2Forg.simantics.db.impl%2Fsrc%2Forg%2Fsimantics%2Fdb%2Fimpl%2Fquery%2FCollectionUnaryQuery.java;h=f0389ccfea61071cf197b22003099a8202234e43;hb=de8b6e194da6d56c410101d9c72763078b0e8717;hp=bde26c36d319cfcb5445f227717ad40b93fe1c5c;hpb=880a8a4927805afbbf47005a807cef3f39406866;p=simantics%2Fplatform.git

diff --git a/bundles/org.simantics.db.impl/src/org/simantics/db/impl/query/CollectionUnaryQuery.java b/bundles/org.simantics.db.impl/src/org/simantics/db/impl/query/CollectionUnaryQuery.java
index bde26c36d..f0389ccfe 100644
--- a/bundles/org.simantics.db.impl/src/org/simantics/db/impl/query/CollectionUnaryQuery.java
+++ b/bundles/org.simantics.db.impl/src/org/simantics/db/impl/query/CollectionUnaryQuery.java
@@ -11,22 +11,25 @@
  *******************************************************************************/
 package org.simantics.db.impl.query;
 
+import org.simantics.db.exception.DatabaseException;
+import org.simantics.db.impl.graph.ReadGraphImpl;
+import org.simantics.db.impl.procedure.IntProcedureAdapter;
 
-
-
-abstract public class CollectionUnaryQuery<T> extends UnaryQuery<T> {
+abstract public class CollectionUnaryQuery extends UnaryQuery<IntProcedure> implements IntProcedure {
     
     public CollectionUnaryQuery(final int id) {
         super(id);
     }
     
+    abstract public void compute(ReadGraphImpl graph, IntProcedure procedure) throws DatabaseException;
+
     @Override
-    public void clearResult(QuerySupport support) {
+    final public void clearResult(QuerySupport support) {
     	setResult(new IntArray());
     }
     
     @Override
-    public void setReady() {
+    final public void setReady() {
     	super.setReady();
     	IntArray v = (IntArray)getResult();
     	int size = v.size();
@@ -34,4 +37,63 @@ abstract public class CollectionUnaryQuery<T> extends UnaryQuery<T> {
         else v.trim();
     }
     
+    @Override
+    final public Object performFromCache(ReadGraphImpl graph, final IntProcedure procedure) throws DatabaseException {
+
+        assert(isReady());
+
+        if(handleException(graph, procedure)) return EXCEPTED;
+        
+        final IntArray value = (IntArray)getResult();
+        if(value.data == null) {
+            if(value.sizeOrData != IntArray.NO_DATA) procedure.execute(graph, value.sizeOrData);
+        } else {
+            for(int i = 0;i < value.sizeOrData ; i++) procedure.execute(graph, value.data[i]);
+        }
+
+        procedure.finished(graph);
+        
+        return getResult();
+
+    }
+
+    @Override
+    final public void recompute(ReadGraphImpl graph) throws DatabaseException {
+
+        compute(graph, new IntProcedureAdapter() {
+
+            @Override
+            public void finished(ReadGraphImpl graph) {
+            }
+
+            @Override
+            public void exception(ReadGraphImpl graph, Throwable t) {
+                new Error("Error in recompute.", t).printStackTrace();
+            }
+
+        });
+
+    }
+    
+    @Override
+    final boolean isImmutable(ReadGraphImpl graph) {
+        return graph.processor.isImmutable(id);
+    }
+
+    @Override
+    final public void execute(ReadGraphImpl graph, int i) throws DatabaseException {
+        IntArray v = (IntArray)getResult();
+        v.add(i);
+    }
+
+    @Override
+    final public void finished(ReadGraphImpl graph) throws DatabaseException {
+        setReady();
+    }
+
+    @Override
+    final public void exception(ReadGraphImpl graph, Throwable throwable) throws DatabaseException {
+        except(throwable);
+    }
+    
 }