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%2FServerSCLHandlerValueRequest.java;h=286cae2728c9f12660c71e5fe2dc38b934dd0568;hp=2071b8323646596c9fa86c0d1c0fc734a9773b95;hb=66a5745bfefb159ce9d959bc29cbf148614e6fae;hpb=a516cf32592cf470cfc3f6ff96ee8b5168bd7a43

diff --git a/bundles/org.simantics.document.server/src/org/simantics/document/server/request/ServerSCLHandlerValueRequest.java b/bundles/org.simantics.document.server/src/org/simantics/document/server/request/ServerSCLHandlerValueRequest.java
index 2071b8323..286cae272 100644
--- a/bundles/org.simantics.document.server/src/org/simantics/document/server/request/ServerSCLHandlerValueRequest.java
+++ b/bundles/org.simantics.document.server/src/org/simantics/document/server/request/ServerSCLHandlerValueRequest.java
@@ -22,8 +22,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.TCon;
 import org.simantics.scl.compiler.types.Type;
 import org.simantics.scl.compiler.types.Types;
@@ -34,12 +36,17 @@ 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 ServerSCLHandlerValueRequest extends AbstractExpressionCompilationRequest<CompilationContext, Variable> {
 
+    private static final Logger LOGGER = LoggerFactory.getLogger(ServerSCLHandlerValueRequest.class);
+
 	private final Variable context;
 	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,15 +58,16 @@ public class ServerSCLHandlerValueRequest extends AbstractExpressionCompilationR
 		}
 	}
 
-	private ServerSCLHandlerValueRequest(Variable context, Pair<Resource,Resource> componentTypeAndRoot, Resource literal) {
+	private ServerSCLHandlerValueRequest(Variable context, Pair<Resource,Resource> componentTypeAndRoot, Resource literal, String possibleExpectedValueType) {
 		assert(literal != null);
 		this.context = context;
 		this.literal = literal;
 		this.componentTypeAndRoot = componentTypeAndRoot;
+		this.possibleExpectedValueType = possibleExpectedValueType;
 	}
 
 	public ServerSCLHandlerValueRequest(ReadGraph graph, Variable context) throws DatabaseException {
-		this(context, getComponentTypeAndRoot(graph, context), context.getRepresents(graph));
+		this(context, getComponentTypeAndRoot(graph, context), context.getRepresents(graph), resolveExpectedValueType(graph, context));
 	}
 
 	private static Pair<Resource,Resource> getComponentTypeAndRoot(ReadGraph graph, Variable property)  throws DatabaseException {
@@ -220,6 +228,19 @@ public class ServerSCLHandlerValueRequest extends AbstractExpressionCompilationR
 			return null;
 	}
 
+    @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);
+    }
+
+
 	@Override
 	public int hashCode() {
 		final int prime = 31;