[openrtm-commit:00355] r541 - branches/work/ForComponentObserverConsumer/jp.go.aist.rtm.RTC/src/jp/go/aist/rtm/RTC

[openrtm ＠ openrtm.org]

Author: fsi-katami
Date: 2011-08-13 15:59:50 +0900 (Sat, 13 Aug 2011)
New Revision: 541

Modified:
   branches/work/ForComponentObserverConsumer/jp.go.aist.rtm.RTC/src/jp/go/aist/rtm/RTC/ComponentObserverConsumer.java
   branches/work/ForComponentObserverConsumer/jp.go.aist.rtm.RTC/src/jp/go/aist/rtm/RTC/DefaultConfiguration.java
   branches/work/ForComponentObserverConsumer/jp.go.aist.rtm.RTC/src/jp/go/aist/rtm/RTC/SdoServiceAdmin.java
Log:
Implemented ComponentObserverConsumer.  refs #2051

Modified: branches/work/ForComponentObserverConsumer/jp.go.aist.rtm.RTC/src/jp/go/aist/rtm/RTC/ComponentObserverConsumer.java
===================================================================
--- branches/work/ForComponentObserverConsumer/jp.go.aist.rtm.RTC/src/jp/go/aist/rtm/RTC/ComponentObserverConsumer.java	2011-08-12 08:51:48 UTC (rev 540)
+++ branches/work/ForComponentObserverConsumer/jp.go.aist.rtm.RTC/src/jp/go/aist/rtm/RTC/ComponentObserverConsumer.java	2011-08-13 06:59:50 UTC (rev 541)
@@ -60,7 +60,7 @@
     public boolean init(RTObject_impl rtobj,
                       final _SDOPackage.ServiceProfile profile){
 
-        if (!m_observer.setObject(profile.service)) {
+        if (!m_observer.setObject(ComponentObserverHelper.narrow(profile.service))) {
           // narrowing failed
           return false;
         }
@@ -754,7 +754,8 @@
 
     private RTObject_impl m_rtobj;
     private _SDOPackage.ServiceProfile m_profile;
-    private CorbaConsumer<OpenRTM.ComponentObserver> m_observer;
+    private CorbaConsumer<OpenRTM.ComponentObserver> m_observer =
+            new CorbaConsumer<OpenRTM.ComponentObserver>(OpenRTM.ComponentObserver.class);
 
     private boolean[] m_observed = new boolean[StatusKind._STATUS_KIND_NUM];
 

Modified: branches/work/ForComponentObserverConsumer/jp.go.aist.rtm.RTC/src/jp/go/aist/rtm/RTC/DefaultConfiguration.java
===================================================================
--- branches/work/ForComponentObserverConsumer/jp.go.aist.rtm.RTC/src/jp/go/aist/rtm/RTC/DefaultConfiguration.java	2011-08-12 08:51:48 UTC (rev 540)
+++ branches/work/ForComponentObserverConsumer/jp.go.aist.rtm.RTC/src/jp/go/aist/rtm/RTC/DefaultConfiguration.java	2011-08-13 06:59:50 UTC (rev 541)
@@ -58,6 +58,8 @@
         "manager.shutdown_auto",            "YES",
         "manager.name",                     "manager",
         "manager.command",                  "rtcd",
+        "sdo.service.provider.enabled_services",  "ALL",
+        "sdo.service.consumer.enabled_services",  "ALL",
         ""
     };
 }

Modified: branches/work/ForComponentObserverConsumer/jp.go.aist.rtm.RTC/src/jp/go/aist/rtm/RTC/SdoServiceAdmin.java
===================================================================
--- branches/work/ForComponentObserverConsumer/jp.go.aist.rtm.RTC/src/jp/go/aist/rtm/RTC/SdoServiceAdmin.java	2011-08-12 08:51:48 UTC (rev 540)
+++ branches/work/ForComponentObserverConsumer/jp.go.aist.rtm.RTC/src/jp/go/aist/rtm/RTC/SdoServiceAdmin.java	2011-08-13 06:59:50 UTC (rev 541)
@@ -88,7 +88,7 @@
      */
     public SdoServiceAdmin(RTObject_impl rtobj) {
         m_rtobj = rtobj;
-        m_allConsumerAllowed = true;
+        m_allConsumerEnabled = true;
         rtcout = new Logbuf("SdoServiceAdmin");
         rtcout.println(Logbuf.TRACE, "SdoServiceAdmin.SdoServiceAdmin(" + rtobj.getProperties().getProperty("instance_name") + ")");
 
@@ -417,7 +417,8 @@
         if (m_allConsumerEnabled) { return true; }
 
         for (Iterator ic=m_consumerTypes.iterator(); ic.hasNext();) {
-            if (ic.next().equals(sProfile.interface_type)) {
+            String str = (String)ic.next();
+            if (str.equals(sProfile.interface_type)) {
                 rtcout.println(Logbuf.DEBUG,sProfile.interface_type+" is supported SDO service.");
                 return true;
             }
@@ -464,7 +465,6 @@
 
     private List<String> m_consumerTypes = new ArrayList<String>();
     private boolean m_allConsumerEnabled;
-    private boolean m_allConsumerAllowed;
     
     /**
      * {@.ja Lock 付き SDO ServiceProfileList}