X-Git-Url: https://gerrit.simantics.org/r/gitweb?a=blobdiff_plain;f=org.simantics.interop.update%2Fscl%2FInterop%2FUpdate.scl;h=e2ee353fb7de1b589081b187e8e1d5f7d033d012;hb=910cc5b113065eea0b3785e3140bb89d0fc86dd8;hp=d4050330da1dcc37c467d0980de8ddabbdcfc7a2;hpb=b0205b09bbd81755eb69452eae0142d5a93f95a4;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 d405033..e2ee353 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,6 +35,9 @@ 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
   
@@ -93,7 +96,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,12 +113,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
+  
 
 importJava "org.simantics.interop.update.model.UpdateNode" where
   data UpdateNode
   
   @JavaName getResource
-  getNodeResource :: UpdateNode -> <Proc> Resource
+  getNodeResource :: UpdateNode -> <Proc> Maybe Resource
   
   @JavaName getStatus
   getNodeStatus :: UpdateNode -> <Proc> UpdateStatus
@@ -129,6 +141,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,6 +178,10 @@ importJava "org.simantics.interop.update.model.UpdateOp" where
   @JavaName isChange
   opIsChange :: UpdateOp -> <Proc> Boolean
   
+  @JavaName getResource
+  getOpResource :: UpdateOp -> <Proc> Maybe Resource
+  
+  
 importJava "org.simantics.interop.update.model.UpdateNode3" where
   data UpdateNode3
   
@@ -178,8 +197,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
@@ -215,13 +237,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