From 1122c7463358f4540aa5639a8703bc8752a5f286 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=BCrgen=20Walter?= <juergen.walter@uni-wuerzburg.de>
Date: Thu, 1 Feb 2018 14:55:44 +0100
Subject: [PATCH] name fixes
---
.../descartes/pmx/builder/ModelBuilder.java | 18 ++++++++++--------
1 file changed, 10 insertions(+), 8 deletions(-)
diff --git a/tools.descartes.pmx.builder/src/tools/descartes/pmx/builder/ModelBuilder.java b/tools.descartes.pmx.builder/src/tools/descartes/pmx/builder/ModelBuilder.java
index b9cbc2ba..fb4518a9 100644
--- a/tools.descartes.pmx.builder/src/tools/descartes/pmx/builder/ModelBuilder.java
+++ b/tools.descartes.pmx.builder/src/tools/descartes/pmx/builder/ModelBuilder.java
@@ -83,7 +83,7 @@ public abstract class ModelBuilder implements IModelBuilder{
public EObject addAllocationContext(String componentName, String hostName) {
EObject allocation;
-
+ componentName = applyNameFixes(componentName);
if(!allocationMap.containsKey(componentName+seperatorChar+hostName)){
allocation = createAllocation(componentName, hostName);
allocationMap.put(componentName+seperatorChar+hostName, allocation);
@@ -94,7 +94,7 @@ public abstract class ModelBuilder implements IModelBuilder{
}
public void addInterface(String interfaceName){
- interfaceName = applyComponentNameFix(interfaceName);
+ interfaceName = applyNameFixes(interfaceName);
if(!interfaceMap.containsKey(interfaceName)){
EObject newInterface = createInterface(interfaceName);
interfaceMap.put(interfaceName, newInterface);
@@ -103,6 +103,8 @@ public abstract class ModelBuilder implements IModelBuilder{
public EObject addAssembly(String name) {
EObject assembly;
+ name = applyNameFixes(name);
+
if(!assemblyMap.containsKey(name)){
assembly = createAssembly(name);
assemblyMap.put(name, assembly);
@@ -113,7 +115,7 @@ public abstract class ModelBuilder implements IModelBuilder{
}
public EObject getAssembly(String assemblyName){
- //assemblyName = applyComponentNameFix(assemblyName);
+ assemblyName = applyNameFixes(assemblyName);
EObject assembly = assemblyMap.get(assemblyName);
if (assembly == null) {
log.error("Could not find AssemblyContext: " + assemblyName);
@@ -155,7 +157,7 @@ public abstract class ModelBuilder implements IModelBuilder{
}
public EObject getComponent(String componentName){
- componentName = applyComponentNameFix(componentName);
+ componentName = applyNameFixes(componentName);
EObject component = componentMap.get(componentName);
if(component == null){
log.error("requested component ["+componentName+"] has not been created");
@@ -164,7 +166,7 @@ public abstract class ModelBuilder implements IModelBuilder{
return component;
}
- public static String applyComponentNameFix(String componentName){
+ public static String applyNameFixes(String componentName){
if(componentName.contains("$")){
//log.info("FIX:" + componentName + " ==> "+componentName.split("\\$")[0]);
componentName = componentName.split("\\$")[0]; //JAVA $
@@ -173,7 +175,7 @@ public abstract class ModelBuilder implements IModelBuilder{
}
public void addComponent(String componentName) {
- componentName = applyComponentNameFix(componentName);
+ componentName = applyNameFixes(componentName);
if(!hasComponentBeenAdded(componentName)){
componentMap.put(componentName, createComponent(componentName));
}
@@ -210,8 +212,8 @@ public abstract class ModelBuilder implements IModelBuilder{
}
public void addMethod(ComponentType type, Signature signature){
- if(!methodMap.containsKey(Util.createMethodKey(signature.getName(), applyComponentNameFix(type.getTypeName())))){
- methodMap.put(Util.createMethodKey(signature.getName(), applyComponentNameFix(type.getTypeName())), createMethod(type, signature));
+ if(!methodMap.containsKey(Util.createMethodKey(signature.getName(), applyNameFixes(type.getTypeName())))){
+ methodMap.put(Util.createMethodKey(signature.getName(), applyNameFixes(type.getTypeName())), createMethod(type, signature));
}
}
--
GitLab