diff options
author | Jan Belle | 2018-08-29 09:41:30 +0000 |
---|---|---|
committer | Jan Belle | 2018-08-31 09:11:08 +0000 |
commit | 99a2c70b13dc3713b7e63c1e1b15ce1e46085815 (patch) | |
tree | 3d775f801d558855c85880dc4f7408986524016e /plugins/org.eclipse.etrice.generator.config/src/org/eclipse/etrice/generator/config/util | |
parent | 0c4faa4761c9085523c8f51dac59106eb2fbda48 (diff) | |
download | org.eclipse.etrice-99a2c70b13dc3713b7e63c1e1b15ce1e46085815.tar.gz org.eclipse.etrice-99a2c70b13dc3713b7e63c1e1b15ce1e46085815.tar.xz org.eclipse.etrice-99a2c70b13dc3713b7e63c1e1b15ce1e46085815.zip |
[generator] Refactor generators to implement common generator interface
* migrated to new generator options implementation
Change-Id: I086b384d502fcd1576256a2afaf08df2538b3670
Diffstat (limited to 'plugins/org.eclipse.etrice.generator.config/src/org/eclipse/etrice/generator/config/util')
-rw-r--r-- | plugins/org.eclipse.etrice.generator.config/src/org/eclipse/etrice/generator/config/util/DataConfigurationHelper.java | 10 |
1 files changed, 5 insertions, 5 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 63fd93b36..9ba7203e2 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 @@ -30,11 +30,11 @@ import org.eclipse.etrice.core.config.PortInstanceConfig; import org.eclipse.etrice.core.config.ProtocolClassConfig; import org.eclipse.etrice.core.config.SubSystemConfig; import org.eclipse.etrice.core.config.util.ConfigUtil; -import org.eclipse.etrice.core.genmodel.fsm.ILogger; import org.eclipse.etrice.core.room.ActorClass; import org.eclipse.etrice.core.room.Attribute; import org.eclipse.etrice.core.room.DataClass; import org.eclipse.etrice.core.room.ProtocolClass; +import org.eclipse.etrice.generator.base.logging.ILogger; import com.google.inject.Inject; import com.google.inject.Singleton; @@ -83,7 +83,7 @@ public class DataConfigurationHelper { for (ActorClassConfig classConfig : config.getActorClassConfigs()) { if (actorClasses.contains(classConfig.getActor())) { logger.logError("Multiple configurations for actor class " - + classConfig.getActor().getName() + " found", null); + + classConfig.getActor().getName() + " found"); error = true; } else { actorClasses.add(classConfig.getActor()); @@ -96,7 +96,7 @@ public class DataConfigurationHelper { logger.logError( "Multiple configurations for protocol class " + protocolConfig.getProtocol().getName() - + " found", null); + + " found"); error = true; } else { protocolClasses.add(protocolConfig.getProtocol()); @@ -109,7 +109,7 @@ public class DataConfigurationHelper { if (actorInstances.contains(path)) { logger.logError( "Multiple configurations for actor instance " - + path + " found", null); + + path + " found"); } else { actorInstances.add(path); collectConfigs(instanceConfig, path, actorInstanceAttrMap); @@ -119,7 +119,7 @@ public class DataConfigurationHelper { String path = ConfigUtil.getPath(ssConfig); if (subSystemConfigMap.containsKey(path)) { logger.logError("Multiple configurations for subSystem" - + path + " found", null); + + path + " found"); error = true; } else subSystemConfigMap.put(path, ssConfig); |