Skip to content

Commit 8155969

Browse files
committed
HotFix: fix error for the launch file generator
1 parent a41a2a7 commit 8155969

2 files changed

Lines changed: 11 additions & 11 deletions

File tree

plugins/de.fraunhofer.ipa.rossystem.xtext.tests/resources/test_system/launch/test_system.launch

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
<?xml version="1.0"?>
22
<launch>
3-
<param name="param1" value=" hello"/>
4-
<rosparam param="list">[ 1, 2, a]</rosparam>
5-
<rosparam param="list">[ 1, 3]</rosparam>
3+
<param name="param1" value="hello"/>
4+
<rosparam param="list">[1,2,a]</rosparam>
5+
<rosparam param="list">[1,3]</rosparam>
66
<rosparam>
7-
first_element: 8
8-
third_element: dsd
7+
first_element:8
8+
third_element:dsd
99
</rosparam>
1010

1111
<node pkg="test_pkg" type="test_node" name="test_node" cwd="node" respawn="false" output="screen">

plugins/de.fraunhofer.ipa.rossystem.xtext/src/de/fraunhofer/ipa/rossystem/generator/RosSystemGenerator.xtend

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -281,10 +281,10 @@ class RosSystemGenerator extends AbstractGenerator {
281281
«FOR rosParameter:component.rosparameter»
282282
«IF rosParameter.parameter.type.toString.contains("ParameterStructType")»
283283
«FOR ParamMember:rosParameter.value.eContents»
284-
<param name=«getParamName(ParamMember.eContents.get(0).toString)» value=«compile_param_value(convertParamValue(ParamMember.eContents.get(0).eContents.get(0)))» />
284+
<param name="«getParamName(ParamMember.eContents.get(0).toString)»" value="«compile_param_value(convertParamValue(ParamMember.eContents.get(0).eContents.get(0)))»" />
285285
«ENDFOR»
286286
«ELSE»
287-
«IF rosParameter.value!==null»<param name=«rosParameter.parameter.name» value=«compile_param_value(rosParameter.value)» />«ENDIF»
287+
«IF rosParameter.value!==null»<param name="«rosParameter.parameter.name»" value="«compile_param_value(rosParameter.value" />«ENDIF»
288288
«ENDIF»
289289
«ENDFOR»
290290
</node>
@@ -589,12 +589,12 @@ def compile_pkg(ComponentInterface component)
589589
value_return =""
590590
param_value = paramValue.toString
591591
if (param_value.contains("(value:")){
592-
value_return= param_value.substring(param_value.indexOf("value:")+6,param_value.indexOf(")"))
592+
value_return= param_value.substring(param_value.indexOf("value:")+7,param_value.indexOf(")"))
593593
} else if(param_value.contains("ParameterSequenceImpl")){
594594
value_return+="{"
595595
for(param: paramValue.eContents){
596596
if (param.toString.contains("(value:")){
597-
value_return+=param.toString.substring(param.toString.indexOf("value:")+6,param.toString.indexOf(")"))
597+
value_return+=param.toString.substring(param.toString.indexOf("value:")+7,param.toString.indexOf(")"))
598598
} else {
599599
for(subparam: param.eContents){
600600
if (subparam.toString.contains("ParameterStructMemberImpl")){
@@ -617,12 +617,12 @@ def compile_pkg(ComponentInterface component)
617617
value_return =""
618618
param_value = paramValue.toString
619619
if (param_value.contains("(value:")){
620-
value_return= param_value.substring(param_value.indexOf("value:")+6,param_value.indexOf(")"))
620+
value_return= param_value.substring(param_value.indexOf("value:")+7,param_value.indexOf(")"))
621621
} else if(param_value.contains("ParameterSequenceImpl")){
622622
value_return+="["
623623
for(param: paramValue.eContents){
624624
if (param.toString.contains("(value:")){
625-
value_return+=param.toString.substring(param.toString.indexOf("value:")+6,param.toString.indexOf(")"))
625+
value_return+=param.toString.substring(param.toString.indexOf("value:")+7,param.toString.indexOf(")"))
626626
value_return+=","
627627

628628
}}

0 commit comments

Comments
 (0)