[openrtm-commit:02528] r955 - in branches/RELENG_1_2/OpenRTM-aist-Java: . jp.go.aist.rtm.RTC jp.go.aist.rtm.RTC/src/jp/go/aist/rtm/RTC/port jp.go.aist.rtm.RTC/src/jp/go/aist/rtm/RTC/util
openrtm ＠ openrtm.org
openrtm ＠ openrtm.org
2017年 3月 17日 (金) 14:00:26 JST
Author: kawauchi
Date: 2017-03-17 14:00:25 +0900 (Fri, 17 Mar 2017)
New Revision: 955
Modified:
branches/RELENG_1_2/OpenRTM-aist-Java/
branches/RELENG_1_2/OpenRTM-aist-Java/jp.go.aist.rtm.RTC/
branches/RELENG_1_2/OpenRTM-aist-Java/jp.go.aist.rtm.RTC/src/jp/go/aist/rtm/RTC/port/ReturnCode.java
branches/RELENG_1_2/OpenRTM-aist-Java/jp.go.aist.rtm.RTC/src/jp/go/aist/rtm/RTC/util/NVUtil.java
Log:
[merge] r948,953 have been merged from trunk.
Property changes on: branches/RELENG_1_2/OpenRTM-aist-Java
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/RELENG_1_1/OpenRTM-aist-Java:806
/trunk/OpenRTM-aist-Java:929-930,932,943
+ /branches/RELENG_1_1/OpenRTM-aist-Java:806
/trunk/OpenRTM-aist-Java:929-930,932,943,948,953
Property changes on: branches/RELENG_1_2/OpenRTM-aist-Java/jp.go.aist.rtm.RTC
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/RELENG_1_0/jp.go.aist.rtm.RTC:408-498
/branches/RELENG_1_0_0/jp.go.aist.rtm.RTC:60-401
/branches/RELENG_1_1/OpenRTM-aist-Java/jp.go.aist.rtm.RTC:806
/branches/work/ConfigurationCallback/jp.go.aist.rtm.RTC:631-635
/branches/work/DesignChangeOfEC/jp.go.aist.rtm.RTC:648-660
/branches/work/ForComponentActionListener/jp.go.aist.rtm.RTC:521-522
/branches/work/ForComponentObserverConsumer/jp.go.aist.rtm.RTC:534-543
/branches/work/ForConfigurationListener/jp.go.aist.rtm.RTC:524-526
/branches/work/ForFileNameservice/jp.go.aist.rtm.RTC:623-628
/branches/work/ForLogFormat/jp.go.aist.rtm.RTC:518-519
/branches/work/ForPortConnectListener/jp.go.aist.rtm.RTC:528-532
/branches/work/ForSDOServiceAdminClass/jp.go.aist.rtm.RTC:505-507
/branches/work/LoggerService/jp.go.aist.rtm.RTC:666-669
/branches/work/SourceSharing/jp.go.aist.rtm.RTC:591-603
/branches/work/ToGetProperties/jp.go.aist.rtm.RTC:545-548
/branches/work/ToIFR_ID/jp.go.aist.rtm.RTC:509-514
/trunk/OpenRTM-aist-Java/jp.go.aist.rtm.RTC:929-930,932,943
+ /branches/RELENG_1_0/jp.go.aist.rtm.RTC:408-498
/branches/RELENG_1_0_0/jp.go.aist.rtm.RTC:60-401
/branches/RELENG_1_1/OpenRTM-aist-Java/jp.go.aist.rtm.RTC:806
/branches/work/ConfigurationCallback/jp.go.aist.rtm.RTC:631-635
/branches/work/DesignChangeOfEC/jp.go.aist.rtm.RTC:648-660
/branches/work/ForComponentActionListener/jp.go.aist.rtm.RTC:521-522
/branches/work/ForComponentObserverConsumer/jp.go.aist.rtm.RTC:534-543
/branches/work/ForConfigurationListener/jp.go.aist.rtm.RTC:524-526
/branches/work/ForFileNameservice/jp.go.aist.rtm.RTC:623-628
/branches/work/ForLogFormat/jp.go.aist.rtm.RTC:518-519
/branches/work/ForPortConnectListener/jp.go.aist.rtm.RTC:528-532
/branches/work/ForSDOServiceAdminClass/jp.go.aist.rtm.RTC:505-507
/branches/work/LoggerService/jp.go.aist.rtm.RTC:666-669
/branches/work/SourceSharing/jp.go.aist.rtm.RTC:591-603
/branches/work/ToGetProperties/jp.go.aist.rtm.RTC:545-548
/branches/work/ToIFR_ID/jp.go.aist.rtm.RTC:509-514
/trunk/OpenRTM-aist-Java/jp.go.aist.rtm.RTC:929-930,932,943,948,953
Modified: branches/RELENG_1_2/OpenRTM-aist-Java/jp.go.aist.rtm.RTC/src/jp/go/aist/rtm/RTC/port/ReturnCode.java
===================================================================
--- branches/RELENG_1_2/OpenRTM-aist-Java/jp.go.aist.rtm.RTC/src/jp/go/aist/rtm/RTC/port/ReturnCode.java 2017-02-21 07:09:31 UTC (rev 954)
+++ branches/RELENG_1_2/OpenRTM-aist-Java/jp.go.aist.rtm.RTC/src/jp/go/aist/rtm/RTC/port/ReturnCode.java 2017-03-17 05:00:25 UTC (rev 955)
@@ -1,7 +1,7 @@
package jp.go.aist.rtm.RTC.port;
/**
* {@.ja DataPortStatus リターンコード}
- * {@.en @brief DataPortStatus return codes}
+ * {@.en DataPortStatus return codes}
*
* <p>
* {@.ja データポート関連のクラスで共通のリターンコード
Modified: branches/RELENG_1_2/OpenRTM-aist-Java/jp.go.aist.rtm.RTC/src/jp/go/aist/rtm/RTC/util/NVUtil.java
===================================================================
--- branches/RELENG_1_2/OpenRTM-aist-Java/jp.go.aist.rtm.RTC/src/jp/go/aist/rtm/RTC/util/NVUtil.java 2017-02-21 07:09:31 UTC (rev 954)
+++ branches/RELENG_1_2/OpenRTM-aist-Java/jp.go.aist.rtm.RTC/src/jp/go/aist/rtm/RTC/util/NVUtil.java 2017-03-17 05:00:25 UTC (rev 955)
@@ -227,6 +227,9 @@
else if(anyVal.type().name().equals("TimedShort")) {
value = RTC.TimedShortHelper.extract(anyVal).toString();
}
+ else if(anyVal.type().name().equals("TimedString")) {
+ value = RTC.TimedStringHelper.extract(anyVal).toString();
+ }
else if(anyVal.type().name().equals("TimedBooleanSeq")) {
value = RTC.TimedBooleanSeqHelper.extract(anyVal).toString();
}
openrtm-commit メーリングリストの案内