From: Marko Luukkainen <marko.luukkainen@semantum.fi>
Date: Wed, 20 Feb 2019 17:14:33 +0000 (+0000)
Subject: Merge "Use STR.Component base type for resolving actual type."
X-Git-Tag: v1.43.0~136^2~192
X-Git-Url: https://gerrit.simantics.org/r/gitweb?a=commitdiff_plain;h=e2f997281a0eb7c0108000e5462659f5906d3e23;hp=162f92e52a7efa9fd0067666be6e9dfd28ec1e51;p=simantics%2Fplatform.git

Merge "Use STR.Component base type for resolving actual type."
---

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 9b5fc4586..970e6f9e8 100644
--- a/bundles/org.simantics.structural2/src/org/simantics/structural2/Functions.java
+++ b/bundles/org.simantics.structural2/src/org/simantics/structural2/Functions.java
@@ -562,8 +562,14 @@ public class Functions {
 	    		}
 	    		throw new DatabaseException("No type for " + variable.getURI(graph));
 	    	} else {
-	    	    Resource possibleType = graph.getPossibleType(represents, Layer0.getInstance(graph).Entity);
-	    	    if (graph.syncRequest(new IsInstanceOf(possibleType, StructuralResource2.getInstance(graph).ReplaceableDefinedComponentType), TransientCacheListener.instance()) ) {
+	    		StructuralResource2 STR = StructuralResource2.getInstance(graph);
+	    	    Resource possibleType = graph.getPossibleType(represents, STR.Component);
+	    	    if (possibleType == null) {
+	    	    	possibleType = graph.getPossibleType(represents, Layer0.getInstance(graph).Entity);
+	    	    	if (possibleType == null)
+	    	    		return null;
+	    	    }
+	    	    if (graph.syncRequest(new IsInstanceOf(possibleType, STR.ReplaceableDefinedComponentType), TransientCacheListener.instance()) ) {
 	    	        return graph.syncRequest(new StructuralOverrideDataWalkRequest(variable, represents, possibleType), TransientCacheListener.instance());
 	    	    } else {
 	    	        return null;
@@ -600,8 +606,8 @@ public class Functions {
 
 		@Override
 		public Variable getVariable(ReadGraph graph, Variable context, String name) throws DatabaseException {
-			
-			Resource type = context.getPossibleType(graph);
+			StructuralResource2 STR = StructuralResource2.getInstance(graph);
+			Resource type = context.getPossibleType(graph, STR.Component);
 			if(type == null) return null;
 		    
 			Tuple2 result = graph.syncRequest(new StructureTypeAndChildMapRequest(type), TransientCacheListener.instance());