[openrtm-commit:01823] r570 - trunk/rtmtools/jp.go.aist.rtm.rtcbuilder.java/src/jp/go/aist/rtm/rtcbuilder/java/template/java

[openrtm ＠ openrtm.org]

Author: ga
Date: 2016-03-07 18:20:15 +0900 (Mon, 07 Mar 2016)
New Revision: 570

Modified:
   trunk/rtmtools/jp.go.aist.rtm.rtcbuilder.java/src/jp/go/aist/rtm/rtcbuilder/java/template/java/Java_RTC.java.vsl
Log:
Modified Configuration Parameter #3072

Modified: trunk/rtmtools/jp.go.aist.rtm.rtcbuilder.java/src/jp/go/aist/rtm/rtcbuilder/java/template/java/Java_RTC.java.vsl
===================================================================
--- trunk/rtmtools/jp.go.aist.rtm.rtcbuilder.java/src/jp/go/aist/rtm/rtcbuilder/java/template/java/Java_RTC.java.vsl	2016-03-07 09:20:02 UTC (rev 569)
+++ trunk/rtmtools/jp.go.aist.rtm.rtcbuilder.java/src/jp/go/aist/rtm/rtcbuilder/java/template/java/Java_RTC.java.vsl	2016-03-07 09:20:15 UTC (rev 570)
@@ -48,12 +48,6 @@
             "conf.default.${configParam.name}", "${configParam.defaultVal}",
 #end
 
-#foreach($configParam in ${rtcParam.configParams})
-            "conf.default.__${configParam.name}", "${configParam.type}#if( ${configParam.step.length()} > 0 ).${configParam.step}#end",
-#end
-#end
-#if( ${rtcParam.configParams.size()} > 0 )
-
             // Widget
 #foreach($configParam in ${rtcParam.configParams})
 #if( ${configParam.widget.length()} > 0 )
@@ -66,7 +60,12 @@
             "conf.__constraints__.${configParam.name}", "${configParam.constraint}",
 #end
 #end
+
+#foreach($configParam in ${rtcParam.configParams})
+            "conf.__type__.${configParam.name}", "${configParam.type}#if( ${configParam.step.length()} > 0 ).${configParam.step}#end",
 #end
+
+#end
 #if( ${rtcParam.configParameterParams.size()} > 0 )
             // System Configuration
 #foreach($parameterParam in ${rtcParam.configParameterParams})