Merge "Multiple reader thread support for db client"

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

diff --git a/bundles/org.simantics.db.impl/src/org/simantics/db/impl/ForEachObjectProcedure.java b/bundles/org.simantics.db.impl/src/org/simantics/db/impl/ForEachObjectProcedure.java
index 85790c4de02cbcce7b5b2d4b209a43ae6782625b..143d0a1868dc8b52be43ae91fff3b969b61a063b 100644 (file)
--- a/bundles/org.simantics.db.impl/src/org/simantics/db/impl/ForEachObjectProcedure.java
+++ b/bundles/org.simantics.db.impl/src/org/simantics/db/impl/ForEachObjectProcedure.java
@@ -1,12 +1,13 @@
 package org.simantics.db.impl;
 
-import org.simantics.db.AsyncReadGraph;
+import org.simantics.db.ReadGraph;
 import org.simantics.db.RelationInfo;
 import org.simantics.db.Resource;
+import org.simantics.db.exception.DatabaseException;
 import org.simantics.db.impl.query.QueryProcessor;
-import org.simantics.db.procedure.AsyncMultiProcedure;
+import org.simantics.db.procedure.SyncMultiProcedure;
 
-public final class ForEachObjectProcedure implements AsyncMultiProcedure<Resource> {
+public final class ForEachObjectProcedure implements SyncMultiProcedure<Resource> {
 
        public final int predicateKey;
        public final int[] clusterKey;
@@ -14,9 +15,9 @@ public final class ForEachObjectProcedure implements AsyncMultiProcedure<Resourc
        public final RelationInfo info;
        public final QueryProcessor processor;
        public final ClusterI.CompleteTypeEnum completeType;
-       private final AsyncMultiProcedure<Resource> user;
+       private final SyncMultiProcedure<Resource> user;
        
-       public ForEachObjectProcedure(int predicateKey, RelationInfo info, QueryProcessor processor, AsyncMultiProcedure<Resource> user) {
+       public ForEachObjectProcedure(int predicateKey, RelationInfo info, QueryProcessor processor, SyncMultiProcedure<Resource> user) {
                this.predicateKey = predicateKey;
                this.completeType = ClusterTraitsBase.getCompleteTypeFromResourceKey(predicateKey); 
                this.info = info;
@@ -27,17 +28,17 @@ public final class ForEachObjectProcedure implements AsyncMultiProcedure<Resourc
        }
        
        @Override
-       public void execute(AsyncReadGraph graph, Resource result) {
+       public void execute(ReadGraph graph, Resource result) throws DatabaseException {
                user.execute(graph, result);
        }
 
        @Override
-       public void finished(AsyncReadGraph graph) {
+       public void finished(ReadGraph graph) throws DatabaseException {
                user.finished(graph);
        }
 
        @Override
-       public void exception(AsyncReadGraph graph, Throwable throwable) {
+       public void exception(ReadGraph graph, Throwable throwable) throws DatabaseException {
                user.exception(graph, throwable);
        }