[openrtm-commit:00906] r367 - in trunk/rtmtools/jp.go.aist.rtm.rtcbuilder.python/src/jp/go/aist/rtm/rtcbuilder/python: manager template/python

[openrtm ＠ openrtm.org]

Author: 
Date: 2012-11-13 00:36:11 +0900 (Tue, 13 Nov 2012)
New Revision: 367

Modified:
   trunk/rtmtools/jp.go.aist.rtm.rtcbuilder.python/src/jp/go/aist/rtm/rtcbuilder/python/manager/TemplateHelperPy.java
   trunk/rtmtools/jp.go.aist.rtm.rtcbuilder.python/src/jp/go/aist/rtm/rtcbuilder/python/template/python/Py_RTC.py.vsl
Log:
Modified import

Modified: trunk/rtmtools/jp.go.aist.rtm.rtcbuilder.python/src/jp/go/aist/rtm/rtcbuilder/python/manager/TemplateHelperPy.java
===================================================================
--- trunk/rtmtools/jp.go.aist.rtm.rtcbuilder.python/src/jp/go/aist/rtm/rtcbuilder/python/manager/TemplateHelperPy.java	2012-11-05 03:40:24 UTC (rev 366)
+++ trunk/rtmtools/jp.go.aist.rtm.rtcbuilder.python/src/jp/go/aist/rtm/rtcbuilder/python/manager/TemplateHelperPy.java	2012-11-12 15:36:11 UTC (rev 367)
@@ -108,16 +108,22 @@
 			String targetType = "";
 			if( target.getTargetType().contains("::") ) {
 				String[] types = target.getTargetType().split("::");
-				StringBuilder builder = new StringBuilder();
-				for(int index=0;index<types.length-1;index++) {
-					if(index!=0) builder.append(".");
-					builder.append(types[index]);
-					targetType = builder.toString();
-					if(check.contains(targetType)==false) {
-						check.add(targetType);
-						result.add(targetType);
-					}
+				/////
+				targetType = types[0];
+				if(check.contains(targetType)==false) {
+					check.add(targetType);
+					result.add(targetType);
 				}
+//				StringBuilder builder = new StringBuilder();
+//				for(int index=0;index<types.length-1;index++) {
+//					if(index!=0) builder.append(".");
+//					builder.append(types[index]);
+//					targetType = builder.toString();
+//					if(check.contains(targetType)==false) {
+//						check.add(targetType);
+//						result.add(targetType);
+//					}
+//				}
 				
 			} else {
 				targetType = "_GlobalIDL";

Modified: trunk/rtmtools/jp.go.aist.rtm.rtcbuilder.python/src/jp/go/aist/rtm/rtcbuilder/python/template/python/Py_RTC.py.vsl
===================================================================
--- trunk/rtmtools/jp.go.aist.rtm.rtcbuilder.python/src/jp/go/aist/rtm/rtcbuilder/python/template/python/Py_RTC.py.vsl	2012-11-05 03:40:24 UTC (rev 366)
+++ trunk/rtmtools/jp.go.aist.rtm.rtcbuilder.python/src/jp/go/aist/rtm/rtcbuilder/python/template/python/Py_RTC.py.vsl	2012-11-12 15:36:11 UTC (rev 367)
@@ -25,8 +25,9 @@
 import RTC
 import OpenRTM_aist
 
-#foreach($IdlFile in ${allIdlFileParam})import ${tmpltHelper.getFilenameNoExt(${IdlFile.IdlFile})}_idl
+#foreach($IdlFile in ${allIdlFileParam})#if(!${IdlFile.dataPort})import ${tmpltHelper.getFilenameNoExt(${IdlFile.IdlFile})}_idl
 #end
+#end
 #if( ${tmpltHelperPy.hasDataPortType(${allIdlFileParam})})
 #foreach($idlTarget in ${tmpltHelperPy.getDataPortTypes(${allIdlFileParam})})import ${idlTarget}
 #end