X-Git-Url: https://gerrit.simantics.org/r/gitweb?p=simantics%2Fplatform.git;a=blobdiff_plain;f=bundles%2Forg.simantics.structural2%2Fsrc%2Forg%2Fsimantics%2Fstructural2%2FFunctions.java;h=e9bb272d3d4442d07184c2bed0437a63f67a5562;hp=970e6f9e813dc710545aeed3d6c0ee1c6cf234cd;hb=HEAD;hpb=e2f997281a0eb7c0108000e5462659f5906d3e23

diff --git a/bundles/org.simantics.structural2/src/org/simantics/structural2/Functions.java b/bundles/org.simantics.structural2/src/org/simantics/structural2/Functions.java
index 970e6f9e8..e9bb272d3 100644
--- a/bundles/org.simantics.structural2/src/org/simantics/structural2/Functions.java
+++ b/bundles/org.simantics.structural2/src/org/simantics/structural2/Functions.java
@@ -635,8 +635,8 @@ public class Functions {
 
 		@Override
 		public Map<String, Variable> getVariables(ReadGraph graph, Variable context, Map<String, Variable> map) throws DatabaseException {
-			
-			Resource type = context.getPossibleType(graph);
+			StructuralResource2 STR = StructuralResource2.getInstance(graph);
+			Resource type = context.getPossibleType(graph, STR.Component);
 			if(type == null) return null;
 			
 			StructuralComponentClass clazz = StructuralComponentClass.get(graph, type);
@@ -653,7 +653,6 @@ public class Functions {
             	}
             	return map;
 			} else if (StructuralComponentClass.DEFINED.equals(clazz)) {
-				StructuralResource2 STR = StructuralResource2.getInstance(graph);
 				Resource def = graph.getSingleObject(type, STR.IsDefinedBy);
                 Map<String, Resource> children = graph.syncRequest(new UnescapedChildMapOfResource(def), TransientCacheListener.instance());
                 return StandardChildDomainChildren.getStandardChildDomainChildVariables(graph, context, children, map);
@@ -749,7 +748,7 @@ public class Functions {
 
 		for(Resource req : requiredConnections) {
 			if(!connections.contains(req)) {
-				result.add(new StandardIssue(sr.ConnectionConstraint_ErrorIssue, component, req));
+				result.add(new StandardIssue(sr.ConnectionValidationConstraint_ErrorIssue, component, req));
 			}
 		}