[openrtm-commit:00907] r368 - in trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/src/jp/go/aist/rtm/rtcbuilder: . generator/param/idl

[openrtm ＠ openrtm.org]

Author: 
Date: 2012-11-13 01:22:08 +0900 (Tue, 13 Nov 2012)
New Revision: 368

Modified:
   trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/src/jp/go/aist/rtm/rtcbuilder/Generator.java
   trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/src/jp/go/aist/rtm/rtcbuilder/generator/param/idl/IdlFileParam.java
Log:
Modified for CUIRTCBuilder

Modified: trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/src/jp/go/aist/rtm/rtcbuilder/Generator.java
===================================================================
--- trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/src/jp/go/aist/rtm/rtcbuilder/Generator.java	2012-11-12 15:36:11 UTC (rev 367)
+++ trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/src/jp/go/aist/rtm/rtcbuilder/Generator.java	2012-11-12 16:22:08 UTC (rev 368)
@@ -83,7 +83,7 @@
 
 	public List<GeneratedResult> generateTemplateCode(
 			GeneratorParam generatorParam) throws Exception {
-		return generateTemplateCode(generatorParam, true);
+		return generateTemplateCode(generatorParam, null, true);
 	}
 
 	/**
@@ -96,7 +96,7 @@
 	 *             IDLのパースに失敗した場合など
 	 */
 	public List<GeneratedResult> generateTemplateCode(
-			GeneratorParam generatorParam, boolean validateFlag)
+			GeneratorParam generatorParam, String idlDir, boolean validateFlag)
 			throws Exception {
 
 		if( validateFlag ) {
@@ -134,6 +134,9 @@
 				}
 			}
 			rtcParam.getIdlPathes().addAll(DataTypePreferenceManager.getInstance().getIdlFileDirectories());
+			if(idlDir!=null) {
+				rtcParam.getIdlPathes().add(idlDir);
+			}
 			
 			rtcServiceClasses.addAll(getRtcServiceClass(rtcParam, IDLPathParams));
 			checkReferencedServiceParam(rtcServiceClasses, rtcParam);

Modified: trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/src/jp/go/aist/rtm/rtcbuilder/generator/param/idl/IdlFileParam.java
===================================================================
--- trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/src/jp/go/aist/rtm/rtcbuilder/generator/param/idl/IdlFileParam.java	2012-11-12 15:36:11 UTC (rev 367)
+++ trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/src/jp/go/aist/rtm/rtcbuilder/generator/param/idl/IdlFileParam.java	2012-11-12 16:22:08 UTC (rev 368)
@@ -98,7 +98,6 @@
 	public boolean isDataPort() {
 		return isDataPort;
 	}
-
 	public void setDataPort(boolean isDataPort) {
 		this.isDataPort = isDataPort;
 	}