From 6505f11165704a9cac6efc1e3de42a636e9217d8 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Roland=20H=C3=A4der?= Date: Wed, 22 Aug 2012 20:48:49 +0000 Subject: [PATCH] More fixes: private->protected changed, generic init of stacker --- .../class_XmlAnnouncementTemplateEngine.php | 48 ++++++++--------- ...ss_XmlAnnouncementAnswerTemplateEngine.php | 52 +++++++++---------- application/hub/main/template/class_ | 4 +- .../template/class_BaseXmlTemplateEngine.php | 5 +- .../class_XmlSelfConnectTemplateEngine.php | 16 +++--- .../class_XmlObjectRegistryTemplateEngine.php | 32 ++++++------ ...lass_XmlCruncherTestUnitTemplateEngine.php | 52 +++++++++---------- ...class_XmlRequestNodeListTemplateEngine.php | 12 ++--- 8 files changed, 112 insertions(+), 109 deletions(-) diff --git a/application/hub/main/template/announcement/class_XmlAnnouncementTemplateEngine.php b/application/hub/main/template/announcement/class_XmlAnnouncementTemplateEngine.php index 9de1559d6..11e7e759d 100644 --- a/application/hub/main/template/announcement/class_XmlAnnouncementTemplateEngine.php +++ b/application/hub/main/template/announcement/class_XmlAnnouncementTemplateEngine.php @@ -148,7 +148,7 @@ class XmlAnnouncementTemplateEngine extends BaseXmlTemplateEngine implements Com * * @return void */ - private function startAnnouncement () { + protected function startAnnouncement () { // Push the node name on the stacker $this->getStackerInstance()->pushNamed('announcement', 'announcement'); } @@ -158,7 +158,7 @@ class XmlAnnouncementTemplateEngine extends BaseXmlTemplateEngine implements Com * * @return void */ - private function startAnnouncementData () { + protected function startAnnouncementData () { // Push the node name on the stacker $this->getStackerInstance()->pushNamed('announcement', 'announcement-data'); } @@ -168,7 +168,7 @@ class XmlAnnouncementTemplateEngine extends BaseXmlTemplateEngine implements Com * * @return void */ - private function startNodeStatus () { + protected function startNodeStatus () { // Push the node name on the stacker $this->getStackerInstance()->pushNamed('announcement', self::ANNOUNCEMENT_DATA_NODE_STATUS); } @@ -178,7 +178,7 @@ class XmlAnnouncementTemplateEngine extends BaseXmlTemplateEngine implements Com * * @return void */ - private function startNodeMode () { + protected function startNodeMode () { // Push the node name on the stacker $this->getStackerInstance()->pushNamed('announcement', self::ANNOUNCEMENT_DATA_NODE_MODE); } @@ -188,7 +188,7 @@ class XmlAnnouncementTemplateEngine extends BaseXmlTemplateEngine implements Com * * @return void */ - private function startListener () { + protected function startListener () { // Push the node name on the stacker $this->getStackerInstance()->pushNamed('announcement', 'listener'); } @@ -198,7 +198,7 @@ class XmlAnnouncementTemplateEngine extends BaseXmlTemplateEngine implements Com * * @return void */ - private function startTcpPort () { + protected function startTcpPort () { // Push the node name on the stacker $this->getStackerInstance()->pushNamed('announcement', self::ANNOUNCEMENT_DATA_TCP_PORT); } @@ -208,7 +208,7 @@ class XmlAnnouncementTemplateEngine extends BaseXmlTemplateEngine implements Com * * @return void */ - private function startUdpPort () { + protected function startUdpPort () { // Push the node name on the stacker $this->getStackerInstance()->pushNamed('announcement', self::ANNOUNCEMENT_DATA_UDP_PORT); } @@ -218,7 +218,7 @@ class XmlAnnouncementTemplateEngine extends BaseXmlTemplateEngine implements Com * * @return void */ - private function startSessionId () { + protected function startSessionId () { // Push the node name on the stacker $this->getStackerInstance()->pushNamed('announcement', self::ANNOUNCEMENT_DATA_SESSION_ID); } @@ -228,7 +228,7 @@ class XmlAnnouncementTemplateEngine extends BaseXmlTemplateEngine implements Com * * @return void */ - private function startExternalIp () { + protected function startExternalIp () { // Push the node name on the stacker $this->getStackerInstance()->pushNamed('announcement', self::ANNOUNCEMENT_DATA_EXTERNAL_IP); } @@ -238,7 +238,7 @@ class XmlAnnouncementTemplateEngine extends BaseXmlTemplateEngine implements Com * * @return void */ - private function startInternalIp () { + protected function startInternalIp () { // Push the node name on the stacker $this->getStackerInstance()->pushNamed('announcement', self::ANNOUNCEMENT_DATA_INTERNAL_IP); } @@ -248,7 +248,7 @@ class XmlAnnouncementTemplateEngine extends BaseXmlTemplateEngine implements Com * * @return void */ - private function startObjectTypeList () { + protected function startObjectTypeList () { // Push the node name on the stacker $this->getStackerInstance()->pushNamed('announcement', 'object-type-list'); } @@ -258,7 +258,7 @@ class XmlAnnouncementTemplateEngine extends BaseXmlTemplateEngine implements Com * * @return void */ - private function startObjectType () { + protected function startObjectType () { // Push the node name on the stacker $this->getStackerInstance()->pushNamed('announcement', 'object-type'); } @@ -268,7 +268,7 @@ class XmlAnnouncementTemplateEngine extends BaseXmlTemplateEngine implements Com * * @return void */ - private function finishObjectType () { + protected function finishObjectType () { // Pop the last entry $this->getStackerInstance()->popNamed('announcement'); } @@ -278,7 +278,7 @@ class XmlAnnouncementTemplateEngine extends BaseXmlTemplateEngine implements Com * * @return void */ - private function finishObjectTypeList () { + protected function finishObjectTypeList () { // Pop the last entry $this->getStackerInstance()->popNamed('announcement'); } @@ -288,7 +288,7 @@ class XmlAnnouncementTemplateEngine extends BaseXmlTemplateEngine implements Com * * @return void */ - private function finishSessionId () { + protected function finishSessionId () { // Pop the last entry $this->getStackerInstance()->popNamed('announcement'); } @@ -298,7 +298,7 @@ class XmlAnnouncementTemplateEngine extends BaseXmlTemplateEngine implements Com * * @return void */ - private function finishInternalIp () { + protected function finishInternalIp () { // Pop the last entry $this->getStackerInstance()->popNamed('announcement'); } @@ -308,7 +308,7 @@ class XmlAnnouncementTemplateEngine extends BaseXmlTemplateEngine implements Com * * @return void */ - private function finishExternalIp () { + protected function finishExternalIp () { // Pop the last entry $this->getStackerInstance()->popNamed('announcement'); } @@ -318,7 +318,7 @@ class XmlAnnouncementTemplateEngine extends BaseXmlTemplateEngine implements Com * * @return void */ - private function finishUdpPort () { + protected function finishUdpPort () { // Pop the last entry $this->getStackerInstance()->popNamed('announcement'); } @@ -328,7 +328,7 @@ class XmlAnnouncementTemplateEngine extends BaseXmlTemplateEngine implements Com * * @return void */ - private function finishTcpPort () { + protected function finishTcpPort () { // Pop the last entry $this->getStackerInstance()->popNamed('announcement'); } @@ -338,7 +338,7 @@ class XmlAnnouncementTemplateEngine extends BaseXmlTemplateEngine implements Com * * @return void */ - private function finishListener () { + protected function finishListener () { // Pop the last entry $this->getStackerInstance()->popNamed('announcement'); } @@ -348,7 +348,7 @@ class XmlAnnouncementTemplateEngine extends BaseXmlTemplateEngine implements Com * * @return void */ - private function finishNodeMode () { + protected function finishNodeMode () { // Pop the last entry $this->getStackerInstance()->popNamed('announcement'); } @@ -358,7 +358,7 @@ class XmlAnnouncementTemplateEngine extends BaseXmlTemplateEngine implements Com * * @return void */ - private function finishNodeStatus () { + protected function finishNodeStatus () { // Pop the last entry $this->getStackerInstance()->popNamed('announcement'); } @@ -368,7 +368,7 @@ class XmlAnnouncementTemplateEngine extends BaseXmlTemplateEngine implements Com * * @return void */ - private function finishAnnouncementData () { + protected function finishAnnouncementData () { // Pop the last entry $this->getStackerInstance()->popNamed('announcement'); } @@ -378,7 +378,7 @@ class XmlAnnouncementTemplateEngine extends BaseXmlTemplateEngine implements Com * * @return void */ - private function finishAnnouncement () { + protected function finishAnnouncement () { // Pop the last entry $this->getStackerInstance()->popNamed('announcement'); } diff --git a/application/hub/main/template/answer/announcement/class_XmlAnnouncementAnswerTemplateEngine.php b/application/hub/main/template/answer/announcement/class_XmlAnnouncementAnswerTemplateEngine.php index 038c66e41..e5603fcca 100644 --- a/application/hub/main/template/answer/announcement/class_XmlAnnouncementAnswerTemplateEngine.php +++ b/application/hub/main/template/answer/announcement/class_XmlAnnouncementAnswerTemplateEngine.php @@ -155,7 +155,7 @@ class XmlAnnouncementAnswerTemplateEngine extends BaseXmlTemplateEngine implemen * * @return void */ - private function startAnnouncementAnswer () { + protected function startAnnouncementAnswer () { // Push the node name on the stacker $this->getStackerInstance()->pushNamed('announcement_answer', 'announcement-answer'); } @@ -165,7 +165,7 @@ class XmlAnnouncementAnswerTemplateEngine extends BaseXmlTemplateEngine implemen * * @return void */ - private function startMyData () { + protected function startMyData () { // Push the node name on the stacker $this->getStackerInstance()->pushNamed('announcement_answer', 'my-data'); } @@ -175,7 +175,7 @@ class XmlAnnouncementAnswerTemplateEngine extends BaseXmlTemplateEngine implemen * * @return void */ - private function startMyExternalIp () { + protected function startMyExternalIp () { // Push the node name on the stacker $this->getStackerInstance()->pushNamed('announcement_answer', self::ANNOUNCEMENT_DATA_EXTERNAL_IP); } @@ -185,7 +185,7 @@ class XmlAnnouncementAnswerTemplateEngine extends BaseXmlTemplateEngine implemen * * @return void */ - private function startMyInternalIp () { + protected function startMyInternalIp () { // Push the node name on the stacker $this->getStackerInstance()->pushNamed('announcement_answer', self::ANNOUNCEMENT_DATA_INTERNAL_IP); } @@ -195,7 +195,7 @@ class XmlAnnouncementAnswerTemplateEngine extends BaseXmlTemplateEngine implemen * * @return void */ - private function startMyTcpPort () { + protected function startMyTcpPort () { // Push the node name on the stacker $this->getStackerInstance()->pushNamed('announcement_answer', self::ANNOUNCEMENT_DATA_TCP_PORT); } @@ -205,7 +205,7 @@ class XmlAnnouncementAnswerTemplateEngine extends BaseXmlTemplateEngine implemen * * @return void */ - private function startMyUdpPort () { + protected function startMyUdpPort () { // Push the node name on the stacker $this->getStackerInstance()->pushNamed('announcement_answer', self::ANNOUNCEMENT_DATA_UDP_PORT); } @@ -215,7 +215,7 @@ class XmlAnnouncementAnswerTemplateEngine extends BaseXmlTemplateEngine implemen * * @return void */ - private function startMySessionId () { + protected function startMySessionId () { // Push the node name on the stacker $this->getStackerInstance()->pushNamed('announcement_answer', self::ANNOUNCEMENT_DATA_SESSION_ID); } @@ -225,7 +225,7 @@ class XmlAnnouncementAnswerTemplateEngine extends BaseXmlTemplateEngine implemen * * @return void */ - private function startMyStatus () { + protected function startMyStatus () { // Push the node name on the stacker $this->getStackerInstance()->pushNamed('announcement_answer', self::ANNOUNCEMENT_DATA_NODE_STATUS); } @@ -235,7 +235,7 @@ class XmlAnnouncementAnswerTemplateEngine extends BaseXmlTemplateEngine implemen * * @return void */ - private function finishMyStatus () { + protected function finishMyStatus () { // Pop the last entry $this->getStackerInstance()->popNamed('announcement_answer'); } @@ -245,7 +245,7 @@ class XmlAnnouncementAnswerTemplateEngine extends BaseXmlTemplateEngine implemen * * @return void */ - private function finishMySessionId () { + protected function finishMySessionId () { // Pop the last entry $this->getStackerInstance()->popNamed('announcement_answer'); } @@ -255,7 +255,7 @@ class XmlAnnouncementAnswerTemplateEngine extends BaseXmlTemplateEngine implemen * * @return void */ - private function finishMyUdpPort () { + protected function finishMyUdpPort () { // Pop the last entry $this->getStackerInstance()->popNamed('announcement_answer'); } @@ -265,7 +265,7 @@ class XmlAnnouncementAnswerTemplateEngine extends BaseXmlTemplateEngine implemen * * @return void */ - private function finishMyTcpPort () { + protected function finishMyTcpPort () { // Pop the last entry $this->getStackerInstance()->popNamed('announcement_answer'); } @@ -275,7 +275,7 @@ class XmlAnnouncementAnswerTemplateEngine extends BaseXmlTemplateEngine implemen * * @return void */ - private function finishMyInternalIp () { + protected function finishMyInternalIp () { // Pop the last entry $this->getStackerInstance()->popNamed('announcement_answer'); } @@ -285,7 +285,7 @@ class XmlAnnouncementAnswerTemplateEngine extends BaseXmlTemplateEngine implemen * * @return void */ - private function finishMyExternalIp () { + protected function finishMyExternalIp () { // Pop the last entry $this->getStackerInstance()->popNamed('announcement_answer'); } @@ -295,7 +295,7 @@ class XmlAnnouncementAnswerTemplateEngine extends BaseXmlTemplateEngine implemen * * @return void */ - private function finishMyData () { + protected function finishMyData () { // Pop the last entry $this->getStackerInstance()->popNamed('announcement_answer'); } @@ -305,7 +305,7 @@ class XmlAnnouncementAnswerTemplateEngine extends BaseXmlTemplateEngine implemen * * @return void */ - private function startYourData () { + protected function startYourData () { // Push the node name on the stacker $this->getStackerInstance()->pushNamed('announcement_answer', 'your-data'); } @@ -315,7 +315,7 @@ class XmlAnnouncementAnswerTemplateEngine extends BaseXmlTemplateEngine implemen * * @return void */ - private function startYourExternalIp () { + protected function startYourExternalIp () { // Push the node name on the stacker $this->getStackerInstance()->pushNamed('announcement_answer', 'your-external-ip'); } @@ -325,7 +325,7 @@ class XmlAnnouncementAnswerTemplateEngine extends BaseXmlTemplateEngine implemen * * @return void */ - private function startYourInternalIp () { + protected function startYourInternalIp () { // Push the node name on the stacker $this->getStackerInstance()->pushNamed('announcement_answer', 'your-internal-ip'); } @@ -335,7 +335,7 @@ class XmlAnnouncementAnswerTemplateEngine extends BaseXmlTemplateEngine implemen * * @return void */ - private function startYourSessionId () { + protected function startYourSessionId () { // Push the node name on the stacker $this->getStackerInstance()->pushNamed('announcement_answer', 'your-session-id'); } @@ -345,7 +345,7 @@ class XmlAnnouncementAnswerTemplateEngine extends BaseXmlTemplateEngine implemen * * @return void */ - private function finishYourSessionId () { + protected function finishYourSessionId () { // Pop the last entry $this->getStackerInstance()->popNamed('announcement_answer'); } @@ -355,7 +355,7 @@ class XmlAnnouncementAnswerTemplateEngine extends BaseXmlTemplateEngine implemen * * @return void */ - private function finishYourInternalIp () { + protected function finishYourInternalIp () { // Pop the last entry $this->getStackerInstance()->popNamed('announcement_answer'); } @@ -365,7 +365,7 @@ class XmlAnnouncementAnswerTemplateEngine extends BaseXmlTemplateEngine implemen * * @return void */ - private function finishYourExternalIp () { + protected function finishYourExternalIp () { // Pop the last entry $this->getStackerInstance()->popNamed('announcement_answer'); } @@ -375,7 +375,7 @@ class XmlAnnouncementAnswerTemplateEngine extends BaseXmlTemplateEngine implemen * * @return void */ - private function finishYourData () { + protected function finishYourData () { // Pop the last entry $this->getStackerInstance()->popNamed('announcement_answer'); } @@ -385,7 +385,7 @@ class XmlAnnouncementAnswerTemplateEngine extends BaseXmlTemplateEngine implemen * * @return void */ - private function startAnswerStatus () { + protected function startAnswerStatus () { // Push the node name on the stacker $this->getStackerInstance()->pushNamed('announcement_answer', self::ANNOUNCEMENT_DATA_ANSWER_STATUS); } @@ -395,7 +395,7 @@ class XmlAnnouncementAnswerTemplateEngine extends BaseXmlTemplateEngine implemen * * @return void */ - private function finishAnswerStatus () { + protected function finishAnswerStatus () { // Pop the last entry $this->getStackerInstance()->popNamed('announcement_answer'); } @@ -405,7 +405,7 @@ class XmlAnnouncementAnswerTemplateEngine extends BaseXmlTemplateEngine implemen * * @return void */ - private function finishAnnouncementAnswer () { + protected function finishAnnouncementAnswer () { // Pop the last entry $this->getStackerInstance()->popNamed('announcement_answer'); } diff --git a/application/hub/main/template/class_ b/application/hub/main/template/class_ index 39c17a160..f55109539 100644 --- a/application/hub/main/template/class_ +++ b/application/hub/main/template/class_ @@ -261,7 +261,7 @@ class Xml???TemplateEngine extends BaseXmlTemplateEngine implements CompileableT * * @return void */ - private function start??? () { + protected function start??? () { // Push the node name on the stacker $this->getStackerInstance()->pushNamed('!!!', '|||'); } @@ -271,7 +271,7 @@ class Xml???TemplateEngine extends BaseXmlTemplateEngine implements CompileableT * * @return void */ - private function finish??? () { + protected function finish??? () { // Pop the last entry $this->getStackerInstance()->popNamed('!!!'); } diff --git a/application/hub/main/template/class_BaseXmlTemplateEngine.php b/application/hub/main/template/class_BaseXmlTemplateEngine.php index 5d28ceecd..16ce5159e 100644 --- a/application/hub/main/template/class_BaseXmlTemplateEngine.php +++ b/application/hub/main/template/class_BaseXmlTemplateEngine.php @@ -112,6 +112,9 @@ class BaseXMLTemplateEngine extends BaseTemplateEngine { // Init a variable stacker $stackerInstance = ObjectFactory::createObjectByConfiguredName($typePrefix . '_' . $xmlTemplateType . '_stacker_class'); + // Init stacker + $stackerInstance->initStacker($xmlTemplateType); + // Set it $this->setStackerInstance($stackerInstance); @@ -120,7 +123,7 @@ class BaseXMLTemplateEngine extends BaseTemplateEngine { $this->typePrefix = $typePrefix; // Set it in main nodes - array_push($this->mainNodes, $xmlTemplateType); + array_push($this->mainNodes, str_replace('_', '-', $xmlTemplateType)); } /** diff --git a/application/hub/main/template/connect/class_XmlSelfConnectTemplateEngine.php b/application/hub/main/template/connect/class_XmlSelfConnectTemplateEngine.php index 88142fd63..3c0a786fb 100644 --- a/application/hub/main/template/connect/class_XmlSelfConnectTemplateEngine.php +++ b/application/hub/main/template/connect/class_XmlSelfConnectTemplateEngine.php @@ -137,7 +137,7 @@ class XmlSelfConnectTemplateEngine extends BaseXmlTemplateEngine implements Comp * * @return void */ - private function startSelfConnect () { + protected function startSelfConnect () { // Push the node name on the stacker $this->getStackerInstance()->pushNamed('self_connect', 'self-connect'); } @@ -147,7 +147,7 @@ class XmlSelfConnectTemplateEngine extends BaseXmlTemplateEngine implements Comp * * @return void */ - private function startSelfConnectData () { + protected function startSelfConnectData () { // Push the node name on the stacker $this->getStackerInstance()->pushNamed('self_connect', 'self-connect-data'); } @@ -157,7 +157,7 @@ class XmlSelfConnectTemplateEngine extends BaseXmlTemplateEngine implements Comp * * @return void */ - private function startNodeId () { + protected function startNodeId () { // Push the node name on the stacker $this->getStackerInstance()->pushNamed('self_connect', self::SELF_CONNECT_DATA_NODE_ID); } @@ -167,7 +167,7 @@ class XmlSelfConnectTemplateEngine extends BaseXmlTemplateEngine implements Comp * * @return void */ - private function startSessionId () { + protected function startSessionId () { // Push the node name on the stacker $this->getStackerInstance()->pushNamed('self_connect', self::SELF_CONNECT_DATA_SESSION_ID); } @@ -177,7 +177,7 @@ class XmlSelfConnectTemplateEngine extends BaseXmlTemplateEngine implements Comp * * @return void */ - private function finishSessionId () { + protected function finishSessionId () { // Pop the last entry $this->getStackerInstance()->popNamed('self_connect'); } @@ -187,7 +187,7 @@ class XmlSelfConnectTemplateEngine extends BaseXmlTemplateEngine implements Comp * * @return void */ - private function finishNodeId () { + protected function finishNodeId () { // Pop the last entry $this->getStackerInstance()->popNamed('self_connect'); } @@ -197,7 +197,7 @@ class XmlSelfConnectTemplateEngine extends BaseXmlTemplateEngine implements Comp * * @return void */ - private function finishSelfConnectData () { + protected function finishSelfConnectData () { // Pop the last entry $this->getStackerInstance()->popNamed('self_connect'); } @@ -207,7 +207,7 @@ class XmlSelfConnectTemplateEngine extends BaseXmlTemplateEngine implements Comp * * @return void */ - private function finishSelfConnect () { + protected function finishSelfConnect () { // Pop the last entry $this->getStackerInstance()->popNamed('self_connect'); } diff --git a/application/hub/main/template/objects/class_XmlObjectRegistryTemplateEngine.php b/application/hub/main/template/objects/class_XmlObjectRegistryTemplateEngine.php index dbeb02266..95f5c758d 100644 --- a/application/hub/main/template/objects/class_XmlObjectRegistryTemplateEngine.php +++ b/application/hub/main/template/objects/class_XmlObjectRegistryTemplateEngine.php @@ -141,7 +141,7 @@ class XmlObjectRegistryTemplateEngine extends BaseXmlTemplateEngine implements C * * @return void */ - private function startObjectRegistry () { + protected function startObjectRegistry () { // Push the node name on the stacker $this->getStackerInstance()->pushNamed('object_registry', 'object-registry'); } @@ -153,7 +153,7 @@ class XmlObjectRegistryTemplateEngine extends BaseXmlTemplateEngine implements C * @return void * @todo Handle $objectCount */ - private function startObjectList ($objectCount) { + protected function startObjectList ($objectCount) { // Push the node name on the stacker $this->getStackerInstance()->pushNamed('object_registry', 'object-list'); } @@ -163,7 +163,7 @@ class XmlObjectRegistryTemplateEngine extends BaseXmlTemplateEngine implements C * * @return void */ - private function startObjectListEntry () { + protected function startObjectListEntry () { // Push the node name on the stacker $this->getStackerInstance()->pushNamed('object_registry', 'object-list'); } @@ -173,7 +173,7 @@ class XmlObjectRegistryTemplateEngine extends BaseXmlTemplateEngine implements C * * @return void */ - private function startObjectName () { + protected function startObjectName () { // Push the node name on the stacker $this->getStackerInstance()->pushNamed('object_registry', self::OBJECT_TYPE_DATA_NAME); } @@ -183,7 +183,7 @@ class XmlObjectRegistryTemplateEngine extends BaseXmlTemplateEngine implements C * * @return void */ - private function startObjectRecipientLimitation () { + protected function startObjectRecipientLimitation () { // Push the node name on the stacker $this->getStackerInstance()->pushNamed('object_registry', self::OBJECT_TYPE_DATA_RECIPIENT_LIMITATION); } @@ -193,7 +193,7 @@ class XmlObjectRegistryTemplateEngine extends BaseXmlTemplateEngine implements C * * @return void */ - private function startObjectMaxSpread () { + protected function startObjectMaxSpread () { // Push the node name on the stacker $this->getStackerInstance()->pushNamed('object_registry', self::OBJECT_TYPE_DATA_MAX_SPREAD); } @@ -203,7 +203,7 @@ class XmlObjectRegistryTemplateEngine extends BaseXmlTemplateEngine implements C * * @return void */ - private function startObjectProtocol () { + protected function startObjectProtocol () { // Push the node name on the stacker $this->getStackerInstance()->pushNamed('object_registry', self::OBJECT_TYPE_DATA_PROTOCOL); } @@ -213,7 +213,7 @@ class XmlObjectRegistryTemplateEngine extends BaseXmlTemplateEngine implements C * * @return void */ - private function startObjectRecipientType () { + protected function startObjectRecipientType () { // Push the node name on the stacker $this->getStackerInstance()->pushNamed('object_registry', self::OBJECT_TYPE_DATA_RECIPIENT_TYPE); } @@ -223,7 +223,7 @@ class XmlObjectRegistryTemplateEngine extends BaseXmlTemplateEngine implements C * * @return void */ - private function finishObjectRecipientType () { + protected function finishObjectRecipientType () { // Pop the last entry $this->getStackerInstance()->popNamed('object_registry'); } @@ -233,7 +233,7 @@ class XmlObjectRegistryTemplateEngine extends BaseXmlTemplateEngine implements C * * @return void */ - private function finishObjectProtocol () { + protected function finishObjectProtocol () { // Pop the last entry $this->getStackerInstance()->popNamed('object_registry'); } @@ -243,7 +243,7 @@ class XmlObjectRegistryTemplateEngine extends BaseXmlTemplateEngine implements C * * @return void */ - private function finishObjectMaxSpread () { + protected function finishObjectMaxSpread () { // Pop the last entry $this->getStackerInstance()->popNamed('object_registry'); } @@ -253,7 +253,7 @@ class XmlObjectRegistryTemplateEngine extends BaseXmlTemplateEngine implements C * * @return void */ - private function finishObjectRecipientLimitation () { + protected function finishObjectRecipientLimitation () { // Pop the last entry $this->getStackerInstance()->popNamed('object_registry'); } @@ -263,7 +263,7 @@ class XmlObjectRegistryTemplateEngine extends BaseXmlTemplateEngine implements C * * @return void */ - private function finishObjectName () { + protected function finishObjectName () { // Pop the last entry $this->getStackerInstance()->popNamed('object_registry'); } @@ -273,7 +273,7 @@ class XmlObjectRegistryTemplateEngine extends BaseXmlTemplateEngine implements C * * @return void */ - private function finishObjectListEntry () { + protected function finishObjectListEntry () { // Pop the last entry $this->getStackerInstance()->popNamed('object_registry'); } @@ -283,7 +283,7 @@ class XmlObjectRegistryTemplateEngine extends BaseXmlTemplateEngine implements C * * @return void */ - private function finishObjectList () { + protected function finishObjectList () { // Pop the last entry $this->getStackerInstance()->popNamed('object_registry'); } @@ -293,7 +293,7 @@ class XmlObjectRegistryTemplateEngine extends BaseXmlTemplateEngine implements C * * @return void */ - private function finishObjectRegistry () { + protected function finishObjectRegistry () { // Pop the last entry $this->getStackerInstance()->popNamed('object_registry'); } diff --git a/application/hub/main/template/producer/test_units/class_XmlCruncherTestUnitTemplateEngine.php b/application/hub/main/template/producer/test_units/class_XmlCruncherTestUnitTemplateEngine.php index dcf248ab9..dbea5dd40 100644 --- a/application/hub/main/template/producer/test_units/class_XmlCruncherTestUnitTemplateEngine.php +++ b/application/hub/main/template/producer/test_units/class_XmlCruncherTestUnitTemplateEngine.php @@ -122,7 +122,7 @@ class XmlCruncherTestUnitTemplateEngine extends BaseXmlTemplateEngine implements * * @return void */ - private function startCruncherTestUnit () { + protected function startCruncherTestUnit () { // Push the node name on the stacker $this->getStackerInstance()->pushNamed('cruncher_test_unit', 'cruncher-test-unit'); } @@ -132,7 +132,7 @@ class XmlCruncherTestUnitTemplateEngine extends BaseXmlTemplateEngine implements * * @return void */ - private function startMetaData () { + protected function startMetaData () { // Push the node name on the stacker $this->getStackerInstance()->pushNamed('cruncher_test_unit', 'meta-data'); } @@ -142,7 +142,7 @@ class XmlCruncherTestUnitTemplateEngine extends BaseXmlTemplateEngine implements * * @return void */ - private function startGlobalProjectIdentifier () { + protected function startGlobalProjectIdentifier () { // Push the node name on the stacker $this->getStackerInstance()->pushNamed('cruncher_test_unit', 'global-project-identifier'); } @@ -152,7 +152,7 @@ class XmlCruncherTestUnitTemplateEngine extends BaseXmlTemplateEngine implements * * @return void */ - private function finishGlobalProjectIdentifier () { + protected function finishGlobalProjectIdentifier () { // Pop the last entry $this->getStackerInstance()->popNamed('cruncher_test_unit'); } @@ -162,7 +162,7 @@ class XmlCruncherTestUnitTemplateEngine extends BaseXmlTemplateEngine implements * * @return void */ - private function startTestUnitCreated () { + protected function startTestUnitCreated () { // Push the node name on the stacker $this->getStackerInstance()->pushNamed('cruncher_test_unit', 'test-unit-created'); } @@ -172,7 +172,7 @@ class XmlCruncherTestUnitTemplateEngine extends BaseXmlTemplateEngine implements * * @return void */ - private function finishTestUnitCreated () { + protected function finishTestUnitCreated () { // Pop the last entry $this->getStackerInstance()->popNamed('cruncher_test_unit'); } @@ -182,7 +182,7 @@ class XmlCruncherTestUnitTemplateEngine extends BaseXmlTemplateEngine implements * * @return void */ - private function startCipher () { + protected function startCipher () { // Push the node name on the stacker $this->getStackerInstance()->pushNamed('cruncher_test_unit', 'cipher'); } @@ -192,7 +192,7 @@ class XmlCruncherTestUnitTemplateEngine extends BaseXmlTemplateEngine implements * * @return void */ - private function startCipherFunction () { + protected function startCipherFunction () { // Push the node name on the stacker $this->getStackerInstance()->pushNamed('cruncher_test_unit', 'cipher-function'); } @@ -202,7 +202,7 @@ class XmlCruncherTestUnitTemplateEngine extends BaseXmlTemplateEngine implements * * @return void */ - private function finishCipherFunction () { + protected function finishCipherFunction () { // Pop the last entry $this->getStackerInstance()->popNamed('cruncher_test_unit'); } @@ -212,7 +212,7 @@ class XmlCruncherTestUnitTemplateEngine extends BaseXmlTemplateEngine implements * * @return void */ - private function startCipherName () { + protected function startCipherName () { // Push the node name on the stacker $this->getStackerInstance()->pushNamed('cruncher_test_unit', 'cipher-name'); } @@ -222,7 +222,7 @@ class XmlCruncherTestUnitTemplateEngine extends BaseXmlTemplateEngine implements * * @return void */ - private function finishCipherName () { + protected function finishCipherName () { // Pop the last entry $this->getStackerInstance()->popNamed('cruncher_test_unit'); } @@ -232,7 +232,7 @@ class XmlCruncherTestUnitTemplateEngine extends BaseXmlTemplateEngine implements * * @return void */ - private function finishCipher () { + protected function finishCipher () { // Pop the last entry $this->getStackerInstance()->popNamed('cruncher_test_unit'); } @@ -242,7 +242,7 @@ class XmlCruncherTestUnitTemplateEngine extends BaseXmlTemplateEngine implements * * @return void */ - private function finishMetaData () { + protected function finishMetaData () { // Pop the last entry $this->getStackerInstance()->popNamed('cruncher_test_unit'); } @@ -252,7 +252,7 @@ class XmlCruncherTestUnitTemplateEngine extends BaseXmlTemplateEngine implements * * @return void */ - private function startUnprocessedData () { + protected function startUnprocessedData () { // Push the node name on the stacker $this->getStackerInstance()->pushNamed('cruncher_test_unit', 'unprocessed-data'); } @@ -262,7 +262,7 @@ class XmlCruncherTestUnitTemplateEngine extends BaseXmlTemplateEngine implements * * @return void */ - private function startEncryptedMessage () { + protected function startEncryptedMessage () { // Push the node name on the stacker $this->getStackerInstance()->pushNamed('cruncher_test_unit', 'encrypted-message'); } @@ -272,7 +272,7 @@ class XmlCruncherTestUnitTemplateEngine extends BaseXmlTemplateEngine implements * * @return void */ - private function finishEncryptedMessage () { + protected function finishEncryptedMessage () { // Pop the last entry $this->getStackerInstance()->popNamed('cruncher_test_unit'); } @@ -284,7 +284,7 @@ class XmlCruncherTestUnitTemplateEngine extends BaseXmlTemplateEngine implements * @return void * @todo Handle $keyCount */ - private function startCruncherKeyList ($keyCount) { + protected function startCruncherKeyList ($keyCount) { // Push the node name on the stacker $this->getStackerInstance()->pushNamed('cruncher_test_unit', 'cruncher-key-list'); } @@ -294,7 +294,7 @@ class XmlCruncherTestUnitTemplateEngine extends BaseXmlTemplateEngine implements * * @return void */ - private function startCruncherKey () { + protected function startCruncherKey () { // Push the node name on the stacker $this->getStackerInstance()->pushNamed('cruncher_test_unit', 'cruncher-key'); } @@ -304,7 +304,7 @@ class XmlCruncherTestUnitTemplateEngine extends BaseXmlTemplateEngine implements * * @return void */ - private function startKeyId () { + protected function startKeyId () { // Push the node name on the stacker $this->getStackerInstance()->pushNamed('cruncher_test_unit', 'key-id'); } @@ -314,7 +314,7 @@ class XmlCruncherTestUnitTemplateEngine extends BaseXmlTemplateEngine implements * * @return void */ - private function finishKeyId () { + protected function finishKeyId () { // Pop the last entry $this->getStackerInstance()->popNamed('cruncher_test_unit'); } @@ -324,7 +324,7 @@ class XmlCruncherTestUnitTemplateEngine extends BaseXmlTemplateEngine implements * * @return void */ - private function startKeyValue () { + protected function startKeyValue () { // Push the node name on the stacker $this->getStackerInstance()->pushNamed('cruncher_test_unit', 'key-value'); } @@ -334,7 +334,7 @@ class XmlCruncherTestUnitTemplateEngine extends BaseXmlTemplateEngine implements * * @return void */ - private function finishKeyValue () { + protected function finishKeyValue () { // Pop the last entry $this->getStackerInstance()->popNamed('cruncher_test_unit'); } @@ -344,7 +344,7 @@ class XmlCruncherTestUnitTemplateEngine extends BaseXmlTemplateEngine implements * * @return void */ - private function finishCruncherKey () { + protected function finishCruncherKey () { // Pop the last entry $this->getStackerInstance()->popNamed('cruncher_test_unit'); } @@ -354,7 +354,7 @@ class XmlCruncherTestUnitTemplateEngine extends BaseXmlTemplateEngine implements * * @return void */ - private function finishCruncherKeyList () { + protected function finishCruncherKeyList () { // Pop the last entry $this->getStackerInstance()->popNamed('cruncher_test_unit'); } @@ -364,7 +364,7 @@ class XmlCruncherTestUnitTemplateEngine extends BaseXmlTemplateEngine implements * * @return void */ - private function finishUnprocessedData () { + protected function finishUnprocessedData () { // Pop the last entry $this->getStackerInstance()->popNamed('cruncher_test_unit'); } @@ -374,7 +374,7 @@ class XmlCruncherTestUnitTemplateEngine extends BaseXmlTemplateEngine implements * * @return void */ - private function finishCruncherTestUnit () { + protected function finishaCruncherTestUnit () { // Pop the last entry $this->getStackerInstance()->popNamed('cruncher_test_unit'); } diff --git a/application/hub/main/template/requests/class_XmlRequestNodeListTemplateEngine.php b/application/hub/main/template/requests/class_XmlRequestNodeListTemplateEngine.php index 41f8b56a6..d22ed2dfb 100644 --- a/application/hub/main/template/requests/class_XmlRequestNodeListTemplateEngine.php +++ b/application/hub/main/template/requests/class_XmlRequestNodeListTemplateEngine.php @@ -116,7 +116,7 @@ class XmlRequestNodeListTemplateEngine extends BaseXmlTemplateEngine implements * * @return void */ - private function startNodeRequestNodeList () { + protected function startNodeRequestNodeList () { // Push the node name on the stacker $this->getStackerInstance()->pushNamed('node_request_node_list', 'node-request-node-list'); } @@ -126,7 +126,7 @@ class XmlRequestNodeListTemplateEngine extends BaseXmlTemplateEngine implements * * @return void */ - private function startAcceptedObjectTypes () { + protected function startAcceptedObjectTypes () { // Push the node name on the stacker $this->getStackerInstance()->pushNamed('node_request_node_list', self::REQUEST_DATA_ACCEPTED_OBJECT_TYPES); } @@ -136,7 +136,7 @@ class XmlRequestNodeListTemplateEngine extends BaseXmlTemplateEngine implements * * @return void */ - private function startSessionId () { + protected function startSessionId () { // Push the node name on the stacker $this->getStackerInstance()->pushNamed('node_request_node_list', self::REQUEST_DATA_SESSION_ID); } @@ -146,7 +146,7 @@ class XmlRequestNodeListTemplateEngine extends BaseXmlTemplateEngine implements * * @return void */ - private function finishSessionId () { + protected function finishSessionId () { // Pop the last entry $this->getStackerInstance()->popNamed('node_request_node_list'); } @@ -156,7 +156,7 @@ class XmlRequestNodeListTemplateEngine extends BaseXmlTemplateEngine implements * * @return void */ - private function finishAcceptedObjectTypes () { + protected function finishAcceptedObjectTypes () { // Pop the last entry $this->getStackerInstance()->popNamed('node_request_node_list'); } @@ -166,7 +166,7 @@ class XmlRequestNodeListTemplateEngine extends BaseXmlTemplateEngine implements * * @return void */ - private function finishNodeRequestNodeList () { + protected function finishNodeRequestNodeList () { // Pop the last entry $this->getStackerInstance()->popNamed('node_request_node_list'); } -- 2.39.5