Renamed again a bunch of methods to generic 'readXmlData' name

diff --git a/application/hub/main/filter/class_BaseHubFilter.php b/application/hub/main/filter/class_BaseHubFilter.php
index 933be692c0d5d371c85aeec5cdd99c44adc7a160..5cf7f1967babb7e85b228ae5523e6ec1f6320d06 100644 (file)
--- a/application/hub/main/filter/class_BaseHubFilter.php
+++ b/application/hub/main/filter/class_BaseHubFilter.php
@@ -68,11 +68,8 @@ class BaseHubFilter extends BaseFilter {
                 * inside the message, the above method call will cause exceptions.
                 */
                foreach ($this->dataXmlNodes as $key => $dummy) {
-                       // Generate method name
-                       $methodName = 'read' . $this->convertToClassName($messageType) . 'Data';
-
                        // Call it
-                       $value = call_user_func(array($templateInstance, $methodName), $key);
+                       $templateInstance->readXmlData($key);
 
                        /*
                         * If value is NULL, a variable hasn't been found. This could mean

diff --git a/application/hub/main/template/announcement/class_XmlAnnouncementTemplateEngine.php b/application/hub/main/template/announcement/class_XmlAnnouncementTemplateEngine.php
index 11e7e759d5e79bf87eae93c2afec224453e23b25..dde53d35e666b0b19d6b7591dffee30ceb2a48ab 100644 (file)
--- a/application/hub/main/template/announcement/class_XmlAnnouncementTemplateEngine.php
+++ b/application/hub/main/template/announcement/class_XmlAnnouncementTemplateEngine.php
@@ -119,21 +119,6 @@ class XmlAnnouncementTemplateEngine extends BaseXmlTemplateEngine implements Com
                parent::assignVariable($this->getStackerInstance()->getNamed('announcement'), $characters);
        }
 
-       /**
-        * Read announcement variables by calling readVariable() with 'general' as
-        * variable stack.
-        *
-        * @param       $key    Key to read from
-        * @return      $value  Value from variable
-        */
-       public function readAnnouncementData ($key) {
-               // Read the variable
-               $value = parent::readVariable($key, 'general');
-
-               // Return value
-               return $value;
-       }
-
        /**
         * Getter for cache file (FQFN)
         *

diff --git a/application/hub/main/template/answer/announcement/class_XmlAnnouncementAnswerTemplateEngine.php b/application/hub/main/template/answer/announcement/class_XmlAnnouncementAnswerTemplateEngine.php
index e5603fccaec98f6b9d9ef2c0fc88e210b7189659..6c613418342cdb2542f63d2a4dafe87efe34e44c 100644 (file)
--- a/application/hub/main/template/answer/announcement/class_XmlAnnouncementAnswerTemplateEngine.php
+++ b/application/hub/main/template/answer/announcement/class_XmlAnnouncementAnswerTemplateEngine.php
@@ -126,21 +126,6 @@ class XmlAnnouncementAnswerTemplateEngine extends BaseXmlTemplateEngine implemen
                parent::assignVariable($this->getStackerInstance()->getNamed('announcement_answer'), $characters);
        }
 
-       /**
-        * Read announcement-answer variables by calling readVariable() with 'general' as
-        * variable stack.
-        *
-        * @param       $key    Key to read from
-        * @return      $value  Value from variable
-        */
-       public function readAnnouncementAnswerData ($key) {
-               // Read the variable
-               $value = parent::readVariable($key, 'general');
-
-               // Return value
-               return $value;
-       }
-
        /**
         * Getter for cache file (FQFN)
         *

diff --git a/application/hub/main/template/class_BaseXmlTemplateEngine.php b/application/hub/main/template/class_BaseXmlTemplateEngine.php
index 2086623d995ec0971eb38c336808e388a181fe73..04af15dfcecebb484518458b31b70c6ebb6e963b 100644 (file)
--- a/application/hub/main/template/class_BaseXmlTemplateEngine.php
+++ b/application/hub/main/template/class_BaseXmlTemplateEngine.php
@@ -177,6 +177,21 @@ class BaseXmlTemplateEngine extends BaseTemplateEngine {
                return $this->subNodes;
        }
 
+       /**
+        * Read XML variables by calling readVariable() with 'general' as
+        * variable stack.
+        *
+        * @param       $key    Key to read from
+        * @return      $value  Value from variable
+        */
+       public function readXmlData ($key) {
+               // Read the variable
+               $value = parent::readVariable($key, 'general');
+
+               // Return value
+               return $value;
+       }
+
        /**
         * Handles the template dependency for given node
         *

diff --git a/application/hub/main/template/connect/class_XmlSelfConnectTemplateEngine.php b/application/hub/main/template/connect/class_XmlSelfConnectTemplateEngine.php
index 3c0a786fbddbb6425e462500f1c101d8b85017f9..da8df035efb245dad09aab0f4196702215aa6efd 100644 (file)
--- a/application/hub/main/template/connect/class_XmlSelfConnectTemplateEngine.php
+++ b/application/hub/main/template/connect/class_XmlSelfConnectTemplateEngine.php
@@ -108,21 +108,6 @@ class XmlSelfConnectTemplateEngine extends BaseXmlTemplateEngine implements Comp
                parent::assignVariable($this->getStackerInstance()->getNamed('self_connect'), $characters);
        }
 
-       /**
-        * Read self-connect variables by calling readVariable() with 'general' as
-        * variable stack.
-        *
-        * @param       $key    Key to read from
-        * @return      $value  Value from variable
-        */
-       public function readSelfConnectData ($key) {
-               // Read the variable
-               $value = parent::readVariable($key, 'general');
-
-               // Return value
-               return $value;
-       }
-
        /**
         * Getter for cache file (FQFN)
         *