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

openrtm @ openrtm.org openrtm @ openrtm.org
2011年 12月 22日 (木) 17:12:54 JST


Author: fsi-katami
Date: 2011-12-22 17:12:53 +0900 (Thu, 22 Dec 2011)
New Revision: 612

Added:
   branches/work/ForLocalService/jp.go.aist.rtm.RTC/src/jp/go/aist/rtm/RTC/LocalServiceActionListenerArgument.java
   branches/work/ForLocalService/jp.go.aist.rtm.RTC/src/jp/go/aist/rtm/RTC/ModuleActionListenerArgument.java
Modified:
   branches/work/ForLocalService/jp.go.aist.rtm.RTC/src/jp/go/aist/rtm/RTC/LocalServiceActionListenerHolder.java
   branches/work/ForLocalService/jp.go.aist.rtm.RTC/src/jp/go/aist/rtm/RTC/ManagerActionListenerHolder.java
   branches/work/ForLocalService/jp.go.aist.rtm.RTC/src/jp/go/aist/rtm/RTC/ModuleActionListenerHolder.java
   branches/work/ForLocalService/jp.go.aist.rtm.RTC/src/jp/go/aist/rtm/RTC/NamingActionListenerHolder.java
   branches/work/ForLocalService/jp.go.aist.rtm.RTC/src/jp/go/aist/rtm/RTC/RtcLifecycleActionListenerHolder.java
Log:
Implemented LocalService.  refs #2301

Added: branches/work/ForLocalService/jp.go.aist.rtm.RTC/src/jp/go/aist/rtm/RTC/LocalServiceActionListenerArgument.java
===================================================================
--- branches/work/ForLocalService/jp.go.aist.rtm.RTC/src/jp/go/aist/rtm/RTC/LocalServiceActionListenerArgument.java	                        (rev 0)
+++ branches/work/ForLocalService/jp.go.aist.rtm.RTC/src/jp/go/aist/rtm/RTC/LocalServiceActionListenerArgument.java	2011-12-22 08:12:53 UTC (rev 612)
@@ -0,0 +1,32 @@
+package jp.go.aist.rtm.RTC;
+
+import jp.go.aist.rtm.RTC.util.Properties;
+
+  /**
+   * {@.ja LocalServiceActionListenerArgument クラス}
+   * {@.en LocalServiceActionListenerArgument class}
+   *
+   *
+   */
+public class LocalServiceActionListenerArgument {
+    /**
+     * {@.ja コンストラクタ}
+     * {@.en Constructor}
+     *
+     */
+    public LocalServiceActionListenerArgument(Properties prop,
+                                LocalServiceBase service){
+        m_prop = prop; 
+        m_service = service;
+    }
+    public LocalServiceActionListenerArgument(String service_name,
+                                LocalServiceBase service){
+        m_service_name = service_name; 
+        m_service = service;
+    }
+    public Properties m_prop; 
+    public LocalServiceBase m_service;
+    public String m_service_name;
+}
+
+

Modified: branches/work/ForLocalService/jp.go.aist.rtm.RTC/src/jp/go/aist/rtm/RTC/LocalServiceActionListenerHolder.java
===================================================================
--- branches/work/ForLocalService/jp.go.aist.rtm.RTC/src/jp/go/aist/rtm/RTC/LocalServiceActionListenerHolder.java	2011-12-22 06:43:06 UTC (rev 611)
+++ branches/work/ForLocalService/jp.go.aist.rtm.RTC/src/jp/go/aist/rtm/RTC/LocalServiceActionListenerHolder.java	2011-12-22 08:12:53 UTC (rev 612)
@@ -25,6 +25,9 @@
      * {@.en preServiceRegister callback function}
      */
     public void preServiceRegister(String service_name){
+        super.setChanged();
+        super.notifyObservers((Object)service_name);
+        super.clearChanged();
     }
     
     /**
@@ -33,6 +36,11 @@
      */
     public void postServiceRegister(String service_name,
                                      LocalServiceBase service){
+        super.setChanged();
+        LocalServiceActionListenerArgument arg 
+            = new LocalServiceActionListenerArgument(service_name,service);
+        super.notifyObservers((Object)arg);
+        super.clearChanged();
     }
     
     /**
@@ -41,6 +49,11 @@
      */
     public void preServiceInit(Properties prop,
                                 LocalServiceBase service){
+        super.setChanged();
+        LocalServiceActionListenerArgument arg 
+            = new LocalServiceActionListenerArgument(prop,service);
+        super.notifyObservers((Object)arg);
+        super.clearChanged();
     }
     /**
      * {@.ja postServiceInit コールバック関数}
@@ -48,6 +61,11 @@
      */
     public void postServiceInit(Properties prop,
                                  LocalServiceBase service){
+        super.setChanged();
+        LocalServiceActionListenerArgument arg 
+            = new LocalServiceActionListenerArgument(prop,service);
+        super.notifyObservers((Object)arg);
+        super.clearChanged();
     }
     
     /**
@@ -56,6 +74,11 @@
      */
     public void preServiceReinit(Properties prop,
                                   LocalServiceBase service){
+        super.setChanged();
+        LocalServiceActionListenerArgument arg 
+            = new LocalServiceActionListenerArgument(prop,service);
+        super.notifyObservers((Object)arg);
+        super.clearChanged();
     }
     /**
      * {@.ja postServiceReinit コールバック関数}
@@ -63,6 +86,11 @@
      */
     public void postServiceReinit(Properties prop,
                                    LocalServiceBase service){
+        super.setChanged();
+        LocalServiceActionListenerArgument arg 
+            = new LocalServiceActionListenerArgument(prop,service);
+        super.notifyObservers((Object)arg);
+        super.clearChanged();
     }
 
     /**
@@ -71,6 +99,11 @@
      */
     public void postServiceFinalize(String service_name,
                                      LocalServiceBase service){
+        super.setChanged();
+        LocalServiceActionListenerArgument arg 
+            = new LocalServiceActionListenerArgument(service_name,service);
+        super.notifyObservers((Object)arg);
+        super.clearChanged();
     }
     /**
      * {@.ja preServiceFinalize コールバック関数}
@@ -78,6 +111,11 @@
      */
     public void preServiceFinalize(String service_name,
                                     LocalServiceBase service){
+        super.setChanged();
+        LocalServiceActionListenerArgument arg 
+            = new LocalServiceActionListenerArgument(service_name,service);
+        super.notifyObservers((Object)arg);
+        super.clearChanged();
     }
   };
 

