X-Git-Url: https://gerrit.simantics.org/r/gitweb?p=simantics%2Fplatform.git;a=blobdiff_plain;f=bundles%2Forg.simantics.document.server%2Fsrc%2Forg%2Fsimantics%2Fdocument%2Fserver%2Frequest%2FServerSCLValueRequest.java;h=f9181d271073964b6082fef5119a679e8c371075;hp=25afd86893fd17a83475aa11f4ec9b2ea148ffb3;hb=7fe2a02ad295ec7406f44e8f86b7d25deedceb8b;hpb=596709570dae626a884ddfe0341af98c80241e82

diff --git a/bundles/org.simantics.document.server/src/org/simantics/document/server/request/ServerSCLValueRequest.java b/bundles/org.simantics.document.server/src/org/simantics/document/server/request/ServerSCLValueRequest.java
index 25afd8689..f9181d271 100644
--- a/bundles/org.simantics.document.server/src/org/simantics/document/server/request/ServerSCLValueRequest.java
+++ b/bundles/org.simantics.document.server/src/org/simantics/document/server/request/ServerSCLValueRequest.java
@@ -24,8 +24,10 @@ import org.simantics.scl.compiler.elaboration.expressions.EVariable;
 import org.simantics.scl.compiler.elaboration.expressions.Expression;
 import org.simantics.scl.compiler.elaboration.modules.SCLValue;
 import org.simantics.scl.compiler.environment.Environment;
+import org.simantics.scl.compiler.environment.Environments;
 import org.simantics.scl.compiler.environment.specification.EnvironmentSpecification;
 import org.simantics.scl.compiler.runtime.RuntimeEnvironment;
+import org.simantics.scl.compiler.top.SCLExpressionCompilationException;
 import org.simantics.scl.compiler.types.Type;
 import org.simantics.scl.compiler.types.Types;
 import org.simantics.scl.compiler.types.kinds.Kinds;
@@ -35,11 +37,14 @@ import org.simantics.structural2.scl.ComponentTypeProperty;
 import org.simantics.structural2.scl.FindPossibleComponentTypeRequest;
 import org.simantics.structural2.scl.ReadComponentTypeInterfaceRequest;
 import org.simantics.utils.datastructures.Pair;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 public class ServerSCLValueRequest extends AbstractExpressionCompilationRequest<CompilationContext, Variable> {
 
 	private final Pair<Resource,Resource> componentTypeAndRoot;
 	private final Resource literal;
+    protected String possibleExpectedValueType;
 
 	public static class CompilationContext extends AbstractExpressionCompilationContext {
 		public final Map<String, ComponentTypeProperty> propertyMap;
@@ -51,14 +56,15 @@ public class ServerSCLValueRequest extends AbstractExpressionCompilationRequest<
 		}
 	}
 
-	private ServerSCLValueRequest(Pair<Resource,Resource> componentTypeAndRoot, Resource literal) {
+	private ServerSCLValueRequest(Pair<Resource,Resource> componentTypeAndRoot, Resource literal, String possibleExpectedValueType) {
 		assert(literal != null);
 		this.literal = literal;
 		this.componentTypeAndRoot = componentTypeAndRoot;
+		this.possibleExpectedValueType = possibleExpectedValueType;
 	}
 
 	public ServerSCLValueRequest(ReadGraph graph, Variable context) throws DatabaseException {
-		this(getComponentTypeAndRoot(graph, context), context.getRepresents(graph));
+		this(getComponentTypeAndRoot(graph, context), context.getRepresents(graph), resolveExpectedValueType(graph, context));
 	}
 
 	private static Pair<Resource,Resource> getComponentTypeAndRoot(ReadGraph graph, Variable property)  throws DatabaseException {
@@ -80,8 +86,7 @@ public class ServerSCLValueRequest extends AbstractExpressionCompilationRequest<
 		SCLContext sclContext = SCLContext.getCurrent();
         Object oldGraph = sclContext.get("graph");
 		try {
-			Function1<Variable,Object> exp = graph.syncRequest(new ServerSCLValueRequest(graph, context),
-					TransientCacheListener.<Function1<Variable,Object>>instance());
+			Function1<Variable,Object> exp = compile(graph, context);
 			sclContext.put("graph", graph);
 			return exp.apply(context);
 		} catch (DatabaseException e) {
@@ -92,6 +97,10 @@ public class ServerSCLValueRequest extends AbstractExpressionCompilationRequest<
             sclContext.put("graph", oldGraph);
 		}
 	}
+	
+	public static Function1<Variable, Object> compile(ReadGraph graph, Variable context) throws DatabaseException {
+	    return graph.syncRequest(new ServerSCLValueRequest(graph, context), TransientCacheListener.<Function1<Variable,Object>>instance());
+	}
 
 	@Override
 	protected String getExpressionText(ReadGraph graph)
@@ -192,6 +201,12 @@ public class ServerSCLValueRequest extends AbstractExpressionCompilationRequest<
 		else
 			return null;
 	}
+	
+    @Override
+    protected Type getExpectedType(ReadGraph graph, CompilationContext context) throws DatabaseException {
+        return super.getExpectedType(graph, context);
+    }
+
 
 	@Override
 	public int hashCode() {
@@ -207,4 +222,29 @@ public class ServerSCLValueRequest extends AbstractExpressionCompilationRequest<
 		ServerSCLValueRequest other = (ServerSCLValueRequest)obj;
 		return literal.equals(other.literal) && componentTypeAndRoot.equals(other.componentTypeAndRoot);
 	}
+
+    public static Function1<Variable, Object> validate(ReadGraph graph, Variable context) throws DatabaseException {
+        return graph.syncRequest(new ServerSCLValueValidationRequest(graph, context), TransientCacheListener.<Function1<Variable,Object>>instance());
+    }
+    
+    public static class ServerSCLValueValidationRequest extends ServerSCLValueRequest {
+
+        private static final Logger LOGGER = LoggerFactory.getLogger(ServerSCLHandlerValueRequest.class);
+
+        public ServerSCLValueValidationRequest(ReadGraph graph, Variable context) throws DatabaseException {
+            super(graph, context);
+        }
+
+        @Override
+        protected Type getExpectedType(ReadGraph graph, CompilationContext context) throws DatabaseException {
+            if(possibleExpectedValueType != null) {
+                try {
+                    return Environments.getType(context.runtimeEnvironment.getEnvironment(), possibleExpectedValueType);
+                } catch (SCLExpressionCompilationException e) {
+                    LOGGER.error("Could not get type for " + String.valueOf(possibleExpectedValueType), e);
+                }
+            }
+            return super.getExpectedType(graph, context);
+        }
+    }
 }