diff options
Diffstat (limited to 'plugins/org.eclipse.etrice.generator/src/org/eclipse/etrice/generator/base/ConfigHelper.java')
| -rw-r--r-- | plugins/org.eclipse.etrice.generator/src/org/eclipse/etrice/generator/base/ConfigHelper.java | 24 |
1 files changed, 20 insertions, 4 deletions
diff --git a/plugins/org.eclipse.etrice.generator/src/org/eclipse/etrice/generator/base/ConfigHelper.java b/plugins/org.eclipse.etrice.generator/src/org/eclipse/etrice/generator/base/ConfigHelper.java index 476f92865..d060009ce 100644 --- a/plugins/org.eclipse.etrice.generator/src/org/eclipse/etrice/generator/base/ConfigHelper.java +++ b/plugins/org.eclipse.etrice.generator/src/org/eclipse/etrice/generator/base/ConfigHelper.java @@ -21,17 +21,21 @@ import org.eclipse.emf.ecore.resource.ResourceSet; import org.eclipse.etrice.core.config.ActorClassConfig;
import org.eclipse.etrice.core.config.ActorInstanceConfig;
import org.eclipse.etrice.core.config.ConfigModel;
+import org.eclipse.etrice.core.config.ProtocolClassConfig;
import org.eclipse.etrice.core.config.RefPath;
import org.eclipse.etrice.core.genmodel.base.ILogger;
import org.eclipse.etrice.core.room.ActorContainerClass;
+import org.eclipse.etrice.core.room.ProtocolClass;
public class ConfigHelper {
- public static Map<ActorContainerClass, ActorClassConfig> classMap = new HashMap<ActorContainerClass, ActorClassConfig>();
+ public static Map<ActorContainerClass, ActorClassConfig> actorMap = new HashMap<ActorContainerClass, ActorClassConfig>();
+ public static Map<ProtocolClass, ProtocolClassConfig> protocolMap = new HashMap<ProtocolClass, ProtocolClassConfig>();
public static Map<String, ActorInstanceConfig> instanceMap = new HashMap<String, ActorInstanceConfig>();
public static boolean setConfigModels(ResourceSet rs, ILogger logger) {
- classMap.clear();
+ actorMap.clear();
+ protocolMap.clear();
instanceMap.clear();
boolean error = false;
@@ -47,12 +51,24 @@ public class ConfigHelper { for (ConfigModel config : configs) {
for (ActorClassConfig classConfig : config.getActorClassConfigs()) {
- if (classMap.containsKey(classConfig.getActor())) {
+ if (actorMap.containsKey(classConfig.getActor())) {
logger.logError("Multiple configurations for actor class "
+ classConfig.getActor().getName() + " found", null);
error = true;
} else
- classMap.put(classConfig.getActor(), classConfig);
+ actorMap.put(classConfig.getActor(), classConfig);
+ }
+ for (ProtocolClassConfig protocolConfig : config
+ .getProtocolClassConfigs()) {
+ if (protocolMap.containsKey(protocolConfig)) {
+ logger.logError(
+ "Multiple configurations for protocol class "
+ + protocolConfig.getProtocol().getName()
+ + " found", null);
+ error = true;
+ } else
+ protocolMap.put(protocolConfig.getProtocol(),
+ protocolConfig);
}
for (ActorInstanceConfig instanceConfig : config
.getActorInstanceConfigs()) {
|