X-Git-Url: https://gerrit.simantics.org/r/gitweb?a=blobdiff_plain;f=bundles%2Forg.simantics.document.server%2Fsrc%2Forg%2Fsimantics%2Fdocument%2Fserver%2Frequest%2FServerSCLHandlerValueRequest.java;h=4a4164303613c1a2c9d963693804d727305cdb2a;hb=refs%2Fchanges%2F30%2F1830%2F5;hp=eb268174040df793f08a49efc2d5476a3dbe2be1;hpb=0ae2b770234dfc3cbb18bd38f324125cf0faca07;p=simantics%2Fplatform.git

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 eb2681740..4a4164303 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
@@ -1,6 +1,5 @@
 package org.simantics.document.server.request;
 
-import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 
@@ -15,15 +14,10 @@ import org.simantics.db.layer0.scl.AbstractExpressionCompilationContext;
 import org.simantics.db.layer0.scl.AbstractExpressionCompilationRequest;
 import org.simantics.db.layer0.util.RuntimeEnvironmentRequest2;
 import org.simantics.db.layer0.variable.Variable;
-import org.simantics.document.server.Functions;
-import org.simantics.document.server.bean.DataDefinition;
 import org.simantics.document.server.request.ServerSCLHandlerValueRequest.CompilationContext;
 import org.simantics.layer0.Layer0;
-import org.simantics.scl.compiler.constants.StringConstant;
 import org.simantics.scl.compiler.elaboration.expressions.EApply;
 import org.simantics.scl.compiler.elaboration.expressions.EConstant;
-import org.simantics.scl.compiler.elaboration.expressions.ELiteral;
-import org.simantics.scl.compiler.elaboration.expressions.EVar;
 import org.simantics.scl.compiler.elaboration.expressions.EVariable;
 import org.simantics.scl.compiler.elaboration.expressions.Expression;
 import org.simantics.scl.compiler.elaboration.modules.SCLValue;
@@ -46,6 +40,7 @@ public class ServerSCLHandlerValueRequest extends AbstractExpressionCompilationR
 	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;
@@ -57,15 +52,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 {
@@ -226,6 +222,11 @@ public class ServerSCLHandlerValueRequest extends AbstractExpressionCompilationR
 			return null;
 	}
 
+    @Override
+    protected Type getExpectedType(ReadGraph graph, CompilationContext context) throws DatabaseException {
+        return super.getExpectedType(graph, context);
+    }
+
 	@Override
 	public int hashCode() {
 		final int prime = 31;