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=a6e9d6ab6818eba35ff09cd6ea5d0549bde1f0aa;hpb=8959bb33806d2252cdf09e42386afd242919630a;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 a6e9d6ab6..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;
@@ -583,6 +586,7 @@ public class Functions {
     	}
     }
 
+    @Deprecated
     public static AbstractEventHandler emptyOnClick(ReadGraph graph) throws DatabaseException {
         return new EventHandler() {
             @Override
@@ -592,6 +596,7 @@ public class Functions {
         };
     }
 
+    @Deprecated
     public static AbstractEventHandler writeEventHandler(ReadGraph graph, final Variable variable, final Function fn) {
 
     	final Session session = graph.getSession();
@@ -624,15 +629,11 @@ public class Functions {
 					            	return (String)response;
 					            }
 					            return null;
-					        } catch (Throwable t) {
-					            t.printStackTrace();
 					        } finally {
 					        	sclContext.put("graph", oldGraph);
 					        	sclContext.put(SCLReportingHandler.REPORTING_HANDLER, oldPrinter);
 					        }
 
-					        return null;
-
 					    }
 
 					});
@@ -649,6 +650,7 @@ public class Functions {
         };
     }
 
+    @Deprecated
     public static AbstractEventHandler readEventHandler(ReadGraph graph, final Variable variable, final Function fn) {
 
     	final Session session = graph.getSession();
@@ -681,15 +683,11 @@ public class Functions {
 					            	return (String)response;
 					            }
 					            return null;
-					        } catch (Throwable t) {
-					            t.printStackTrace();
 					        } finally {
 					        	sclContext.put("graph", oldGraph);
 					        	sclContext.put(SCLReportingHandler.REPORTING_HANDLER, oldPrinter);
 					        }
 
-					        return null;
-
 					    }
 
 					});
@@ -706,6 +704,7 @@ public class Functions {
         };
     }
 
+    @Deprecated
     public static AbstractEventHandler readEventHandler2(ReadGraph graph, final Function fn) {
 
     	final Session session = graph.getSession();
@@ -732,15 +731,11 @@ public class Functions {
 					            	return (CommandResult)response;
 					            }
 					            return null;
-					        } catch (Throwable t) {
-					            t.printStackTrace();
 					        } finally {
 					        	sclContext.put("graph", oldGraph);
 					        	sclContext.put(SCLReportingHandler.REPORTING_HANDLER, oldPrinter);
 					        }
 
-					        return null;
-
 					    }
 
 					});
@@ -764,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) {
 
@@ -830,10 +825,7 @@ public class Functions {
                 				Object oldGraph = sclContext.put("graph", graph);
                 				Object oldPrinter = sclContext.put(SCLReportingHandler.REPORTING_HANDLER, printer);
                 				try {
-                					Object response = fn.apply(parameters);
-                					return response;
-                				} catch (Throwable t) {
-                					return new org.simantics.document.server.serverResponse.Error(formatError(graph, t));
+                					return fn.apply(parameters);
                 				} finally {
                 					sclContext.put("graph", oldGraph);
                 					sclContext.put(SCLReportingHandler.REPORTING_HANDLER, oldPrinter);
@@ -854,10 +846,7 @@ public class Functions {
                 				Object oldPrinter = sclContext.put(SCLReportingHandler.REPORTING_HANDLER, printer);
 
                 				try {
-                					Object response = fn.apply(parameters);
-                					return response;
-                				} catch (Throwable t) {
-                					return new org.simantics.document.server.serverResponse.Error(formatError(graph, t));
+                					return fn.apply(parameters);
                 				} finally {
                 					sclContext.put("graph", oldGraph);
                 					sclContext.put(SCLReportingHandler.REPORTING_HANDLER, oldPrinter);
@@ -899,6 +888,7 @@ public class Functions {
         };
     }
 
+    @Deprecated
     public static AbstractEventHandler writeEventHandler2(ReadGraph graph, final Function fn) {
 
     	final Session session = graph.getSession();
@@ -925,15 +915,11 @@ public class Functions {
 					            	return (CommandResult)response;
 					            }
 					            return null;
-					        } catch (Throwable t) {
-					            t.printStackTrace();
 					        } finally {
 					        	sclContext.put("graph", oldGraph);
 					        	sclContext.put(SCLReportingHandler.REPORTING_HANDLER, oldPrinter);
 					        }
 
-					        return null;
-
 					    }
 
 					});
@@ -950,6 +936,8 @@ public class Functions {
         };
     }
 
+
+    @Deprecated
     public static AbstractEventHandler eventHandler2(ReadGraph graph, final Function fn) {
 
         return new AbstractEventHandler() {
@@ -969,14 +957,10 @@ public class Functions {
                 			return (CommandResult)response;
                 		}
                 		return null;
-                	} catch (Throwable t) {
-                		t.printStackTrace();
                 	} finally {
                 		sclContext.put(SCLReportingHandler.REPORTING_HANDLER, oldPrinter);
                 	}
 
-                	return null;
-
 				} catch (Throwable e) {
 					Logger.defaultLogError(e);
 					return new org.simantics.document.server.serverResponse.Error(e.getMessage()); 
@@ -987,6 +971,7 @@ public class Functions {
         };
     }
 
+    @Deprecated
     public static AbstractEventHandler eventHandler(ReadGraph graph, final Function fn) {
 
         return new AbstractEventHandler() {
@@ -1013,8 +998,6 @@ public class Functions {
 			            if(response instanceof String) {
 			            	result = (String)response;
 			            }
-			        } catch (Throwable t) {
-			            t.printStackTrace();
 			        } finally {
 			        	sclContext.put(SCLReportingHandler.REPORTING_HANDLER, oldPrinter);
 			        }
@@ -1167,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;
 
     	}
@@ -1181,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);
 
     }
 
@@ -1312,7 +1290,7 @@ public class Functions {
 
     public static String compileDocumentSCLValueExpression(ReadGraph graph, Variable context) {
         try {
-            ServerSCLValueRequest.compile(graph, context);
+            ServerSCLValueRequest.validate(graph, context);
             return "";
         } catch (Exception e) {
             return resolveIssueMessage(e);