Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJuergen Haug2012-11-08 15:51:16 +0000
committerJuergen Haug2012-11-08 15:51:16 +0000
commit81f5a744f74c664952750abd74b306f5c84fad89 (patch)
tree436097f345ba0e11037ba09206d97b56bdea6908 /plugins/org.eclipse.etrice.generator.config/src/org/eclipse/etrice
parent0f233b0b11dbc6b1bbaf28e238f56c4371d58f0d (diff)
downloadorg.eclipse.etrice-81f5a744f74c664952750abd74b306f5c84fad89.tar.gz
org.eclipse.etrice-81f5a744f74c664952750abd74b306f5c84fad89.tar.xz
org.eclipse.etrice-81f5a744f74c664952750abd74b306f5c84fad89.zip
[CQ 6485][generator, tests] update models, fix
Diffstat (limited to 'plugins/org.eclipse.etrice.generator.config/src/org/eclipse/etrice')
-rw-r--r--plugins/org.eclipse.etrice.generator.config/src/org/eclipse/etrice/generator/config/util/DataConfigurationHelper.java16
1 files changed, 10 insertions, 6 deletions
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<String, AttrClassConfig> 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,

Back to the top