[openrtm-commit:00526] r619 - branches/work/ForLocalService/jp.go.aist.rtm.RTC/src/jp/go/aist/rtm/RTC

[openrtm ＠ openrtm.org]

Author: fsi-katami
Date: 2011-12-28 14:37:59 +0900 (Wed, 28 Dec 2011)
New Revision: 619

Modified:
   branches/work/ForLocalService/jp.go.aist.rtm.RTC/src/jp/go/aist/rtm/RTC/Manager.java
Log:
Implemented LocalService.  refs #2301

Modified: branches/work/ForLocalService/jp.go.aist.rtm.RTC/src/jp/go/aist/rtm/RTC/Manager.java
===================================================================
--- branches/work/ForLocalService/jp.go.aist.rtm.RTC/src/jp/go/aist/rtm/RTC/Manager.java	2011-12-28 01:01:43 UTC (rev 618)
+++ branches/work/ForLocalService/jp.go.aist.rtm.RTC/src/jp/go/aist/rtm/RTC/Manager.java	2011-12-28 05:37:59 UTC (rev 619)
@@ -846,7 +846,6 @@
         
         rtcout.println(Logbuf.TRACE, 
                             "Manager.createComponent(" + comp_args + ")");
-System.out.println("Manager.createComponent(" + comp_args + ")");
         
         if( comp_args == null || comp_args.equals("") ) {
             return null;
@@ -1280,6 +1279,7 @@
         
         // NamingManagerのみで代用可能
         m_compManager.registerObject(comp, new InstanceName(comp));
+
         
         String[] names = comp.getNamingNames();
         m_listeners.naming_.preBind(comp,names);
@@ -1318,11 +1318,13 @@
         m_compManager.unregisterObject(new InstanceName(comp));
         
         String[] names = comp.getNamingNames();
+        m_listeners.naming_.preUnbind(comp, names);
         for (int i = 0; i < names.length; ++i) {
             rtcout.println(Logbuf.TRACE, "Unbind name: " + names[i]);
             
             m_namingManager.unbindObject(names[i]);
         }
+        m_listeners.naming_.postUnbind(comp, names);
         
         return true;
     }
@@ -1688,7 +1690,7 @@
     public void
     addRtcLifecycleActionListener(RtcLifecycleActionListener listener,
                                   boolean autoclean){
-    m_listeners.rtclifecycle_.addObserver(listener);
+        m_listeners.rtclifecycle_.addObserver(listener);
     }
     /**
      *
@@ -2545,17 +2547,6 @@
     protected void shutdownNaming() {
         
         rtcout.println(Logbuf.TRACE, "Manager.shutdownNaming()");
-        Vector<RTObject_impl> comps = getComponents();
-
-        for (int ic=0; ic < comps.size(); ++ic) {
-            String[] names = comps.get(ic).getNamingNames();
-            m_listeners.naming_.preUnbind(comps.get(ic), names);
-            for (int jc=0; jc < names.length; ++jc) {
-                m_namingManager.unbindObject(names[jc]);
-            }
-            m_listeners.naming_.postUnbind(comps.get(ic), names);
-        }
-
         m_namingManager.unbindAll();
     }