Merge changes I78c3a258,I7bf72f04

[simantics/platform.git] / bundles / org.simantics.scl.db / src / org / simantics / scl / db / SCLFunctions.java

diff --git a/bundles/org.simantics.scl.db/src/org/simantics/scl/db/SCLFunctions.java b/bundles/org.simantics.scl.db/src/org/simantics/scl/db/SCLFunctions.java
index d8f83e05f5b2f231bc5dcd14bf27bf93ff85ffdc..09022d543c1aba3e9101028c88ed939b72759963 100644 (file)
--- a/bundles/org.simantics.scl.db/src/org/simantics/scl/db/SCLFunctions.java
+++ b/bundles/org.simantics.scl.db/src/org/simantics/scl/db/SCLFunctions.java
@@ -123,7 +123,7 @@ public class SCLFunctions {
     }
 
     private static <T> T evaluate(RuntimeModule rm, String function, Object ... args) throws ValueNotFound {
-        return evaluate(resolveFunction(rm, function));
+        return evaluate(resolveFunction(rm, function), args);
     }
 
     public static <T> T evaluate(String module, String function, Object ... args) throws ValueNotFound {
@@ -151,7 +151,7 @@ public class SCLFunctions {
         }
     }
     
-    public static <T> T evaluateGraph(String module, String function, Object graph, Object ... args) throws DatabaseException {
+    public static <T> T evaluateGraph(String module, String function, ReadGraph graph, Object ... args) throws DatabaseException {
         final SCLContext context = SCLContext.getCurrent();
         SCLContext.push(context);
         Object oldGraph = context.put(GRAPH, graph);
@@ -163,7 +163,7 @@ public class SCLFunctions {
         }
     }
 
-    public static void runWithGraph(Object graph, Runnable r) {
+    public static void runWithGraph(ReadGraph graph, Runnable r) {
         final SCLContext context = SCLContext.getCurrent();
         SCLContext.push(context);
         Object oldGraph = context.put(GRAPH, graph);