diff options
| author | Henrik Rentz-Reichert | 2012-11-12 11:44:25 +0000 |
|---|---|---|
| committer | Gerrit Code Review @ Eclipse.org | 2012-11-12 11:44:25 +0000 |
| commit | b6333b6fd46f7886ca8639079945a1784120ebb4 (patch) | |
| tree | cbe8372d3287327bcdceebe9d39740e3d87aa4e1 /plugins | |
| parent | d3fea8bf084775ffeba2e3dfb66863417073e968 (diff) | |
| parent | 81f5a744f74c664952750abd74b306f5c84fad89 (diff) | |
| download | org.eclipse.etrice-b6333b6fd46f7886ca8639079945a1784120ebb4.tar.gz org.eclipse.etrice-b6333b6fd46f7886ca8639079945a1784120ebb4.tar.xz org.eclipse.etrice-b6333b6fd46f7886ca8639079945a1784120ebb4.zip | |
Merge "[CQ 6485][generator, tests] update models, fix"
Diffstat (limited to 'plugins')
| -rw-r--r-- | plugins/org.eclipse.etrice.generator.config/src/org/eclipse/etrice/generator/config/util/DataConfigurationHelper.java | 16 |
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,
|