X-Git-Url: https://gerrit.simantics.org/r/gitweb?a=blobdiff_plain;ds=sidebyside;f=bundles%2Forg.simantics.db.common%2Fsrc%2Forg%2Fsimantics%2Fdb%2Fcommon%2Fprimitiverequest%2FForEachAssertedObject.java;fp=bundles%2Forg.simantics.db.common%2Fsrc%2Forg%2Fsimantics%2Fdb%2Fcommon%2Fprimitiverequest%2FForEachAssertedObject.java;h=541aee94e10d31c50480f7a2508a3f432face183;hb=0f268b9157bfa6399692f8aa42f532a0c0d68c1c;hp=a71fd1ba6f91552ef78794dc84faac7a21f183da;hpb=2ee4ce7f7cb1df434c7552d4fce34fd7330352e5;p=simantics%2Fplatform.git

diff --git a/bundles/org.simantics.db.common/src/org/simantics/db/common/primitiverequest/ForEachAssertedObject.java b/bundles/org.simantics.db.common/src/org/simantics/db/common/primitiverequest/ForEachAssertedObject.java
index a71fd1ba6..541aee94e 100644
--- a/bundles/org.simantics.db.common/src/org/simantics/db/common/primitiverequest/ForEachAssertedObject.java
+++ b/bundles/org.simantics.db.common/src/org/simantics/db/common/primitiverequest/ForEachAssertedObject.java
@@ -11,20 +11,50 @@
  *******************************************************************************/
 package org.simantics.db.common.primitiverequest;
 
+import java.util.Collection;
+
 import org.simantics.db.AsyncReadGraph;
+import org.simantics.db.ReadGraph;
 import org.simantics.db.Resource;
-import org.simantics.db.common.request.ResourceAsyncMultiRead2;
+import org.simantics.db.common.request.ResourceRead2;
+import org.simantics.db.exception.DatabaseException;
 import org.simantics.db.procedure.AsyncMultiProcedure;
+import org.simantics.db.service.CollectionSupport;
+import org.simantics.utils.DataContainer;
 
-final public class ForEachAssertedObject extends ResourceAsyncMultiRead2<Resource> {
+final public class ForEachAssertedObject extends ResourceRead2<Collection<Resource>> {
 
     public ForEachAssertedObject(Resource subject, Resource relation) {
         super(subject, relation);
     }
 
 	@Override
-	public void perform(AsyncReadGraph graph, AsyncMultiProcedure<Resource> procedure) {
-    	graph.forEachAssertedObject(resource, resource2, procedure);
+	public Collection<Resource> perform(ReadGraph graph) throws DatabaseException {
+		CollectionSupport cs = graph.getService(CollectionSupport.class);
+		Collection<Resource> result = cs.createSet();
+		DataContainer<Throwable> throwable = new DataContainer<Throwable>(null);
+		graph.forEachAssertedObject(resource, resource2, new AsyncMultiProcedure<Resource>() {
+			
+			@Override
+			public void finished(AsyncReadGraph graph) {
+			}
+			
+			@Override
+			public void execute(AsyncReadGraph graph, Resource r) {
+				result.add(r);
+			}
+			
+			@Override
+			public void exception(AsyncReadGraph graph, Throwable t) {
+				throwable.set(t);
+			}
+		});
+		Throwable t = throwable.get();
+		if(t != null)
+			if(t instanceof DatabaseException)
+				throw (DatabaseException)t;
+			else throw new DatabaseException(t);
+		return result;
 	}
 
 }