Some renames

diff --git a/application/hub/main/filter/tags/answer/class_PackageAnnouncementAnswerTagFilter.php b/application/hub/main/filter/tags/answer/class_PackageAnnouncementAnswerTagFilter.php
index bb078205bb7f659dcaf6827e0f4f1c94b26483c1..394f6a1f484c428e10d73e62008fdba1746a1f20 100644 (file)
--- 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 a02daae188e8249f967c7735e70579182231d21f..e5104b20f9c452f64428f6acce6df36601538b95 100644 (file)
--- 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 @@
 <?php
 /**
- * A ??? hub helper class
+ * A AnnouncementMessageAnswer node helper class
  *
  * @author             Roland Haeder <webmaster@ship-simu.org>
  * @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 a1e28a948ab410eac5ec0c38895c4469aee77204..0ba2e814aab2d902086c1d1b916024ef129ddb89 100644 (file)
--- 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 647ad98255af566c6bb39ce8a021dff9f2ea2834..a496d5141f25f3c670d1f87e60260aeada4559ff 100644 (file)
--- 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 <http://www.gnu.org/licenses/>
                <!--
                This node's status
                //-->
-               <my-status>{?my_status?}</my-status>
+               <my-state>{?my_state?}</my-state>
        </my-data>
        <!--
        The following data is the other node's data. This data is being sent to