[openrtm-commit:02394] r934 - trunk/OpenRTM-aist-Java/jp.go.aist.rtm.RTC/src/jp/go/aist/rtm/RTC/port

[openrtm ＠ openrtm.org]

Author: win-ei
Date: 2017-02-07 11:09:20 +0900 (Tue, 07 Feb 2017)
New Revision: 934

Modified:
   trunk/OpenRTM-aist-Java/jp.go.aist.rtm.RTC/src/jp/go/aist/rtm/RTC/port/ConnectorDataListener.java
   trunk/OpenRTM-aist-Java/jp.go.aist.rtm.RTC/src/jp/go/aist/rtm/RTC/port/InPortBase.java
   trunk/OpenRTM-aist-Java/jp.go.aist.rtm.RTC/src/jp/go/aist/rtm/RTC/port/OutPortBase.java
Log:
[FSM4RTC] EventPort class has been intorduced for FSm framework. refs #3772

Modified: trunk/OpenRTM-aist-Java/jp.go.aist.rtm.RTC/src/jp/go/aist/rtm/RTC/port/ConnectorDataListener.java
===================================================================
--- trunk/OpenRTM-aist-Java/jp.go.aist.rtm.RTC/src/jp/go/aist/rtm/RTC/port/ConnectorDataListener.java	2017-02-06 08:30:33 UTC (rev 933)
+++ trunk/OpenRTM-aist-Java/jp.go.aist.rtm.RTC/src/jp/go/aist/rtm/RTC/port/ConnectorDataListener.java	2017-02-07 02:09:20 UTC (rev 934)
@@ -7,6 +7,7 @@
 
 import RTC.ReturnCode_t;
 
+import jp.go.aist.rtm.RTC.connectorListener.ReturnCode;
   /**
    * {@.ja ConnectorDataListener クラス}
    * {@.en ConnectorDataListener class}

Modified: trunk/OpenRTM-aist-Java/jp.go.aist.rtm.RTC/src/jp/go/aist/rtm/RTC/port/InPortBase.java
===================================================================
--- trunk/OpenRTM-aist-Java/jp.go.aist.rtm.RTC/src/jp/go/aist/rtm/RTC/port/InPortBase.java	2017-02-06 08:30:33 UTC (rev 933)
+++ trunk/OpenRTM-aist-Java/jp.go.aist.rtm.RTC/src/jp/go/aist/rtm/RTC/port/InPortBase.java	2017-02-07 02:09:20 UTC (rev 934)
@@ -995,6 +995,27 @@
         this.addConnectorDataListener(type,listener,true);
     }
 
+    public void addConnectorDataListener(int type,
+                             ConnectorDataListener listener,
+                             boolean autoclean) {
+  
+        if (type < ConnectorDataListenerType.CONNECTOR_DATA_LISTENER_NUM) {
+            rtcout.println(Logbuf.TRACE,
+                    "addConnectorDataListener("
+                    +ConnectorDataListenerType.toString(type)
+                    +")");
+            m_listeners.connectorData_[type].addObserver(listener);
+            return;
+        }
+        rtcout.println(Logbuf.ERROR, 
+                    "addConnectorDataListener(): Invalid listener type.");
+        return;
+    }
+    public void addConnectorDataListener(int type,
+                                        ConnectorDataListener listener) {
+        this.addConnectorDataListener(type,listener,true);
+    }
+
     /**
      * {@.ja ConnectorDataListener リスナを削除する}
      * {@.en Removing BufferDataListener type listener}
@@ -1025,6 +1046,22 @@
                     "removeConnectorDataListener(): Invalid listener type.");
         return;
     }
+    public void removeConnectorDataListener(int type,
+                                ConnectorDataListener listener) {
+
+
+        if (type < ConnectorDataListenerType.CONNECTOR_DATA_LISTENER_NUM) {
+            rtcout.println(Logbuf.TRACE, 
+                             "removeConnectorDataListener("
+                             +ConnectorDataListenerType.toString(type)
+                             +")");
+            m_listeners.connectorData_[type].deleteObserver(listener);
+            return;
+        }
+        rtcout.println(Logbuf.ERROR, 
+                    "removeConnectorDataListener(): Invalid listener type.");
+        return;
+    }
   
     /**
      * {@.ja ConnectorListener リスナを追加する}

Modified: trunk/OpenRTM-aist-Java/jp.go.aist.rtm.RTC/src/jp/go/aist/rtm/RTC/port/OutPortBase.java
===================================================================
--- trunk/OpenRTM-aist-Java/jp.go.aist.rtm.RTC/src/jp/go/aist/rtm/RTC/port/OutPortBase.java	2017-02-06 08:30:33 UTC (rev 933)
+++ trunk/OpenRTM-aist-Java/jp.go.aist.rtm.RTC/src/jp/go/aist/rtm/RTC/port/OutPortBase.java	2017-02-07 02:09:20 UTC (rev 934)
@@ -1025,6 +1025,22 @@
                         "addConnectorDataListener(): Invalid listener type.");
         return; 
     }
+    public void addConnectorDataListener(int type,
+                             ConnectorDataListener listener,
+                             boolean autoclean) {
+  
+        if (type < ConnectorDataListenerType.CONNECTOR_DATA_LISTENER_NUM) {
+            rtcout.println(Logbuf.TRACE,
+                           "addConnectorDataListener("
+                           +ConnectorDataListenerType.toString(type)
+                           +")");
+            m_listeners.connectorData_[type].addObserver(listener);
+            return;
+        }
+        rtcout.println(Logbuf.ERROR,
+                        "addConnectorDataListener(): Invalid listener type.");
+        return; 
+    }
     /**
      * {@.ja ConnectorDataListener リスナを追加する}
      * {@.en Adds ConnectorDataListener type listener}
@@ -1103,6 +1119,10 @@
                                         ConnectorDataListenerT listener) {
         this.addConnectorDataListener(type,listener,true);
     }
+    public void addConnectorDataListener(int type,
+                                        ConnectorDataListener listener) {
+        this.addConnectorDataListener(type,listener,true);
+    }
 
     /**
      * {@.ja ConnectorDataListener リスナを削除する}
@@ -1134,6 +1154,21 @@
                     "removeConnectorDataListener(): Invalid listener type.");
         return;
     }
+    public void removeConnectorDataListener(int type,
+                                ConnectorDataListener listener) {
+
+        if (type < ConnectorDataListenerType.CONNECTOR_DATA_LISTENER_NUM) {
+            rtcout.println(Logbuf.TRACE,
+                            "removeConnectorDataListener("
+                            +ConnectorDataListenerType.toString(type)
+                            +")");
+            m_listeners.connectorData_[type].deleteObserver(listener);
+            return;
+        }
+        rtcout.println(Logbuf.ERROR,
+                    "removeConnectorDataListener(): Invalid listener type.");
+        return;
+    }
   
     /**
      * {@.ja ConnectorListener リスナを追加する}