Rewrites, some more methods:

[hub.git] / application / hub / main / template / announcement / class_XmlAnnouncementTemplateEngine.php

diff --git a/application/hub/main/template/announcement/class_XmlAnnouncementTemplateEngine.php b/application/hub/main/template/announcement/class_XmlAnnouncementTemplateEngine.php
index e0fdbd70a990244bd43728fabf35f4836c09ee6c..684e6dafc8991caf75ec35f954ecbb7965be1508 100644 (file)
--- a/application/hub/main/template/announcement/class_XmlAnnouncementTemplateEngine.php
+++ b/application/hub/main/template/announcement/class_XmlAnnouncementTemplateEngine.php
@@ -31,8 +31,7 @@ class XmlAnnouncementTemplateEngine extends BaseXmlTemplateEngine implements Com
        const ANNOUNCEMENT_DATA_NODE_MODE   = 'node-mode';
        const ANNOUNCEMENT_DATA_EXTERNAL_IP = 'external-ip';
        const ANNOUNCEMENT_DATA_INTERNAL_IP = 'internal-ip';
-       const ANNOUNCEMENT_DATA_TCP_PORT    = 'tcp-port';
-       const ANNOUNCEMENT_DATA_UDP_PORT    = 'udp-port';
+       const ANNOUNCEMENT_DATA_LISTEN_PORT = 'listen-port';
 
        /**
         * Protected constructor
@@ -49,8 +48,7 @@ class XmlAnnouncementTemplateEngine extends BaseXmlTemplateEngine implements Com
                        'listener',
                        self::ANNOUNCEMENT_DATA_NODE_STATUS,
                        self::ANNOUNCEMENT_DATA_NODE_MODE,
-                       self::ANNOUNCEMENT_DATA_TCP_PORT,
-                       self::ANNOUNCEMENT_DATA_UDP_PORT,
+                       self::ANNOUNCEMENT_DATA_LISTEN_PORT,
                        self::ANNOUNCEMENT_DATA_SESSION_ID,
                        self::ANNOUNCEMENT_DATA_EXTERNAL_IP,
                        self::ANNOUNCEMENT_DATA_INTERNAL_IP,
@@ -164,23 +162,13 @@ class XmlAnnouncementTemplateEngine extends BaseXmlTemplateEngine implements Com
        }
 
        /**
-        * Starts the TCP port
+        * Starts the TCP/UDP listen port
         *
         * @return      void
         */
-       protected function startTcpPort () {
+       protected function startListenPort () {
                // Push the node name on the stacker
-               $this->getStackerInstance()->pushNamed('node_announcement', self::ANNOUNCEMENT_DATA_TCP_PORT);
-       }
-
-       /**
-        * Starts the UDP port
-        *
-        * @return      void
-        */
-       protected function startUdpPort () {
-               // Push the node name on the stacker
-               $this->getStackerInstance()->pushNamed('node_announcement', self::ANNOUNCEMENT_DATA_UDP_PORT);
+               $this->getStackerInstance()->pushNamed('node_announcement', self::ANNOUNCEMENT_DATA_LISTEN_PORT);
        }
 
        /**
@@ -284,21 +272,11 @@ class XmlAnnouncementTemplateEngine extends BaseXmlTemplateEngine implements Com
        }
 
        /**
-        * Finishes the UDP port
-        *
-        * @return      void
-        */
-       protected function finishUdpPort () {
-               // Pop the last entry
-               $this->getStackerInstance()->popNamed('node_announcement');
-       }
-
-       /**
-        * Finishes the TCP port
+        * Finishes the TCP/UDP listen port
         *
         * @return      void
         */
-       protected function finishTcpPort () {
+       protected function finishListenPort () {
                // Pop the last entry
                $this->getStackerInstance()->popNamed('node_announcement');
        }