This interface can be moved to 'core' + removed parameter nodeInstance.

Signed-off-by: Roland Haeder <roland@mxchange.org>

diff --git a/application/hub/classes/listener/tcp/class_TcpListener.php b/application/hub/classes/listener/tcp/class_TcpListener.php
index 4d01c5a2c72507bd7e871757a8ab317bc548dc36..a5bed83ee6f041afe23c1b2ecd81078ade4fe87a 100644 (file)
--- a/application/hub/classes/listener/tcp/class_TcpListener.php
+++ b/application/hub/classes/listener/tcp/class_TcpListener.php
@@ -38,10 +38,9 @@ class TcpListener extends BaseListener implements Listenable {
        /**
         * Creates an instance of this class
         *
        /**
         * Creates an instance of this class
         *

-        * @param       $nodeInstance           A NodeHelper instance

         * @return      $listenerInstance       An instance a prepared listener class
         */
         * @return      $listenerInstance       An instance a prepared listener class
         */

-       public static final function createTcpListener (NodeHelper $nodeInstance) {
+       public static final function createTcpListener () {

                // Get new instance
                $listenerInstance = new TcpListener();
 
                // Get new instance
                $listenerInstance = new TcpListener();
 

diff --git a/application/hub/classes/listener/udp/class_UdpListener.php b/application/hub/classes/listener/udp/class_UdpListener.php
index 0eed46a90c23d57f1822051832f57c87f2faea39..63dbd2f93f2ed293610d3e1738ef6205e9abf9f4 100644 (file)
--- a/application/hub/classes/listener/udp/class_UdpListener.php
+++ b/application/hub/classes/listener/udp/class_UdpListener.php
@@ -38,10 +38,9 @@ class UdpListener extends BaseListener implements Listenable {
        /**
         * Creates an instance of this class
         *
        /**
         * Creates an instance of this class
         *

-        * @param       $nodeInstance           A NodeHelper instance

         * @return      $listenerInstance       An instance a prepared listener class
         */
         * @return      $listenerInstance       An instance a prepared listener class
         */

-       public static final function createUdpListener (NodeHelper $nodeInstance) {
+       public static final function createUdpListener () {

                // Get new instance
                $listenerInstance = new UdpListener();
 
                // Get new instance
                $listenerInstance = new UdpListener();
 

diff --git a/application/hub/classes/nodes/class_BaseHubNode.php b/application/hub/classes/nodes/class_BaseHubNode.php
index 1dff70eea9b166becf1ecf95f0b33ebb619caec0..0979c889bb210926b653c2baf859e961d90d13d9 100644 (file)
--- a/application/hub/classes/nodes/class_BaseHubNode.php
+++ b/application/hub/classes/nodes/class_BaseHubNode.php
@@ -532,7 +532,7 @@ class BaseHubNode extends BaseHubSystem implements Updateable, AddableCriteria {
                $this->setListenerPoolInstance(ObjectFactory::createObjectByConfiguredName('listener_pool_class', array($this)));
 
                // Get an instance of the low-level listener
                $this->setListenerPoolInstance(ObjectFactory::createObjectByConfiguredName('listener_pool_class', array($this)));
 
                // Get an instance of the low-level listener

-               $listenerInstance = ObjectFactory::createObjectByConfiguredName('tcp_listener_class', array($this));
+               $listenerInstance = ObjectFactory::createObjectByConfiguredName('tcp_listener_class');

 
                // Setup address and port
                $listenerInstance->setListenAddressByConfiguration('node_listen_addr');
 
                // Setup address and port
                $listenerInstance->setListenAddressByConfiguration('node_listen_addr');


@@ -559,7 +559,7 @@ class BaseHubNode extends BaseHubSystem implements Updateable, AddableCriteria {
                $this->getListenerPoolInstance()->addListener($decoratorInstance);
 
                // Get an instance of the low-level listener
                $this->getListenerPoolInstance()->addListener($decoratorInstance);
 
                // Get an instance of the low-level listener

-               $listenerInstance = ObjectFactory::createObjectByConfiguredName('udp_listener_class', array($this));
+               $listenerInstance = ObjectFactory::createObjectByConfiguredName('udp_listener_class');

 
                // Setup address and port
                $listenerInstance->setListenAddressByConfiguration('node_listen_addr');
 
                // Setup address and port
                $listenerInstance->setListenAddressByConfiguration('node_listen_addr');

diff --git a/application/hub/interfaces/listener/.htaccess b/application/hub/interfaces/listener/.htaccess
deleted file mode 100644 (file)
index 3a42882..0000000
--- a/application/hub/interfaces/listener/.htaccess
+++ /dev/null
@@ -1 +0,0 @@
-Deny from all

diff --git a/application/hub/interfaces/listener/class_Listenable.php b/application/hub/interfaces/listener/class_Listenable.php
deleted file mode 100644 (file)
index d453324..0000000
--- a/application/hub/interfaces/listener/class_Listenable.php
+++ /dev/null
@@ -1,85 +0,0 @@
-<?php
-/**
- * An interface for listeners
- *
- * @author             Roland Haeder <webmaster@shipsimu.org>
- * @version            0.0.0
- * @copyright  Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2015 Hub Developer Team
- * @license            GNU GPL 3.0 or any newer version
- * @link               http://www.shipsimu.org
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- */
-interface Listenable extends FrameworkInterface {
-       /**
-        * Initializes the listener by setting up the required socket server
-        *
-        * @return      void
-        */
-       function initListener();
-
-       /**
-        * "Listens" for incoming network packages
-        *
-        * @return      void
-        */
-       function doListen();
-
-       /**
-        * Checks whether the listener would accept the given package data array
-        *
-        * @param       $packageData    Raw package data
-        * @return      $accepts                Whether this listener does accept
-        */
-       function ifListenerAcceptsPackageData (array $packageData);
-
-       /**
-        * Monitors incoming raw data from the handler and transfers it to the
-        * given receiver instance.
-        *
-        * @return      void
-        */
-       function monitorIncomingRawData ();
-
-       /**
-        * Getter for listen address
-        *
-        * @return      $listenAddress  The address this listener should listen on
-        */
-       function getListenAddress ();
-
-       /**
-        * Getter for listen port
-        *
-        * @return      $listenPort             The port this listener should listen on
-        */
-       function getListenPort ();
-
-       /**
-        * Getter for connection type
-        *
-        * @return      $connectionType         Connection type for this listener
-        */
-       function getConnectionType ();
-
-       /**
-        * Getter for peer pool instance
-        *
-        * @return      $poolInstance   The peer pool instance we shall set
-        */
-       function getPoolInstance ();
-}
-
-// [EOF]
-?>