From 17a70711724bbf8ba37f163fc611ba4f33380f94 Mon Sep 17 00:00:00 2001 From: jsimomaa Date: Thu, 16 Oct 2014 08:25:43 +0000 Subject: [PATCH] Merged trunk@30110, @30126, @30139, @30147, @30190, @30206, @30230, @30233 to branches/sysdyn-1.8 on 2014-10-16 for 1.8.2 release. refs #5178 refs #5197 refs #5227 refs #5261 refs #5278 refs #5275 git-svn-id: https://www.simantics.org/svn/simantics/sysdyn/branches/1.8@30426 ac1ea38d-2e2b-0410-8846-a27921b304fc --- .../src/org/simantics/sysdyn/manager/SysdynExperiments.java | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/org.simantics.sysdyn/src/org/simantics/sysdyn/manager/SysdynExperiments.java b/org.simantics.sysdyn/src/org/simantics/sysdyn/manager/SysdynExperiments.java index 5c7ac3de..7bf5b1ff 100644 --- a/org.simantics.sysdyn/src/org/simantics/sysdyn/manager/SysdynExperiments.java +++ b/org.simantics.sysdyn/src/org/simantics/sysdyn/manager/SysdynExperiments.java @@ -154,13 +154,9 @@ public class SysdynExperiments { } private static void processChild(ReadGraph graph, Variable child, PartialIC IC) throws DatabaseException { -<<<<<<< .working -======= - StructuralResource2 STR = StructuralResource2.getInstance(graph); - ->>>>>>> .merge-right.r30389 + for(Variable c : child.getChildren(graph)) { Resource type = c.getPossibleType(graph); if(type == null) continue; -- 2.47.1