Bug 563666 - Fix Sonar issues to improve code quality
diff --git a/framework/examples/app4mc.example.transform.ui/src/app4mc/example/transform/product/handlers/SampleHandler.java b/framework/examples/app4mc.example.transform.ui/src/app4mc/example/transform/product/handlers/SampleHandler.java
index d223d91..1b14e35 100644
--- a/framework/examples/app4mc.example.transform.ui/src/app4mc/example/transform/product/handlers/SampleHandler.java
+++ b/framework/examples/app4mc.example.transform.ui/src/app4mc/example/transform/product/handlers/SampleHandler.java
@@ -46,7 +46,7 @@
@Named(IServiceConstants.ACTIVE_SELECTION) ISelection selection) throws ExecutionException {
LOG.debug("\n\n\n****************************************************************************************************************");
- LOG.debug("TransformationProcessor : "+cmd.hashCode());
+ LOG.debug("TransformationProcessor : {}", cmd.hashCode());
try {
Properties properties = new Properties();
diff --git a/load_generator/commons/plugins/org.eclipse.app4mc.slg.commons.m2t/src/org/eclipse/app4mc/slg/commons/m2t/generators/LabelGenerator.xtend b/load_generator/commons/plugins/org.eclipse.app4mc.slg.commons.m2t/src/org/eclipse/app4mc/slg/commons/m2t/generators/LabelGenerator.xtend
index 0198f5a..497b97d 100644
--- a/load_generator/commons/plugins/org.eclipse.app4mc.slg.commons.m2t/src/org/eclipse/app4mc/slg/commons/m2t/generators/LabelGenerator.xtend
+++ b/load_generator/commons/plugins/org.eclipse.app4mc.slg.commons.m2t/src/org/eclipse/app4mc/slg/commons/m2t/generators/LabelGenerator.xtend
@@ -57,29 +57,32 @@
'''
- static def String toCpp(Label label)
- '''
- int «label.name»[«AmaltheaModelUtils.getLabelArraySize(label)»];
+ static def String toCpp(Label label) {
+ val name = if (label?.name.isNullOrEmpty) "<undefined label>" else label.name
+ val numberOfBytes = if (label?.size === null) 0 else label.size.numberBytes
+
+ '''
+ int «name»[«AmaltheaModelUtils.getLabelArraySize(label)»];
- static bool isIinitialized_«label.name» = false;
+ static bool isIinitialized_«name» = false;
void «initCall(label)» {
- if (!isIinitialized_«label.name»){
+ if (!isIinitialized_«name»){
for (int i=0; i < «AmaltheaModelUtils.getLabelArraySize(label)»; i++){
- «label.name»[i] = i+1;
+ «name»[i] = i+1;
}
- isIinitialized_«label.name» = true;
+ isIinitialized_«name» = true;
}
}
void «readCall(label, "int labelAccessStatistics")» {
- int numberOfBytes = «label?.size?.numberBytes»;
+ int numberOfBytes = «numberOfBytes»;
for (int repeat = 0 ; repeat < labelAccessStatistics; repeat++){
if(numberOfBytes < 4){
numberOfBytes = 4;
}
- int arraysize = sizeof(«label.name») / 4;
+ int arraysize = sizeof(«name») / 4;
//printf("number of bytes:%d\n",arraysize);
int leftOverElements=arraysize%10;
@@ -88,52 +91,53 @@
int i = 0;
int a = 0;
for (i = 0; i < arraySizeWith10Multiples; i = i + 10) { //iteration with 10 reads
- a = «label.name»[i];
- a = «label.name»[i+1];
- a = «label.name»[i+2];
- a = «label.name»[i+3];
- a = «label.name»[i+4];
- a = «label.name»[i+5];
- a = «label.name»[i+6];
- a = «label.name»[i+7];
- a = «label.name»[i+8];
- a = «label.name»[i+9];
+ a = «name»[i];
+ a = «name»[i+1];
+ a = «name»[i+2];
+ a = «name»[i+3];
+ a = «name»[i+4];
+ a = «name»[i+5];
+ a = «name»[i+6];
+ a = «name»[i+7];
+ a = «name»[i+8];
+ a = «name»[i+9];
}
for(;i<arraysize;i++){
- a = «label.name»[i];
+ a = «name»[i];
}
}
}
void «writeCall(label, "int labelAccessStatistics")» {
- int numberOfBytes = «label?.size?.numberBytes»;
+ int numberOfBytes = «numberOfBytes»;
for (int repeat = 0 ; repeat < labelAccessStatistics; repeat++){
if(numberOfBytes < 4){
numberOfBytes = 4;
}
- int arraysize = sizeof(«label.name») / 4;
+ int arraysize = sizeof(«name») / 4;
int leftOverElements=arraysize%10;
int arraySizeWith10Multiples=arraysize-leftOverElements;
int i = 0;
for (i = 0; i < arraySizeWith10Multiples; i = i + 10) {
- «label.name»[i] = 0xAFFE;
- «label.name»[i+1] = 0xAFFE;
- «label.name»[i+2] = 0xAFFE;
- «label.name»[i+3] = 0xAFFE;
- «label.name»[i+4] = 0xAFFE;
- «label.name»[i+5] = 0xAFFE;
- «label.name»[i+6] = 0xAFFE;
- «label.name»[i+7] = 0xAFFE;
- «label.name»[i+8] = 0xAFFE;
- «label.name»[i+9] = 0xAFFE;
+ «name»[i] = 0xAFFE;
+ «name»[i+1] = 0xAFFE;
+ «name»[i+2] = 0xAFFE;
+ «name»[i+3] = 0xAFFE;
+ «name»[i+4] = 0xAFFE;
+ «name»[i+5] = 0xAFFE;
+ «name»[i+6] = 0xAFFE;
+ «name»[i+7] = 0xAFFE;
+ «name»[i+8] = 0xAFFE;
+ «name»[i+9] = 0xAFFE;
}
for(;i<arraysize;i++){
- «label.name»[i]=0xAFFE;
+ «name»[i]=0xAFFE;
}
}
}
- '''
+ '''
+ }
}
diff --git a/load_generator/commons/plugins/org.eclipse.app4mc.slg.commons.m2t/src/org/eclipse/app4mc/slg/commons/m2t/transformers/sw/GroupHeaderTransformer.java b/load_generator/commons/plugins/org.eclipse.app4mc.slg.commons.m2t/src/org/eclipse/app4mc/slg/commons/m2t/transformers/sw/GroupHeaderTransformer.java
index 1547a86..a5f9289 100644
--- a/load_generator/commons/plugins/org.eclipse.app4mc.slg.commons.m2t/src/org/eclipse/app4mc/slg/commons/m2t/transformers/sw/GroupHeaderTransformer.java
+++ b/load_generator/commons/plugins/org.eclipse.app4mc.slg.commons.m2t/src/org/eclipse/app4mc/slg/commons/m2t/transformers/sw/GroupHeaderTransformer.java
@@ -39,6 +39,7 @@
private final Map<List<Object>, SLGTranslationUnit> transformCache = new HashMap<>();
+ @Override
public Map<List<Object>, SLGTranslationUnit> getCache() {
return this.transformCache;
}
diff --git a/load_generator/commons/plugins/org.eclipse.app4mc.slg.commons.m2t/src/org/eclipse/app4mc/slg/commons/m2t/transformers/sw/GroupSourceTransformer.java b/load_generator/commons/plugins/org.eclipse.app4mc.slg.commons.m2t/src/org/eclipse/app4mc/slg/commons/m2t/transformers/sw/GroupSourceTransformer.java
index 138ace5..5e7b75d 100644
--- a/load_generator/commons/plugins/org.eclipse.app4mc.slg.commons.m2t/src/org/eclipse/app4mc/slg/commons/m2t/transformers/sw/GroupSourceTransformer.java
+++ b/load_generator/commons/plugins/org.eclipse.app4mc.slg.commons.m2t/src/org/eclipse/app4mc/slg/commons/m2t/transformers/sw/GroupSourceTransformer.java
@@ -38,6 +38,7 @@
private final Map<List<Object>, SLGTranslationUnit> transformCache = new HashMap<>();
+ @Override
public Map<List<Object>, SLGTranslationUnit> getCache() {
return this.transformCache;
}
diff --git a/load_generator/commons/plugins/org.eclipse.app4mc.slg.commons.m2t/src/org/eclipse/app4mc/slg/commons/m2t/transformers/sw/LabelTransformer.java b/load_generator/commons/plugins/org.eclipse.app4mc.slg.commons.m2t/src/org/eclipse/app4mc/slg/commons/m2t/transformers/sw/LabelTransformer.java
index c2c2ed3..a0d4736 100644
--- a/load_generator/commons/plugins/org.eclipse.app4mc.slg.commons.m2t/src/org/eclipse/app4mc/slg/commons/m2t/transformers/sw/LabelTransformer.java
+++ b/load_generator/commons/plugins/org.eclipse.app4mc.slg.commons.m2t/src/org/eclipse/app4mc/slg/commons/m2t/transformers/sw/LabelTransformer.java
@@ -45,6 +45,7 @@
private final Map<List<Object>, SLGTranslationUnit> transformCache = new HashMap<>();
+ @Override
public Map<List<Object>, SLGTranslationUnit> getCache() {
return this.transformCache;
}
diff --git a/load_generator/commons/plugins/org.eclipse.app4mc.slg.commons.m2t/src/org/eclipse/app4mc/slg/commons/m2t/transformers/sw/TicksUtilsTransformer.java b/load_generator/commons/plugins/org.eclipse.app4mc.slg.commons.m2t/src/org/eclipse/app4mc/slg/commons/m2t/transformers/sw/TicksUtilsTransformer.java
index a7af03f..11181f8 100644
--- a/load_generator/commons/plugins/org.eclipse.app4mc.slg.commons.m2t/src/org/eclipse/app4mc/slg/commons/m2t/transformers/sw/TicksUtilsTransformer.java
+++ b/load_generator/commons/plugins/org.eclipse.app4mc.slg.commons.m2t/src/org/eclipse/app4mc/slg/commons/m2t/transformers/sw/TicksUtilsTransformer.java
@@ -52,6 +52,7 @@
private final Map<List<Object>, SLGTranslationUnit> transformCache = new HashMap<>();
+ @Override
public Map<List<Object>, SLGTranslationUnit> getCache() {
return this.transformCache;
}
diff --git a/load_generator/linux/plugins/org.eclipse.app4mc.slg.linux/src/org/eclipse/app4mc/slg/linux/transformers/stimuli/LinuxStimulusTransformer.java b/load_generator/linux/plugins/org.eclipse.app4mc.slg.linux/src/org/eclipse/app4mc/slg/linux/transformers/stimuli/LinuxStimulusTransformer.java
index bb5b623..dfd1b23 100644
--- a/load_generator/linux/plugins/org.eclipse.app4mc.slg.linux/src/org/eclipse/app4mc/slg/linux/transformers/stimuli/LinuxStimulusTransformer.java
+++ b/load_generator/linux/plugins/org.eclipse.app4mc.slg.linux/src/org/eclipse/app4mc/slg/linux/transformers/stimuli/LinuxStimulusTransformer.java
@@ -38,6 +38,7 @@
private final Map<List<Object>, SLGTranslationUnit> transformCache = new HashMap<>();
+ @Override
public Map<List<Object>, SLGTranslationUnit> getCache() {
return this.transformCache;
}
diff --git a/load_generator/linux/plugins/org.eclipse.app4mc.slg.linux/src/org/eclipse/app4mc/slg/linux/transformers/sw/LinuxLabelTransformer.java b/load_generator/linux/plugins/org.eclipse.app4mc.slg.linux/src/org/eclipse/app4mc/slg/linux/transformers/sw/LinuxLabelTransformer.java
index 3a7507b..0275032 100644
--- a/load_generator/linux/plugins/org.eclipse.app4mc.slg.linux/src/org/eclipse/app4mc/slg/linux/transformers/sw/LinuxLabelTransformer.java
+++ b/load_generator/linux/plugins/org.eclipse.app4mc.slg.linux/src/org/eclipse/app4mc/slg/linux/transformers/sw/LinuxLabelTransformer.java
@@ -33,6 +33,7 @@
private final Map<List<Object>, SLGTranslationUnit> transformCache = new HashMap<>();
+ @Override
public Map<List<Object>, SLGTranslationUnit> getCache() {
return this.transformCache;
}
diff --git a/load_generator/linux/plugins/org.eclipse.app4mc.slg.linux/src/org/eclipse/app4mc/slg/linux/transformers/sw/LinuxRealisticCodeTransformer.java b/load_generator/linux/plugins/org.eclipse.app4mc.slg.linux/src/org/eclipse/app4mc/slg/linux/transformers/sw/LinuxRealisticCodeTransformer.java
index 1dd36ed..817be20 100644
--- a/load_generator/linux/plugins/org.eclipse.app4mc.slg.linux/src/org/eclipse/app4mc/slg/linux/transformers/sw/LinuxRealisticCodeTransformer.java
+++ b/load_generator/linux/plugins/org.eclipse.app4mc.slg.linux/src/org/eclipse/app4mc/slg/linux/transformers/sw/LinuxRealisticCodeTransformer.java
@@ -31,6 +31,7 @@
private final Map<List<Object>, SLGTranslationUnit> transformCache = new HashMap<>();
+ @Override
public Map<List<Object>, SLGTranslationUnit> getCache() {
return this.transformCache;
}
diff --git a/load_generator/linux/plugins/org.eclipse.app4mc.slg.linux/src/org/eclipse/app4mc/slg/linux/transformers/sw/LinuxRunnableTransformer.java b/load_generator/linux/plugins/org.eclipse.app4mc.slg.linux/src/org/eclipse/app4mc/slg/linux/transformers/sw/LinuxRunnableTransformer.java
index 2a8c79d..dbdae5d 100644
--- a/load_generator/linux/plugins/org.eclipse.app4mc.slg.linux/src/org/eclipse/app4mc/slg/linux/transformers/sw/LinuxRunnableTransformer.java
+++ b/load_generator/linux/plugins/org.eclipse.app4mc.slg.linux/src/org/eclipse/app4mc/slg/linux/transformers/sw/LinuxRunnableTransformer.java
@@ -48,6 +48,7 @@
private final Map<List<Object>, SLGTranslationUnit> transformCache = new HashMap<>();
+ @Override
public Map<List<Object>, SLGTranslationUnit> getCache() {
return this.transformCache;
}
diff --git a/load_generator/linux/plugins/org.eclipse.app4mc.slg.linux/src/org/eclipse/app4mc/slg/linux/transformers/sw/LinuxTaskTransformer.java b/load_generator/linux/plugins/org.eclipse.app4mc.slg.linux/src/org/eclipse/app4mc/slg/linux/transformers/sw/LinuxTaskTransformer.java
index 1ca5014..ef5cd55 100644
--- a/load_generator/linux/plugins/org.eclipse.app4mc.slg.linux/src/org/eclipse/app4mc/slg/linux/transformers/sw/LinuxTaskTransformer.java
+++ b/load_generator/linux/plugins/org.eclipse.app4mc.slg.linux/src/org/eclipse/app4mc/slg/linux/transformers/sw/LinuxTaskTransformer.java
@@ -46,6 +46,7 @@
private final Map<List<Object>, SLGTranslationUnit> transformCache = new HashMap<>();
+ @Override
public Map<List<Object>, SLGTranslationUnit> getCache() {
return this.transformCache;
}
diff --git a/load_generator/linux/plugins/org.eclipse.app4mc.slg.linux/src/org/eclipse/app4mc/slg/linux/transformers/sw/LinuxTicksUtilsTransformer.java b/load_generator/linux/plugins/org.eclipse.app4mc.slg.linux/src/org/eclipse/app4mc/slg/linux/transformers/sw/LinuxTicksUtilsTransformer.java
index d904134..669d835 100644
--- a/load_generator/linux/plugins/org.eclipse.app4mc.slg.linux/src/org/eclipse/app4mc/slg/linux/transformers/sw/LinuxTicksUtilsTransformer.java
+++ b/load_generator/linux/plugins/org.eclipse.app4mc.slg.linux/src/org/eclipse/app4mc/slg/linux/transformers/sw/LinuxTicksUtilsTransformer.java
@@ -42,6 +42,7 @@
private final Map<List<Object>, SLGTranslationUnit> transformCache = new HashMap<>();
+ @Override
public Map<List<Object>, SLGTranslationUnit> getCache() {
return this.transformCache;
}
diff --git a/load_generator/ros2/plugins/org.eclipse.app4mc.slg.ros2/src/org/eclipse/app4mc/slg/ros2/generators/RosLabelGenerator.xtend b/load_generator/ros2/plugins/org.eclipse.app4mc.slg.ros2/src/org/eclipse/app4mc/slg/ros2/generators/RosLabelGenerator.xtend
index ac3d394..1e36d08 100644
--- a/load_generator/ros2/plugins/org.eclipse.app4mc.slg.ros2/src/org/eclipse/app4mc/slg/ros2/generators/RosLabelGenerator.xtend
+++ b/load_generator/ros2/plugins/org.eclipse.app4mc.slg.ros2/src/org/eclipse/app4mc/slg/ros2/generators/RosLabelGenerator.xtend
@@ -49,21 +49,27 @@
'''
- static def String toH(Label label)
- '''
- typedef struct «label.name»_CacheLine
- {
- struct «label.name»_CacheLine* ptrCacheLine[8] ;
- } «label.name»_CacheLine ;
- void «initCall(label.name, "_CacheLine* array, int array_elements")»;
- void «readCall(label.name, "int labelAccessStatistics")»;
- void «writeCall(label.name, "int labelAccessStatistics")»;
-
- '''
+ static def String toH(Label label) {
+ val name = if (label?.name.isNullOrEmpty) "<undefined label>" else label.name
- static def String toCpp(Label label)
- '''
- void initialize_«label.name»(«label.name»_CacheLine* array,int array_elements) {
+ '''
+ typedef struct «name»_CacheLine
+ {
+ struct «name»_CacheLine* ptrCacheLine[8] ;
+ } «name»_CacheLine ;
+ void «initCall(name, "_CacheLine* array, int array_elements")»;
+ void «readCall(name, "int labelAccessStatistics")»;
+ void «writeCall(name, "int labelAccessStatistics")»;
+
+ '''
+ }
+
+ static def String toCpp(Label label) {
+ val name = if (label?.name.isNullOrEmpty) "<undefined label>" else label.name
+ val numberOfBytes = if (label?.size === null) 0 else label.size.numberBytes
+
+ '''
+ void initialize_«name»(«name»_CacheLine* array,int array_elements) {
int steps = array_elements / 2 ;
int bottom = 0 ;
int top = steps ;
@@ -81,21 +87,21 @@
void «readCall(label.name, "int labelAccessStatistics")» {
static bool initialized = false;
- int numberOfBytes = «label?.size?.numberBytes»;
- static «label.name»_CacheLine* «label.name»;
+ int numberOfBytes = «numberOfBytes»;
+ static «name»_CacheLine* «name»;
if(!initialized) {
//init
- «label.name» = («label.name»_CacheLine*) malloc(sizeof(«label.name»_CacheLine) * 17000);
- initialize_«label.name»(«label.name», 17000);
+ «name» = («name»_CacheLine*) malloc(sizeof(«name»_CacheLine) * 17000);
+ initialize_«name»(«name», 17000);
initialized = true;
}
- static «label.name»_CacheLine* i = «label.name»;
+ static «name»_CacheLine* i = «name»;
static int counter = 0;
if(counter > 16100) {
counter = 0;
- i = «label.name»;
+ i = «name»;
}
int end_value = counter + numberOfBytes;
@@ -110,21 +116,21 @@
void «writeCall(label.name, "int labelAccessStatistics")» {
static bool initialized = false;
- int numberOfBytes = «label?.size?.numberBytes»;
- static «label.name»_CacheLine* «label.name»;
+ int numberOfBytes = «numberOfBytes»;
+ static «name»_CacheLine* «name»;
if(!initialized) {
//init
- «label.name» = («label.name»_CacheLine*) malloc(sizeof(«label.name»_CacheLine) * 17000);
- initialize_«label.name»(«label.name», 17000);
+ «name» = («name»_CacheLine*) malloc(sizeof(«name»_CacheLine) * 17000);
+ initialize_«name»(«name», 17000);
initialized = true;
}
- static «label.name»_CacheLine* i = «label.name»;
+ static «name»_CacheLine* i = «name»;
static int counter = 0;
if(counter > 16100) {
counter = 0;
- i = «label.name»;
+ i = «name»;
}
int end_value = counter + numberOfBytes;
@@ -134,6 +140,7 @@
}
}
- '''
+ '''
+ }
}
diff --git a/load_generator/ros2/plugins/org.eclipse.app4mc.slg.ros2/src/org/eclipse/app4mc/slg/ros2/transformers/RosModel2TextTransformer.java b/load_generator/ros2/plugins/org.eclipse.app4mc.slg.ros2/src/org/eclipse/app4mc/slg/ros2/transformers/RosModel2TextTransformer.java
index fb1dc3f..1cdc55e 100644
--- a/load_generator/ros2/plugins/org.eclipse.app4mc.slg.ros2/src/org/eclipse/app4mc/slg/ros2/transformers/RosModel2TextTransformer.java
+++ b/load_generator/ros2/plugins/org.eclipse.app4mc.slg.ros2/src/org/eclipse/app4mc/slg/ros2/transformers/RosModel2TextTransformer.java
@@ -61,7 +61,7 @@
private boolean ticks = false;
private boolean interprocess = false;
private boolean channelSend = false;
- private boolean performance_measurement = false;
+ private boolean performanceMeasurement = false;
@Override
public void transform(final Amalthea model, final String outputFolder) {
@@ -99,7 +99,7 @@
// check custom properties
Value perf = run.getCustomProperties().get("measure_performance");
if (perf instanceof BooleanObject && ((BooleanObject) perf).isValue()) {
- performance_measurement = true;
+ performanceMeasurement = true;
}
// check activity graph
@@ -125,7 +125,7 @@
labelTransformer.createCMake();
outputBuffer.appendTo(OTHER_TYPE, "CMakeLists.txt", RosModel2TextGenerator.toCmake(nodes, services, label,
- ticks, interprocess, channelSend, performance_measurement));
+ ticks, interprocess, channelSend, performanceMeasurement));
outputBuffer.appendTo(OTHER_TYPE, "package.xml", RosModel2TextGenerator.toPackageXml(services));
outputBuffer.appendTo(OTHER_TYPE, "build.sh", RosModel2TextGenerator.toBuildScript(services));
outputBuffer.appendTo(OTHER_TYPE, "launch.py", RosModel2TextGenerator.toLaunchFile(nodes));
diff --git a/load_generator/ros2/plugins/org.eclipse.app4mc.slg.ros2/src/org/eclipse/app4mc/slg/ros2/transformers/common/RosAmlTransformer.java b/load_generator/ros2/plugins/org.eclipse.app4mc.slg.ros2/src/org/eclipse/app4mc/slg/ros2/transformers/common/RosAmlTransformer.java
index a6d9f4a..85011e7 100644
--- a/load_generator/ros2/plugins/org.eclipse.app4mc.slg.ros2/src/org/eclipse/app4mc/slg/ros2/transformers/common/RosAmlTransformer.java
+++ b/load_generator/ros2/plugins/org.eclipse.app4mc.slg.ros2/src/org/eclipse/app4mc/slg/ros2/transformers/common/RosAmlTransformer.java
@@ -28,7 +28,7 @@
// if translation unit is newly created and valid -> create files
if (tu.isValid()) {
- doTransform(tu, model);
+ doTransform(tu);
}
return tu;
@@ -45,11 +45,11 @@
}
}
- private void doTransform(final SLGTranslationUnit tu, final Amalthea model) {
- genFiles(tu, model);
+ private void doTransform(final SLGTranslationUnit tu) {
+ genFiles(tu);
}
- private void genFiles(SLGTranslationUnit tu, final Amalthea model) {
+ private void genFiles(SLGTranslationUnit tu) {
incAppend(tu, RosAmlGenerator.toH());
srcAppend(tu, RosAmlGenerator.toCpp());
}
diff --git a/load_generator/ros2/plugins/org.eclipse.app4mc.slg.ros2/src/org/eclipse/app4mc/slg/ros2/transformers/common/RosTagTransformer.java b/load_generator/ros2/plugins/org.eclipse.app4mc.slg.ros2/src/org/eclipse/app4mc/slg/ros2/transformers/common/RosTagTransformer.java
index e451c1c..e64da1e 100644
--- a/load_generator/ros2/plugins/org.eclipse.app4mc.slg.ros2/src/org/eclipse/app4mc/slg/ros2/transformers/common/RosTagTransformer.java
+++ b/load_generator/ros2/plugins/org.eclipse.app4mc.slg.ros2/src/org/eclipse/app4mc/slg/ros2/transformers/common/RosTagTransformer.java
@@ -46,6 +46,7 @@
private final Map<List<Object>, SLGTranslationUnit> transformCache = new HashMap<>();
+ @Override
public Map<List<Object>, SLGTranslationUnit> getCache() {
return this.transformCache;
}
@@ -58,7 +59,7 @@
if (transformCache.containsKey(key)) {
return transformCache.get(key);
}
- tu = createTranslationUnit(tag, model);
+ tu = createTranslationUnit(tag);
transformCache.put(key, tu);
}
@@ -72,7 +73,7 @@
// ---------------------------------------------------
- private SLGTranslationUnit createTranslationUnit(final Tag tag, final Amalthea model) {
+ private SLGTranslationUnit createTranslationUnit(final Tag tag) {
if ((tag == null)) {
return new SLGTranslationUnit("UNSPECIFIED TAG");
} else {
@@ -100,6 +101,7 @@
if (task.getTags().contains(tag)) {
final SLGTranslationUnit taskTU = rosTaskTransformer.transform(task);
final TaskStore store = rosTaskCache.getStore(taskTU);
+
header.add(store.getHeaders());
declaration.add(store.getDeclaration());
initialization.add(store.getInitialisation(tu.getModuleName()));
diff --git a/load_generator/ros2/plugins/org.eclipse.app4mc.slg.ros2/src/org/eclipse/app4mc/slg/ros2/transformers/stimuli/RosInterProcessStimulusTransformer.java b/load_generator/ros2/plugins/org.eclipse.app4mc.slg.ros2/src/org/eclipse/app4mc/slg/ros2/transformers/stimuli/RosInterProcessStimulusTransformer.java
index 549fcd2..e5e7cef 100644
--- a/load_generator/ros2/plugins/org.eclipse.app4mc.slg.ros2/src/org/eclipse/app4mc/slg/ros2/transformers/stimuli/RosInterProcessStimulusTransformer.java
+++ b/load_generator/ros2/plugins/org.eclipse.app4mc.slg.ros2/src/org/eclipse/app4mc/slg/ros2/transformers/stimuli/RosInterProcessStimulusTransformer.java
@@ -43,6 +43,7 @@
private final Map<List<Object>, SLGTranslationUnit> transformCache = new HashMap<>();
+ @Override
public Map<List<Object>, SLGTranslationUnit> getCache() {
return this.transformCache;
}
@@ -61,7 +62,7 @@
// if translation unit is newly created and valid -> create files
if (tu.isValid()) {
- doTransform(tu, stimulus);
+ doTransform(tu);
}
return tu;
@@ -95,11 +96,11 @@
return outputBuffer.appendTo(OTHER_TYPE, getSrcPath(tu), str);
}
- private void doTransform(final SLGTranslationUnit tu, final InterProcessStimulus stimulus) {
- genFiles(tu, stimulus);
+ private void doTransform(final SLGTranslationUnit tu) {
+ genFiles(tu);
}
- private void genFiles(final SLGTranslationUnit tu, final InterProcessStimulus ip) {
+ private void genFiles(final SLGTranslationUnit tu) {
srcAppend(tu, RosInterProcessStimulusGenerator.toSrvFile());
diff --git a/load_generator/ros2/plugins/org.eclipse.app4mc.slg.ros2/src/org/eclipse/app4mc/slg/ros2/transformers/sw/RosChannelSendUtilsTransformer.java b/load_generator/ros2/plugins/org.eclipse.app4mc.slg.ros2/src/org/eclipse/app4mc/slg/ros2/transformers/sw/RosChannelSendUtilsTransformer.java
index cb68a3e..2a0f77e 100644
--- a/load_generator/ros2/plugins/org.eclipse.app4mc.slg.ros2/src/org/eclipse/app4mc/slg/ros2/transformers/sw/RosChannelSendUtilsTransformer.java
+++ b/load_generator/ros2/plugins/org.eclipse.app4mc.slg.ros2/src/org/eclipse/app4mc/slg/ros2/transformers/sw/RosChannelSendUtilsTransformer.java
@@ -32,8 +32,9 @@
public class RosChannelSendUtilsTransformer extends RosBaseTransformer {
public static final String LIB_NAME = "CHANNELSEND_UTIL";
+ public static final String BASE_PATH = "synthetic_gen";
public static final String MODULE_NAME = "channelSendUtils";
- public static final String MODULE_PATH = "synthetic_gen/" + MODULE_NAME;
+ public static final String MODULE_PATH = BASE_PATH + "/" + MODULE_NAME;
public static final String MAKEFILE_PATH = MODULE_PATH + "/CMakeLists.txt";
private List<String> topicList = new ArrayList<>();
@@ -42,6 +43,7 @@
private final Map<List<Object>, SLGTranslationUnit> transformCache = new HashMap<>();
+ @Override
public Map<List<Object>, SLGTranslationUnit> getCache() {
return this.transformCache;
}
@@ -72,8 +74,8 @@
if (cs == null) {
return new SLGTranslationUnit("UNSPECIFIED CHANNEL SEND");
} else {
- String basePath = "synthetic_gen";
- String moduleName = "channelSendUtils";
+ String basePath = BASE_PATH;
+ String moduleName = MODULE_NAME;
String call = ""; // unused
return new SLGTranslationUnit(basePath, moduleName, call);
}
diff --git a/load_generator/ros2/plugins/org.eclipse.app4mc.slg.ros2/src/org/eclipse/app4mc/slg/ros2/transformers/sw/RosInterProcessTriggerUtilsTransformer.java b/load_generator/ros2/plugins/org.eclipse.app4mc.slg.ros2/src/org/eclipse/app4mc/slg/ros2/transformers/sw/RosInterProcessTriggerUtilsTransformer.java
index 51c0a29..42430f1 100644
--- a/load_generator/ros2/plugins/org.eclipse.app4mc.slg.ros2/src/org/eclipse/app4mc/slg/ros2/transformers/sw/RosInterProcessTriggerUtilsTransformer.java
+++ b/load_generator/ros2/plugins/org.eclipse.app4mc.slg.ros2/src/org/eclipse/app4mc/slg/ros2/transformers/sw/RosInterProcessTriggerUtilsTransformer.java
@@ -32,14 +32,16 @@
public class RosInterProcessTriggerUtilsTransformer extends SLGBaseTransformer {
public static final String LIB_NAME = "INTERPROCESSTRIGGER_UTIL";
+ public static final String BASE_PATH = "synthetic_gen";
public static final String MODULE_NAME = "interProcessTriggerUtils";
- public static final String MODULE_PATH = "synthetic_gen/" + MODULE_NAME;
+ public static final String MODULE_PATH = BASE_PATH + "/" + MODULE_NAME;
public static final String MAKEFILE_PATH = MODULE_PATH + "/CMakeLists.txt";
// ---------- generic part "def create new transform(...)" ----------
private final Map<List<Object>, SLGTranslationUnit> transformCache = new HashMap<>();
+ @Override
public Map<List<Object>, SLGTranslationUnit> getCache() {
return this.transformCache;
}
@@ -70,8 +72,8 @@
if (ipt == null) {
return new SLGTranslationUnit("UNSPECIFIED INTER PROCESS TRIGGER");
} else {
- String basePath = "synthetic_gen";
- String moduleName = "interProcessTriggerUtils";
+ String basePath = BASE_PATH;
+ String moduleName = MODULE_NAME;
String call = ""; // unused
return new SLGTranslationUnit(basePath, moduleName, call);
}
diff --git a/load_generator/ros2/plugins/org.eclipse.app4mc.slg.ros2/src/org/eclipse/app4mc/slg/ros2/transformers/sw/RosLabelTransformer.java b/load_generator/ros2/plugins/org.eclipse.app4mc.slg.ros2/src/org/eclipse/app4mc/slg/ros2/transformers/sw/RosLabelTransformer.java
index 0d07a1c..7ea6330 100644
--- a/load_generator/ros2/plugins/org.eclipse.app4mc.slg.ros2/src/org/eclipse/app4mc/slg/ros2/transformers/sw/RosLabelTransformer.java
+++ b/load_generator/ros2/plugins/org.eclipse.app4mc.slg.ros2/src/org/eclipse/app4mc/slg/ros2/transformers/sw/RosLabelTransformer.java
@@ -34,11 +34,6 @@
@Inject private OutputBuffer outputBuffer;
@Override
- public SLGTranslationUnit transform(final Label label) {
- return super.transform(label);
- }
-
- @Override
public void genFiles(SLGTranslationUnit tu, Label label) {
if (isSrcFileEmpty(tu)) {
srcAppend(tu,"#include \"" + getIncFile(tu) + "\"\n\n");
diff --git a/load_generator/ros2/plugins/org.eclipse.app4mc.slg.ros2/src/org/eclipse/app4mc/slg/ros2/transformers/utils/Utils.java b/load_generator/ros2/plugins/org.eclipse.app4mc.slg.ros2/src/org/eclipse/app4mc/slg/ros2/transformers/utils/Utils.java
index fd7486f..1c787ba 100644
--- a/load_generator/ros2/plugins/org.eclipse.app4mc.slg.ros2/src/org/eclipse/app4mc/slg/ros2/transformers/utils/Utils.java
+++ b/load_generator/ros2/plugins/org.eclipse.app4mc.slg.ros2/src/org/eclipse/app4mc/slg/ros2/transformers/utils/Utils.java
@@ -17,12 +17,17 @@
public class Utils {
+ // Suppress default constructor
+ private Utils() {
+ throw new IllegalStateException("Utility class");
+ }
+
public static String toIdlCompliantName(final String str) {
- String returnString = "";
+ StringBuilder builder = new StringBuilder();
for (final String s : str.split("_")) {
- returnString = returnString + StringExtensions.toFirstUpper(s);
+ builder.append(StringExtensions.toFirstUpper(s));
}
- return returnString;
+ return builder.toString();
}
}
