X-Git-Url: https://gerrit.simantics.org/r/gitweb?a=blobdiff_plain;f=bundles%2Forg.simantics.document.server%2Fsrc%2Forg%2Fsimantics%2Fdocument%2Fserver%2FFunctions.java;h=66cc0047c3389fe4e559486c76f8eb52bf50a8ab;hb=8c8283a01e63980527d605936286747006bea601;hp=0a7e004f7dcab5e75740d176100c78d59c3dfb47;hpb=8a609b2a6559fef3d2f21224253d87c414473187;p=simantics%2Fplatform.git

diff --git a/bundles/org.simantics.document.server/src/org/simantics/document/server/Functions.java b/bundles/org.simantics.document.server/src/org/simantics/document/server/Functions.java
index 0a7e004f7..66cc0047c 100644
--- a/bundles/org.simantics.document.server/src/org/simantics/document/server/Functions.java
+++ b/bundles/org.simantics.document.server/src/org/simantics/document/server/Functions.java
@@ -68,6 +68,9 @@ import org.simantics.document.server.request.ServerSCLHandlerValueRequest;
 import org.simantics.document.server.request.ServerSCLValueRequest;
 import org.simantics.document.server.serverResponse.ServerResponse;
 import org.simantics.document.server.serverResponse.SuccessResponse;
+import org.simantics.document.server.state.StateNodeManager;
+import org.simantics.document.server.state.StateRealm;
+import org.simantics.document.server.state.StateSessionManager;
 import org.simantics.modeling.ModelingResources;
 import org.simantics.modeling.scl.SCLRealm;
 import org.simantics.modeling.scl.SCLSessionManager;
@@ -756,12 +759,12 @@ public class Functions {
 
         final List<TCon> effects = ServerSCLHandlerValueRequest.getEffects(graph, anyFunction);
 
-    	final Function1<CommandContext, CommandResult> fn = anyFunction.getValue(graph);
-        String expression = anyFunction.getPropertyValue(graph, "expression");
+    	Function1<CommandContext, CommandResult> fn = anyFunction.getValue(graph);
+        //String expression = anyFunction.getPropertyValue(graph, "expression");
 
     	final Session session = graph.getSession();
 
-        return new AbstractResponseHandler(expression) {
+        return new AbstractResponseHandler(fn) {
 
         	private String formatError(RequestProcessor proc, Throwable t) {
 
@@ -1147,11 +1150,6 @@ public class Functions {
 
     	} else {
 
-        	String id = sclStateKey(graph, base, self, ref);
-
-        	SCLRealm realm = SCLSessionManager.getOrCreateSCLRealm(base.getURI(graph) + "/__scl__");
-        	realm.getConnection().setVariable(id, getSCLType(defaultValue), defaultValue);
-
     		return defaultValue;
 
     	}
@@ -1161,9 +1159,9 @@ public class Functions {
 
     	String id = sclStateKey(graph, base, self, ref);
 
-    	SCLRealm realm = SCLSessionManager.getOrCreateSCLRealm(base.getURI(graph)+"/__scl__");
-    	realm.getConnection().setVariable(id, getSCLType(value), value);
-    	realm.refreshVariablesSync();
+		StateRealm realm = (StateRealm) StateSessionManager.getInstance().getOrCreateRealm(graph, base.getURI(graph)+"/__scl__");
+		StateNodeManager nodeManager = (StateNodeManager) realm.getNodeManager();
+		nodeManager.setState(id, value);
 
     }