Fixed regressions in box selection and element color function validation

[simantics/district.git] / org.simantics.district.network.ui / src / org / simantics / district / network / ui / function / Functions.java

diff --git a/org.simantics.district.network.ui/src/org/simantics/district/network/ui/function/Functions.java b/org.simantics.district.network.ui/src/org/simantics/district/network/ui/function/Functions.java
index 3aa6f2752cc04363acf417762d1e1ab680ea3ac7..cc9b336f69a796680b8fc8bd1c972900f9d35ece 100644 (file)
--- a/org.simantics.district.network.ui/src/org/simantics/district/network/ui/function/Functions.java
+++ b/org.simantics.district.network.ui/src/org/simantics/district/network/ui/function/Functions.java
@@ -601,10 +601,16 @@ public class Functions {
                 importEntry = graph.getPossibleURI(sclmain);
             }
         }
-        return new BrightnessExpressionValidator(
-                importEntry != null
-                ? Arrays.asList(importEntry)
-                : Collections.emptyList());
+        SCLContext ctx = SCLContext.getCurrent();
+        Object oldGraph = ctx.put("graph", graph);
+        try {
+            return new BrightnessExpressionValidator(
+                    importEntry != null
+                    ? Arrays.asList(importEntry)
+                    : Collections.emptyList());
+        } finally {
+            ctx.put("graph", oldGraph);
+        }
     }
 
     private static class BrightnessExpressionValidator implements Function1<String, String> {