X-Git-Url: https://gerrit.simantics.org/r/gitweb?a=blobdiff_plain;f=org.simantics.interop.update%2Fscl%2FInterop%2FUpdate.scl;h=9badee25eb79b25f14fc5bf64d4e51407bf747d1;hb=dc5ff213540b06b8cb88222837d573bff80abb3d;hp=e850b0521daeff179ed8af9348339fab45f0799c;hpb=820c9ca2c316976594e0a855e6e79563b0502845;p=simantics%2Finterop.git

diff --git a/org.simantics.interop.update/scl/Interop/Update.scl b/org.simantics.interop.update/scl/Interop/Update.scl
index e850b05..9badee2 100644
--- a/org.simantics.interop.update/scl/Interop/Update.scl
+++ b/org.simantics.interop.update/scl/Interop/Update.scl
@@ -21,13 +21,13 @@ importJava "org.simantics.interop.update.model.ModelUpdate" where
   applySelectedUpdates :: ModelUpdate -> <WriteGraph> ()
   
   @JavaName getUpdateTree2
-  getUpdateTree2 :: ModelUpdate -> <Proc> UpdateTree
+  getUpdateTree2 :: ModelUpdate -> <Proc> Maybe UpdateTree
   
   @JavaName getUpdateList2
-  getUpdateList2 :: ModelUpdate -> <Proc> UpdateList
+  getUpdateList2 :: ModelUpdate -> <Proc> Maybe UpdateList
   
   @JavaName getChanges2
-  getGraphChanges2 :: ModelUpdate -> <Proc> GraphChanges
+  getGraphChanges2 :: ModelUpdate -> <Proc> Maybe GraphChanges
   
   @JavaName getUpdateTree3
   getUpdateTree3 :: ModelUpdate -> <Proc> Maybe UpdateTree
@@ -35,11 +35,23 @@ importJava "org.simantics.interop.update.model.ModelUpdate" where
   @JavaName getUpdateList
   getUpdateList3 :: ModelUpdate -> <Proc> Maybe UpdateList
   
+  @JavaName getUpdateNode3
+  getUpdateNode3 :: ModelUpdate -> <Proc> Maybe UpdateNode3
+  
   @JavaName getChanges
   getGraphChanges3 :: ModelUpdate -> <Proc> Maybe GraphChanges
   
   @JavaName defaultSelections
   setDefaultSelections :: ModelUpdate -> <Proc>()
+
+importJava "org.simantics.interop.update.model.UpdateOperations" where
+  data UpdateOperations
+  
+  @JavaName getUpdateOp
+  getUpdateOpWithResource :: UpdateOperations -> Resource -> <Proc> Maybe UpdateOp
+  
+  @JavaName getUpdateOp
+  getUpdateOpWithStatement :: UpdateOperations -> Statement -> <Proc> Maybe UpdateOp
   
 importJava "org.simantics.interop.update.model.UpdateTree" where
   data UpdateTree
@@ -50,6 +62,9 @@ importJava "org.simantics.interop.update.model.UpdateTree" where
   @JavaName getNode
   getNode :: UpdateTree -> Resource -> <Proc> Maybe UpdateNode
   
+  @JavaName getUpdateOps
+  getUpdateOps :: UpdateTree -> <Proc> UpdateOperations
+  
 importJava "org.simantics.interop.update.model.UpdateList" where
   data UpdateList
   
@@ -93,7 +108,7 @@ importJava "org.simantics.interop.update.model.PropertyChange" where
   data PropertyChange
   
   @JavaName "<init>"
-  createPropertyChange :: GraphChanges -> Maybe Statement -> Maybe Statement -> <Proc> PropertyChange
+  createPropertyChange :: GraphChanges -> Resource -> Maybe Statement -> Resource -> Maybe Statement -> <Proc> PropertyChange
   
   @JavaName applied
   pcApplied :: PropertyChange -> <Proc> Boolean
@@ -110,6 +125,21 @@ importJava "org.simantics.interop.update.model.PropertyChange" where
   @JavaName getSecond
   getSecond :: PropertyChange -> <Proc> Maybe Statement
   
+  @JavaName getFirstSubject
+  getFirstSubject :: PropertyChange -> <Proc> Resource
+  
+  @JavaName getSecondSubject
+  getSecondSubject :: PropertyChange -> <Proc> Resource
+  
+  @JavaName isVisible  
+  pcVisible :: PropertyChange -> <Proc> Boolean
+  
+  @JavaName enabled  
+  pcEnabled :: PropertyChange -> <Proc> Boolean
+  
+  @JavaName setEnabled
+  pcEnable :: PropertyChange -> Boolean -> <Proc> ()
+  
 
 importJava "org.simantics.interop.update.model.UpdateNode" where
   data UpdateNode
@@ -129,6 +159,9 @@ importJava "org.simantics.interop.update.model.UpdateNode" where
   @JavaName getChildren
   getNodeChildren :: UpdateNode -> <Proc> [UpdateNode]
   
+  @JavaName isVisible
+  isNodeVisible :: UpdateNode -> <Proc> Boolean
+  
   
   
 importJava "org.simantics.interop.update.model.UpdateStatus" where
@@ -163,9 +196,13 @@ importJava "org.simantics.interop.update.model.UpdateOp" where
   @JavaName isChange
   opIsChange :: UpdateOp -> <Proc> Boolean
   
+  @JavaName enabled
+  opEnabled :: UpdateOp -> <Proc> Boolean
+  
   @JavaName getResource
   getOpResource :: UpdateOp -> <Proc> Maybe Resource
   
+  
 importJava "org.simantics.interop.update.model.UpdateNode3" where
   data UpdateNode3
   
@@ -181,8 +218,11 @@ importJava "org.simantics.interop.update.model.UpdateNode3" where
   @JavaName getChildren
   getNode3Children :: UpdateNode3 -> <Proc> [UpdateNode3]
   
-  @JavaName getCombinedTree
-  getCombinedTree :: ModelUpdate -> <Proc> UpdateNode3
+  @JavaName isVisible
+  isNode3Visible :: UpdateNode3 -> <Proc> Boolean
+  
+  //@JavaName getCombinedTree
+  //getCombinedTree :: ModelUpdate -> <Proc> UpdateNode3
   
 importJava "org.simantics.utils.datastructures.Pair" where
   data Pair
@@ -218,13 +258,12 @@ importJava "java.lang.Object" where
     data Object
     
     @JavaName getClass
-    getClass :: Object -> <Proc> Class
+    getClass :: Object -> <Proc> Class a
     
 importJava "java.lang.Class" where
-    data Class 
     
     @JavaName getName
-    getClassName :: Class -> <Proc> String
+    getClassName :: Class a -> <Proc> String
     
     @JavaName getSimpleName
-    getSimpleClassName :: Class -> <Proc> String
\ No newline at end of file
+    getSimpleClassName :: Class a -> <Proc> String