From e5c2145c881f5cb3fde8e4b3618c1cdc805ac666 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Roland=20H=C3=A4der?= Date: Tue, 26 Jun 2012 14:50:55 +0000 Subject: [PATCH] Some renames --- .../class_PackageAnnouncementAnswerTagFilter.php | 2 +- .../class_NodeAnnouncementMessageAnswerHelper.php | 2 +- .../class_XmlAnnouncementAnswerTemplateEngine.php | 14 +++++++------- .../answer/announcement/announcement_answer.xml | 2 +- 4 files changed, 10 insertions(+), 10 deletions(-) diff --git a/application/hub/main/filter/tags/answer/class_PackageAnnouncementAnswerTagFilter.php b/application/hub/main/filter/tags/answer/class_PackageAnnouncementAnswerTagFilter.php index bb078205b..394f6a1f4 100644 --- a/application/hub/main/filter/tags/answer/class_PackageAnnouncementAnswerTagFilter.php +++ b/application/hub/main/filter/tags/answer/class_PackageAnnouncementAnswerTagFilter.php @@ -40,7 +40,7 @@ class PackageAnnouncementAnswerTagFilter extends BaseFilter implements Filterabl $this->dataXmlNodes = array( XmlAnnouncementAnswerTemplateEngine::ANNOUNCEMENT_DATA_EXTERNAL_IP => '', XmlAnnouncementAnswerTemplateEngine::ANNOUNCEMENT_DATA_INTERNAL_IP => '', - XmlAnnouncementAnswerTemplateEngine::ANNOUNCEMENT_DATA_NODE_STATUS => '', + XmlAnnouncementAnswerTemplateEngine::ANNOUNCEMENT_DATA_NODE_STATE => '', XmlAnnouncementAnswerTemplateEngine::ANNOUNCEMENT_DATA_SESSION_ID => '', XmlAnnouncementAnswerTemplateEngine::ANNOUNCEMENT_DATA_TCP_PORT => 9060, XmlAnnouncementAnswerTemplateEngine::ANNOUNCEMENT_DATA_UDP_PORT => 9060 diff --git a/application/hub/main/helper/hub/answer/announcement/class_NodeAnnouncementMessageAnswerHelper.php b/application/hub/main/helper/hub/answer/announcement/class_NodeAnnouncementMessageAnswerHelper.php index a02daae18..e5104b20f 100644 --- a/application/hub/main/helper/hub/answer/announcement/class_NodeAnnouncementMessageAnswerHelper.php +++ b/application/hub/main/helper/hub/answer/announcement/class_NodeAnnouncementMessageAnswerHelper.php @@ -1,6 +1,6 @@ * @version 0.0.0 diff --git a/application/hub/main/template/answer/announcement/class_XmlAnnouncementAnswerTemplateEngine.php b/application/hub/main/template/answer/announcement/class_XmlAnnouncementAnswerTemplateEngine.php index a1e28a948..0ba2e814a 100644 --- a/application/hub/main/template/answer/announcement/class_XmlAnnouncementAnswerTemplateEngine.php +++ b/application/hub/main/template/answer/announcement/class_XmlAnnouncementAnswerTemplateEngine.php @@ -27,7 +27,7 @@ class XmlAnnouncementAnswerTemplateEngine extends BaseTemplateEngine implements * Some XML nodes must be available for later data extraction */ const ANNOUNCEMENT_DATA_SESSION_ID = 'my-session-id'; - const ANNOUNCEMENT_DATA_NODE_STATUS = 'my-status'; + const ANNOUNCEMENT_DATA_NODE_STATE = 'my-state'; const ANNOUNCEMENT_DATA_EXTERNAL_IP = 'my-external-ip'; const ANNOUNCEMENT_DATA_INTERNAL_IP = 'my-internal-ip'; const ANNOUNCEMENT_DATA_TCP_PORT = 'my-tcp-port'; @@ -53,7 +53,7 @@ class XmlAnnouncementAnswerTemplateEngine extends BaseTemplateEngine implements 'my-tcp-port', 'my-udp-port', 'my-session-id', - 'my-status', + 'my-state', // Data from other node 'your-external-ip', 'your-internal-ip', @@ -368,21 +368,21 @@ class XmlAnnouncementAnswerTemplateEngine extends BaseTemplateEngine implements } /** - * Starts the my-status + * Starts the my-state * * @return void */ - private function startMyStatus () { + private function startMyState () { // Push the node name on the stacker - $this->getStackerInstance()->pushNamed('announcement_answer', 'my-status'); + $this->getStackerInstance()->pushNamed('announcement_answer', 'my-state'); } /** - * Finishes the my-status + * Finishes the my-state * * @return void */ - private function finishMyStatus () { + private function finishMyState () { // Pop the last entry $this->getStackerInstance()->popNamed('announcement_answer'); } diff --git a/application/hub/templates/xml/answer/announcement/announcement_answer.xml b/application/hub/templates/xml/answer/announcement/announcement_answer.xml index 647ad9825..a496d5141 100644 --- a/application/hub/templates/xml/answer/announcement/announcement_answer.xml +++ b/application/hub/templates/xml/answer/announcement/announcement_answer.xml @@ -50,7 +50,7 @@ along with this program. If not, see - {?my_status?} + {?my_state?}