Three-way comparison

[simantics/interop.git] / org.simantics.interop.update / scl / Interop / Update.scl

diff --git a/org.simantics.interop.update/scl/Interop/Update.scl b/org.simantics.interop.update/scl/Interop/Update.scl
index 06e778540c47b40830c77ecb527cba92074bde60..1498a864737a84e9b43f879c8542c5dec8c24d11 100644 (file)
--- a/org.simantics.interop.update/scl/Interop/Update.scl
+++ b/org.simantics.interop.update/scl/Interop/Update.scl
@@ -20,6 +20,24 @@ importJava "org.simantics.interop.update.model.ModelUpdate" where
   @JavaName applySelected
   applySelectedUpdates :: ModelUpdate -> <WriteGraph> ()
   
+  @JavaName getUpdateTree2
+  getUpdateTree2 :: ModelUpdate -> <Proc> UpdateTree
+  
+  @JavaName getUpdateList2
+  getUpdateList2 :: ModelUpdate -> <Proc> UpdateList
+  
+  @JavaName getChanges2
+  getGraphChanges2 :: ModelUpdate -> <Proc> GraphChanges
+  
+  @JavaName getUpdateTree3
+  getUpdateTree3 :: ModelUpdate -> <Proc> Maybe UpdateTree
+  
+  @JavaName getUpdateList
+  getUpdateList3 :: ModelUpdate -> <Proc> Maybe UpdateList
+  
+  @JavaName getChanges
+  getGraphChanges3 :: ModelUpdate -> <Proc> Maybe GraphChanges
+  
 importJava "org.simantics.interop.update.model.UpdateTree" where
   data UpdateTree
   
@@ -114,6 +132,24 @@ importJava "org.simantics.interop.update.model.UpdateOp" where
   @JavaName isChange
   opIsChange :: UpdateOp -> <Proc> Boolean
   
+importJava "org.simantics.interop.update.model.UpdateNode3" where
+  data UpdateNode3
+  
+  @JavaName getUn1
+  getNode1 :: UpdateNode3 -> <Proc> Maybe UpdateNode
+  
+  @JavaName getUn2
+  getNode2 :: UpdateNode3 -> <Proc> Maybe UpdateNode
+  
+  @JavaName getUn3
+  getNode3 :: UpdateNode3 -> <Proc> Maybe UpdateNode
+  
+  @JavaName getChildren
+  getNode3Children :: UpdateNode3 -> <Proc> [UpdateNode3]
+  
+  @JavaName getCombinedTree
+  getCombinedTree :: ModelUpdate -> <Proc> UpdateNode3
+  
 importJava "org.simantics.utils.datastructures.Pair" where
   data Pair