Merge "Multiple reader thread support for db client"

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

diff --git a/bundles/org.simantics.db.impl/src/org/simantics/db/impl/ClusterI.java b/bundles/org.simantics.db.impl/src/org/simantics/db/impl/ClusterI.java
index d3b24eb3e42c0f0a355847c68a954e0beda5eb14..a82a7490f3e1f506051b794c7cc17d3bf91fa5a1 100644 (file)
--- a/bundles/org.simantics.db.impl/src/org/simantics/db/impl/ClusterI.java
+++ b/bundles/org.simantics.db.impl/src/org/simantics/db/impl/ClusterI.java
@@ -12,13 +12,13 @@
 package org.simantics.db.impl;
 
 import java.io.InputStream;
+import java.util.function.Consumer;
 
 import org.simantics.db.Resource;
 import org.simantics.db.exception.DatabaseException;
 import org.simantics.db.impl.graph.ReadGraphImpl;
-import org.simantics.db.procedure.AsyncMultiProcedure;
+import org.simantics.db.procedure.SyncMultiProcedure;
 import org.simantics.db.service.ClusterUID;
-import org.simantics.utils.datastructures.Callback;
 
 public interface ClusterI {
     public enum TypeEnum {
@@ -114,7 +114,7 @@ public interface ClusterI {
     public <C, T> int getSingleObject(int resourceKey, ForPossibleRelatedValueContextProcedure<C, T> procedure, ClusterSupport support)
     throws DatabaseException;
 
-    public void forObjects(ReadGraphImpl graph, int resourceKey, int predicateKey, AsyncMultiProcedure<Resource> procedure)
+    public void forObjects(ReadGraphImpl graph, int resourceKey, int predicateKey, SyncMultiProcedure<Resource> procedure)
     throws DatabaseException;
 
     public void forObjects(ReadGraphImpl graph, int resourceKey, ForEachObjectProcedure procedure)
@@ -210,7 +210,7 @@ public interface ClusterI {
     public void load()
     throws DatabaseException;
 
-    public void load(Callback<DatabaseException> callback);
+    public void load(Consumer<DatabaseException> callback);
     public void load(ClusterSupport session, Runnable callback);