[openrtm-commit:00384] r546 - branches/work/ToGetProperties/jp.go.aist.rtm.RTC/src/jp/go/aist/rtm/RTC

[openrtm ＠ openrtm.org]

Author: fsi-katami
Date: 2011-08-14 17:14:09 +0900 (Sun, 14 Aug 2011)
New Revision: 546

Modified:
   branches/work/ToGetProperties/jp.go.aist.rtm.RTC/src/jp/go/aist/rtm/RTC/Manager.java
   branches/work/ToGetProperties/jp.go.aist.rtm.RTC/src/jp/go/aist/rtm/RTC/ManagerConfig.java
   branches/work/ToGetProperties/jp.go.aist.rtm.RTC/src/jp/go/aist/rtm/RTC/RTObject_impl.java
Log:
To get the value of m_properties by get_component_profile().  refs #2125

Modified: branches/work/ToGetProperties/jp.go.aist.rtm.RTC/src/jp/go/aist/rtm/RTC/Manager.java
===================================================================
--- branches/work/ToGetProperties/jp.go.aist.rtm.RTC/src/jp/go/aist/rtm/RTC/Manager.java	2011-08-14 07:47:47 UTC (rev 545)
+++ branches/work/ToGetProperties/jp.go.aist.rtm.RTC/src/jp/go/aist/rtm/RTC/Manager.java	2011-08-14 08:14:09 UTC (rev 546)
@@ -932,6 +932,16 @@
 
 
         final String[] inherit_prop = {
+            "config.version",
+            "openrtm.name",
+            "openrtm.version",
+            "os.name",
+            "os.release",
+            "os.version",
+            "os.arch",
+            "os.hostname",
+            "corba.endpoint",
+            "corba.id",
             "exec_cxt.periodic.type",
             "exec_cxt.periodic.rate",
             "exec_cxt.evdriven.type",

Modified: branches/work/ToGetProperties/jp.go.aist.rtm.RTC/src/jp/go/aist/rtm/RTC/ManagerConfig.java
===================================================================
--- branches/work/ToGetProperties/jp.go.aist.rtm.RTC/src/jp/go/aist/rtm/RTC/ManagerConfig.java	2011-08-14 07:47:47 UTC (rev 545)
+++ branches/work/ToGetProperties/jp.go.aist.rtm.RTC/src/jp/go/aist/rtm/RTC/ManagerConfig.java	2011-08-14 08:14:09 UTC (rev 546)
@@ -353,21 +353,21 @@
      * {@.ja システム情報を取得しプロパティにセットする。
      * 設定されるキーは以下の通り。
      * <ul>
-     * <li> manager.os.name    : OS名
-     * <li> manager.os.release : OSリリース名
-     * <li> maanger.os.version : OSバージョン名
-     * <li> manager.os.arch    : OSアーキテクチャ
-     * <li> manager.os.hostname: ホスト名
+     * <li> os.name    : OS名
+     * <li> os.release : OSリリース名
+     * <li> os.version : OSバージョン名
+     * <li> os.arch    : OSアーキテクチャ
+     * <li> os.hostname: ホスト名
      * <li> manager.pid        : プロセスID
      * </ul>}
      * {@.en Get the following system info. and set them to Manager's 
      * properties.
      * <ul>
-     * <li> manager.os.name    : OS name
-     * <li> manager.os.release : OS release name
-     * <li> manager.os.version : OS version
-     * <li> manager.os.arch    : OS architecture
-     * <li> manager.os.hostname: Hostname
+     * <li> os.name    : OS name
+     * <li> os.release : OS release name
+     * <li> os.version : OS version
+     * <li> os.arch    : OS architecture
+     * <li> os.hostname: Hostname
      * <li> manager.pid        : process ID
      * </ul>}
      *
@@ -412,11 +412,11 @@
             ignored.printStackTrace();
         }
         
-        properties.setProperty("manager.os.name", osName);
-        properties.setProperty("manager.os.release", osRelease);
-        properties.setProperty("manager.os.version", osVersion);
-        properties.setProperty("manager.os.arch", osArch);
-        properties.setProperty("manager.os.hostname", hostName);
+        properties.setProperty("os.name", osName);
+        properties.setProperty("os.release", osRelease);
+        properties.setProperty("os.version", osVersion);
+        properties.setProperty("os.arch", osArch);
+        properties.setProperty("os.hostname", hostName);
         properties.setProperty("manager.pid", pid);
 
     }

Modified: branches/work/ToGetProperties/jp.go.aist.rtm.RTC/src/jp/go/aist/rtm/RTC/RTObject_impl.java
===================================================================
--- branches/work/ToGetProperties/jp.go.aist.rtm.RTC/src/jp/go/aist/rtm/RTC/RTObject_impl.java	2011-08-14 07:47:47 UTC (rev 545)
+++ branches/work/ToGetProperties/jp.go.aist.rtm.RTC/src/jp/go/aist/rtm/RTC/RTObject_impl.java	2011-08-14 08:14:09 UTC (rev 546)
@@ -1098,6 +1098,10 @@
             profile.parent = m_profile.parent;
             profile.properties = m_profile.properties;
             profile.port_profiles = m_portAdmin.getPortProfileList().value;
+            NVListHolder nvholder = 
+                new NVListHolder(profile.properties);
+            NVUtil.copyFromProperties(nvholder, m_properties);
+            profile.properties = nvholder.value;
             return profile;
         } catch (Exception ex) {
             ; // This operation throws no exception.