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

[openrtm ＠ openrtm.org]

Author: 
Date: 2012-11-17 13:17:07 +0900 (Sat, 17 Nov 2012)
New Revision: 371

Modified:
   trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/src/jp/go/aist/rtm/rtcbuilder/generator/param/RtcParam.java
   trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/src/jp/go/aist/rtm/rtcbuilder/generator/param/idl/IdlFileParam.java
Log:
Modified Python import section

Modified: trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/src/jp/go/aist/rtm/rtcbuilder/generator/param/RtcParam.java
===================================================================
--- trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/src/jp/go/aist/rtm/rtcbuilder/generator/param/RtcParam.java	2012-11-17 04:16:56 UTC (rev 370)
+++ trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/src/jp/go/aist/rtm/rtcbuilder/generator/param/RtcParam.java	2012-11-17 04:17:07 UTC (rev 371)
@@ -753,12 +753,25 @@
 					if( targetIDL!=null) {
 						idlPathes.add(targetIDL.trim());
 						consumerIdlStrings.add(targetIDL);
-						IdlFileParam target = new IdlFileParam(targetIDL,this);
-						target.setDataPort(true);
-						target.setTargetType(targetType);
-						consumerIdlParams.add(target);
 					}
 				}
+				boolean isHit = false;
+				for(IdlFileParam file : consumerIdlParams) {
+					if( file.getIdlPath().equals(targetIDL) ) {
+						if(file.getTargetType().contains(targetType)==false) {
+							file.getTargetType().add(targetType);
+							isHit = true;
+							break;
+						}
+					}
+				}
+				if(isHit==false) {
+					IdlFileParam target = new IdlFileParam(targetIDL,this);
+					target.setDataPort(true);
+					target.getTargetType().add(targetType);
+					consumerIdlParams.add(target);
+				}
+				
 				break;
 			}
 		}

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-17 04:16:56 UTC (rev 370)
+++ trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/src/jp/go/aist/rtm/rtcbuilder/generator/param/idl/IdlFileParam.java	2012-11-17 04:17:07 UTC (rev 371)
@@ -20,7 +20,7 @@
 	private List<String> idlSearchPathes = new ArrayList<String>();
 	private List<String> includeIdlPathes = new ArrayList<String>();
 	private boolean isDataPort = false;
-	private String targetType;
+	private List<String> targetTypes = new ArrayList<String>();
 
 	public IdlFileParam() {
 	}
@@ -102,11 +102,7 @@
 		this.isDataPort = isDataPort;
 	}
 
-	public String getTargetType() {
-		return targetType;
+	public List<String> getTargetType() {
+		return targetTypes;
 	}
-	public void setTargetType(String targetType) {
-		this.targetType = targetType;
-	}
-
 }