[openrtm-commit:00506] r227 - in trunk/rtmtools/jp.go.aist.rtm.rtcbuilder: resource/100/CXX/Doc/fullLong src/jp/go/aist/rtm/rtcbuilder src/jp/go/aist/rtm/rtcbuilder/util test/jp/go/aist/rtm/rtcbuilder/_test/_100
openrtm ＠ openrtm.org
openrtm ＠ openrtm.org
2011年 12月 22日 (木) 02:26:38 JST
Author: sakamoto
Date: 2011-12-22 02:26:36 +0900 (Thu, 22 Dec 2011)
New Revision: 227
Modified:
trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/Doc/fullLong/MyServiceSVC_impl.cpp
trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/Doc/fullLong/MyServiceSVC_impl.h
trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/Doc/fullLong/foo.cpp
trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/Doc/fullLong/foo.h
trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/Doc/fullLong/fooComp.cpp
trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/src/jp/go/aist/rtm/rtcbuilder/IRtcBuilderConstants.java
trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/src/jp/go/aist/rtm/rtcbuilder/util/StringUtil.java
trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/test/jp/go/aist/rtm/rtcbuilder/_test/_100/CXXDocLongTest.java
Log:
Modify comment length #2244
Modified: trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/Doc/fullLong/MyServiceSVC_impl.cpp
===================================================================
--- trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/Doc/fullLong/MyServiceSVC_impl.cpp 2011-12-17 16:11:24 UTC (rev 226)
+++ trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/Doc/fullLong/MyServiceSVC_impl.cpp 2011-12-21 17:26:36 UTC (rev 227)
@@ -3,11 +3,11 @@
* @file MyServiceSVC_impl.cpp
* @brief Service implementation code of MyService.idl
*
- * @author Noriaki Ando <n-ando at aist.go.jp>3456789412345678951234567896123456789
- * 7123456789812345
+ * @author Noriaki Ando <n-ando at aist.go.jp> one two three four
+ * five six seven eight nine ten
*
- * Copyright (C) 2006-2008 ライセンス1234567890123456789012345678901234567890123
- * 4567890
+ * Copyright (C) 2006-2008
+ * ライセンス12345678901234567890123456789012345678901234567890
*
*/
Modified: trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/Doc/fullLong/MyServiceSVC_impl.h
===================================================================
--- trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/Doc/fullLong/MyServiceSVC_impl.h 2011-12-17 16:11:24 UTC (rev 226)
+++ trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/Doc/fullLong/MyServiceSVC_impl.h 2011-12-21 17:26:36 UTC (rev 227)
@@ -3,11 +3,11 @@
* @file MyServiceSVC_impl.h
* @brief Service implementation header of MyService.idl
*
- * @author Noriaki Ando <n-ando at aist.go.jp>3456789412345678951234567896123456789
- * 7123456789812345
+ * @author Noriaki Ando <n-ando at aist.go.jp> one two three four
+ * five six seven eight nine ten
*
- * Copyright (C) 2006-2008 ライセンス1234567890123456789012345678901234567890123
- * 4567890
+ * Copyright (C) 2006-2008
+ * ライセンス12345678901234567890123456789012345678901234567890
*
*/
Modified: trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/Doc/fullLong/foo.cpp
===================================================================
--- trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/Doc/fullLong/foo.cpp 2011-12-17 16:11:24 UTC (rev 226)
+++ trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/Doc/fullLong/foo.cpp 2011-12-21 17:26:36 UTC (rev 227)
@@ -4,11 +4,11 @@
* @brief MDesc
* @date $Date$
*
- * @author Noriaki Ando <n-ando at aist.go.jp>3456789412345678951234567896123456789
- * 7123456789812345
+ * @author Noriaki Ando <n-ando at aist.go.jp> one two three four
+ * five six seven eight nine ten
*
- * Copyright (C) 2006-2008 ライセンス1234567890123456789012345678901234567890123
- * 4567890
+ * Copyright (C) 2006-2008
+ * ライセンス12345678901234567890123456789012345678901234567890
*
* $Id$
*/
@@ -69,8 +69,8 @@
/*!
- * on_initialize概要説明12345678901234567890123456789012345678901234567890123456
- * 78901234567890
+ * on_initialize概要説明123456789012345678901234567890123456789012
+ * 3456789012345678901234567890
*/
RTC::ReturnCode_t foo::onInitialize()
{
@@ -109,8 +109,8 @@
}
/*!
- * on_finalize概要説明1234567890123456789012345678901234567890123456789012345678
- * 901234567890
+ * on_finalize概要説明12345678901234567890123456789012345678901234
+ * 56789012345678901234567890
*/
/*
RTC::ReturnCode_t foo::onFinalize()
@@ -120,8 +120,8 @@
*/
/*!
- * on_startup概要説明12345678901234567890123456789012345678901234567890123456789
- * 01234567890
+ * on_startup概要説明123456789012345678901234567890123456789012345
+ * 6789012345678901234567890
*/
/*
RTC::ReturnCode_t foo::onStartup(RTC::UniqueId ec_id)
@@ -131,8 +131,8 @@
*/
/*!
- * on_shutdown概要説明1234567890123456789012345678901234567890123456789012345678
- * 901234567890
+ * on_shutdown概要説明12345678901234567890123456789012345678901234
+ * 56789012345678901234567890
*/
/*
RTC::ReturnCode_t foo::onShutdown(RTC::UniqueId ec_id)
@@ -142,8 +142,8 @@
*/
/*!
- * on_activated概要説明123456789012345678901234567890123456789012345678901234567
- * 8901234567890
+ * on_activated概要説明1234567890123456789012345678901234567890123
+ * 456789012345678901234567890
*/
/*
RTC::ReturnCode_t foo::onActivated(RTC::UniqueId ec_id)
@@ -153,8 +153,8 @@
*/
/*!
- * on_deactivated概要説明1234567890123456789012345678901234567890123456789012345
- * 678901234567890
+ * on_deactivated概要説明12345678901234567890123456789012345678901
+ * 23456789012345678901234567890
*/
/*
RTC::ReturnCode_t foo::onDeactivated(RTC::UniqueId ec_id)
@@ -164,8 +164,8 @@
*/
/*!
- * on_execute概要説明12345678901234567890123456789012345678901234567890123456789
- * 01234567890
+ * on_execute概要説明123456789012345678901234567890123456789012345
+ * 6789012345678901234567890
*/
/*
RTC::ReturnCode_t foo::onExecute(RTC::UniqueId ec_id)
@@ -175,8 +175,8 @@
*/
/*!
- * on_aborting概要説明1234567890123456789012345678901234567890123456789012345678
- * 901234567890
+ * on_aborting概要説明12345678901234567890123456789012345678901234
+ * 56789012345678901234567890
*/
/*
RTC::ReturnCode_t foo::onAborting(RTC::UniqueId ec_id)
@@ -186,8 +186,8 @@
*/
/*!
- * on_error概要説明1234567890123456789012345678901234567890123456789012345678901
- * 234567890
+ * on_error概要説明12345678901234567890123456789012345678901234567
+ * 89012345678901234567890
*/
/*
RTC::ReturnCode_t foo::onError(RTC::UniqueId ec_id)
@@ -197,8 +197,8 @@
*/
/*!
- * on_reset概要説明1234567890123456789012345678901234567890123456789012345678901
- * 234567890
+ * on_reset概要説明12345678901234567890123456789012345678901234567
+ * 89012345678901234567890
*/
/*
RTC::ReturnCode_t foo::onReset(RTC::UniqueId ec_id)
@@ -208,8 +208,8 @@
*/
/*!
- * on_state_update概要説明123456789012345678901234567890123456789012345678901234
- * 5678901234567890
+ * on_state_update概要説明1234567890123456789012345678901234567890
+ * 123456789012345678901234567890
*/
/*
RTC::ReturnCode_t foo::onStateUpdate(RTC::UniqueId ec_id)
@@ -219,8 +219,8 @@
*/
/*!
- * on_rate_changed概要説明123456789012345678901234567890123456789012345678901234
- * 5678901234567890
+ * on_rate_changed概要説明1234567890123456789012345678901234567890
+ * 123456789012345678901234567890
*/
/*
RTC::ReturnCode_t foo::onRateChanged(RTC::UniqueId ec_id)
Modified: trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/Doc/fullLong/foo.h
===================================================================
--- trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/Doc/fullLong/foo.h 2011-12-17 16:11:24 UTC (rev 226)
+++ trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/Doc/fullLong/foo.h 2011-12-21 17:26:36 UTC (rev 227)
@@ -4,11 +4,11 @@
* @brief MDesc
* @date $Date$
*
- * @author Noriaki Ando <n-ando at aist.go.jp>3456789412345678951234567896123456789
- * 7123456789812345
+ * @author Noriaki Ando <n-ando at aist.go.jp> one two three four
+ * five six seven eight nine ten
*
- * Copyright (C) 2006-2008 ライセンス1234567890123456789012345678901234567890123
- * 4567890
+ * Copyright (C) 2006-2008
+ * ライセンス12345678901234567890123456789012345678901234567890
*
* $Id$
*/
@@ -43,17 +43,17 @@
* @class foo
* @brief MDesc
*
- * 本コンポーネントの概要説明123456789012345678901234567890123456789012345678901
- * 2345678901234567890
+ * 本コンポーネントの概要説明1234567890123456789012345678901234567
+ * 890123456789012345678901234567890
*
- * 本コンポーネントの入出力12345678901234567890123456789012345678901234567890123
- * 45678901234567890
+ * 本コンポーネントの入出力123456789012345678901234567890123456789
+ * 0123456789012345678901234567890
*
- * 本コンポーネントのアルゴリズムなど1234567890123456789012345678901234567890123
- * 456789012345678901234567890
+ * 本コンポーネントのアルゴリズムなど12345678901234567890123456789
+ * 01234567890123456789012345678901234567890
*
- * 参考文献の情報123456789012345678901234567890123456789012345678901234567890123
- * 4567890
+ * 参考文献の情報1234567890123456789012345678901234567890123456789
+ * 012345678901234567890
*
*/
class foo
@@ -80,42 +80,42 @@
// </rtc-template>
/***
- * on_initialize概要説明123456789012345678901234567890123456789012345678901234
- * 5678901234567890
+ * on_initialize概要説明1234567890123456789012345678901234567890
+ * 123456789012345678901234567890
*
* The initialize action (on CREATED->ALIVE transition)
* formaer rtc_init_entry()
*
* @return RTC::ReturnCode_t
*
- * @pre on_initialize事前条件1234567890123456789012345678901234567890123456789
- * 012345678901234567890
- * @post on_initialize事後条件123456789012345678901234567890123456789012345678
- * 9012345678901234567890
+ * @pre on_initialize事前条件12345678901234567890123456789012345
+ * 67890123456789012345678901234567890
+ * @post on_initialize事後条件1234567890123456789012345678901234
+ * 567890123456789012345678901234567890
*
*/
virtual RTC::ReturnCode_t onInitialize();
/***
- * on_finalize概要説明12345678901234567890123456789012345678901234567890123456
- * 78901234567890
+ * on_finalize概要説明123456789012345678901234567890123456789012
+ * 3456789012345678901234567890
*
* The finalize action (on ALIVE->END transition)
* formaer rtc_exiting_entry()
*
* @return RTC::ReturnCode_t
*
- * @pre on_finalize事前条件123456789012345678901234567890123456789012345678901
- * 2345678901234567890
- * @post on_finalize事後条件12345678901234567890123456789012345678901234567890
- * 12345678901234567890
+ * @pre on_finalize事前条件1234567890123456789012345678901234567
+ * 890123456789012345678901234567890
+ * @post on_finalize事後条件123456789012345678901234567890123456
+ * 7890123456789012345678901234567890
*
*/
// virtual RTC::ReturnCode_t onFinalize();
/***
- * on_startup概要説明123456789012345678901234567890123456789012345678901234567
- * 8901234567890
+ * on_startup概要説明1234567890123456789012345678901234567890123
+ * 456789012345678901234567890
*
* The startup action when ExecutionContext startup
* former rtc_starting_entry()
@@ -124,17 +124,17 @@
*
* @return RTC::ReturnCode_t
*
- * @pre on_startup事前条件1234567890123456789012345678901234567890123456789012
- * 345678901234567890
- * @post on_startup事後条件123456789012345678901234567890123456789012345678901
- * 2345678901234567890
+ * @pre on_startup事前条件12345678901234567890123456789012345678
+ * 90123456789012345678901234567890
+ * @post on_startup事後条件1234567890123456789012345678901234567
+ * 890123456789012345678901234567890
*
*/
// virtual RTC::ReturnCode_t onStartup(RTC::UniqueId ec_id);
/***
- * on_shutdown概要説明12345678901234567890123456789012345678901234567890123456
- * 78901234567890
+ * on_shutdown概要説明123456789012345678901234567890123456789012
+ * 3456789012345678901234567890
*
* The shutdown action when ExecutionContext stop
* former rtc_stopping_entry()
@@ -143,17 +143,17 @@
*
* @return RTC::ReturnCode_t
*
- * @pre on_shutdown事前条件123456789012345678901234567890123456789012345678901
- * 2345678901234567890
- * @post on_shutdown事後条件12345678901234567890123456789012345678901234567890
- * 12345678901234567890
+ * @pre on_shutdown事前条件1234567890123456789012345678901234567
+ * 890123456789012345678901234567890
+ * @post on_shutdown事後条件123456789012345678901234567890123456
+ * 7890123456789012345678901234567890
*
*/
// virtual RTC::ReturnCode_t onShutdown(RTC::UniqueId ec_id);
/***
- * on_activated概要説明1234567890123456789012345678901234567890123456789012345
- * 678901234567890
+ * on_activated概要説明12345678901234567890123456789012345678901
+ * 23456789012345678901234567890
*
* The activated action (Active state entry action)
* former rtc_active_entry()
@@ -162,17 +162,17 @@
*
* @return RTC::ReturnCode_t
*
- * @pre on_activated事前条件12345678901234567890123456789012345678901234567890
- * 12345678901234567890
- * @post on_activated事後条件1234567890123456789012345678901234567890123456789
- * 012345678901234567890
+ * @pre on_activated事前条件123456789012345678901234567890123456
+ * 7890123456789012345678901234567890
+ * @post on_activated事後条件12345678901234567890123456789012345
+ * 67890123456789012345678901234567890
*
*/
// virtual RTC::ReturnCode_t onActivated(RTC::UniqueId ec_id);
/***
- * on_deactivated概要説明12345678901234567890123456789012345678901234567890123
- * 45678901234567890
+ * on_deactivated概要説明123456789012345678901234567890123456789
+ * 0123456789012345678901234567890
*
* The deactivated action (Active state exit action)
* former rtc_active_exit()
@@ -181,17 +181,17 @@
*
* @return RTC::ReturnCode_t
*
- * @pre on_deactivated事前条件123456789012345678901234567890123456789012345678
- * 9012345678901234567890
- * @post on_deactivated事後条件12345678901234567890123456789012345678901234567
- * 89012345678901234567890
+ * @pre on_deactivated事前条件1234567890123456789012345678901234
+ * 567890123456789012345678901234567890
+ * @post on_deactivated事後条件123456789012345678901234567890123
+ * 4567890123456789012345678901234567890
*
*/
// virtual RTC::ReturnCode_t onDeactivated(RTC::UniqueId ec_id);
/***
- * on_execute概要説明123456789012345678901234567890123456789012345678901234567
- * 8901234567890
+ * on_execute概要説明1234567890123456789012345678901234567890123
+ * 456789012345678901234567890
*
* The execution action that is invoked periodically
* former rtc_active_do()
@@ -200,17 +200,17 @@
*
* @return RTC::ReturnCode_t
*
- * @pre on_execute事前条件1234567890123456789012345678901234567890123456789012
- * 345678901234567890
- * @post on_execute事後条件123456789012345678901234567890123456789012345678901
- * 2345678901234567890
+ * @pre on_execute事前条件12345678901234567890123456789012345678
+ * 90123456789012345678901234567890
+ * @post on_execute事後条件1234567890123456789012345678901234567
+ * 890123456789012345678901234567890
*
*/
// virtual RTC::ReturnCode_t onExecute(RTC::UniqueId ec_id);
/***
- * on_aborting概要説明12345678901234567890123456789012345678901234567890123456
- * 78901234567890
+ * on_aborting概要説明123456789012345678901234567890123456789012
+ * 3456789012345678901234567890
*
* The aborting action when main logic error occurred.
* former rtc_aborting_entry()
@@ -219,17 +219,17 @@
*
* @return RTC::ReturnCode_t
*
- * @pre on_aborting事前条件123456789012345678901234567890123456789012345678901
- * 2345678901234567890
- * @post on_aborting事後条件12345678901234567890123456789012345678901234567890
- * 12345678901234567890
+ * @pre on_aborting事前条件1234567890123456789012345678901234567
+ * 890123456789012345678901234567890
+ * @post on_aborting事後条件123456789012345678901234567890123456
+ * 7890123456789012345678901234567890
*
*/
// virtual RTC::ReturnCode_t onAborting(RTC::UniqueId ec_id);
/***
- * on_error概要説明12345678901234567890123456789012345678901234567890123456789
- * 01234567890
+ * on_error概要説明123456789012345678901234567890123456789012345
+ * 6789012345678901234567890
*
* The error action in ERROR state
* former rtc_error_do()
@@ -238,17 +238,17 @@
*
* @return RTC::ReturnCode_t
*
- * @pre on_error事前条件123456789012345678901234567890123456789012345678901234
- * 5678901234567890
- * @post on_error事後条件12345678901234567890123456789012345678901234567890123
- * 45678901234567890
+ * @pre on_error事前条件1234567890123456789012345678901234567890
+ * 123456789012345678901234567890
+ * @post on_error事後条件123456789012345678901234567890123456789
+ * 0123456789012345678901234567890
*
*/
// virtual RTC::ReturnCode_t onError(RTC::UniqueId ec_id);
/***
- * on_reset概要説明12345678901234567890123456789012345678901234567890123456789
- * 01234567890
+ * on_reset概要説明123456789012345678901234567890123456789012345
+ * 6789012345678901234567890
*
* The reset action that is invoked resetting
* This is same but different the former rtc_init_entry()
@@ -257,17 +257,17 @@
*
* @return RTC::ReturnCode_t
*
- * @pre on_reset事前条件123456789012345678901234567890123456789012345678901234
- * 5678901234567890
- * @post on_reset事後条件12345678901234567890123456789012345678901234567890123
- * 45678901234567890
+ * @pre on_reset事前条件1234567890123456789012345678901234567890
+ * 123456789012345678901234567890
+ * @post on_reset事後条件123456789012345678901234567890123456789
+ * 0123456789012345678901234567890
*
*/
// virtual RTC::ReturnCode_t onReset(RTC::UniqueId ec_id);
/***
- * on_state_update概要説明1234567890123456789012345678901234567890123456789012
- * 345678901234567890
+ * on_state_update概要説明12345678901234567890123456789012345678
+ * 90123456789012345678901234567890
*
* The state update action that is invoked after onExecute() action
* no corresponding operation exists in OpenRTm-aist-0.2.0
@@ -276,17 +276,17 @@
*
* @return RTC::ReturnCode_t
*
- * @pre on_state_update事前条件12345678901234567890123456789012345678901234567
- * 89012345678901234567890
- * @post on_state_update事後条件1234567890123456789012345678901234567890123456
- * 789012345678901234567890
+ * @pre on_state_update事前条件123456789012345678901234567890123
+ * 4567890123456789012345678901234567890
+ * @post on_state_update事後条件12345678901234567890123456789012
+ * 34567890123456789012345678901234567890
*
*/
// virtual RTC::ReturnCode_t onStateUpdate(RTC::UniqueId ec_id);
/***
- * on_rate_changed概要説明1234567890123456789012345678901234567890123456789012
- * 345678901234567890
+ * on_rate_changed概要説明12345678901234567890123456789012345678
+ * 90123456789012345678901234567890
*
* The action that is invoked when execution context's rate is changed
* no corresponding operation exists in OpenRTm-aist-0.2.0
@@ -295,10 +295,10 @@
*
* @return RTC::ReturnCode_t
*
- * @pre on_rate_changed事前条件12345678901234567890123456789012345678901234567
- * 89012345678901234567890
- * @post on_rate_changed事後条件1234567890123456789012345678901234567890123456
- * 789012345678901234567890
+ * @pre on_rate_changed事前条件123456789012345678901234567890123
+ * 4567890123456789012345678901234567890
+ * @post on_rate_changed事後条件12345678901234567890123456789012
+ * 34567890123456789012345678901234567890
*
*/
// virtual RTC::ReturnCode_t onRateChanged(RTC::UniqueId ec_id);
@@ -316,68 +316,69 @@
// Configuration variable declaration
// <rtc-template block="config_declare">
/*!
- * Config1の概要12345678901234567890123456789012345678901234567890123456789012
- * 34567890
+ * ０１２３４５６７８９０１２３４５６７８９０１２３４５６７８９０
+ * １２３４５６７８９
* - Name: Config1の名前 int_param0
* - DefaultValue: 0
- * - Unit: Config1の単位123456789012345678901234567890123456789012345678901234
- * 5678901234567890
- * - Range: Config1の範囲12345678901234567890123456789012345678901234567890123
- * 45678901234567890
- * - Constraint: Config1の制約条件12345678901234567890123456789012345678901234
- * 56789012345678901234567890
+ * - Unit: 01234567890123456789０１２３４５01234567890123456789０
+ * １２３４５01234567890123456789
+ * - Range: 0123456789012345678901234567890123456789 one two
+ * three four five six
+ * - Constraint: Config1の制約条件123456789012345678901234567890
+ * one two 1234567890 one two three four five six
*/
int m_int_param0;
/*!
- * Config2の概要12345678901234567890123456789012345678901234567890123456789012
- * 34567890
+ * Config2の概要123456789012345678901234567890123456789012345678
+ * 9012345678901234567890
* - Name: Config2の名前 int_param1
* - DefaultValue: 1
- * - Unit: Config2の単位123456789012345678901234567890123456789012345678901234
- * 5678901234567890
- * - Range: Config2の範囲12345678901234567890123456789012345678901234567890123
- * 45678901234567890
- * - Constraint: Config2の制約条件12345678901234567890123456789012345678901234
- * 56789012345678901234567890
+ * - Unit: Config2の単位
+ * 12345678901234567890123456789012345678901234567890123
+ * 45678901234567890 1234567890
+ * - Range: Config2の範囲123456789012345678901234567890123456789
+ * 0123456789012345678901234567890
+ * - Constraint: Config2の制約条件123456789012345678901234567890
+ * 1234567890123456789012345678901234567890
*/
int m_int_param1;
/*!
- * Config3の概要12345678901234567890123456789012345678901234567890123456789012
- * 34567890
+ * Config3の概要123456789012345678901234567890123456789012345678
+ * 9012345678901234567890
* - Name: Config3の名前 double_param0
* - DefaultValue: 0.11
- * - Unit: Config3の単位123456789012345678901234567890123456789012345678901234
- * 5678901234567890
- * - Range: Config3の範囲12345678901234567890123456789012345678901234567890123
- * 45678901234567890
- * - Constraint: Config3の制約条件12345678901234567890123456789012345678901234
- * 56789012345678901234567890
+ * - Unit: Config3の単位1234567890123456789012345678901234567890
+ * 123456789012345678901234567890
+ * - Range: Config3の範囲123456789012345678901234567890123456789
+ * 0123456789012345678901234567890
+ * - Constraint: Config3の制約条件123456789012345678901234567890
+ * 1234567890123456789012345678901234567890
*/
double m_double_param0;
/*!
- * Config4の概要12345678901234567890123456789012345678901234567890123456789012
- * 34567890
+ * Config4の概要123456789012345678901234567890123456789012345678
+ * 9012345678901234567890
* - Name: Config4の名前 str_param0
* - DefaultValue: hoge
- * - Unit: Config4の単位123456789012345678901234567890123456789012345678901234
- * 5678901234567890
- * - Range: Config4の範囲12345678901234567890123456789012345678901234567890123
- * 45678901234567890
- * - Constraint: Config4の制約条件12345678901234567890123456789012345678901234
- * 56789012345678901234567890
+ * - Unit: Config4の単位1234567890123456789012345678901234567890
+ * 123456789012345678901234567890
+ * - Range: Config4の範囲123456789012345678901234567890123456789
+ * 0123456789012345678901234567890
+ * - Constraint: Config4の制約条件123456789012345678901234567890
+ * 1234567890123456789012345678901234567890
*/
std::string m_str_param0;
/*!
- * Config5の概要12345678901234567890123456789012345678901234567890123456789012
- * 34567890
+ * Config5の概要123456789012345678901234567890123456789012345678
+ * 9012345678901234567890
* - Name: Config5の名前 str_param1
* - DefaultValue: dara
- * - Unit: Config5の単位123456789012345678901234567890123456789012345678901234
- * 5678901234567890
- * - Range: Config5の範囲12345678901234567890123456789012345678901234567890123
- * 45678901234567890
- * - Constraint: Config5の制約条件12345678901234567890123456789012345678901234
- * 56789012345678901234567890
+ * - Unit: Config5の単位1234567890123456789012345678901234567890
+ * 123456789012345678901234567890
+ * - Range: Config5の範囲123456789012345678901234567890123456789
+ * 0123456789012345678901234567890
+ * - Constraint: Config5の制約条件123456789012345678901234567890
+ * 1234567890123456789012345678901234567890
*/
std::string m_str_param1;
// </rtc-template>
@@ -386,38 +387,40 @@
// <rtc-template block="inport_declare">
TimedShort m_InName1;
/*!
- * InPort1の概要12345678901234567890123456789012345678901234567890123456789012
- * 34567890
- * - Type: InPort1のデータの型123456789012345678901234567890123456789012345678
- * 9012345678901234567890
- * - Number: InPort1のデータの数1234567890123456789012345678901234567890123456
- * 789012345678901234567890
- * - Semantics: InPort1のデータの意味12345678901234567890123456789012345678901
- * 23456789012345678901234567890
- * - Unit: InPort1のデータの単位1234567890123456789012345678901234567890123456
- * 789012345678901234567890
- * - Frequency: InPort1のデータの発生頻度1234567890123456789012345678901234567
- * 890123456789012345678901234567890
- * - Operation Cycle: InPort1のデータの処理周期1234567890123456789012345678901
- * 234567890123456789012345678901234567890
+ * InPort1の概要123456789012345678901234567890123456789012345678
+ * 9012345678901234567890
+ * - Type: InPort1のデータの型1234567890123456789012345678901234
+ * 567890123456789012345678901234567890
+ * - Number: InPort1のデータの数12345678901234567890123456789012
+ * 34567890123456789012345678901234567890
+ * - Semantics: InPort1のデータの意味123456789012345678901234567
+ * 8901234567890123456789012345678901234567890
+ * - Unit: InPort1のデータの単位12345678901234567890123456789012
+ * 34567890123456789012345678901234567890
+ * - Frequency: InPort1のデータの発生頻度12345678901234567890123
+ * 45678901234567890123456789012345678901234567890
+ * - Operation Cycle: InPort1のデータの処理周期12345678901234567
+ * 890123456789012345678901234567890123456789
+ * 01234567890
*/
InPort<TimedShort> m_InName1In;
TimedLong m_InNm2;
/*!
- * InPort2の概要12345678901234567890123456789012345678901234567890123456789012
- * 34567890
- * - Type: InPort2のデータの型123456789012345678901234567890123456789012345678
- * 9012345678901234567890
- * - Number: InPort2のデータの数1234567890123456789012345678901234567890123456
- * 789012345678901234567890
- * - Semantics: InPort2のデータの意味12345678901234567890123456789012345678901
- * 23456789012345678901234567890
- * - Unit: InPort2のデータの単位1234567890123456789012345678901234567890123456
- * 789012345678901234567890
- * - Frequency: InPort2のデータの発生頻度1234567890123456789012345678901234567
- * 890123456789012345678901234567890
- * - Operation Cycle: InPort2のデータの処理周期1234567890123456789012345678901
- * 234567890123456789012345678901234567890
+ * InPort2の概要123456789012345678901234567890123456789012345678
+ * 9012345678901234567890
+ * - Type: InPort2のデータの型1234567890123456789012345678901234
+ * 567890123456789012345678901234567890
+ * - Number: InPort2のデータの数12345678901234567890123456789012
+ * 34567890123456789012345678901234567890
+ * - Semantics: InPort2のデータの意味123456789012345678901234567
+ * 8901234567890123456789012345678901234567890
+ * - Unit: InPort2のデータの単位12345678901234567890123456789012
+ * 34567890123456789012345678901234567890
+ * - Frequency: InPort2のデータの発生頻度12345678901234567890123
+ * 45678901234567890123456789012345678901234567890
+ * - Operation Cycle: InPort2のデータの処理周期12345678901234567
+ * 890123456789012345678901234567890123456789
+ * 01234567890
*/
InPort<TimedLong> m_InNm2In;
@@ -428,38 +431,40 @@
// <rtc-template block="outport_declare">
TimedLong m_OutName1;
/*!
- * OutPort1の概要1234567890123456789012345678901234567890123456789012345678901
- * 234567890
- * - Type: OutPort1のデータの型12345678901234567890123456789012345678901234567
- * 89012345678901234567890
- * - Number: OutPort1のデータの数123456789012345678901234567890123456789012345
- * 6789012345678901234567890
- * - Semantics: OutPort1のデータの意味1234567890123456789012345678901234567890
- * 123456789012345678901234567890
- * - Unit: OutPort1のデータの単位123456789012345678901234567890123456789012345
- * 6789012345678901234567890
- * - Frequency: OutPort1のデータの発生頻度123456789012345678901234567890123456
- * 7890123456789012345678901234567890
- * - Operation Cycle: OutPort1のデータの処理周期123456789012345678901234567890
- * 1234567890123456789012345678901234567890
+ * OutPort1の概要12345678901234567890123456789012345678901234567
+ * 89012345678901234567890
+ * - Type: OutPort1のデータの型123456789012345678901234567890123
+ * 4567890123456789012345678901234567890
+ * - Number: OutPort1のデータの数1234567890123456789012345678901
+ * 234567890123456789012345678901234567890
+ * - Semantics: OutPort1のデータの意味12345678901234567890123456
+ * 78901234567890123456789012345678901234567890
+ * - Unit: OutPort1のデータの単位1234567890123456789012345678901
+ * 234567890123456789012345678901234567890
+ * - Frequency: OutPort1のデータの発生頻度1234567890123456789012
+ * 345678901234567890123456789012345678901234567890
+ * - Operation Cycle: OutPort1のデータの処理周期1234567890123456
+ * 789012345678901234567890123456789012345678
+ * 901234567890
*/
OutPort<TimedLong> m_OutName1Out;
TimedFloat m_OutNme2;
/*!
- * OutPort2の概要1234567890123456789012345678901234567890123456789012345678901
- * 234567890
- * - Type: OutPort2のデータの型12345678901234567890123456789012345678901234567
- * 89012345678901234567890
- * - Number: OutPort2のデータの数123456789012345678901234567890123456789012345
- * 6789012345678901234567890
- * - Semantics: OutPort2のデータの意味1234567890123456789012345678901234567890
- * 123456789012345678901234567890
- * - Unit: OutPort2のデータの単位123456789012345678901234567890123456789012345
- * 6789012345678901234567890
- * - Frequency: OutPort2のデータの発生頻度123456789012345678901234567890123456
- * 7890123456789012345678901234567890
- * - Operation Cycle: OutPort2のデータの処理周期123456789012345678901234567890
- * 1234567890123456789012345678901234567890
+ * OutPort2の概要12345678901234567890123456789012345678901234567
+ * 89012345678901234567890
+ * - Type: OutPort2のデータの型123456789012345678901234567890123
+ * 4567890123456789012345678901234567890
+ * - Number: OutPort2のデータの数1234567890123456789012345678901
+ * 234567890123456789012345678901234567890
+ * - Semantics: OutPort2のデータの意味12345678901234567890123456
+ * 78901234567890123456789012345678901234567890
+ * - Unit: OutPort2のデータの単位1234567890123456789012345678901
+ * 234567890123456789012345678901234567890
+ * - Frequency: OutPort2のデータの発生頻度1234567890123456789012
+ * 345678901234567890123456789012345678901234567890
+ * - Operation Cycle: OutPort2のデータの処理周期1234567890123456
+ * 789012345678901234567890123456789012345678
+ * 901234567890
*/
OutPort<TimedFloat> m_OutNme2Out;
@@ -468,17 +473,19 @@
// CORBA Port declaration
// <rtc-template block="corbaport_declare">
/*!
- * ServicePort1の概要123456789012345678901234567890123456789012345678901234567
- * 8901234567890
- * Interface: ServicePort1のインターフェースの概要1234567890123456789012345678
- * 901234567890123456789012345678901234567890
+ * ServicePort1の概要1234567890123456789012345678901234567890123
+ * 456789012345678901234567890
+ * Interface: ServicePort1のインターフェースの概要12345678901234
+ * 56789012345678901234567890123456789012345678901234
+ * 567890
*/
RTC::CorbaPort m_svPortPort;
/*!
- * ServicePort2の概要123456789012345678901234567890123456789012345678901234567
- * 8901234567890
- * Interface: ServicePort2のインターフェースの概要1234567890123456789012345678
- * 901234567890123456789012345678901234567890
+ * ServicePort2の概要1234567890123456789012345678901234567890123
+ * 456789012345678901234567890
+ * Interface: ServicePort2のインターフェースの概要12345678901234
+ * 56789012345678901234567890123456789012345678901234
+ * 567890
*/
RTC::CorbaPort m_cmPortPort;
@@ -487,18 +494,20 @@
// Service declaration
// <rtc-template block="service_declare">
/*!
- * ServiceIF1の概要説明1234567890123456789012345678901234567890123456789012345
- * 678901234567890
- * - Argument: ServiceIF1の引数123456789012345678901234567890123456789012
- * 3456789012345678901234567890
- * - Return Value: ServiceIF1の返値123456789012345678901234567890123456789012
- * 3456789012345678901234567890
- * - Exception: ServiceIF1の例外123456789012345678901234567890123456789012
- * 3456789012345678901234567890
- * - PreCondition: ServiceIF1の事前条件12345678901234567890123456789012345678
- * 90123456789012345678901234567890
- * - PostCondition: ServiceIF1の事後条件12345678901234567890123456789012345678
- * 90123456789012345678901234567890
+ * ServiceIF1の概要説明12345678901234567890123456789012345678901
+ * 23456789012345678901234567890
+ * - Argument: ServiceIF1の引数1234567890123456789012345678
+ * 901234567890123456789012345678901234567890
+ * - Return Value: ServiceIF1の返値1234567890123456789012345678
+ * 901234567890123456789012345678901234567890
+ * - Exception: ServiceIF1の例外1234567890123456789012345678
+ * 901234567890123456789012345678901234567890
+ * - PreCondition: ServiceIF1の事前条件123456789012345678901234
+ * 56789012345678901234567890123456789012345678
+ * 90
+ * - PostCondition: ServiceIF1の事後条件123456789012345678901234
+ * 56789012345678901234567890123456789012345678
+ * 90
*/
MyServiceSVC_impl m_acc;
@@ -507,18 +516,20 @@
// Consumer declaration
// <rtc-template block="consumer_declare">
/*!
- * ServiceIF2の概要説明1234567890123456789012345678901234567890123456789012345
- * 678901234567890
- * - Argument: ServiceIF2の引数123456789012345678901234567890123456789012
- * 3456789012345678901234567890
- * - Return Value: ServiceIF2の返値123456789012345678901234567890123456789012
- * 3456789012345678901234567890
- * - Exception: ServiceIF2の例外123456789012345678901234567890123456789012
- * 3456789012345678901234567890
- * - PreCondition: ServiceIF2の事前条件12345678901234567890123456789012345678
- * 90123456789012345678901234567890
- * - PostCondition: ServiceIF2の事後条件12345678901234567890123456789012345678
- * 90123456789012345678901234567890
+ * ServiceIF2の概要説明12345678901234567890123456789012345678901
+ * 23456789012345678901234567890
+ * - Argument: ServiceIF2の引数1234567890123456789012345678
+ * 901234567890123456789012345678901234567890
+ * - Return Value: ServiceIF2の返値1234567890123456789012345678
+ * 901234567890123456789012345678901234567890
+ * - Exception: ServiceIF2の例外1234567890123456789012345678
+ * 901234567890123456789012345678901234567890
+ * - PreCondition: ServiceIF2の事前条件123456789012345678901234
+ * 56789012345678901234567890123456789012345678
+ * 90
+ * - PostCondition: ServiceIF2の事後条件123456789012345678901234
+ * 56789012345678901234567890123456789012345678
+ * 90
*/
RTC::CorbaConsumer<DAQService> m_rate;
Modified: trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/Doc/fullLong/fooComp.cpp
===================================================================
--- trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/Doc/fullLong/fooComp.cpp 2011-12-17 16:11:24 UTC (rev 226)
+++ trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/Doc/fullLong/fooComp.cpp 2011-12-21 17:26:36 UTC (rev 227)
@@ -4,11 +4,11 @@
* @brief Standalone component
* @date $Date$
*
- * @author Noriaki Ando <n-ando at aist.go.jp>3456789412345678951234567896123456789
- * 7123456789812345
+ * @author Noriaki Ando <n-ando at aist.go.jp> one two three four
+ * five six seven eight nine ten
*
- * Copyright (C) 2006-2008 ライセンス1234567890123456789012345678901234567890123
- * 4567890
+ * Copyright (C) 2006-2008
+ * ライセンス12345678901234567890123456789012345678901234567890
*
* $Id$
*/
Modified: trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/src/jp/go/aist/rtm/rtcbuilder/IRtcBuilderConstants.java
===================================================================
--- trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/src/jp/go/aist/rtm/rtcbuilder/IRtcBuilderConstants.java 2011-12-17 16:11:24 UTC (rev 226)
+++ trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/src/jp/go/aist/rtm/rtcbuilder/IRtcBuilderConstants.java 2011-12-21 17:26:36 UTC (rev 227)
@@ -123,7 +123,7 @@
public static final String DOC_README_PORT_DETAIL_PREFIX = "\t\t" + SPACE17;
public static final String DOC_README_INTERFACE_PREFIX = "\t\t" + SPACE15;
//
- public static final int DOC_DEFAULT_WIDTH = 80;
+ public static final int DOC_DEFAULT_WIDTH = 66;
public static final int DOC_AUTHOR_OFFSET = 11;
public static final int DOC_DEFAULT_OFFSET = 3;
public static final int DOC_DESC_OFFSET = 5;
Modified: trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/src/jp/go/aist/rtm/rtcbuilder/util/StringUtil.java
===================================================================
--- trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/src/jp/go/aist/rtm/rtcbuilder/util/StringUtil.java 2011-12-17 16:11:24 UTC (rev 226)
+++ trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/src/jp/go/aist/rtm/rtcbuilder/util/StringUtil.java 2011-12-21 17:26:36 UTC (rev 227)
@@ -45,74 +45,92 @@
for( int intline=0; intline<lines.length; intline++ ) {
source = lines[intline];
- for( int intIdx=0; intIdx<source.length(); intIdx++ ) {
- char c = source.charAt(intIdx);
- if ((c <= '\u007e') || // 英数字
- (c == '\u00a5') || // \記号
- (c == '\u203e') || // ~記号
- (c >= '\uff61' && c <= '\uff9f') // 半角カナ
- ) {
- length += 1;
- } else {
- length += 2;
- }
- // 一文字ずつ取得する
- strBuf.append(c);
- // 改行文字の場合は，その前までを投入
- if (String.valueOf(c).equals(sep)) {
- workResult.add(strBuf);
- strBuf = new StringBuffer();
- length = 0;
- }
-
- if (String.valueOf(c).equals(START_MARK)) {
- // tempの値をworkに投入
- if (temp.size() > 0) {
- workResult.addAll(temp);
- temp = new ArrayList<StringBuffer>();
+ String[] eachWord = source.split(" ");
+
+ for(int idxWord=0;idxWord<eachWord.length;idxWord++) {
+ String target = eachWord[idxWord];
+ for( int intIdx=0; intIdx<target.length(); intIdx++ ) {
+ char c = target.charAt(intIdx);
+ if ((c <= '\u007e') || // 英数字
+ (c == '\u00a5') || // \記号
+ (c == '\u203e') || // ~記号
+ (c >= '\uff61' && c <= '\uff9f') // 半角カナ
+ ) {
+ length += 1;
+ } else {
+ length += 2;
}
- bolFlg = false;
- }
-
- if (String.valueOf(c).equals(END_MARK)) {
- bolFlg = true;
- if (temp.size() > 0) {
- // 終了文字までをStringBufferにため、workに投入
- StringBuffer workBuffer = new StringBuffer();
- for (int intIdx2=0; intIdx2 < temp.size(); intIdx2++) {
- workBuffer.append(temp.get(intIdx2));
+ // 一文字ずつ取得する
+ strBuf.append(c);
+ // 改行文字の場合は，その前までを投入
+ if (String.valueOf(c).equals(sep)) {
+ workResult.add(strBuf);
+ strBuf = new StringBuffer();
+ length = offset;
+ }
+
+ if (String.valueOf(c).equals(START_MARK)) {
+ // tempの値をworkに投入
+ if (temp.size() > 0) {
+ workResult.addAll(temp);
+ temp = new ArrayList<StringBuffer>();
}
- workBuffer.append(strBuf);
- workResult.add(workBuffer);
- // 初期化
bolFlg = false;
- temp = new ArrayList<StringBuffer>();
+ }
+
+ if (String.valueOf(c).equals(END_MARK)) {
+ bolFlg = true;
+ if (temp.size() > 0) {
+ // 終了文字までをStringBufferにため、workに投入
+ StringBuffer workBuffer = new StringBuffer();
+ for (int intIdx2=0; intIdx2 < temp.size(); intIdx2++) {
+ workBuffer.append(temp.get(intIdx2));
+ }
+ workBuffer.append(strBuf);
+ workResult.add(workBuffer);
+ // 初期化
+ bolFlg = false;
+ temp = new ArrayList<StringBuffer>();
+ strBuf = new StringBuffer();
+ length = offset;
+ }
+ }
+
+ if(length >= width) {
+ //単語の途中で改行になった場合
+ if(intIdx<target.length()) {
+ if(intIdx+2< strBuf.length()) {
+ //追加した単語の長さ分を削除
+ strBuf.delete(strBuf.length()-intIdx-2,strBuf.length());
+ //再度同じ単語を解析
+ intIdx = -1;
+ }
+ }
+ // width分文字列を取得した時に終了文字が含まれていなければtempへ
+ // 含まれていたらworkへ。
+ if (bolFlg == false) {
+ temp.add(strBuf);
+ } else {
+ workResult.add(strBuf);
+ }
strBuf = new StringBuffer();
- length = 0;
+ length = offset;
}
+
}
-
- if(length >= width) {
- // width分文字列を取得した時に終了文字が含まれていなければtempへ
- // 含まれていたらworkへ。
- if (bolFlg == false) {
- temp.add(strBuf);
- } else {
- workResult.add(strBuf);
- }
- strBuf = new StringBuffer();
- length = 0;
+ if( idxWord<eachWord.length-1 && 0<strBuf.length()) {
+ strBuf.append(" ");
+ length += 1;
}
-
}
-
+
// tempに残っている文字列をworkへ
if (temp.size() > 0) workResult.addAll(temp);
// strBufに残っている文字列をworkへ
if (strBuf.length() > 0) workResult.add(strBuf);
temp = new ArrayList<StringBuffer>();
strBuf = new StringBuffer();
- length = 0;
+ length = offset;
}
// workResultからresultを成形する
Modified: trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/test/jp/go/aist/rtm/rtcbuilder/_test/_100/CXXDocLongTest.java
===================================================================
--- trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/test/jp/go/aist/rtm/rtcbuilder/_test/_100/CXXDocLongTest.java 2011-12-17 16:11:24 UTC (rev 226)
+++ trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/test/jp/go/aist/rtm/rtcbuilder/_test/_100/CXXDocLongTest.java 2011-12-21 17:26:36 UTC (rev 227)
@@ -42,7 +42,7 @@
rtcParam.setMaxInstance(5);
rtcParam.setComponentKind("DataFlowComponent");
//
- rtcParam.setDocCreator("Noriaki Ando <n-ando at aist.go.jp>34567894123456789512345678961234567897123456789812345");
+ rtcParam.setDocCreator("Noriaki Ando <n-ando at aist.go.jp> one two three four five six seven eight nine ten");
rtcParam.setDocLicense("Copyright (C) 2006-2008 ライセンス12345678901234567890123456789012345678901234567890");
rtcParam.setDocDescription("本コンポーネントの概要説明1234567890123456789012345678901234567890123456789012345678901234567890");
rtcParam.setDocInOut("本コンポーネントの入出力1234567890123456789012345678901234567890123456789012345678901234567890");
@@ -181,17 +181,17 @@
List<ConfigSetParam> configset = new ArrayList<ConfigSetParam>();
ConfigSetParam config1 = new ConfigSetParam("int_param0","int","", "0");
config1.setDocDataName("Config1の名前");
- config1.setDocDescription("Config1の概要1234567890123456789012345678901234567890123456789012345678901234567890");
+ config1.setDocDescription("０１２３４５６７８９０１２３４５６７８９０１２３４５６７８９０１２３４５６７８９");
config1.setDocDefaultVal("Config1のデフォルト値");
- config1.setDocUnit("Config1の単位1234567890123456789012345678901234567890123456789012345678901234567890");
- config1.setDocRange("Config1の範囲1234567890123456789012345678901234567890123456789012345678901234567890");
- config1.setDocConstraint("Config1の制約条件1234567890123456789012345678901234567890123456789012345678901234567890");
+ config1.setDocUnit("01234567890123456789０１２３４５01234567890123456789０１２３４５01234567890123456789");
+ config1.setDocRange("0123456789012345678901234567890123456789 one two three four five six");
+ config1.setDocConstraint("Config1の制約条件123456789012345678901234567890 one two 1234567890 one two three four five six");
configset.add(config1);
ConfigSetParam config2 = new ConfigSetParam("int_param1","int","", "1");
config2.setDocDataName("Config2の名前");
config2.setDocDescription("Config2の概要1234567890123456789012345678901234567890123456789012345678901234567890");
config2.setDocDefaultVal("Config2のデフォルト値");
- config2.setDocUnit("Config2の単位1234567890123456789012345678901234567890123456789012345678901234567890");
+ config2.setDocUnit("Config2の単位 1234567890123456789012345678901234567890123456789012345678901234567890 1234567890");
config2.setDocRange("Config2の範囲1234567890123456789012345678901234567890123456789012345678901234567890");
config2.setDocConstraint("Config2の制約条件1234567890123456789012345678901234567890123456789012345678901234567890");
configset.add(config2);
openrtm-commit メーリングリストの案内