Use RuntimeEnvironmentRequest2 where applicable

[simantics/platform.git] / bundles / org.simantics.modeling / src / org / simantics / modeling / scl / CompileSCLMonitorRequest.java

diff --git a/bundles/org.simantics.modeling/src/org/simantics/modeling/scl/CompileSCLMonitorRequest.java b/bundles/org.simantics.modeling/src/org/simantics/modeling/scl/CompileSCLMonitorRequest.java
index 10eeb6ac6aacce7255c510b848de59a4e55416b6..b9ec1affcd9871fa5a134c9c2d736f6f5d9ad53f 100644 (file)
--- a/bundles/org.simantics.modeling/src/org/simantics/modeling/scl/CompileSCLMonitorRequest.java
+++ b/bundles/org.simantics.modeling/src/org/simantics/modeling/scl/CompileSCLMonitorRequest.java
@@ -9,7 +9,7 @@ import org.simantics.db.common.request.ResourceRead;
 import org.simantics.db.exception.DatabaseException;
 import org.simantics.db.layer0.scl.AbstractExpressionCompilationContext;
 import org.simantics.db.layer0.scl.AbstractExpressionCompilationRequest;
-import org.simantics.db.layer0.util.RuntimeEnvironmentRequest;
+import org.simantics.db.layer0.util.RuntimeEnvironmentRequest2;
 import org.simantics.db.layer0.variable.Variable;
 import org.simantics.layer0.Layer0;
 import org.simantics.modeling.ComponentTypeSubstructure;
@@ -29,10 +29,14 @@ import org.simantics.scl.compiler.types.Type;
 import org.simantics.scl.runtime.SCLContext;
 import org.simantics.scl.runtime.function.Function1;
 import org.simantics.utils.datastructures.Pair;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 
 public class CompileSCLMonitorRequest extends AbstractExpressionCompilationRequest<CompilationContext, Variable> {
-    
+
+    private static Logger LOGGER = LoggerFactory.getLogger(CompileSCLMonitorRequest.class);
+
     protected static Name BROWSE = Name.create("Simantics/Variables", "browse");
     protected static Name VALUE = Name.create("Simantics/Variables", "value");
     
@@ -72,10 +76,8 @@ public class CompileSCLMonitorRequest extends AbstractExpressionCompilationReque
             sclContext.put("graph", graph);
             return exp.apply(context.getParent(graph));
         } catch (DatabaseException e) {
-            e.printStackTrace();
             throw (DatabaseException)e;
         } catch (Throwable t) {
-            t.printStackTrace();
             throw new DatabaseException(t);
         } finally {
             sclContext.put("graph", oldGraph);
@@ -98,7 +100,7 @@ public class CompileSCLMonitorRequest extends AbstractExpressionCompilationReque
             try {
                 return Environments.getType(context.runtimeEnvironment.getEnvironment(), valueType);
             } catch (SCLExpressionCompilationException e) {
-                e.printStackTrace();
+                LOGGER.warn("getExpectedType failed for valueType: " + valueType, e);
             }
         }
         return super.getExpectedType(graph, context);
@@ -112,7 +114,7 @@ public class CompileSCLMonitorRequest extends AbstractExpressionCompilationReque
             public CompilationContext perform(ReadGraph graph)
                     throws DatabaseException {
                 Resource indexRoot = graph.syncRequest(new IndexRoot(resource));
-                RuntimeEnvironment runtimeEnvironment = graph.syncRequest(new RuntimeEnvironmentRequest(indexRoot));
+                RuntimeEnvironment runtimeEnvironment = graph.syncRequest(new RuntimeEnvironmentRequest2(resource, indexRoot));
                 return new CompilationContext(runtimeEnvironment, ComponentTypeSubstructure.forType(graph, resource));
             }
         });