[core.genmodel] adding subsystems to list in root

also in the presence of a logical system

1 files changed, 5 insertions, 2 deletions

diff --git a/plugins/org.eclipse.etrice.core.genmodel/src/org/eclipse/etrice/core/genmodel/builder/GeneratorModelBuilder.java b/plugins/org.eclipse.etrice.core.genmodel/src/org/eclipse/etrice/core/genmodel/builder/GeneratorModelBuilder.java
index cbc4f37c4..8d75a1c9a 100644
--- a/plugins/org.eclipse.etrice.core.genmodel/src/org/eclipse/etrice/core/genmodel/builder/GeneratorModelBuilder.java
+++ b/plugins/org.eclipse.etrice.core.genmodel/src/org/eclipse/etrice/core/genmodel/builder/GeneratorModelBuilder.java
@@ -147,7 +147,9 @@ public class GeneratorModelBuilder {
 			for (RoomModel mdl : models) {

 				for (LogicalSystem sys : mdl.getSystems()) {

 					hasSystem = true;

-					root.getSystemInstances().add(createLogicalSystemInstance(sys));

+					SystemInstance si = createLogicalSystemInstance(sys);

+					root.getSystemInstances().add(si);

+					root.getSubSystemInstances().addAll(si.getInstances());

 				}

 			}

 			

@@ -433,7 +435,8 @@ public class GeneratorModelBuilder {
 		instance.setLogicalSystem(sys);

 		

 		for (SubSystemRef sr : sys.getSubSystems()) {

-			instance.getInstances().add(createSubSystemInstance(instance, sr));

+			SubSystemInstance ssi = createSubSystemInstance(instance, sr);

+			instance.getInstances().add(ssi);

 		}

 		

 		return instance;