[openrtm-commit:03322] r1124 - in trunk/OpenRTM-aist-Java/jp.go.aist.rtm.RTC/src/jp/go/aist/rtm/RTC: . port

[openrtm ＠ openrtm.org]

Author: t-katami
Date: 2018-03-29 15:42:39 +0900 (Thu, 29 Mar 2018)
New Revision: 1124

Modified:
   trunk/OpenRTM-aist-Java/jp.go.aist.rtm.RTC/src/jp/go/aist/rtm/RTC/Manager.java
   trunk/OpenRTM-aist-Java/jp.go.aist.rtm.RTC/src/jp/go/aist/rtm/RTC/port/InPortBase.java
   trunk/OpenRTM-aist-Java/jp.go.aist.rtm.RTC/src/jp/go/aist/rtm/RTC/port/OutPortBase.java
   trunk/OpenRTM-aist-Java/jp.go.aist.rtm.RTC/src/jp/go/aist/rtm/RTC/port/PortBase.java
Log:
[compat,->RELENG_1_2] Made the contents of rtc.conf reflected to the connector profile. refs #4477

Modified: trunk/OpenRTM-aist-Java/jp.go.aist.rtm.RTC/src/jp/go/aist/rtm/RTC/Manager.java
===================================================================
--- trunk/OpenRTM-aist-Java/jp.go.aist.rtm.RTC/src/jp/go/aist/rtm/RTC/Manager.java	2018-03-28 08:40:45 UTC (rev 1123)
+++ trunk/OpenRTM-aist-Java/jp.go.aist.rtm.RTC/src/jp/go/aist/rtm/RTC/Manager.java	2018-03-29 06:42:39 UTC (rev 1124)
@@ -1761,7 +1761,10 @@
             ""
         };
 
-
+        Properties prop_ = prop.getNode("port");
+        prop_.merge(m_config.getNode("port"));
+         
+       
         comp = factory.create(this);
         rtcout.println(Logbuf.PARANOID, 
                         "factory.create(this):" +comp);

Modified: trunk/OpenRTM-aist-Java/jp.go.aist.rtm.RTC/src/jp/go/aist/rtm/RTC/port/InPortBase.java
===================================================================
--- trunk/OpenRTM-aist-Java/jp.go.aist.rtm.RTC/src/jp/go/aist/rtm/RTC/port/InPortBase.java	2018-03-28 08:40:45 UTC (rev 1123)
+++ trunk/OpenRTM-aist-Java/jp.go.aist.rtm.RTC/src/jp/go/aist/rtm/RTC/port/InPortBase.java	2018-03-29 06:42:39 UTC (rev 1124)
@@ -568,7 +568,17 @@
                 new NVListHolder(connector_profile.value.properties);
         NVUtil.copyToProperties(prop, nvholder);
 
-        String _str = m_properties.getProperty("dataport.fan_in");
+
+        Properties node = prop.getNode("dataport.inport");
+        Properties portprop = new Properties(m_properties);
+        portprop.merge(node);
+        node.merge(portprop);
+        NVListHolder holder = new NVListHolder(new NameValue[0]);
+        NVUtil.copyFromProperties(holder,prop);
+        connector_profile.value.properties = holder.value;
+
+        String _str = node.getProperty("fan_out");
+
         int _type = 100;
         try {
             _type = Integer.parseInt(_str);

Modified: trunk/OpenRTM-aist-Java/jp.go.aist.rtm.RTC/src/jp/go/aist/rtm/RTC/port/OutPortBase.java
===================================================================
--- trunk/OpenRTM-aist-Java/jp.go.aist.rtm.RTC/src/jp/go/aist/rtm/RTC/port/OutPortBase.java	2018-03-28 08:40:45 UTC (rev 1123)
+++ trunk/OpenRTM-aist-Java/jp.go.aist.rtm.RTC/src/jp/go/aist/rtm/RTC/port/OutPortBase.java	2018-03-29 06:42:39 UTC (rev 1124)
@@ -563,7 +563,15 @@
                 new NVListHolder(connector_profile.value.properties);
         NVUtil.copyToProperties(prop, nvholder);
 
-        String _str = m_properties.getProperty("dataport.fan_out");
+        Properties node = prop.getNode("dataport.outport");
+        Properties portprop = new Properties(m_properties);
+        portprop.merge(node);
+        node.merge(portprop);
+        NVListHolder holder = new NVListHolder(new NameValue[0]);
+        NVUtil.copyFromProperties(holder,prop);
+        connector_profile.value.properties = holder.value;
+
+        String _str = node.getProperty("fan_out");
         int _type = 100;
         try {
             _type = Integer.parseInt(_str);

Modified: trunk/OpenRTM-aist-Java/jp.go.aist.rtm.RTC/src/jp/go/aist/rtm/RTC/port/PortBase.java
===================================================================
--- trunk/OpenRTM-aist-Java/jp.go.aist.rtm.RTC/src/jp/go/aist/rtm/RTC/port/PortBase.java	2018-03-28 08:40:45 UTC (rev 1123)
+++ trunk/OpenRTM-aist-Java/jp.go.aist.rtm.RTC/src/jp/go/aist/rtm/RTC/port/PortBase.java	2018-03-29 06:42:39 UTC (rev 1124)
@@ -732,7 +732,7 @@
                 new NVListHolder(this.m_profile.properties);
         NVUtil.copyToProperties(prop, nvholder);
         boolean default_value = StringUtil.toBool(
-                   prop.getProperty("dataport.allow_dup_connection"),
+                   prop.getProperty("allow_dup_connection"),
                                      "YES", "NO", false); 
 
         prop = new Properties();