Merge branch 'change/300/2'

[simantics/python.git] / org.simantics.pythonlink / src / org / simantics / pythonlink / PythonContext.java

diff --git a/org.simantics.pythonlink/src/org/simantics/pythonlink/PythonContext.java b/org.simantics.pythonlink/src/org/simantics/pythonlink/PythonContext.java
index ecf925d9bfc9c358a72e5b5303b6bbf315f1a7b4..16b02348196b4326f70f4475173a94677928c433 100644 (file)
--- a/org.simantics.pythonlink/src/org/simantics/pythonlink/PythonContext.java
+++ b/org.simantics.pythonlink/src/org/simantics/pythonlink/PythonContext.java
@@ -13,6 +13,8 @@ import org.simantics.databoard.Bindings;
 import org.simantics.databoard.binding.Binding;
 import org.simantics.databoard.binding.error.BindingException;
 import org.simantics.databoard.binding.mutable.Variant;
+import org.simantics.scl.runtime.SCLContext;
+import org.simantics.scl.runtime.reporting.SCLReportingHandler;
 
 public class PythonContext implements Closeable {
     private long contextID;
@@ -75,7 +77,14 @@ public class PythonContext implements Closeable {
     }
     
     public void executePythonStatement(String statement) {
-        execute(() -> executePythonStatementImpl( contextID, statement ));
+       SCLContext sclContext = SCLContext.getCurrent();
+       
+        execute(() -> {
+               SCLContext.push(sclContext);
+               executePythonStatementImpl( contextID, statement );
+               SCLContext.pop();
+        });
+        
        for (Listener l : listeners) { l.updated(null); }
     }