X-Git-Url: https://gerrit.simantics.org/r/gitweb?a=blobdiff_plain;f=bundles%2Forg.simantics.diagram%2Fsrc%2Forg%2Fsimantics%2Fdiagram%2Fsynchronization%2Fgraph%2FCopyAdvisorUtil.java;h=ab28463e84d5a8e3d3ae81af98b52f990393f167;hb=195c63dd5c7600170f594750de96793ebf06a0ad;hp=60d4c56aeaa54d9c5d0559dcea7b189d188e6a06;hpb=0ae2b770234dfc3cbb18bd38f324125cf0faca07;p=simantics%2Fplatform.git

diff --git a/bundles/org.simantics.diagram/src/org/simantics/diagram/synchronization/graph/CopyAdvisorUtil.java b/bundles/org.simantics.diagram/src/org/simantics/diagram/synchronization/graph/CopyAdvisorUtil.java
index 60d4c56ae..ab28463e8 100644
--- a/bundles/org.simantics.diagram/src/org/simantics/diagram/synchronization/graph/CopyAdvisorUtil.java
+++ b/bundles/org.simantics.diagram/src/org/simantics/diagram/synchronization/graph/CopyAdvisorUtil.java
@@ -15,7 +15,9 @@ import gnu.trove.map.hash.THashMap;
 
 import java.util.Map;
 import java.util.Set;
+import java.util.function.BiFunction;
 
+import org.eclipse.core.runtime.NullProgressMonitor;
 import org.simantics.databoard.Bindings;
 import org.simantics.databoard.binding.Binding;
 import org.simantics.databoard.type.Datatype;
@@ -44,7 +46,6 @@ import org.simantics.diagram.synchronization.SynchronizationHints;
 import org.simantics.graph.db.TransferableGraphs;
 import org.simantics.graph.representation.TransferableGraph1;
 import org.simantics.layer0.Layer0;
-import org.simantics.utils.datastructures.BinaryFunction;
 
 /**
  * This class contains utility methods for the basic cut/copy operations
@@ -223,7 +224,7 @@ public class CopyAdvisorUtil {
      * @return the copied resource
      * @throws DatabaseException
      */
