[openrtm-commit:01735] r762 - trunk/OpenRTM-aist-Java/jp.go.aist.rtm.RTC/src/jp/go/aist/rtm/RTC

[openrtm ＠ openrtm.org]

Author: win-ei
Date: 2016-02-21 13:18:43 +0900 (Sun, 21 Feb 2016)
New Revision: 762

Modified:
   trunk/OpenRTM-aist-Java/jp.go.aist.rtm.RTC/src/jp/go/aist/rtm/RTC/RTObject_impl.java
Log:
Now PortProfile.properties of CorbaPort includes given port porperties from component configuration files. refs #3391

Modified: trunk/OpenRTM-aist-Java/jp.go.aist.rtm.RTC/src/jp/go/aist/rtm/RTC/RTObject_impl.java
===================================================================
--- trunk/OpenRTM-aist-Java/jp.go.aist.rtm.RTC/src/jp/go/aist/rtm/RTC/RTObject_impl.java	2016-02-20 10:05:48 UTC (rev 761)
+++ trunk/OpenRTM-aist-Java/jp.go.aist.rtm.RTC/src/jp/go/aist/rtm/RTC/RTObject_impl.java	2016-02-21 04:18:43 UTC (rev 762)
@@ -2936,7 +2936,34 @@
     public boolean addPort(CorbaPort port) {
         rtcout.println(Logbuf.TRACE, "addPort(CrobaPort)");
         String propkey = "port.corbaport.";
+
+        String temp = port.getName();
+        String[] vtmp = temp.split("\\.");
+        rtcout.println(Logbuf.PARANOID, 
+            "port.getName[]: "+Arrays.toString(vtmp));
+        if(vtmp.length != 0) {
+            propkey = propkey + vtmp[vtmp.length - 1];
+        }
+        {
+            String dumpString = new String();
+            rtcout.println(Logbuf.PARANOID, 
+                "m_properties.getNode("+propkey+") :");
+            Properties prop = new Properties();
+            prop = m_properties.getNode(propkey);
+            dumpString = m_properties._dump(dumpString, m_properties, 0);
+            rtcout.println(Logbuf.PARANOID, dumpString);
+        }
         m_properties.getNode(propkey).merge(m_properties.getNode("port.corba"));
+
+        {
+            String dumpString = new String();
+            rtcout.println(Logbuf.PARANOID, 
+                "m_properties.getNode("+propkey+") :");
+            Properties prop = new Properties();
+            prop = m_properties.getNode(propkey);
+            dumpString = m_properties._dump(dumpString, m_properties, 0);
+            rtcout.println(Logbuf.PARANOID, dumpString);
+        }
     
         port.init(m_properties.getNode(propkey));
         return addPort((PortBase)port);