UCs can have their own SCLModule definitions

[simantics/platform.git] / bundles / org.simantics.document.server / src / org / simantics / document / server / request / ServerSCLHandlerValueRequest.java

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 ca82be6c94ee53d624fdcb539573186602cb962e..12a4e017a3bffc3ff60253befba71b98ddd7fc8c 100644 (file)
--- 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
@@ -13,7 +13,7 @@ import org.simantics.db.exception.DatabaseException;
 import org.simantics.db.layer0.request.VariableRead;\r
 import org.simantics.db.layer0.scl.AbstractExpressionCompilationContext;\r
 import org.simantics.db.layer0.scl.AbstractExpressionCompilationRequest;\r
-import org.simantics.db.layer0.util.RuntimeEnvironmentRequest;\r
+import org.simantics.db.layer0.util.RuntimeEnvironmentRequest2;\r
 import org.simantics.db.layer0.variable.Variable;\r
 import org.simantics.document.server.Functions;\r
 import org.simantics.document.server.bean.DataDefinition;\r
@@ -120,8 +120,8 @@ public class ServerSCLHandlerValueRequest extends AbstractExpressionCompilationR
                return "\\context -> " + exp;\r
        }\r
 \r
-       protected RuntimeEnvironmentRequest getRuntimeEnvironmentRequest(Resource indexRoot) {\r
-               return new RuntimeEnvironmentRequest(indexRoot) {\r
+       protected RuntimeEnvironmentRequest2 getRuntimeEnvironmentRequest(Resource componentType, Resource indexRoot) {\r
+               return new RuntimeEnvironmentRequest2(componentType, indexRoot) {\r
                        @Override\r
                        protected void fillEnvironmentSpecification(\r
                                        EnvironmentSpecification environmentSpecification) {\r
@@ -138,7 +138,7 @@ public class ServerSCLHandlerValueRequest extends AbstractExpressionCompilationR
                        public CompilationContext perform(ReadGraph graph) throws DatabaseException {\r
                                \r
                                Pair<Resource,Resource> parameter = getComponentTypeAndRoot(graph, variable);\r
-                               RuntimeEnvironment runtimeEnvironment = graph.syncRequest(getRuntimeEnvironmentRequest(parameter.second));\r
+                               RuntimeEnvironment runtimeEnvironment = graph.syncRequest(getRuntimeEnvironmentRequest(parameter.first, parameter.second));\r
                                \r
                                Map<String, ComponentTypeProperty> propertyMap =\r
                                                graph.syncRequest(new ReadComponentTypeInterfaceRequest(parameter.first, runtimeEnvironment.getEnvironment()),\r