[openrtm-commit:00351] r540 - in branches/work/ForComponentObserverConsumer/jp.go.aist.rtm.RTC/src/jp/go/aist/rtm/RTC: . SDOPackage

[openrtm ＠ openrtm.org]

Author: fsi-katami
Date: 2011-08-12 17:51:48 +0900 (Fri, 12 Aug 2011)
New Revision: 540

Modified:
   branches/work/ForComponentObserverConsumer/jp.go.aist.rtm.RTC/src/jp/go/aist/rtm/RTC/RTObject_impl.java
   branches/work/ForComponentObserverConsumer/jp.go.aist.rtm.RTC/src/jp/go/aist/rtm/RTC/SDOPackage/Configuration_impl.java
   branches/work/ForComponentObserverConsumer/jp.go.aist.rtm.RTC/src/jp/go/aist/rtm/RTC/SdoServiceProviderFactory.java
Log:
Implemented ComponentObserverConsumer.  refs #2051

Modified: branches/work/ForComponentObserverConsumer/jp.go.aist.rtm.RTC/src/jp/go/aist/rtm/RTC/RTObject_impl.java
===================================================================
--- branches/work/ForComponentObserverConsumer/jp.go.aist.rtm.RTC/src/jp/go/aist/rtm/RTC/RTObject_impl.java	2011-08-11 09:04:04 UTC (rev 539)
+++ branches/work/ForComponentObserverConsumer/jp.go.aist.rtm.RTC/src/jp/go/aist/rtm/RTC/RTObject_impl.java	2011-08-12 08:51:48 UTC (rev 540)
@@ -140,7 +140,9 @@
         m_writeAll = false;
         m_readAllCompletion = false;
         m_writeAllCompletion = false;
-        
+        rtcout = new Logbuf("RTObject_impl");
+        m_sdoservice = new SdoServiceAdmin(this);
+
         m_objref = this._this();
         m_pSdoConfigImpl = new Configuration_impl(m_configsets,m_sdoservice);
         m_pSdoConfig = m_pSdoConfigImpl.getObjRef();
@@ -157,7 +159,6 @@
         }
 
         m_profile.properties    = new NameValue[0];
-        rtcout = new Logbuf("RTObject_impl");
          
     }
 
@@ -183,6 +184,8 @@
         m_writeAll = false;
         m_readAllCompletion = false;
         m_writeAllCompletion = false;
+        rtcout = new Logbuf("RTObject_impl");
+        m_sdoservice = new SdoServiceAdmin(this);
         
         m_objref = this._this();
         m_pSdoConfigImpl = new Configuration_impl(m_configsets,m_sdoservice);
@@ -199,7 +202,6 @@
 
         Manager manager = Manager.instance();
         m_profile.properties    = new NameValue[0];
-        rtcout = new Logbuf("RTObject_impl");
     }
 
     /**
@@ -5092,7 +5094,6 @@
 
                 }
                 catch(java.lang.Exception e){
-                    System.out.println("Exception caught."+e.toString());
                     rtcout.println(Logbuf.WARN, 
                         "Exception caught."+e.toString());
                 }

Modified: branches/work/ForComponentObserverConsumer/jp.go.aist.rtm.RTC/src/jp/go/aist/rtm/RTC/SDOPackage/Configuration_impl.java
===================================================================
--- branches/work/ForComponentObserverConsumer/jp.go.aist.rtm.RTC/src/jp/go/aist/rtm/RTC/SDOPackage/Configuration_impl.java	2011-08-11 09:04:04 UTC (rev 539)
+++ branches/work/ForComponentObserverConsumer/jp.go.aist.rtm.RTC/src/jp/go/aist/rtm/RTC/SDOPackage/Configuration_impl.java	2011-08-12 08:51:48 UTC (rev 540)
@@ -1054,7 +1054,7 @@
      * {@.en SDO Service admin object with mutex lock}
      */
     protected SdoServiceAdmin m_sdoservice;
-    protected String m_sdoservice_mutex;
+    protected String m_sdoservice_mutex = new String();
     
     /**
      * {@.ja Organization リスト}

Modified: branches/work/ForComponentObserverConsumer/jp.go.aist.rtm.RTC/src/jp/go/aist/rtm/RTC/SdoServiceProviderFactory.java
===================================================================
--- branches/work/ForComponentObserverConsumer/jp.go.aist.rtm.RTC/src/jp/go/aist/rtm/RTC/SdoServiceProviderFactory.java	2011-08-11 09:04:04 UTC (rev 539)
+++ branches/work/ForComponentObserverConsumer/jp.go.aist.rtm.RTC/src/jp/go/aist/rtm/RTC/SdoServiceProviderFactory.java	2011-08-12 08:51:48 UTC (rev 540)
@@ -41,7 +41,7 @@
         }
         return factory_global;
 */
-        return (SdoServiceProviderFactory)instance("SdoServiceProviderFactory");
+        return (SdoServiceProviderFactory)instance("jp.go.aist.rtm.RTC.SdoServiceProviderFactory");
     }
     /**
      *  <p> mutex </p>