Modified: branches/work/ForLocalService/jp.go.aist.rtm.RTC/src/jp/go/aist/rtm/RTC/ManagerActionListenerHolder.java
===================================================================
--- branches/work/ForLocalService/jp.go.aist.rtm.RTC/src/jp/go/aist/rtm/RTC/ManagerActionListenerHolder.java	2011-12-22 06:43:06 UTC (rev 611)
+++ branches/work/ForLocalService/jp.go.aist.rtm.RTC/src/jp/go/aist/rtm/RTC/ManagerActionListenerHolder.java	2011-12-22 08:12:53 UTC (rev 612)
@@ -15,6 +15,9 @@
      * {@.en preShutdown callback function}
      */
     public void preShutdown(){
+        super.setChanged();
+        super.notifyObservers();
+        super.clearChanged();
     }
 
     /**
@@ -22,6 +25,9 @@
      * {@.en postShutdown callback function}
      */
     public void postShutdown() {
+        super.setChanged();
+        super.notifyObservers();
+        super.clearChanged();
     }
 
     /**
@@ -29,6 +35,9 @@
      * {@.en preReinit callback function}
      */
     public void preReinit(){
+        super.setChanged();
+        super.notifyObservers();
+        super.clearChanged();
     }
 
     /**
@@ -36,6 +45,9 @@
      * {@.en postReinit callback function}
      */
     public void postReinit(){
+        super.setChanged();
+        super.notifyObservers();
+        super.clearChanged();
     }
   };
 

Added: branches/work/ForLocalService/jp.go.aist.rtm.RTC/src/jp/go/aist/rtm/RTC/ModuleActionListenerArgument.java
===================================================================
--- branches/work/ForLocalService/jp.go.aist.rtm.RTC/src/jp/go/aist/rtm/RTC/ModuleActionListenerArgument.java	                        (rev 0)
+++ branches/work/ForLocalService/jp.go.aist.rtm.RTC/src/jp/go/aist/rtm/RTC/ModuleActionListenerArgument.java	2011-12-22 08:12:53 UTC (rev 612)
@@ -0,0 +1,22 @@
+package jp.go.aist.rtm.RTC;
+  /**
+   * {@.ja ModuleActionListenerArgument クラス}
+   * {@.en ModuleActionListenerArgument class}
+   *
+   *
+   */
+public class ModuleActionListenerArgument {
+    /**
+     * {@.ja コンストラクタ}
+     * {@.en Constructor}
+     *
+     */
+    public ModuleActionListenerArgument(String modname,
+                         String funcname){
+        m_modname = modname; 
+        m_funcname = funcname;
+    }
+    public String m_modname; 
+    public String m_funcname;
+}
+

Modified: branches/work/ForLocalService/jp.go.aist.rtm.RTC/src/jp/go/aist/rtm/RTC/ModuleActionListenerHolder.java
===================================================================
--- branches/work/ForLocalService/jp.go.aist.rtm.RTC/src/jp/go/aist/rtm/RTC/ModuleActionListenerHolder.java	2011-12-22 06:43:06 UTC (rev 611)
+++ branches/work/ForLocalService/jp.go.aist.rtm.RTC/src/jp/go/aist/rtm/RTC/ModuleActionListenerHolder.java	2011-12-22 08:12:53 UTC (rev 612)
@@ -16,6 +16,11 @@
      */
     public void preLoad(String modname,
                          String funcname){
+        super.setChanged();
+        ModuleActionListenerArgument arg 
+            = new ModuleActionListenerArgument(modname,funcname);
+        super.notifyObservers((Object)arg);
+        super.clearChanged();
     }
     
     /**
@@ -24,12 +29,20 @@
      */
     public void postLoad(String modname,
                           String funcname){
+        super.setChanged();
+        ModuleActionListenerArgument arg 
+            = new ModuleActionListenerArgument(modname,funcname);
+        super.notifyObservers((Object)arg);
+        super.clearChanged();
     }
     /**
      * {@.ja preUnload コールバック関数}
      * {@.en preUnload callback function}
      */
     public void preUnload(String modname){
+        super.setChanged();
+        super.notifyObservers((Object)modname);
+        super.clearChanged();
     }
     
     /**
@@ -37,6 +50,9 @@
      * {@.en postUnload callback function}
      */
     public void postUnload(String modname){
+        super.setChanged();
+        super.notifyObservers((Object)modname);
+        super.clearChanged();
     }
   };
 

