Working towards multiple readers.

[simantics/platform.git] / bundles / org.simantics.db.common / src / org / simantics / db / common / primitiverequest / ForEachAssertedObject.java

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 541aee94e10d31c50480f7a2508a3f432face183..6e0a3c0b5a6f126d8bde01fb739290adf844265f 100644 (file)
--- 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,50 +11,20 @@
  *******************************************************************************/
 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.ResourceRead2;
-import org.simantics.db.exception.DatabaseException;
+import org.simantics.db.common.request.ResourceAsyncMultiRead2;
 import org.simantics.db.procedure.AsyncMultiProcedure;
-import org.simantics.db.service.CollectionSupport;
-import org.simantics.utils.DataContainer;
 
-final public class ForEachAssertedObject extends ResourceRead2<Collection<Resource>> {
+final public class ForEachAssertedObject extends ResourceAsyncMultiRead2<Resource> {
 
     public ForEachAssertedObject(Resource subject, Resource relation) {
         super(subject, relation);
     }
 
        @Override
-       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;
+       public void perform(AsyncReadGraph graph, AsyncMultiProcedure<Resource> procedure) {
+               graph.forEachAssertedObject(resource, resource2, procedure);
        }
 
 }