Use java.util.Consumer instead of os.utils.datastructures.Callback

[simantics/platform.git] / bundles / org.simantics.acorn / src / org / simantics / acorn / cluster / ClusterBig.java

diff --git a/bundles/org.simantics.acorn/src/org/simantics/acorn/cluster/ClusterBig.java b/bundles/org.simantics.acorn/src/org/simantics/acorn/cluster/ClusterBig.java
index f623d587f8d745907a86edf18fd1977fb5bfc894..1de4006a72e630482a22dd5390c39b2e411fb15b 100644 (file)
--- a/bundles/org.simantics.acorn/src/org/simantics/acorn/cluster/ClusterBig.java
+++ b/bundles/org.simantics.acorn/src/org/simantics/acorn/cluster/ClusterBig.java
@@ -15,7 +15,10 @@ import java.io.ByteArrayInputStream;
 import java.io.IOException;
 import java.io.InputStream;
 import java.util.Arrays;
+import java.util.function.Consumer;
 
+import org.simantics.acorn.exception.AcornAccessVerificationException;
+import org.simantics.acorn.exception.IllegalAcornStateException;
 import org.simantics.acorn.internal.ClusterChange;
 import org.simantics.acorn.internal.ClusterStream;
 import org.simantics.acorn.internal.ClusterSupport2;
@@ -50,7 +53,6 @@ import org.simantics.db.procore.cluster.PredicateTable;
 import org.simantics.db.procore.cluster.ResourceTable;
 import org.simantics.db.procore.cluster.ValueTable;
 import org.simantics.db.service.ClusterUID;
-import org.simantics.utils.datastructures.Callback;
 
 final public class ClusterBig extends ClusterImpl {
     private static final int TABLE_HEADER_SIZE = TableHeader.HEADER_SIZE + TableHeader.EXTRA_SIZE;
@@ -571,8 +573,11 @@ final public class ClusterBig extends ClusterImpl {
         try {
             return resourceTable.getValue(valueTable, resourceIndex);
         } catch (ExternalValueException e) {
-               return clusterSupport.impl.getResourceFile(clusterUID.asBytes(), resourceIndex);
-//            return support.getValueEx(resourceIndex, clusterUID.second);
+            try {
+                return clusterSupport.impl.getResourceFile(clusterUID.asBytes(), resourceIndex);
+            } catch (AcornAccessVerificationException | IllegalAcornStateException e1) {
+                throw new DatabaseException(e1);
+            }
         }
     }
     @Override
@@ -859,7 +864,7 @@ final public class ClusterBig extends ClusterImpl {
     }
 
     @Override
-    public void load(Callback<DatabaseException> r) {
+    public void load(Consumer<DatabaseException> r) {
         throw new Error("Not supported.");
     }