[openrtm-commit:02940] r775 - in trunk/rtmtools/jp.go.aist.rtm.rtcbuilder: resource/100/CXX/AIST2 resource/100/CXX/idlmodule/serviceArg resource/100/CXX/idlmodule/serviceM resource/100/CXX/idlstruct src/jp/go/aist/rtm/rtcbuilder src/jp/go/aist/rtm/rtcbuilder/generator

[openrtm ＠ openrtm.org]

Author: ga
Date: 2017-12-02 19:37:40 +0900 (Sat, 02 Dec 2017)
New Revision: 775

Modified:
   trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/AIST2/MyServiceSVC_impl.h
   trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/idlmodule/serviceArg/MyServiceModuleTypeDefSVC_impl.h
   trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/idlmodule/serviceM/MyServiceSVC_impl.h
   trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/idlstruct/module_ysuga_netSVC_impl.h
   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/IDLParamConverter.java
Log:
The character code was modified. #4376

Modified: trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/AIST2/MyServiceSVC_impl.h
===================================================================
--- trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/AIST2/MyServiceSVC_impl.h	2017-11-08 04:39:55 UTC (rev 774)
+++ trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/AIST2/MyServiceSVC_impl.h	2017-12-02 10:37:40 UTC (rev 775)
@@ -11,7 +11,7 @@
 #define MYSERVICESVC_IMPL_H
  
 /*!
- * @class MyServiceSVC_impl
+ * @class Test_MyServiceSVC_impl
  * Example class implementing IDL interface Test::MyService
  */
 class Test_MyServiceSVC_impl
@@ -21,13 +21,13 @@
  private:
    // Make sure all instances are built on the heap by making the
    // destructor non-public
-   //virtual ~MyServiceSVC_impl();
+   //virtual ~Test_MyServiceSVC_impl();
 
  public:
   /*!
    * @brief standard constructor
    */
-   MyServiceSVC_impl();
+   Test_MyServiceSVC_impl();
   /*!
    * @brief destructor
    */

Modified: trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/idlmodule/serviceArg/MyServiceModuleTypeDefSVC_impl.h
===================================================================
--- trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/idlmodule/serviceArg/MyServiceModuleTypeDefSVC_impl.h	2017-11-08 04:39:55 UTC (rev 774)
+++ trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/idlmodule/serviceArg/MyServiceModuleTypeDefSVC_impl.h	2017-12-02 10:37:40 UTC (rev 775)
@@ -11,7 +11,7 @@
 #define MYSERVICEMODULETYPEDEFSVC_IMPL_H
  
 /*!
- * @class MyServiceSVC_impl
+ * @class RTC_RTM_MyServiceSVC_impl
  * Example class implementing IDL interface RTC::RTM::MyService
  */
 class RTC_RTM_MyServiceSVC_impl
@@ -21,13 +21,13 @@
  private:
    // Make sure all instances are built on the heap by making the
    // destructor non-public
-   //virtual ~MyServiceSVC_impl();
+   //virtual ~RTC_RTM_MyServiceSVC_impl();
 
  public:
   /*!
    * @brief standard constructor
    */
-   MyServiceSVC_impl();
+   RTC_RTM_MyServiceSVC_impl();
   /*!
    * @brief destructor
    */

Modified: trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/idlmodule/serviceM/MyServiceSVC_impl.h
===================================================================
--- trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/idlmodule/serviceM/MyServiceSVC_impl.h	2017-11-08 04:39:55 UTC (rev 774)
+++ trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/idlmodule/serviceM/MyServiceSVC_impl.h	2017-12-02 10:37:40 UTC (rev 775)
@@ -11,7 +11,7 @@
 #define MYSERVICESVC_IMPL_H
  
 /*!
- * @class MyServiceSVC_impl
+ * @class SimpleService_MyServiceSVC_impl
  * Example class implementing IDL interface SimpleService::MyService
  */
 class SimpleService_MyServiceSVC_impl
@@ -21,13 +21,13 @@
  private:
    // Make sure all instances are built on the heap by making the
    // destructor non-public
-   //virtual ~MyServiceSVC_impl();
+   //virtual ~SimpleService_MyServiceSVC_impl();
 
  public:
   /*!
    * @brief standard constructor
    */
-   MyServiceSVC_impl();
+   SimpleService_MyServiceSVC_impl();
   /*!
    * @brief destructor
    */

Modified: trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/idlstruct/module_ysuga_netSVC_impl.h
===================================================================
--- trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/idlstruct/module_ysuga_netSVC_impl.h	2017-11-08 04:39:55 UTC (rev 774)
+++ trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/idlstruct/module_ysuga_netSVC_impl.h	2017-12-02 10:37:40 UTC (rev 775)
@@ -13,7 +13,7 @@
 #define MODULE_YSUGA_NETSVC_IMPL_H
  
 /*!
- * @class HogeSVC_impl
+ * @class ysuga_net_HogeSVC_impl
  * Example class implementing IDL interface ysuga_net::Hoge
  */
 class ysuga_net_HogeSVC_impl
@@ -23,13 +23,13 @@
  private:
    // Make sure all instances are built on the heap by making the
    // destructor non-public
-   //virtual ~HogeSVC_impl();
+   //virtual ~ysuga_net_HogeSVC_impl();
 
  public:
   /*!
    * @brief standard constructor
    */
-   HogeSVC_impl();
+   ysuga_net_HogeSVC_impl();
   /*!
    * @brief destructor
    */

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	2017-11-08 04:39:55 UTC (rev 774)
+++ trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/src/jp/go/aist/rtm/rtcbuilder/Generator.java	2017-12-02 10:37:40 UTC (rev 775)
@@ -356,7 +356,7 @@
 			specification spec = parser.specification();
 
 			List<ServiceClassParam> serviceClassParams = IDLParamConverter.convert(spec, sv.getName());
-			if(IDLParamConverter.checkSuperInterface(serviceClassParams)==false) {
+			if(IDLParamConverter.checkSuperInterface(serviceClassParams, false)==false) {
 				warningMessage = "No parent interface definition found. Please check the IDL and included IDL files. ";
 			}
 			List<TypeDefParam> typedefParams = IDLParamConverter.convert_typedef(spec, sv.getName());

Modified: trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/src/jp/go/aist/rtm/rtcbuilder/generator/IDLParamConverter.java
===================================================================
--- trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/src/jp/go/aist/rtm/rtcbuilder/generator/IDLParamConverter.java	2017-11-08 04:39:55 UTC (rev 774)
+++ trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/src/jp/go/aist/rtm/rtcbuilder/generator/IDLParamConverter.java	2017-12-02 10:37:40 UTC (rev 775)
@@ -112,12 +112,12 @@
 			}
 
 		}, null);
-		checkSuperInterface(result);
+		checkSuperInterface(result, true);
 
 		return result;
 	}
 	
-	public static boolean checkSuperInterface(List<ServiceClassParam> targetList) {
+	public static boolean checkSuperInterface(List<ServiceClassParam> targetList, boolean isAdd) {
 		for(ServiceClassParam target : targetList) {
 			if( target.getSuperInterfaceList().size()==0 ) continue;
 			boolean isHit = false;
@@ -124,7 +124,9 @@
 			for(String targetIF : target.getSuperInterfaceList()) {
 				for(ServiceClassParam source : targetList) {
 					if(targetIF.equals(source.getName())) {
-						target.getMethods().addAll(source.getMethods());
+						if(isAdd) {
+							target.getMethods().addAll(source.getMethods());
+						}
 						target.setTypeDef(source.getTypeDefList());
 						isHit = true;
 						break;