[openrtm-commit:00470] r589 - trunk/jp.go.aist.rtm.RTC/src/jp/go/aist/rtm/RTC/util

[openrtm ＠ openrtm.org]

Author: fsi-katami
Date: 2011-11-01 15:28:37 +0900 (Tue, 01 Nov 2011)
New Revision: 589

Modified:
   trunk/jp.go.aist.rtm.RTC/src/jp/go/aist/rtm/RTC/util/NVUtil.java
   trunk/jp.go.aist.rtm.RTC/src/jp/go/aist/rtm/RTC/util/TypeCast.java
Log:
Fixed to treat  _SDOPackage.NameValue.value as String type.   refs #2277

Modified: trunk/jp.go.aist.rtm.RTC/src/jp/go/aist/rtm/RTC/util/NVUtil.java
===================================================================
--- trunk/jp.go.aist.rtm.RTC/src/jp/go/aist/rtm/RTC/util/NVUtil.java	2011-11-01 06:05:45 UTC (rev 588)
+++ trunk/jp.go.aist.rtm.RTC/src/jp/go/aist/rtm/RTC/util/NVUtil.java	2011-11-01 06:28:37 UTC (rev 589)
@@ -140,7 +140,7 @@
             }
             nvlist.value[intIdx].name = (String) keys.elementAt(intIdx);
             Any anyValue = ORBUtil.getOrb().create_any();
-            anyValue.insert_wstring(prop.getProperty((String) keys.elementAt(intIdx)));
+            anyValue.insert_string(prop.getProperty((String) keys.elementAt(intIdx)));
             nvlist.value[intIdx].value = anyValue;
         }
     }
@@ -480,7 +480,7 @@
                 }
                 if (!find) {
                     tmp_str = tmp_str + "," + value;
-                    nvlist.value[index].value.insert_wstring(tmp_str);
+                    nvlist.value[index].value.insert_string(tmp_str);
                 }
             }
         } else {

Modified: trunk/jp.go.aist.rtm.RTC/src/jp/go/aist/rtm/RTC/util/TypeCast.java
===================================================================
--- trunk/jp.go.aist.rtm.RTC/src/jp/go/aist/rtm/RTC/util/TypeCast.java	2011-11-01 06:05:45 UTC (rev 588)
+++ trunk/jp.go.aist.rtm.RTC/src/jp/go/aist/rtm/RTC/util/TypeCast.java	2011-11-01 06:28:37 UTC (rev 589)
@@ -284,7 +284,7 @@
             return any;
             
         } else if (klass.equals(String.class)) {
-            any.insert_wstring(String.class.cast(data));
+            any.insert_string(String.class.cast(data));
             return any;
             
         } else if (klass.equals(Character.class)) {