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 b230b49d955d829f7017c0ef3fe270d3f753f65e..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,
@@ -101,7 +99,7 @@ class XmlAnnouncementTemplateEngine extends BaseXmlTemplateEngine implements Com
                 * Assign the found characters to variable and use the last entry from
                 * stack as the name.
                 */
-               parent::assignVariable($this->getStackerInstance()->getNamed('announcement'), $characters);
+               parent::assignVariable($this->getStackerInstance()->getNamed('node_announcement'), $characters);
        }
 
        /**
@@ -120,7 +118,7 @@ class XmlAnnouncementTemplateEngine extends BaseXmlTemplateEngine implements Com
         */
        protected function startAnnouncement () {
                // Push the node name on the stacker
-               $this->getStackerInstance()->pushNamed('announcement', 'announcement');
+               $this->getStackerInstance()->pushNamed('node_announcement', 'node_announcement');
        }
 
        /**
@@ -130,7 +128,7 @@ class XmlAnnouncementTemplateEngine extends BaseXmlTemplateEngine implements Com
         */
        protected function startAnnouncementData () {
                // Push the node name on the stacker
-               $this->getStackerInstance()->pushNamed('announcement', 'announcement-data');
+               $this->getStackerInstance()->pushNamed('node_announcement', 'announcement-data');
        }
 
        /**
@@ -140,7 +138,7 @@ class XmlAnnouncementTemplateEngine extends BaseXmlTemplateEngine implements Com
         */
        protected function startNodeStatus () {
                // Push the node name on the stacker
-               $this->getStackerInstance()->pushNamed('announcement', self::ANNOUNCEMENT_DATA_NODE_STATUS);
+               $this->getStackerInstance()->pushNamed('node_announcement', self::ANNOUNCEMENT_DATA_NODE_STATUS);
        }
 
        /**
@@ -150,7 +148,7 @@ class XmlAnnouncementTemplateEngine extends BaseXmlTemplateEngine implements Com
         */
        protected function startNodeMode () {
                // Push the node name on the stacker
-               $this->getStackerInstance()->pushNamed('announcement', self::ANNOUNCEMENT_DATA_NODE_MODE);
+               $this->getStackerInstance()->pushNamed('node_announcement', self::ANNOUNCEMENT_DATA_NODE_MODE);
        }
 
        /**
@@ -160,27 +158,17 @@ class XmlAnnouncementTemplateEngine extends BaseXmlTemplateEngine implements Com
         */
        protected function startListener () {
                // Push the node name on the stacker
-               $this->getStackerInstance()->pushNamed('announcement', 'listener');
+               $this->getStackerInstance()->pushNamed('node_announcement', 'listener');
        }
 
        /**
-        * 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('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('announcement', self::ANNOUNCEMENT_DATA_UDP_PORT);
+               $this->getStackerInstance()->pushNamed('node_announcement', self::ANNOUNCEMENT_DATA_LISTEN_PORT);
        }
 
        /**
@@ -190,7 +178,7 @@ class XmlAnnouncementTemplateEngine extends BaseXmlTemplateEngine implements Com
         */
        protected function startSessionId () {
                // Push the node name on the stacker
-               $this->getStackerInstance()->pushNamed('announcement', self::ANNOUNCEMENT_DATA_SESSION_ID);
+               $this->getStackerInstance()->pushNamed('node_announcement', self::ANNOUNCEMENT_DATA_SESSION_ID);
        }
 
        /**
@@ -200,7 +188,7 @@ class XmlAnnouncementTemplateEngine extends BaseXmlTemplateEngine implements Com
         */
        protected function startExternalIp () {
                // Push the node name on the stacker
-               $this->getStackerInstance()->pushNamed('announcement', self::ANNOUNCEMENT_DATA_EXTERNAL_IP);
+               $this->getStackerInstance()->pushNamed('node_announcement', self::ANNOUNCEMENT_DATA_EXTERNAL_IP);
        }
 
        /**
@@ -210,7 +198,7 @@ class XmlAnnouncementTemplateEngine extends BaseXmlTemplateEngine implements Com
         */
        protected function startInternalIp () {
                // Push the node name on the stacker
-               $this->getStackerInstance()->pushNamed('announcement', self::ANNOUNCEMENT_DATA_INTERNAL_IP);
+               $this->getStackerInstance()->pushNamed('node_announcement', self::ANNOUNCEMENT_DATA_INTERNAL_IP);
        }
 
        /**
@@ -220,7 +208,7 @@ class XmlAnnouncementTemplateEngine extends BaseXmlTemplateEngine implements Com
         */
        protected function startObjectTypeList () {
                // Push the node name on the stacker
-               $this->getStackerInstance()->pushNamed('announcement', 'object-type-list');
+               $this->getStackerInstance()->pushNamed('node_announcement', 'object-type-list');
        }
 
        /**
@@ -230,7 +218,7 @@ class XmlAnnouncementTemplateEngine extends BaseXmlTemplateEngine implements Com
         */
        protected function startObjectType () {
                // Push the node name on the stacker
-               $this->getStackerInstance()->pushNamed('announcement', 'object-type');
+               $this->getStackerInstance()->pushNamed('node_announcement', 'object-type');
        }
 
        /**
@@ -240,7 +228,7 @@ class XmlAnnouncementTemplateEngine extends BaseXmlTemplateEngine implements Com
         */
        protected function finishObjectType () {
                // Pop the last entry
-               $this->getStackerInstance()->popNamed('announcement');
+               $this->getStackerInstance()->popNamed('node_announcement');
        }
 
        /**
@@ -250,7 +238,7 @@ class XmlAnnouncementTemplateEngine extends BaseXmlTemplateEngine implements Com
         */
        protected function finishObjectTypeList () {
                // Pop the last entry
-               $this->getStackerInstance()->popNamed('announcement');
+               $this->getStackerInstance()->popNamed('node_announcement');
        }
 
        /**
@@ -260,7 +248,7 @@ class XmlAnnouncementTemplateEngine extends BaseXmlTemplateEngine implements Com
         */
        protected function finishSessionId () {
                // Pop the last entry
-               $this->getStackerInstance()->popNamed('announcement');
+               $this->getStackerInstance()->popNamed('node_announcement');
        }
 
        /**
@@ -270,7 +258,7 @@ class XmlAnnouncementTemplateEngine extends BaseXmlTemplateEngine implements Com
         */
        protected function finishInternalIp () {
                // Pop the last entry
-               $this->getStackerInstance()->popNamed('announcement');
+               $this->getStackerInstance()->popNamed('node_announcement');
        }
 
        /**
@@ -280,27 +268,17 @@ class XmlAnnouncementTemplateEngine extends BaseXmlTemplateEngine implements Com
         */
        protected function finishExternalIp () {
                // Pop the last entry
-               $this->getStackerInstance()->popNamed('announcement');
-       }
-
-       /**
-        * Finishes the UDP port
-        *
-        * @return      void
-        */
-       protected function finishUdpPort () {
-               // Pop the last entry
-               $this->getStackerInstance()->popNamed('announcement');
+               $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('announcement');
+               $this->getStackerInstance()->popNamed('node_announcement');
        }
 
        /**
@@ -310,7 +288,7 @@ class XmlAnnouncementTemplateEngine extends BaseXmlTemplateEngine implements Com
         */
        protected function finishListener () {
                // Pop the last entry
-               $this->getStackerInstance()->popNamed('announcement');
+               $this->getStackerInstance()->popNamed('node_announcement');
        }
 
        /**
@@ -320,7 +298,7 @@ class XmlAnnouncementTemplateEngine extends BaseXmlTemplateEngine implements Com
         */
        protected function finishNodeMode () {
                // Pop the last entry
-               $this->getStackerInstance()->popNamed('announcement');
+               $this->getStackerInstance()->popNamed('node_announcement');
        }
 
        /**
@@ -330,7 +308,7 @@ class XmlAnnouncementTemplateEngine extends BaseXmlTemplateEngine implements Com
         */
        protected function finishNodeStatus () {
                // Pop the last entry
-               $this->getStackerInstance()->popNamed('announcement');
+               $this->getStackerInstance()->popNamed('node_announcement');
        }
 
        /**
@@ -340,7 +318,7 @@ class XmlAnnouncementTemplateEngine extends BaseXmlTemplateEngine implements Com
         */
        protected function finishAnnouncementData () {
                // Pop the last entry
-               $this->getStackerInstance()->popNamed('announcement');
+               $this->getStackerInstance()->popNamed('node_announcement');
        }
 
        /**
@@ -350,7 +328,7 @@ class XmlAnnouncementTemplateEngine extends BaseXmlTemplateEngine implements Com
         */
        protected function finishAnnouncement () {
                // Pop the last entry
-               $this->getStackerInstance()->popNamed('announcement');
+               $this->getStackerInstance()->popNamed('node_announcement');
        }
 }