From 81f5a744f74c664952750abd74b306f5c84fad89 Mon Sep 17 00:00:00 2001 From: Juergen Haug Date: Thu, 8 Nov 2012 16:51:16 +0100 Subject: [CQ 6485][generator, tests] update models, fix Change-Id: I2489ae62595265e5d7c8ef91d833b86bde485cc3 --- .../generator/config/util/DataConfigurationHelper.java | 16 ++++++++++------ 1 file changed, 10 insertions(+), 6 deletions(-) (limited to 'plugins') diff --git a/plugins/org.eclipse.etrice.generator.config/src/org/eclipse/etrice/generator/config/util/DataConfigurationHelper.java b/plugins/org.eclipse.etrice.generator.config/src/org/eclipse/etrice/generator/config/util/DataConfigurationHelper.java index bb768ad46..25e0d6bb6 100644 --- a/plugins/org.eclipse.etrice.generator.config/src/org/eclipse/etrice/generator/config/util/DataConfigurationHelper.java +++ b/plugins/org.eclipse.etrice.generator.config/src/org/eclipse/etrice/generator/config/util/DataConfigurationHelper.java @@ -149,12 +149,16 @@ public class DataConfigurationHelper { private static void collectConfigs(ProtocolClassConfig protocolConfig, Map map) { String path = "/" + protocolConfig.getProtocol().getName(); - for (AttrClassConfig c : protocolConfig.getRegular().getAttributes()) - collectConfigs(c, path + "/regular/" + c.getAttribute().getName(), - map); - for (AttrClassConfig c : protocolConfig.getConjugated().getAttributes()) - collectConfigs(c, path + "/conjugated/" - + c.getAttribute().getName(), map); + if (protocolConfig.getRegular() != null) + for (AttrClassConfig c : protocolConfig.getRegular() + .getAttributes()) + collectConfigs(c, path + "/regular/" + + c.getAttribute().getName(), map); + if (protocolConfig.getConjugated() != null) + for (AttrClassConfig c : protocolConfig.getConjugated() + .getAttributes()) + collectConfigs(c, path + "/conjugated/" + + c.getAttribute().getName(), map); } private static void collectConfigs(ActorClassConfig actorConfig, -- cgit v1.2.3