Variable support in SCLTest (BrowseContext)

Change-Id: I96386f74951a99171cf93bac1def922d3ed299b5

diff --git a/bundles/org.simantics.modeling.ontology/graph/ModelingViewpoint.pgraph b/bundles/org.simantics.modeling.ontology/graph/ModelingViewpoint.pgraph
index 35bfa3a379ee7339bc6b5127580becef890adebd..890d91a627b27867eb2528b50ce53cc7791a4b64 100644 (file)
--- a/bundles/org.simantics.modeling.ontology/graph/ModelingViewpoint.pgraph
+++ b/bundles/org.simantics.modeling.ontology/graph/ModelingViewpoint.pgraph
@@ -33,7 +33,7 @@ MOD.SCLDropAction <T ACT.Action
   --> MOD.SCLDropAction.action ==> "Resource -> Dynamic -> Integer -> <Proc> ()" <R L0.HasProperty : L0.FunctionalRelation 
 
 MOD.SCLTest <T VP.Test
-  --> MOD.SCLTest.test ==> "Resource -> <ReadGraph> Boolean" <R L0.HasProperty : L0.FunctionalRelation 
+  --> MOD.SCLTest.test /*==> "Resource -> <ReadGraph> Boolean"*/ <R L0.HasProperty : L0.FunctionalRelation
 
 // Legacy ModelingBrowseContext
 MBC = MOD.ModelingBrowseContext : VP.BrowseContext

diff --git a/bundles/org.simantics.modeling/src/org/simantics/modeling/adapters/SCLTest.java b/bundles/org.simantics.modeling/src/org/simantics/modeling/adapters/SCLTest.java
index 7f87f3cd9eee1c1856d7da554d1ebe64d28fdec1..b056f99a6fa532fb0d72c969d4fc8cc9ea07c2a1 100644 (file)
--- a/bundles/org.simantics.modeling/src/org/simantics/modeling/adapters/SCLTest.java
+++ b/bundles/org.simantics.modeling/src/org/simantics/modeling/adapters/SCLTest.java
@@ -36,7 +36,7 @@ public class SCLTest implements Test {
         Object oldGraph = sclContext.get("graph");
         try {
             sclContext.put("graph", graph);
-            Object value = test.apply((Resource)content);
+            Object value = test.apply(content);
             return (Boolean)value;
         } catch (Throwable t) {
                throw new DatabaseException(t);