-    public static Resource copy(WriteGraph graph, Resource source, BinaryFunction<Boolean, ReadGraph, Statement> advisor) throws DatabaseException {
+    public static Resource copy(WriteGraph graph, Resource source, BiFunction<ReadGraph, Statement, Boolean> advisor) throws DatabaseException {
         return copy(graph, source, 0, advisor, new THashMap<Object, Object>());
     }
 
@@ -238,11 +239,11 @@ public class CopyAdvisorUtil {
      * @return
      * @throws DatabaseException
      */
-    public static Resource copy(WriteGraph graph, Resource source, BinaryFunction<Boolean, ReadGraph, Statement> advisor, Map<Object, Object> copyMap) throws DatabaseException {
+    public static Resource copy(WriteGraph graph, Resource source, BiFunction<ReadGraph, Statement, Boolean> advisor, Map<Object, Object> copyMap) throws DatabaseException {
         return copy(graph, source, 0, advisor, copyMap);
     }
 
-    private static Resource copy(WriteGraph graph, Resource source, int level, BinaryFunction<Boolean, ReadGraph, Statement> advisor, Map<Object, Object> copyMap) throws DatabaseException {
+    private static Resource copy(WriteGraph graph, Resource source, int level, BiFunction<ReadGraph, Statement, Boolean> advisor, Map<Object, Object> copyMap) throws DatabaseException {
         if (DEBUG_COPY)
             System.out.println("[" + level + "] CopyAdvisorUtil.copy(" + NameUtils.getSafeName(graph, source) + ", advisor=" + advisor + ")");
 
@@ -320,7 +321,7 @@ public class CopyAdvisorUtil {
                 }
             } else {
                 if (advisor != null) {
-                    Boolean result = advisor.call(graph, stm);
+                    Boolean result = advisor.apply(graph, stm);
                     if (Boolean.TRUE.equals(result)) {
                         // Don't clone the object, just add relation to the same object.
                         if (inverse != null)
@@ -363,7 +364,7 @@ public class CopyAdvisorUtil {
      * @throws DatabaseException
      */
     public static Resource copy2(WriteGraph graph, Resource source,
-            BinaryFunction<StatementEvaluation, ReadGraph, Statement> advisor) throws DatabaseException {
+            BiFunction<ReadGraph, Statement, StatementEvaluation> advisor) throws DatabaseException {
         return copy2(graph, source, 0, advisor, new THashMap<Object, Object>());
     }
 
@@ -379,13 +380,13 @@ public class CopyAdvisorUtil {
      * @throws DatabaseException 
      */
     public static Resource copy2(WriteGraph graph, Resource source,
-            BinaryFunction<StatementEvaluation, ReadGraph, Statement> advisor, Map<Object, Object> copyMap)
+            BiFunction<ReadGraph, Statement, StatementEvaluation> advisor, Map<Object, Object> copyMap)
             throws DatabaseException {
         return copy2(graph, source, 0, advisor, copyMap);
     }
 
     private static Resource copy2(final WriteGraph graph, final Resource source, final int level,
-            BinaryFunction<StatementEvaluation, ReadGraph, Statement> advisor, Map<Object, Object> copyMap)
+            BiFunction<ReadGraph, Statement, StatementEvaluation> advisor, Map<Object, Object> copyMap)
     throws DatabaseException {
         if (DEBUG_COPY)
             System.out.println("[" + level + "] CopyAdvisorUtil.copy(" + NameUtils.getSafeName(graph, source) + ", advisor=" + advisor + ")");
@@ -536,7 +537,7 @@ public class CopyAdvisorUtil {
      * @throws DatabaseException
      */
     public static Resource copy3(WriteGraph graph, Resource source, Resource model,
-            BinaryFunction<StatementEvaluation, ReadGraph, Statement> advisor) throws DatabaseException {
+            BiFunction<ReadGraph, Statement, StatementEvaluation> advisor) throws DatabaseException {
         String modelURI = graph.getURI(model);
         return copy3(graph, modelURI, source, 0, advisor, new THashMap<Object, Object>());
     }
@@ -554,13 +555,13 @@ public class CopyAdvisorUtil {
      * @throws DatabaseException
      */
     public static Resource copy3(WriteGraph graph, Resource source, Resource model,
-            BinaryFunction<StatementEvaluation, ReadGraph, Statement> advisor, Map<Object, Object> copyMap) throws DatabaseException {
+            BiFunction<ReadGraph, Statement, StatementEvaluation> advisor, Map<Object, Object> copyMap) throws DatabaseException {
         String modelURI = graph.getURI(model);
         return copy3(graph, modelURI, source, 0, advisor, copyMap);
     }
 
     private static Resource copy3(WriteGraph graph, String modelURI, Resource source, int level,
-            BinaryFunction<StatementEvaluation, ReadGraph, Statement> advisor, Map<Object, Object> copyMap)
+            BiFunction<ReadGraph, Statement, StatementEvaluation> advisor, Map<Object, Object> copyMap)
     throws DatabaseException {
         if (DEBUG_COPY)
             System.out.println("[" + level + "] CopyAdvisorUtil.copy(" + NameUtils.getSafeName(graph, source) + ", advisor=" + advisor + ")");
@@ -698,10 +699,10 @@ public class CopyAdvisorUtil {
         return copy;
     }
 
-    protected static StatementEvaluation evaluate(ReadGraph graph, Statement stm, BinaryFunction<StatementEvaluation, ReadGraph, Statement> tester) {
+    protected static StatementEvaluation evaluate(ReadGraph graph, Statement stm, BiFunction<ReadGraph, Statement, StatementEvaluation> tester) {
         if (tester == null)
             return StatementEvaluation.USE_DEFAULT;
-        return tester.call(graph, stm);
+        return tester.apply(graph, stm);
     }
 
     /**
@@ -736,7 +737,7 @@ public class CopyAdvisorUtil {
      */
     public static Resource copy4(WriteGraph graph, Resource source, CopyHandler copyHandler) throws DatabaseException {
         SimanticsClipboardImpl builder = new SimanticsClipboardImpl();
-        copyHandler.copyToClipboard(graph, builder);
+        copyHandler.copyToClipboard(graph, builder, new NullProgressMonitor());
 
         for(Set<Representation> object : builder.getContents()) {
             TransferableGraph1 tg = ClipboardUtils.accept(graph, object, SimanticsKeys.KEY_TRANSFERABLE_GRAPH);