Revert "Avoid duplicate evaluation of procedural component type requests" 37/3437/2
authorTuukka Lehtonen <tuukka.lehtonen@semantum.fi>
Fri, 1 Nov 2019 07:21:56 +0000 (07:21 +0000)
committerTuukka Lehtonen <tuukka.lehtonen@semantum.fi>
Fri, 1 Nov 2019 07:22:09 +0000 (07:22 +0000)
This reverts commit 45ddae414b7f632d52546c3c46b0f6d2b4ab37af.

The change seems to have broken existing products for unknown reasons.
Let's revert immediately and see what went wrong afterwards.

gitlab #408

Change-Id: I7deabcb0fd6982963d809e0549a1e4a66165e9bb

bundles/org.simantics.structural2/src/org/simantics/structural2/Functions.java

index 8bf4e3df68b6ac62dc30b2575ddb3eb75b1b9bf2..e43007637ac5ca616a89f33b3cc3f62247ad8fea 100644 (file)
@@ -50,7 +50,6 @@ import org.simantics.db.layer0.variable.Variable;
 import org.simantics.db.layer0.variable.VariableMap;
 import org.simantics.db.layer0.variable.VariableMapImpl;
 import org.simantics.db.layer0.variable.VariableNode;
-import org.simantics.db.layer0.variable.Variables;
 import org.simantics.db.service.CollectionSupport;
 import org.simantics.issues.common.IssueUtils;
 import org.simantics.layer0.Layer0;
@@ -333,11 +332,10 @@ public class Functions {
 
     public static List<SubstructureElement> getProceduralDesc(ReadGraph graph, final Variable context) throws DatabaseException {
         StructuralResource2 STR = StructuralResource2.getInstance(graph);
-        Variable config = Variables.getConfigurationVariable(graph, context);
-        final Resource type = config.getPossibleType(graph);
+        final Resource type = context.getPossibleType(graph);
         if(type != null) {
             if(graph.isInstanceOf(type, STR.ProceduralComponentType)) {
-                return graph.syncRequest(new SubstructureRequest(config));
+                return graph.syncRequest(new SubstructureRequest(context));
             }
         }
         return null;