From 45a2967cc4237a04739b53ef1cbbe2dc4eab6bc0 Mon Sep 17 00:00:00 2001
From: ipa-nhg <nadia.hammoudeh.garcia@ipa.fraunhofer.de>
Date: Thu, 3 Dec 2020 14:01:30 +0100
Subject: [PATCH] fix spaces and launch file generator test

---
 .../test_system/launch/test_system.launch     | 28 ++++++++--------
 .../generator/LaunchFileCompiler.xtend        | 33 +++++++++++--------
 2 files changed, 34 insertions(+), 27 deletions(-)

diff --git a/plugins/de.fraunhofer.ipa.rossystem.xtext.tests/resources/test_system/launch/test_system.launch b/plugins/de.fraunhofer.ipa.rossystem.xtext.tests/resources/test_system/launch/test_system.launch
index 10cfffc87..4c092d6b5 100644
--- a/plugins/de.fraunhofer.ipa.rossystem.xtext.tests/resources/test_system/launch/test_system.launch
+++ b/plugins/de.fraunhofer.ipa.rossystem.xtext.tests/resources/test_system/launch/test_system.launch
@@ -1,20 +1,20 @@
 <?xml version="1.0"?>
 <launch>
-		<param name="param1" value="hello"/>
-		<rosparam param="list">[1,2,a]</rosparam>
-		<rosparam param="list">[1,3]</rosparam>
-		<rosparam>
-			first_element:8
-			third_element:dsd
-		</rosparam>
+  <param name="param1" value="hello"/>
+  <rosparam param="list">[1,2,a]</rosparam>
+  <rosparam param="list">[1,3]</rosparam>
+  <rosparam>
+first_element:8
+third_element:dsd
+  </rosparam>
 
-	<node pkg="test_pkg" type="test_node" name="test_node" cwd="node" respawn="false" output="screen">
-	</node>
+  <node pkg="test_pkg" type="test_node" name="test_node" cwd="node" respawn="false" output="screen">
+  </node>
 
-	<node pkg="test_pkg" type="test_node" name="test_node2" ns="test2" cwd="node" respawn="false" output="screen">
-	</node>
+  <node pkg="test_pkg" type="test_node" name="test_node2" ns="test2" cwd="node" respawn="false" output="screen">
+  </node>
 
-	<node pkg="test_pkg" type="test_node" name="test_nodea" cwd="node" respawn="false" output="screen">
-	</node>
+  <node pkg="test_pkg" type="test_node" name="test_nodea" cwd="node" respawn="false" output="screen">
+  </node>
 
-</launch>
+</launch>
\ No newline at end of file
diff --git a/plugins/de.fraunhofer.ipa.rossystem.xtext/src/de/fraunhofer/ipa/rossystem/generator/LaunchFileCompiler.xtend b/plugins/de.fraunhofer.ipa.rossystem.xtext/src/de/fraunhofer/ipa/rossystem/generator/LaunchFileCompiler.xtend
index 83b452198..5e473984a 100644
--- a/plugins/de.fraunhofer.ipa.rossystem.xtext/src/de/fraunhofer/ipa/rossystem/generator/LaunchFileCompiler.xtend
+++ b/plugins/de.fraunhofer.ipa.rossystem.xtext/src/de/fraunhofer/ipa/rossystem/generator/LaunchFileCompiler.xtend
@@ -26,20 +26,27 @@ class LaunchFileCompiler {
 	def compile_tolaunch(RosSystem system) '''«init_comp()»
 <?xml version="1.0"?>
 <launch>
-		«FOR ROSParameter:system.parameter»«IF ROSParameter.type.toString.contains("ParameterStructType")»
-		<rosparam>
-			«IF ROSParameter.value!==null»«FOR ParamMember:ROSParameter.value.eContents»
+  «FOR ROSParameter:system.parameter»
+  	«IF ROSParameter.type.toString.contains("ParameterStructType")»
+  	<rosparam>
+		  «IF ROSParameter.value!==null»
+			  «FOR ParamMember:ROSParameter.value.eContents»
 			«getParamName(ParamMember.eContents.get(0).toString)»:«compile_param_value(convertParamValue(ParamMember.eContents.get(0).eContents.get(0)))»
-			«ENDFOR»«ELSE»
-			«FOR ParamMember:ROSParameter.eContents.get(0).eContents»«IF !(ParamMember.eContents.get(0).eContents.empty)»
-			«getParamName(ParamMember.toString)»:«compile_param_value(convertParamValue(ParamMember.eContents.get(0).eContents.get(0)))»«ENDIF»
-			«ENDFOR»«ENDIF»
-		</rosparam>
-		«ELSEIF ROSParameter.type.toString.contains("ParameterListType") || ROSParameter.type.toString.contains("ParameterArrayType")»
-		<rosparam param="list">«IF ROSParameter.value!==null»«compile_param_value(ROSParameter.value)»«ENDIF»</rosparam>
-		«ELSE»	<param name="«ROSParameter.name»" value="«compile_param_value(ROSParameter.value)»"/>
-		«ENDIF»
-	«ENDFOR»
+			  «ENDFOR»
+		  «ELSE»
+			  «FOR ParamMember:ROSParameter.eContents.get(0).eContents»
+				  «IF !(ParamMember.eContents.get(0).eContents.empty)»
+				«getParamName(ParamMember.toString)»:«compile_param_value(convertParamValue(ParamMember.eContents.get(0).eContents.get(0)))»
+				  «ENDIF»
+			  «ENDFOR»
+		  «ENDIF»
+  	</rosparam>
+  	«ELSEIF ROSParameter.type.toString.contains("ParameterListType") || ROSParameter.type.toString.contains("ParameterArrayType")»
+  	<rosparam param="list">«IF ROSParameter.value!==null»«compile_param_value(ROSParameter.value)»«ENDIF»</rosparam>
+  	«ELSE»
+  		<param name="«ROSParameter.name»" value="«compile_param_value(ROSParameter.value)»"/>
+  	«ENDIF»
+  «ENDFOR»
 	«FOR component:system.rosComponent»
 		«FOR rosPublisher:component.rospublisher»
 				«IF component.hasNS»