From 9657818282b9d5c4cb0321a71c1831b17f87ee71 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Roland=20H=C3=A4der?= Date: Thu, 25 Jul 2013 01:14:40 +0000 Subject: [PATCH] Renamed 'stacker' -> 'stack' --- .../hub/interfaces/package/class_Deliverable.php | 4 ++-- .../hub/main/cruncher/class_BaseHubCruncher.php | 2 +- .../main/decoder/package/class_PackageDecoder.php | 2 +- application/hub/main/dht/class_BaseDht.php | 6 +++--- .../hub/main/handler/chunks/class_ChunkHandler.php | 2 +- .../handler/network/class_BaseRawDataHandler.php | 6 +++--- .../hub/main/package/class_NetworkPackage.php | 14 +++++++------- .../hub/main/producer/class_BaseProducer.php | 4 ++-- .../main/template/class_BaseXmlTemplateEngine.php | 2 +- .../visitor/socket/class_ShutdownSocketVisitor.php | 2 +- 10 files changed, 22 insertions(+), 22 deletions(-) diff --git a/application/hub/interfaces/package/class_Deliverable.php b/application/hub/interfaces/package/class_Deliverable.php index 17f148c4b..470b90d3b 100644 --- a/application/hub/interfaces/package/class_Deliverable.php +++ b/application/hub/interfaces/package/class_Deliverable.php @@ -83,11 +83,11 @@ interface Deliverable extends FrameworkInterface { function sendWaitingPackage (); /** - * Clears all stacker + * Clears all stacks * * @return void */ - function clearAllStacker (); + function clearAllStacks (); } // [EOF] diff --git a/application/hub/main/cruncher/class_BaseHubCruncher.php b/application/hub/main/cruncher/class_BaseHubCruncher.php index 1b6bdab09..0f68adc7c 100644 --- a/application/hub/main/cruncher/class_BaseHubCruncher.php +++ b/application/hub/main/cruncher/class_BaseHubCruncher.php @@ -158,7 +158,7 @@ abstract class BaseHubCruncher extends BaseHubSystem implements Updateable { $this->bufferInstance = ObjectFactory::createObjectByConfiguredName('cruncher_buffer_stacker_class'); // Initialize common stackers, like in/out - $this->bufferInstance->initStackers(array( + $this->bufferInstance->initStacks(array( self::STACKER_NAME_IN_QUEUE, self::STACKER_NAME_OUT_QUEUE )); diff --git a/application/hub/main/decoder/package/class_PackageDecoder.php b/application/hub/main/decoder/package/class_PackageDecoder.php index 2db2c2a1b..06bc7ccad 100644 --- a/application/hub/main/decoder/package/class_PackageDecoder.php +++ b/application/hub/main/decoder/package/class_PackageDecoder.php @@ -48,7 +48,7 @@ class PackageDecoder extends BaseDecoder implements Decodeable { $decoderInstance = new PackageDecoder(); // Init stacker for received packages - $stackerInstance->initStacker(self::STACKER_NAME_DECODED_PACKAGE); + $stackerInstance->initStack(self::STACKER_NAME_DECODED_PACKAGE); // Set the stacker instance here $decoderInstance->setStackerInstance($stackerInstance); diff --git a/application/hub/main/dht/class_BaseDht.php b/application/hub/main/dht/class_BaseDht.php index 691f12035..172b0e5a1 100644 --- a/application/hub/main/dht/class_BaseDht.php +++ b/application/hub/main/dht/class_BaseDht.php @@ -44,7 +44,7 @@ abstract class BaseDht extends BaseHubSystem { $this->setStackerInstance($stackerInstance); // Init all stackers - $this->initStackers(); + $this->initStacks(); /* * Get the state factory and create the initial state, we don't need @@ -58,9 +58,9 @@ abstract class BaseDht extends BaseHubSystem { * * @return void */ - private function initStackers () { + private function initStacks () { // Initialize all stacker - $this->getStackerInstance()->initStackers(array( + $this->getStackerInstance()->initStacks(array( self::STACKER_NAME_INSERT_NODE, )); } diff --git a/application/hub/main/handler/chunks/class_ChunkHandler.php b/application/hub/main/handler/chunks/class_ChunkHandler.php index a7708cf2f..d0a7feafb 100644 --- a/application/hub/main/handler/chunks/class_ChunkHandler.php +++ b/application/hub/main/handler/chunks/class_ChunkHandler.php @@ -91,7 +91,7 @@ class ChunkHandler extends BaseHandler implements HandleableChunks, Registerable $stackerInstance = ObjectFactory::createObjectByConfiguredName('chunk_handler_stacker_class'); // Init all stacker - $stackerInstance->initStackers(array( + $stackerInstance->initStacks(array( self::STACKER_NAME_CHUNKS_WITH_FINAL_EOP, self::STACKER_NAME_CHUNKS_WITHOUT_FINAL, self::STACKER_NAME_ASSEMBLED_RAW_DATA diff --git a/application/hub/main/handler/network/class_BaseRawDataHandler.php b/application/hub/main/handler/network/class_BaseRawDataHandler.php index 57857bfcd..d7b99dcee 100644 --- a/application/hub/main/handler/network/class_BaseRawDataHandler.php +++ b/application/hub/main/handler/network/class_BaseRawDataHandler.php @@ -82,7 +82,7 @@ class BaseRawDataHandler extends BaseHandler { $this->setStackerInstance($stackerInstance); // Init stacker - $this->initStacker(); + $this->initStack(); } /** @@ -90,8 +90,8 @@ class BaseRawDataHandler extends BaseHandler { * * @return void */ - protected function initStacker () { - $this->getStackerInstance()->initStacker(self::STACKER_NAME_RAW_DATA); + protected function initStack () { + $this->getStackerInstance()->initStack(self::STACKER_NAME_RAW_DATA); } /** diff --git a/application/hub/main/package/class_NetworkPackage.php b/application/hub/main/package/class_NetworkPackage.php index df1ff642a..1d6d6e467 100644 --- a/application/hub/main/package/class_NetworkPackage.php +++ b/application/hub/main/package/class_NetworkPackage.php @@ -256,7 +256,7 @@ class NetworkPackage extends BaseHubSystem implements Deliverable, Receivable, R $packageInstance->setStackerInstance($stackerInstance); // Init all stacker - $packageInstance->initStackers(); + $packageInstance->initStacks(); // Get a visitor instance for speeding up things and set it $visitorInstance = ObjectFactory::createObjectByConfiguredName('node_raw_data_monitor_visitor_class', array($packageInstance)); @@ -280,9 +280,9 @@ class NetworkPackage extends BaseHubSystem implements Deliverable, Receivable, R * @param $forceReInit Whether to force reinitialization of all stacks * @return void */ - protected function initStackers ($forceReInit = FALSE) { + protected function initStacks ($forceReInit = FALSE) { // Initialize all - $this->getStackerInstance()->initStackers(array( + $this->getStackerInstance()->initStacks(array( self::STACKER_NAME_UNDECLARED, self::STACKER_NAME_DECLARED, self::STACKER_NAME_OUTGOING, @@ -292,7 +292,7 @@ class NetworkPackage extends BaseHubSystem implements Deliverable, Receivable, R self::STACKER_NAME_NEW_MESSAGE, self::STACKER_NAME_PROCESSED_MESSAGE, self::STACKER_NAME_BACK_BUFFER - )); + ), $forceReInit); } /** @@ -954,13 +954,13 @@ class NetworkPackage extends BaseHubSystem implements Deliverable, Receivable, R } /** - * Clears all stacker + * Clears all stacks * * @return void */ - public function clearAllStacker () { + public function clearAllStacks () { // Call the init method to force re-initialization - $this->initStackers(TRUE); + $this->initStacks(TRUE); // Debug message //* NOISY-DEBUG: */ self::createDebugInstance(__CLASS__)->debugOutput('NETWORK-PACKAGE[' . __LINE__ . ']: All stacker have been re-initialized.'); diff --git a/application/hub/main/producer/class_BaseProducer.php b/application/hub/main/producer/class_BaseProducer.php index 1045a0153..9c22b5dc0 100644 --- a/application/hub/main/producer/class_BaseProducer.php +++ b/application/hub/main/producer/class_BaseProducer.php @@ -133,7 +133,7 @@ abstract class BaseProducer extends BaseFrameworkSystem { * @return void */ protected function initOutgoingQueue () { - $this->getOutgoingQueueInstance()->initStacker(self::STACKER_NAME_OUT_QUEUE, TRUE); + $this->getOutgoingQueueInstance()->initStack(self::STACKER_NAME_OUT_QUEUE, TRUE); } /** @@ -162,7 +162,7 @@ abstract class BaseProducer extends BaseFrameworkSystem { * @return void */ protected function initIncomingQueue () { - $this->getIncomingQueueInstance()->initStacker(self::STACKER_NAME_IN_QUEUE, TRUE); + $this->getIncomingQueueInstance()->initStack(self::STACKER_NAME_IN_QUEUE, TRUE); } /** diff --git a/application/hub/main/template/class_BaseXmlTemplateEngine.php b/application/hub/main/template/class_BaseXmlTemplateEngine.php index 2cb598f38..ca168bf52 100644 --- a/application/hub/main/template/class_BaseXmlTemplateEngine.php +++ b/application/hub/main/template/class_BaseXmlTemplateEngine.php @@ -121,7 +121,7 @@ class BaseXmlTemplateEngine extends BaseTemplateEngine { $this->stackerName = $typePrefix . '_' . $xmlTemplateType; // Init stacker - $stackerInstance->initStacker($this->stackerName); + $stackerInstance->initStack($this->stackerName); // Set it $this->setStackerInstance($stackerInstance); diff --git a/application/hub/main/visitor/socket/class_ShutdownSocketVisitor.php b/application/hub/main/visitor/socket/class_ShutdownSocketVisitor.php index aa22ef538..5b514282a 100644 --- a/application/hub/main/visitor/socket/class_ShutdownSocketVisitor.php +++ b/application/hub/main/visitor/socket/class_ShutdownSocketVisitor.php @@ -78,7 +78,7 @@ class ShutdownSocketVisitor extends BaseVisitor implements Visitor { */ public function visitNetworkPackage (Deliverable $packageInstance) { // Just call it back - $packageInstance->clearAllStacker(); + $packageInstance->clearAllStacks(); } } -- 2.39.5