UCs can have their own SCLModule definitions

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

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 246acfdec72236a9640e7c3b3f0d27ded78b29f8..d9c5a0103c1ab20f121a917e5f7cfe9fd090a5bf 100644 (file)
--- 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
@@ -12,6 +12,7 @@ import org.simantics.db.exception.DatabaseException;
 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.request.ServerSCLValueRequest.CompilationContext;\r
 import org.simantics.layer0.Layer0;\r
@@ -100,8 +101,8 @@ public class ServerSCLValueRequest extends AbstractExpressionCompilationRequest<
                return graph.getRelatedValue(literal, L0.SCLValue_expression, Bindings.STRING);\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
@@ -116,7 +117,7 @@ public class ServerSCLValueRequest extends AbstractExpressionCompilationRequest<
                        @Override\r
                        public CompilationContext perform(ReadGraph graph)\r
                                        throws DatabaseException {\r
-                               RuntimeEnvironment runtimeEnvironment = graph.syncRequest(getRuntimeEnvironmentRequest(parameter.second));\r
+                               RuntimeEnvironment runtimeEnvironment = graph.syncRequest(getRuntimeEnvironmentRequest(parameter.first, parameter.second));\r
                                Map<String, ComponentTypeProperty> propertyMap =\r
                                                graph.syncRequest(new ReadComponentTypeInterfaceRequest(parameter.first, runtimeEnvironment.getEnvironment()),\r
                                                                TransientCacheListener.<Map<String, ComponentTypeProperty>>instance());\r