Clear for single functions + include interop.scl in the build

gilab #13

Change-Id: I2b1e0e1b3c4c41b902e5e95cc667651275d9e200

diff --git a/org.simantics.interop.scl/scl/Interop/FunctionRegistry.scl b/org.simantics.interop.scl/scl/Interop/FunctionRegistry.scl
index 9d707cfdb5fe768b8510587d62d031f53d50a9c9..bdba0e3c46db34ade61473e89ddd1149b071fa76 100644 (file)
--- a/org.simantics.interop.scl/scl/Interop/FunctionRegistry.scl
+++ b/org.simantics.interop.scl/scl/Interop/FunctionRegistry.scl
@@ -19,4 +19,15 @@ importJava "org.simantics.interop.scl.FunctionRegistry" where
   clear :: a -> <Proc> ()
   
   @JavaName clear
-  clearName :: a -> String -> <Proc> ()
\ No newline at end of file
+  clearName :: a -> String -> <Proc> ()
+  
+  @JavaName clear
+  clearFunction :: a -> String -> (f -> <Proc>()) -> <Proc> ()
+  @JavaName clear
+  clearFunction1 :: a -> String -> (f -> b -> <Proc>()) -> <Proc> ()
+  @JavaName clear
+  clearFunction2 :: a -> String -> (f -> b -> c -> <Proc>()) -> <Proc> ()
+  @JavaName clear
+  clearFunction3 :: a -> String -> (f -> b -> c -> d -> <Proc>()) -> <Proc> ()
+  @JavaName clear
+  clearFunction4 :: a -> String -> (f -> b -> c -> d -> e -> <Proc>()) -> <Proc> ()
\ No newline at end of file

diff --git a/org.simantics.interop.scl/src/org/simantics/interop/scl/FunctionRegistry.java b/org.simantics.interop.scl/src/org/simantics/interop/scl/FunctionRegistry.java
index 003a50ad8488a1fbcf237deb401acdeb7d4fa5fe..efabdaa6065924e1fcc49f88e852b607b1dcf3e6 100644 (file)
--- a/org.simantics.interop.scl/src/org/simantics/interop/scl/FunctionRegistry.java
+++ b/org.simantics.interop.scl/src/org/simantics/interop/scl/FunctionRegistry.java
@@ -78,5 +78,12 @@ public class FunctionRegistry {
         fmap.remove(name);
     }
     
+    public static void clear(Object key, String name,Function f) {
+        MapList<String, Function> fmap = map.get(key);
+        if (fmap == null)
+            return;
+        fmap.remove(name,f);
+    }
+    
 
 }

diff --git a/pom.xml b/pom.xml
index 8ca9be564f33f4df237a1d854b7996150de5df64..be0c16ebc8f0a5523a2be16cfcf5045829d7404f 100644 (file)
--- a/pom.xml
+++ b/pom.xml
@@ -66,6 +66,7 @@
                <module>org.simantics.xml.sax.base</module>
                <module>org.simantics.xml.sax.ontology</module>
                <module>org.simantics.xml.sax.ui</module>
+               <module>org.simantics.interop.scl</module>
 
                <module>org.simantics.excel.poi.feature</module>
                <module>org.simantics.interop.feature</module>