X-Git-Url: https://gerrit.simantics.org/r/gitweb?a=blobdiff_plain;f=org.simantics.interop.update%2Fscl%2FInterop%2FUpdate.scl;h=e2ee353fb7de1b589081b187e8e1d5f7d033d012;hb=c276677539e2b4111a072a2e6f6c4e8aa3e65b30;hp=1498a864737a84e9b43f879c8542c5dec8c24d11;hpb=904106737f8068e02fe8e43dd258e93bae3a71c8;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 1498a86..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,9 +35,15 @@ 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.UpdateTree" where
   data UpdateTree
   
@@ -51,19 +57,25 @@ importJava "org.simantics.interop.update.model.UpdateList" where
   data UpdateList
   
   @JavaName getChanges
-  getListChanges :: UpdateList -> <Proc> [Pair]
+  getListChanges :: UpdateList -> <Proc> [PropertyChange]
   
   @JavaName getSelected
-  getListSelected :: UpdateList -> <Proc> MSet.T Pair
+  getListSelected :: UpdateList -> <Proc> [PropertyChange]
+  
+  @JavaName getChanges
+  getResChanges :: UpdateList -> Resource -> <ReadGraph> [PropertyChange]
   
-  @JavaName addSelected
-  addListSelected :: UpdateList -> Pair -> <Proc>()
+  @JavaName getChange
+  getStmChange :: UpdateList -> Statement -> <ReadGraph> Maybe PropertyChange
   
-  @JavaName removeSelected
-  removeListSelected :: UpdateList -> Pair -> <Proc>()
+  //@JavaName addSelected
+  //addListSelected :: UpdateList -> Pair -> <Proc>()
   
-  @JavaName isSelected
-  isListSelected :: UpdateList -> Pair -> <Proc> Boolean
+  //@JavaName removeSelected
+  //removeListSelected :: UpdateList -> Pair -> <Proc>()
+  
+  //@JavaName isSelected
+  //isListSelected :: UpdateList -> Pair -> <Proc> Boolean
   
 importJava "org.simantics.interop.test.GraphChanges" where
   data GraphChanges
@@ -79,12 +91,43 @@ importJava "org.simantics.interop.test.GraphChanges" where
   
   @JavaName getModifications
   getModifications :: GraphChanges -> <Proc> [Pair]
+
+importJava "org.simantics.interop.update.model.PropertyChange" where
+  data PropertyChange
   
+  @JavaName "<init>"
+  createPropertyChange :: GraphChanges -> Resource -> Maybe Statement -> Resource -> Maybe Statement -> <Proc> PropertyChange
+  
+  @JavaName applied
+  pcApplied :: PropertyChange -> <Proc> Boolean
+  
+  @JavaName selected
+  pcSelected :: PropertyChange -> <Proc> Boolean
+  
+  @JavaName "select"
+  pcSelect :: PropertyChange -> Boolean -> <Proc> Boolean
+  
+  @JavaName getFirst
+  getFirst :: PropertyChange -> <Proc> Maybe Statement
+  
+  @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
@@ -98,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
@@ -132,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
   
@@ -147,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
@@ -157,10 +210,10 @@ importJava "org.simantics.utils.datastructures.Pair" where
   createPair :: Maybe a -> Maybe b -> <Proc> Pair
   
   @JavaName first
-  getFirst :: Pair -> <Proc> Maybe a
+  getPairFirst :: Pair -> <Proc> Maybe a
   
   @JavaName second
-  getSecond :: Pair -> <Proc> Maybe b
+  getPairSecond :: Pair -> <Proc> Maybe b
   
 importJava "org.simantics.utils.datastructures.BijectionMap" where
   data BijectionMap 
@@ -184,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