Modified: branches/work/ForLocalService/jp.go.aist.rtm.RTC/src/jp/go/aist/rtm/RTC/NamingActionListenerHolder.java
===================================================================
--- branches/work/ForLocalService/jp.go.aist.rtm.RTC/src/jp/go/aist/rtm/RTC/NamingActionListenerHolder.java	2011-12-22 06:43:06 UTC (rev 611)
+++ branches/work/ForLocalService/jp.go.aist.rtm.RTC/src/jp/go/aist/rtm/RTC/NamingActionListenerHolder.java	2011-12-22 08:12:53 UTC (rev 612)
@@ -21,6 +21,11 @@
      */
     public void preBind(RTObject_impl rtobj,
                          Vector<String> name){
+        super.setChanged();
+        NamingActionListenerArgument arg 
+            = new NamingActionListenerArgument(rtobj,name);
+        super.notifyObservers((Object)arg);
+        super.clearChanged();
     }
     /**
      * {@.ja postBind コールバック関数}
@@ -28,6 +33,11 @@
      */
     public void postBind(RTObject_impl rtobj,
                           Vector<String> name){
+        super.setChanged();
+        NamingActionListenerArgument arg 
+            = new NamingActionListenerArgument(rtobj,name);
+        super.notifyObservers((Object)arg);
+        super.clearChanged();
     }
     
     /**
@@ -36,6 +46,11 @@
      */
     public void preUnbind(RTObject_impl rtobj,
                            Vector<String> name){
+        super.setChanged();
+        NamingActionListenerArgument arg 
+            = new NamingActionListenerArgument(rtobj,name);
+        super.notifyObservers((Object)arg);
+        super.clearChanged();
     }
     
     /**
@@ -44,6 +59,11 @@
      */
     public void postUnbind(RTObject_impl rtobj,
                             Vector<String> name){
+        super.setChanged();
+        NamingActionListenerArgument arg 
+            = new NamingActionListenerArgument(rtobj,name);
+        super.notifyObservers((Object)arg);
+        super.clearChanged();
     }
   };
 

Modified: branches/work/ForLocalService/jp.go.aist.rtm.RTC/src/jp/go/aist/rtm/RTC/RtcLifecycleActionListenerHolder.java
===================================================================
--- branches/work/ForLocalService/jp.go.aist.rtm.RTC/src/jp/go/aist/rtm/RTC/RtcLifecycleActionListenerHolder.java	2011-12-22 06:43:06 UTC (rev 611)
+++ branches/work/ForLocalService/jp.go.aist.rtm.RTC/src/jp/go/aist/rtm/RTC/RtcLifecycleActionListenerHolder.java	2011-12-22 08:12:53 UTC (rev 612)
@@ -19,6 +19,9 @@
      * {@.en preCreate callback function}
      */
     public void preCreate(String args){
+        super.setChanged();
+        super.notifyObservers((Object)args);
+        super.clearChanged();
     }
     
     /**
@@ -26,6 +29,9 @@
      * {@.en postCreate callback function}
      */
     public void postCreate(RTObject_impl rtobj){
+        super.setChanged();
+        super.notifyObservers((Object)rtobj);
+        super.clearChanged();
     }
     
     /**
@@ -33,6 +39,9 @@
      * {@.en preConfigure callback function}
      */
     public void preConfigure(Properties prop){
+        super.setChanged();
+        super.notifyObservers((Object)prop);
+        super.clearChanged();
     }
     
     /**
@@ -40,6 +49,9 @@
      * {@.en postConfigure callback function}
      */
     public void postConfigure(Properties prop){
+        super.setChanged();
+        super.notifyObservers((Object)prop);
+        super.clearChanged();
     }
     
     /**
@@ -47,6 +59,9 @@
      * {@.en preInitialize callback function}
      */
     public void preInitialize(){
+        super.setChanged();
+        super.notifyObservers();
+        super.clearChanged();
     }
     
     /**
@@ -54,6 +69,9 @@
      * {@.en postInitialize callback function}
      */
     public void postInitialize(){
+        super.setChanged();
+        super.notifyObservers();
+        super.clearChanged();
     }
   };
 



openrtm-commit メーリングリストの案内