From: Roland Haeder Date: Mon, 23 Jun 2014 20:52:00 +0000 (+0200) Subject: Continued: X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=b4558678a56b0622fe7afed4931d53737c795f2c;p=hub.git Continued: - renamed 'stacker' to 'stack' as they are stacks - updated to latest 'core'. Signed-off-by: Roland Haeder --- diff --git a/application/hub/main/decoder/package/class_PackageDecoder.php b/application/hub/main/decoder/package/class_PackageDecoder.php index 759fed315..ce9a11a13 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 - $handlerInstance->getStackerInstance()->initStack(self::STACKER_NAME_DECODED_PACKAGE); + $handlerInstance->getStackInstance()->initStack(self::STACKER_NAME_DECODED_PACKAGE); // Set the handler instance here $decoderInstance->setHandlerInstance($handlerInstance); @@ -70,7 +70,7 @@ class PackageDecoder extends BaseDecoder implements Decodeable { */ public function ifUnhandledRawPackageDataLeft () { // Check it - $unhandledDataLeft = (!$this->getHandlerInstance()->getStackerInstance()->isStackEmpty(ChunkHandler::STACKER_NAME_ASSEMBLED_RAW_DATA)); + $unhandledDataLeft = (!$this->getHandlerInstance()->getStackInstance()->isStackEmpty(ChunkHandler::STACKER_NAME_ASSEMBLED_RAW_DATA)); // Return it //* NOISY-DEBUG: */ self::createDebugInstance(__CLASS__)->debugOutput('PACKAGE-DECODER[' . __METHOD__ . ':' . __LINE__ . ']: unhandledDataLeft=' . intval($unhandledDataLeft)); @@ -87,7 +87,7 @@ class PackageDecoder extends BaseDecoder implements Decodeable { assert($this->ifUnhandledRawPackageDataLeft()); // "Pop" the next raw package content - $rawPackageContent = $this->getHandlerInstance()->getStackerInstance()->popNamed(ChunkHandler::STACKER_NAME_ASSEMBLED_RAW_DATA); + $rawPackageContent = $this->getHandlerInstance()->getStackInstance()->popNamed(ChunkHandler::STACKER_NAME_ASSEMBLED_RAW_DATA); // Debug message //* NOISY-DEBUG: */ self::createDebugInstance(__CLASS__)->debugOutput('PACKAGE-DECODER[' . __METHOD__ . ':' . __LINE__ . ']: Got ' . strlen($rawPackageContent) . ' bytes from stack ' . ChunkHandler::STACKER_NAME_ASSEMBLED_RAW_DATA . ', decoding it ...'); @@ -117,7 +117,7 @@ class PackageDecoder extends BaseDecoder implements Decodeable { if ($discoveryInstance->isRecipientListEmpty()) { // The recipient is this node so next stack it on 'decoded_package' //* NOISY-DEBUG: */ self::createDebugInstance(__CLASS__)->debugOutput('PACKAGE-DECODER[' . __METHOD__ . ':' . __LINE__ . ']: Pushing ' . strlen($decodedData) . ' bytes to stack ' . self::STACKER_NAME_DECODED_PACKAGE . ' ...'); - $this->getHandlerInstance()->getStackerInstance()->pushNamed(self::STACKER_NAME_DECODED_PACKAGE, $decodedData); + $this->getHandlerInstance()->getStackInstance()->pushNamed(self::STACKER_NAME_DECODED_PACKAGE, $decodedData); } else { // Forward the package to the next node $this->getPackageInstance()->forwardRawPackage($decodedData); @@ -131,7 +131,7 @@ class PackageDecoder extends BaseDecoder implements Decodeable { */ public function ifDeocedPackagesLeft () { // Check it ... - $ifRawPackagesLeft = (!$this->getHandlerInstance()->getStackerInstance()->isStackEmpty(self::STACKER_NAME_DECODED_PACKAGE)); + $ifRawPackagesLeft = (!$this->getHandlerInstance()->getStackInstance()->isStackEmpty(self::STACKER_NAME_DECODED_PACKAGE)); // ... return it return $ifRawPackagesLeft; @@ -147,7 +147,7 @@ class PackageDecoder extends BaseDecoder implements Decodeable { assert($this->ifDeocedPackagesLeft()); // Get the next entry (assoziative array) - $decodedData = $this->getHandlerInstance()->getStackerInstance()->popNamed(self::STACKER_NAME_DECODED_PACKAGE); + $decodedData = $this->getHandlerInstance()->getStackInstance()->popNamed(self::STACKER_NAME_DECODED_PACKAGE); // Handle it //* NOISY-DEBUG: */ self::createDebugInstance(__CLASS__)->debugOutput('PACKAGE-DECODER[' . __METHOD__ . ':' . __LINE__ . ']: decodedData(' . count($decodedData) . ')=' . print_r($decodedData, TRUE)); diff --git a/application/hub/main/dht/class_BaseDht.php b/application/hub/main/dht/class_BaseDht.php index 4dda72d23..490875a36 100644 --- a/application/hub/main/dht/class_BaseDht.php +++ b/application/hub/main/dht/class_BaseDht.php @@ -44,10 +44,10 @@ abstract class BaseDht extends BaseHubSystem implements Distributable { parent::__construct($className); // Get a stacker instance for this DHT - $stackerInstance = ObjectFactory::createObjectByConfiguredName('dht_stacker_class'); + $stackInstance = ObjectFactory::createObjectByConfiguredName('dht_stacker_class'); // Set it in this class - $this->setStackerInstance($stackerInstance); + $this->setStackInstance($stackInstance); // Init all stackers $this->initStacks(); @@ -63,7 +63,7 @@ abstract class BaseDht extends BaseHubSystem implements Distributable { */ private function initStacks () { // Initialize all stacker - $this->getStackerInstance()->initStacks(array( + $this->getStackInstance()->initStacks(array( self::STACKER_NAME_INSERT_NODE, self::STACKER_NAME_PENDING_PUBLISHING, )); @@ -97,7 +97,7 @@ abstract class BaseDht extends BaseHubSystem implements Distributable { */ public function ifInsertNodeDataPending () { // Determine it if it is not empty - $isPending = ($this->getStackerInstance()->isStackEmpty(self::STACKER_NAME_INSERT_NODE) === FALSE); + $isPending = ($this->getStackInstance()->isStackEmpty(self::STACKER_NAME_INSERT_NODE) === FALSE); // Return status return $isPending; @@ -110,7 +110,7 @@ abstract class BaseDht extends BaseHubSystem implements Distributable { */ public function insertSingleNodeData () { // Get next node data from stack - $nodeData = $this->getStackerInstance()->popNamed(self::STACKER_NAME_INSERT_NODE); + $nodeData = $this->getStackInstance()->popNamed(self::STACKER_NAME_INSERT_NODE); // Make sure $nodeData is really an array and has at least one entry assert((is_array($nodeData)) && (count($nodeData) > 0)); @@ -162,7 +162,7 @@ abstract class BaseDht extends BaseHubSystem implements Distributable { // ... and push it to the next stack //* NOISY-DEBUG: */ self::createDebugInstance(__CLASS__)->debugOutput('BASE-DHT[' . __METHOD__ . ':' . __LINE__ . '] Pushing entry with ' . count($current) . ' elements to stack ' . self::STACKER_NAME_PENDING_PUBLISHING . ' ...'); - $this->getStackerInstance()->pushNamed(self::STACKER_NAME_PENDING_PUBLISHING, $current); + $this->getStackInstance()->pushNamed(self::STACKER_NAME_PENDING_PUBLISHING, $current); } // END - while } @@ -173,7 +173,7 @@ abstract class BaseDht extends BaseHubSystem implements Distributable { */ public function hasEntriesPendingPublication () { // Determine it if it is not empty - $isPending = ($this->getStackerInstance()->isStackEmpty(self::STACKER_NAME_PENDING_PUBLISHING) === FALSE); + $isPending = ($this->getStackInstance()->isStackEmpty(self::STACKER_NAME_PENDING_PUBLISHING) === FALSE); // Return status /* NOISY-DEBUG: */ self::createDebugInstance(__CLASS__)->debugOutput('BASE-DHT[' . __METHOD__ . ':' . __LINE__ . '] isPending=' . intval($isPending)); @@ -215,7 +215,7 @@ abstract class BaseDht extends BaseHubSystem implements Distributable { $this->publishHelperInstance->loadDescriptorXml($this); // "Pop" next entry - $entry = $this->getStackerInstance()->popNamed(self::STACKER_NAME_PENDING_PUBLISHING); + $entry = $this->getStackInstance()->popNamed(self::STACKER_NAME_PENDING_PUBLISHING); // Some sanity-checks assert(is_array($entry)); diff --git a/application/hub/main/dht/node/class_NodeDhtFacade.php b/application/hub/main/dht/node/class_NodeDhtFacade.php index 56ed66f77..a4b291f6d 100644 --- a/application/hub/main/dht/node/class_NodeDhtFacade.php +++ b/application/hub/main/dht/node/class_NodeDhtFacade.php @@ -312,7 +312,7 @@ class NodeDhtFacade extends BaseDht implements DistributableNode, Registerable { // Put them all into a stack foreach ($nodeList as $nodeData) { // Insert all entries - $this->getStackerInstance()->pushNamed(self::STACKER_NAME_INSERT_NODE, $nodeData); + $this->getStackInstance()->pushNamed(self::STACKER_NAME_INSERT_NODE, $nodeData); } // END - foreach } diff --git a/application/hub/main/filter/class_BaseHubFilter.php b/application/hub/main/filter/class_BaseHubFilter.php index b85dbeff2..1018f6fd9 100644 --- a/application/hub/main/filter/class_BaseHubFilter.php +++ b/application/hub/main/filter/class_BaseHubFilter.php @@ -103,7 +103,7 @@ class BaseHubFilter extends BaseFilter { ); // Push the processed message back on stack - $packageInstance->getStackerInstance()->pushNamed(NetworkPackage::STACKER_NAME_PROCESSED_MESSAGE, $messageArray); + $packageInstance->getStackInstance()->pushNamed(NetworkPackage::STACKER_NAME_PROCESSED_MESSAGE, $messageArray); } } diff --git a/application/hub/main/handler/chunks/class_ChunkHandler.php b/application/hub/main/handler/chunks/class_ChunkHandler.php index 5dd182892..0821f0138 100644 --- a/application/hub/main/handler/chunks/class_ChunkHandler.php +++ b/application/hub/main/handler/chunks/class_ChunkHandler.php @@ -88,17 +88,17 @@ class ChunkHandler extends BaseHandler implements HandleableChunks, Registerable $handlerInstance = new ChunkHandler(); // Get a FIFO stacker - $stackerInstance = ObjectFactory::createObjectByConfiguredName('chunk_handler_stacker_class'); + $stackInstance = ObjectFactory::createObjectByConfiguredName('chunk_handler_stacker_class'); // Init all stacker - $stackerInstance->initStacks(array( + $stackInstance->initStacks(array( self::STACKER_NAME_CHUNKS_WITH_FINAL_EOP, self::STACKER_NAME_CHUNKS_WITHOUT_FINAL, self::STACKER_NAME_ASSEMBLED_RAW_DATA )); // Set the stacker in this handler - $handlerInstance->setStackerInstance($stackerInstance); + $handlerInstance->setStackInstance($stackInstance); // Get a crypto instance ... $cryptoInstance = ObjectFactory::createObjectByConfiguredName('crypto_class'); @@ -413,15 +413,15 @@ class ChunkHandler extends BaseHandler implements HandleableChunks, Registerable } // Do we have some pending chunks (no final)? - while (!$this->getStackerInstance()->isStackEmpty(self::STACKER_NAME_CHUNKS_WITHOUT_FINAL)) { + while (!$this->getStackInstance()->isStackEmpty(self::STACKER_NAME_CHUNKS_WITHOUT_FINAL)) { // Then get it first and add it before the EOP chunks - array_unshift($chunks, $this->getStackerInstance()->popNamed(self::STACKER_NAME_CHUNKS_WITHOUT_FINAL)); + array_unshift($chunks, $this->getStackInstance()->popNamed(self::STACKER_NAME_CHUNKS_WITHOUT_FINAL)); } // END - while // Add all chunks to the FIFO stacker foreach ($chunks as $chunk) { // Add the chunk - $this->getStackerInstance()->pushNamed(self::STACKER_NAME_CHUNKS_WITH_FINAL_EOP, $chunk); + $this->getStackInstance()->pushNamed(self::STACKER_NAME_CHUNKS_WITH_FINAL_EOP, $chunk); } // END - foreach } @@ -435,7 +435,7 @@ class ChunkHandler extends BaseHandler implements HandleableChunks, Registerable // Add all chunks to the FIFO stacker foreach ($chunks as $chunk) { // Add the chunk - $this->getStackerInstance()->pushNamed(self::STACKER_NAME_CHUNKS_WITHOUT_FINAL, $chunk); + $this->getStackInstance()->pushNamed(self::STACKER_NAME_CHUNKS_WITHOUT_FINAL, $chunk); } // END - foreach } @@ -446,7 +446,7 @@ class ChunkHandler extends BaseHandler implements HandleableChunks, Registerable */ public function ifUnhandledChunksWithFinalAvailable () { // Simply check if the stacker is not empty - $unhandledChunks = $this->getStackerInstance()->isStackEmpty(self::STACKER_NAME_CHUNKS_WITH_FINAL_EOP) === FALSE; + $unhandledChunks = $this->getStackInstance()->isStackEmpty(self::STACKER_NAME_CHUNKS_WITH_FINAL_EOP) === FALSE; // Return result return $unhandledChunks; @@ -464,7 +464,7 @@ class ChunkHandler extends BaseHandler implements HandleableChunks, Registerable assert($this->ifUnhandledChunksWithFinalAvailable()); // Get an entry from the stacker - $chunk = $this->getStackerInstance()->popNamed(self::STACKER_NAME_CHUNKS_WITH_FINAL_EOP); + $chunk = $this->getStackInstance()->popNamed(self::STACKER_NAME_CHUNKS_WITH_FINAL_EOP); // Split the string with proper separator character $chunkSplits = explode(PackageFragmenter::CHUNK_DATA_HASH_SEPARATOR, $chunk); @@ -512,7 +512,7 @@ class ChunkHandler extends BaseHandler implements HandleableChunks, Registerable $this->addChunkToFinalArray($chunkSplits); // Is the stack now empty? - if ($this->getStackerInstance()->isStackEmpty(self::STACKER_NAME_CHUNKS_WITH_FINAL_EOP)) { + if ($this->getStackInstance()->isStackEmpty(self::STACKER_NAME_CHUNKS_WITH_FINAL_EOP)) { // Then mark the final array as complete $this->markFinalArrayAsCompleted(); } // END - if @@ -610,7 +610,7 @@ class ChunkHandler extends BaseHandler implements HandleableChunks, Registerable // Then feed it into the next stacker //* NOISY-DEBUG: */ self::createDebugInstance(__CLASS__)->debugOutput('CHUNK-HANDLER[' . __METHOD__ . ':' . __LINE__ . ']: Pushing ' . strlen($this->rawPackageData) . ' bytes to stack ' . self::STACKER_NAME_ASSEMBLED_RAW_DATA . ' ...'); - $this->getStackerInstance()->pushNamed(self::STACKER_NAME_ASSEMBLED_RAW_DATA, $this->rawPackageData); + $this->getStackInstance()->pushNamed(self::STACKER_NAME_ASSEMBLED_RAW_DATA, $this->rawPackageData); // ... and reset it $this->rawPackageData = ''; diff --git a/application/hub/main/handler/network/class_BaseRawDataHandler.php b/application/hub/main/handler/network/class_BaseRawDataHandler.php index 05dc64387..6bb894438 100644 --- a/application/hub/main/handler/network/class_BaseRawDataHandler.php +++ b/application/hub/main/handler/network/class_BaseRawDataHandler.php @@ -78,10 +78,10 @@ class BaseRawDataHandler extends BaseHandler { $this->setErrorCode(self::SOCKET_ERROR_UNKNOWN); // Init stacker instance for processed raw data - $stackerInstance = ObjectFactory::createObjectByConfiguredName('node_raw_data_stacker_class'); + $stackInstance = ObjectFactory::createObjectByConfiguredName('node_raw_data_stacker_class'); // Remember this in this package handler - $this->setStackerInstance($stackerInstance); + $this->setStackInstance($stackInstance); // Init stacker $this->initStack(); @@ -93,7 +93,7 @@ class BaseRawDataHandler extends BaseHandler { * @return void */ protected function initStack () { - $this->getStackerInstance()->initStack(self::STACKER_NAME_RAW_DATA); + $this->getStackInstance()->initStack(self::STACKER_NAME_RAW_DATA); } /** @@ -107,7 +107,7 @@ class BaseRawDataHandler extends BaseHandler { * Add the deocoded data and error code to the stacker so other classes * (e.g. NetworkPackage) can "pop" it from the stacker. */ - $this->getStackerInstance()->pushNamed(self::STACKER_NAME_RAW_DATA, array( + $this->getStackInstance()->pushNamed(self::STACKER_NAME_RAW_DATA, array( self::PACKAGE_RAW_DATA => $rawData, self::PACKAGE_ERROR_CODE => $this->getErrorCode() )); @@ -120,7 +120,7 @@ class BaseRawDataHandler extends BaseHandler { */ public function isRawDataPending () { // Does the stacker have some entries (not empty)? - $isPending = (!$this->getStackerInstance()->isStackEmpty(self::STACKER_NAME_RAW_DATA)); + $isPending = (!$this->getStackInstance()->isStackEmpty(self::STACKER_NAME_RAW_DATA)); // Return it return $isPending; @@ -133,7 +133,7 @@ class BaseRawDataHandler extends BaseHandler { */ public function getNextRawData () { // "Pop" the raw data from the stacker - $rawData = $this->getStackerInstance()->popNamed(self::STACKER_NAME_RAW_DATA); + $rawData = $this->getStackInstance()->popNamed(self::STACKER_NAME_RAW_DATA); // And return it return $rawData; diff --git a/application/hub/main/helper/connection/class_BaseConnectionHelper.php b/application/hub/main/helper/connection/class_BaseConnectionHelper.php index 5fc569a91..eede0f8f3 100644 --- a/application/hub/main/helper/connection/class_BaseConnectionHelper.php +++ b/application/hub/main/helper/connection/class_BaseConnectionHelper.php @@ -435,7 +435,7 @@ class BaseConnectionHelper extends BaseHubSystemHelper implements Registerable, $diff = $encodedDataArray[NetworkPackage::RAW_BUFFER_SIZE_INDEX] - strlen($encodedDataArray[NetworkPackage::RAW_ENCODED_DATA_INDEX]); // Push raw data to the package's outgoing stack - $this->getPackageInstance()->getStackerInstance()->pushNamed(NetworkPackage::STACKER_NAME_OUTGOING_STREAM, $encodedDataArray); + $this->getPackageInstance()->getStackInstance()->pushNamed(NetworkPackage::STACKER_NAME_OUTGOING_STREAM, $encodedDataArray); } /** diff --git a/application/hub/main/package/assembler/class_PackageAssembler.php b/application/hub/main/package/assembler/class_PackageAssembler.php index cf862aba3..855cf57f0 100644 --- a/application/hub/main/package/assembler/class_PackageAssembler.php +++ b/application/hub/main/package/assembler/class_PackageAssembler.php @@ -74,13 +74,13 @@ class PackageAssembler extends BaseHubSystem implements Assembler, Registerable, $assemblerInstance->setHandlerInstance($handlerInstance); // Get stacker instance - $stackerInstance = ObjectFactory::createObjectByConfiguredName('multiple_message_stacker_class'); + $stackInstance = ObjectFactory::createObjectByConfiguredName('multiple_message_stacker_class'); // Initialize the only one stack - $stackerInstance->initStack(self::STACKER_NAME_MULTIPLE_MESSAGE); + $stackInstance->initStack(self::STACKER_NAME_MULTIPLE_MESSAGE); // And add it - $assemblerInstance->setStackerInstance($stackerInstance); + $assemblerInstance->setStackInstance($stackInstance); // Return the prepared instance return $assemblerInstance; @@ -93,7 +93,7 @@ class PackageAssembler extends BaseHubSystem implements Assembler, Registerable, */ private function ifInputBufferIsEmpty () { // Check it - $isInputBufferEmpty = $this->getPackageInstance()->getStackerInstance()->isStackEmpty(NetworkPackage::STACKER_NAME_DECODED_HANDLED); + $isInputBufferEmpty = $this->getPackageInstance()->getStackInstance()->isStackEmpty(NetworkPackage::STACKER_NAME_DECODED_HANDLED); // Debug message //* NOISY-DEBUG: */ self::createDebugInstance(__CLASS__)->debugOutput('PACKAGE-ASSEMBLER[' . __METHOD__ . ':' . __LINE__ . ']: isInputBufferEmpty=' . intval($isInputBufferEmpty)); @@ -201,7 +201,7 @@ class PackageAssembler extends BaseHubSystem implements Assembler, Registerable, */ public function ifMultipleMessagesPending () { // Determine it - $isPending = (!$this->getStackerInstance()->isStackEmpty(self::STACKER_NAME_MULTIPLE_MESSAGE)); + $isPending = (!$this->getStackInstance()->isStackEmpty(self::STACKER_NAME_MULTIPLE_MESSAGE)); // Return it //* NOISY-DEBUG: */ self::createDebugInstance(__CLASS__)->debugOutput('PACKAGE-ASSEMBLER[' . __METHOD__ . ':' . __LINE__ . ': isPending=' . intval($isPending)); @@ -236,7 +236,7 @@ class PackageAssembler extends BaseHubSystem implements Assembler, Registerable, $message = BaseRawDataHandler::STREAM_START_MARKER . $message; // Push it on stack - $this->getStackerInstance()->pushNamed(self::STACKER_NAME_MULTIPLE_MESSAGE, $message); + $this->getStackInstance()->pushNamed(self::STACKER_NAME_MULTIPLE_MESSAGE, $message); } // END - foreach // Clear pending data @@ -290,7 +290,7 @@ class PackageAssembler extends BaseHubSystem implements Assembler, Registerable, assert($this->isPendingDataEmpty()); // "Pop" next entry from stack and set it as new pending data - $this->pendingData = $this->getStackerInstance()->popNamed(self::STACKER_NAME_MULTIPLE_MESSAGE); + $this->pendingData = $this->getStackInstance()->popNamed(self::STACKER_NAME_MULTIPLE_MESSAGE); // And handle it $this->handlePendingData(); diff --git a/application/hub/main/package/class_NetworkPackage.php b/application/hub/main/package/class_NetworkPackage.php index 8eeaf8be3..7d396a866 100644 --- a/application/hub/main/package/class_NetworkPackage.php +++ b/application/hub/main/package/class_NetworkPackage.php @@ -280,10 +280,10 @@ class NetworkPackage extends BaseHubSystem implements Deliverable, Receivable, R * which have no recipient address and stamp... ;-) This stacker will * also be used for incoming raw data to handle it. */ - $stackerInstance = ObjectFactory::createObjectByConfiguredName('network_package_stacker_class'); + $stackInstance = ObjectFactory::createObjectByConfiguredName('network_package_stacker_class'); // At last, set it in this class - $packageInstance->setStackerInstance($stackerInstance); + $packageInstance->setStackInstance($stackInstance); // Init all stacker $packageInstance->initStacks(); @@ -312,7 +312,7 @@ class NetworkPackage extends BaseHubSystem implements Deliverable, Receivable, R */ protected function initStacks ($forceReInit = FALSE) { // Initialize all - $this->getStackerInstance()->initStacks(array( + $this->getStackInstance()->initStacks(array( self::STACKER_NAME_UNDECLARED, self::STACKER_NAME_DECLARED, self::STACKER_NAME_OUTGOING, @@ -380,13 +380,13 @@ class NetworkPackage extends BaseHubSystem implements Deliverable, Receivable, R */ private function changePackageStatus (array $packageData, $stackerName, $newStatus) { // Skip this for empty stacks - if ($this->getStackerInstance()->isStackEmpty($stackerName)) { + if ($this->getStackInstance()->isStackEmpty($stackerName)) { // This avoids an exception after all packages has failed return; } // END - if // Pop the entry (it should be it) - $nextData = $this->getStackerInstance()->popNamed($stackerName); + $nextData = $this->getStackInstance()->popNamed($stackerName); // Compare both signatures assert($nextData[self::PACKAGE_DATA_SIGNATURE] == $packageData[self::PACKAGE_DATA_SIGNATURE]); @@ -395,7 +395,7 @@ class NetworkPackage extends BaseHubSystem implements Deliverable, Receivable, R $packageData[self::PACKAGE_DATA_STATUS] = $newStatus; // And push it again - $this->getStackerInstance()->pushNamed($stackerName, $packageData); + $this->getStackInstance()->pushNamed($stackerName, $packageData); } /** @@ -466,7 +466,7 @@ class NetworkPackage extends BaseHubSystem implements Deliverable, Receivable, R $packageData[self::PACKAGE_DATA_RECIPIENT] = $currentRecipient; // Push the declared package to the next stack. - $this->getStackerInstance()->pushNamed(self::STACKER_NAME_DECLARED, $packageData); + $this->getStackInstance()->pushNamed(self::STACKER_NAME_DECLARED, $packageData); // Debug message //* NOISY-DEBUG: */ self::createDebugInstance(__CLASS__)->debugOutput('NETWORK-PACKAGE[' . __METHOD__ . ':' . __LINE__ . ']: Package declared for recipient ' . $currentRecipient); @@ -551,7 +551,7 @@ class NetworkPackage extends BaseHubSystem implements Deliverable, Receivable, R //* NOISY-DEBUG: */ self::createDebugInstance(__CLASS__)->debugOutput('NETWORK-PACKAGE[' . __METHOD__ . ':' . __LINE__ . ']: Reached line ' . __LINE__ . ' after validatePeerStateConnected() has been called.'); // Enqueue it again on the out-going queue, the connection is up and working at this point - $this->getStackerInstance()->pushNamed(self::STACKER_NAME_OUTGOING, $packageData); + $this->getStackInstance()->pushNamed(self::STACKER_NAME_OUTGOING, $packageData); // Debug message //* NOISY-DEBUG: */ self::createDebugInstance(__CLASS__)->debugOutput('NETWORK-PACKAGE[' . __METHOD__ . ':' . __LINE__ . ']: Reached line ' . __LINE__ . ' after pushNamed() has been called.'); @@ -655,7 +655,7 @@ class NetworkPackage extends BaseHubSystem implements Deliverable, Receivable, R ); // Now prepare the temporary array and push it on the 'undeclared' stack - $this->getStackerInstance()->pushNamed(self::STACKER_NAME_UNDECLARED, array( + $this->getStackInstance()->pushNamed(self::STACKER_NAME_UNDECLARED, array( self::PACKAGE_DATA_SENDER => $this->getSessionId(), self::PACKAGE_DATA_RECIPIENT => $helperInstance->getRecipientType(), self::PACKAGE_DATA_PROTOCOL => $protocolName, @@ -672,7 +672,7 @@ class NetworkPackage extends BaseHubSystem implements Deliverable, Receivable, R */ public function isPackageEnqueued () { // Check whether the stacker is not empty - $isEnqueued = (($this->getStackerInstance()->isStackInitialized(self::STACKER_NAME_UNDECLARED)) && (!$this->getStackerInstance()->isStackEmpty(self::STACKER_NAME_UNDECLARED))); + $isEnqueued = (($this->getStackInstance()->isStackInitialized(self::STACKER_NAME_UNDECLARED)) && (!$this->getStackInstance()->isStackEmpty(self::STACKER_NAME_UNDECLARED))); // Return the result return $isEnqueued; @@ -685,7 +685,7 @@ class NetworkPackage extends BaseHubSystem implements Deliverable, Receivable, R */ public function isPackageDeclared () { // Check whether the stacker is not empty - $isDeclared = (($this->getStackerInstance()->isStackInitialized(self::STACKER_NAME_DECLARED)) && (!$this->getStackerInstance()->isStackEmpty(self::STACKER_NAME_DECLARED))); + $isDeclared = (($this->getStackInstance()->isStackInitialized(self::STACKER_NAME_DECLARED)) && (!$this->getStackInstance()->isStackEmpty(self::STACKER_NAME_DECLARED))); // Return the result return $isDeclared; @@ -698,7 +698,7 @@ class NetworkPackage extends BaseHubSystem implements Deliverable, Receivable, R */ public function isPackageWaitingForDelivery () { // Check whether the stacker is not empty - $isWaitingDelivery = (($this->getStackerInstance()->isStackInitialized(self::STACKER_NAME_OUTGOING)) && (!$this->getStackerInstance()->isStackEmpty(self::STACKER_NAME_OUTGOING))); + $isWaitingDelivery = (($this->getStackInstance()->isStackInitialized(self::STACKER_NAME_OUTGOING)) && (!$this->getStackInstance()->isStackEmpty(self::STACKER_NAME_OUTGOING))); // Return the result return $isWaitingDelivery; @@ -711,7 +711,7 @@ class NetworkPackage extends BaseHubSystem implements Deliverable, Receivable, R */ public function isEncodedDataPending () { // Check whether the stacker is not empty - $isPending = (($this->getStackerInstance()->isStackInitialized(self::STACKER_NAME_OUTGOING_STREAM)) && (!$this->getStackerInstance()->isStackEmpty(self::STACKER_NAME_OUTGOING_STREAM))); + $isPending = (($this->getStackInstance()->isStackInitialized(self::STACKER_NAME_OUTGOING_STREAM)) && (!$this->getStackInstance()->isStackEmpty(self::STACKER_NAME_OUTGOING_STREAM))); // Return the result return $isPending; @@ -739,7 +739,7 @@ class NetworkPackage extends BaseHubSystem implements Deliverable, Receivable, R * Now there are for sure packages to deliver, so start with the first * one. */ - $packageData = $this->getStackerInstance()->popNamed(self::STACKER_NAME_UNDECLARED); + $packageData = $this->getStackInstance()->popNamed(self::STACKER_NAME_UNDECLARED); // Declare the raw package data for delivery $this->declareRawPackageData($packageData); @@ -761,7 +761,7 @@ class NetworkPackage extends BaseHubSystem implements Deliverable, Receivable, R } // END - if // Get the package - $packageData = $this->getStackerInstance()->getNamed(self::STACKER_NAME_DECLARED); + $packageData = $this->getStackInstance()->getNamed(self::STACKER_NAME_DECLARED); // Assert on it assert(isset($packageData[self::PACKAGE_DATA_RECIPIENT])); @@ -772,7 +772,7 @@ class NetworkPackage extends BaseHubSystem implements Deliverable, Receivable, R $this->deliverRawPackageData($packageData); // And remove it finally - $this->getStackerInstance()->popNamed(self::STACKER_NAME_DECLARED); + $this->getStackInstance()->popNamed(self::STACKER_NAME_DECLARED); } catch (InvalidStateException $e) { // The state is not excepected (shall be 'connected') self::createDebugInstance(__CLASS__)->debugOutput('NETWORK-PACKAGE[' . __METHOD__ . ':' . __LINE__ . ']: Caught ' . $e->__toString() . ',message=' . $e->getMessage()); @@ -796,14 +796,14 @@ class NetworkPackage extends BaseHubSystem implements Deliverable, Receivable, R } // END - if // Get the package - $packageData = $this->getStackerInstance()->getNamed(self::STACKER_NAME_OUTGOING); + $packageData = $this->getStackInstance()->getNamed(self::STACKER_NAME_OUTGOING); try { // Now try to send it $this->sendOutgoingRawPackageData($packageData); // And remove it finally - $this->getStackerInstance()->popNamed(self::STACKER_NAME_OUTGOING); + $this->getStackInstance()->popNamed(self::STACKER_NAME_OUTGOING); } catch (InvalidSocketException $e) { // Output exception message self::createDebugInstance(__CLASS__)->debugOutput('NETWORK-PACKAGE[' . __METHOD__ . ':' . __LINE__ . ']: Package was not delivered: ' . $e->getMessage()); @@ -823,7 +823,7 @@ class NetworkPackage extends BaseHubSystem implements Deliverable, Receivable, R assert($this->isEncodedDataPending()); // Pop current data from stack - $encodedDataArray = $this->getStackerInstance()->popNamed(self::STACKER_NAME_OUTGOING_STREAM); + $encodedDataArray = $this->getStackInstance()->popNamed(self::STACKER_NAME_OUTGOING_STREAM); // Init in this round sent bytes $sentBytes = 0; @@ -877,7 +877,7 @@ class NetworkPackage extends BaseHubSystem implements Deliverable, Receivable, R } // Push array back in stack - $this->getStackerInstance()->pushNamed(self::STACKER_NAME_OUTGOING_STREAM, $encodedDataArray); + $this->getStackInstance()->pushNamed(self::STACKER_NAME_OUTGOING_STREAM, $encodedDataArray); } /////////////////////////////////////////////////////////////////////////// @@ -891,7 +891,7 @@ class NetworkPackage extends BaseHubSystem implements Deliverable, Receivable, R */ private function isRawDataPending () { // Just return whether the stack is not empty - $isPending = (!$this->getStackerInstance()->isStackEmpty(self::STACKER_NAME_DECODED_INCOMING)); + $isPending = (!$this->getStackInstance()->isStackEmpty(self::STACKER_NAME_DECODED_INCOMING)); // Return the status return $isPending; @@ -933,10 +933,10 @@ class NetworkPackage extends BaseHubSystem implements Deliverable, Receivable, R } // END - if // Very noisy debug message: - //* NOISY-DEBUG: */ self::createDebugInstance(__CLASS__)->debugOutput('NETWORK-PACKAGE[' . __METHOD__ . ':' . __LINE__ . ']: Stacker size is ' . $this->getStackerInstance()->getStackCount(self::STACKER_NAME_DECODED_INCOMING) . ' entries.'); + //* NOISY-DEBUG: */ self::createDebugInstance(__CLASS__)->debugOutput('NETWORK-PACKAGE[' . __METHOD__ . ':' . __LINE__ . ']: Stacker size is ' . $this->getStackInstance()->getStackCount(self::STACKER_NAME_DECODED_INCOMING) . ' entries.'); // "Pop" the next entry (the same array again) from the stack - $decodedData = $this->getStackerInstance()->popNamed(self::STACKER_NAME_DECODED_INCOMING); + $decodedData = $this->getStackInstance()->popNamed(self::STACKER_NAME_DECODED_INCOMING); // Make sure both array elements are there assert( @@ -960,7 +960,7 @@ class NetworkPackage extends BaseHubSystem implements Deliverable, Receivable, R // This package is "handled" and can be pushed on the next stack //* NOISY-DEBUG: */ self::createDebugInstance(__CLASS__)->debugOutput('NETWORK-PACKAGE[' . __METHOD__ . ':' . __LINE__ . ']: Pushing ' . strlen($decodedData[BaseRawDataHandler::PACKAGE_RAW_DATA]) . ' bytes to stack ' . self::STACKER_NAME_DECODED_HANDLED . ' ...'); - $this->getStackerInstance()->pushNamed(self::STACKER_NAME_DECODED_HANDLED, $decodedData); + $this->getStackInstance()->pushNamed(self::STACKER_NAME_DECODED_HANDLED, $decodedData); } /** @@ -980,7 +980,7 @@ class NetworkPackage extends BaseHubSystem implements Deliverable, Receivable, R //* NOISY-DEBUG: */ self::createDebugInstance(__CLASS__)->debugOutput('NETWORK-PACKAGE[' . __METHOD__ . ':' . __LINE__ . ']: decodedData[' . gettype($decodedData) . ']=' . print_r($decodedData, TRUE)); // And push it on our stack - $this->getStackerInstance()->pushNamed(self::STACKER_NAME_DECODED_INCOMING, $decodedData); + $this->getStackInstance()->pushNamed(self::STACKER_NAME_DECODED_INCOMING, $decodedData); } /** @@ -990,7 +990,7 @@ class NetworkPackage extends BaseHubSystem implements Deliverable, Receivable, R */ public function isIncomingRawDataHandled () { // Determine if the stack is not empty - $isHandled = (!$this->getStackerInstance()->isStackEmpty(self::STACKER_NAME_DECODED_HANDLED)); + $isHandled = (!$this->getStackInstance()->isStackEmpty(self::STACKER_NAME_DECODED_HANDLED)); // Return it return $isHandled; @@ -1055,7 +1055,7 @@ class NetworkPackage extends BaseHubSystem implements Deliverable, Receivable, R assert($this->isIncomingRawDataHandled()); // Get current package content (an array with two elements; see handleIncomingDecodedData() for details) - $packageContent = $this->getStackerInstance()->getNamed(self::STACKER_NAME_DECODED_HANDLED); + $packageContent = $this->getStackInstance()->getNamed(self::STACKER_NAME_DECODED_HANDLED); // Assert on some elements assert( @@ -1068,11 +1068,11 @@ class NetworkPackage extends BaseHubSystem implements Deliverable, Receivable, R $this->getAssemblerInstance()->chunkPackageContent($packageContent); // Remove the package from 'handled_decoded' stack ... - $this->getStackerInstance()->popNamed(self::STACKER_NAME_DECODED_HANDLED); + $this->getStackInstance()->popNamed(self::STACKER_NAME_DECODED_HANDLED); // ... and push it on the 'chunked' stacker //* NOISY-DEBUG: */ self::createDebugInstance(__CLASS__)->debugOutput('NETWORK-PACKAGE[' . __METHOD__ . ':' . __LINE__ . ']: Pushing ' . strlen($packageContent[BaseRawDataHandler::PACKAGE_RAW_DATA]) . ' bytes on stack ' . self::STACKER_NAME_DECODED_CHUNKED . ',packageContent=' . print_r($packageContent, TRUE)); - $this->getStackerInstance()->pushNamed(self::STACKER_NAME_DECODED_CHUNKED, $packageContent); + $this->getStackInstance()->pushNamed(self::STACKER_NAME_DECODED_CHUNKED, $packageContent); } /** @@ -1118,7 +1118,7 @@ class NetworkPackage extends BaseHubSystem implements Deliverable, Receivable, R */ public function removeFirstFailedPackage () { // Get the package again - $packageData = $this->getStackerInstance()->getNamed(self::STACKER_NAME_DECLARED); + $packageData = $this->getStackInstance()->getNamed(self::STACKER_NAME_DECLARED); // Is the package status 'failed'? if ($packageData[self::PACKAGE_DATA_STATUS] != self::PACKAGE_STATUS_FAILED) { @@ -1127,7 +1127,7 @@ class NetworkPackage extends BaseHubSystem implements Deliverable, Receivable, R } // END - if // Remove this entry - $this->getStackerInstance()->popNamed(self::STACKER_NAME_DECLARED); + $this->getStackInstance()->popNamed(self::STACKER_NAME_DECLARED); } /** @@ -1214,7 +1214,7 @@ class NetworkPackage extends BaseHubSystem implements Deliverable, Receivable, R $decodedContent[self::PACKAGE_CONTENT_MESSAGE] = $this->getCompressorInstance()->decompressStream($decodedContent[self::PACKAGE_CONTENT_MESSAGE]); // And push it on the next stack - $this->getStackerInstance()->pushNamed(self::STACKER_NAME_NEW_MESSAGE, $decodedContent); + $this->getStackInstance()->pushNamed(self::STACKER_NAME_NEW_MESSAGE, $decodedContent); } /** @@ -1224,7 +1224,7 @@ class NetworkPackage extends BaseHubSystem implements Deliverable, Receivable, R */ public function isNewMessageArrived () { // Determine if the stack is not empty - $hasArrived = (!$this->getStackerInstance()->isStackEmpty(self::STACKER_NAME_NEW_MESSAGE)); + $hasArrived = (!$this->getStackInstance()->isStackEmpty(self::STACKER_NAME_NEW_MESSAGE)); // Return it return $hasArrived; @@ -1238,7 +1238,7 @@ class NetworkPackage extends BaseHubSystem implements Deliverable, Receivable, R */ public function handleNewlyArrivedMessage () { // Get it from the stacker, it is the full array with the decoded message - $decodedContent = $this->getStackerInstance()->popNamed(self::STACKER_NAME_NEW_MESSAGE); + $decodedContent = $this->getStackInstance()->popNamed(self::STACKER_NAME_NEW_MESSAGE); // Now get a filter chain back from factory with given tags array $chainInstance = PackageFilterChainFactory::createChainByTagsArray($decodedContent[self::PACKAGE_CONTENT_TAGS]); @@ -1257,7 +1257,7 @@ class NetworkPackage extends BaseHubSystem implements Deliverable, Receivable, R */ public function isProcessedMessagePending () { // Check it - $isPending = (!$this->getStackerInstance()->isStackEmpty(self::STACKER_NAME_PROCESSED_MESSAGE)); + $isPending = (!$this->getStackInstance()->isStackEmpty(self::STACKER_NAME_PROCESSED_MESSAGE)); // Return it return $isPending; @@ -1270,7 +1270,7 @@ class NetworkPackage extends BaseHubSystem implements Deliverable, Receivable, R */ public function handleProcessedMessage () { // Get it from the stacker, it is the full array with the processed message - $messageArray = $this->getStackerInstance()->popNamed(self::STACKER_NAME_PROCESSED_MESSAGE); + $messageArray = $this->getStackInstance()->popNamed(self::STACKER_NAME_PROCESSED_MESSAGE); // Add type for later easier handling $messageArray[self::MESSAGE_ARRAY_DATA][self::MESSAGE_ARRAY_TYPE] = $messageArray[self::MESSAGE_ARRAY_TYPE]; diff --git a/application/hub/main/producer/miner/blocks/class_MinerTestGenesisBlockProducer.php b/application/hub/main/producer/miner/blocks/class_MinerTestGenesisBlockProducer.php index 140fbb77e..dc3b55488 100644 --- a/application/hub/main/producer/miner/blocks/class_MinerTestGenesisBlockProducer.php +++ b/application/hub/main/producer/miner/blocks/class_MinerTestGenesisBlockProducer.php @@ -41,6 +41,12 @@ class MinerTestGenesisBlockProducer extends BaseBlockProducer implements BlockPr // Get new instance $producerInstance = new MinerTestGenesisBlockProducer(); + // Init the queue for this test block producer + $stackInstance = FileStackFactory::createFileStackInstance('test_block_miner'); + + // Set it here + $producerInstance->setStackInstance($stackInstance); + // Return the prepared instance return $producerInstance; } diff --git a/application/hub/main/source/class_BaseUrlSource.php b/application/hub/main/source/class_BaseUrlSource.php index 9e3de5c37..f34b5e460 100644 --- a/application/hub/main/source/class_BaseUrlSource.php +++ b/application/hub/main/source/class_BaseUrlSource.php @@ -45,7 +45,7 @@ class BaseUrlSource extends BaseSource { $stackInstance = FileStackFactory::createFileStackInstance($prefix . '_url', $sourceName); // Set the stack here - $this->setStackerInstance($stackInstance); + $this->setStackInstance($stackInstance); } /** @@ -55,7 +55,7 @@ class BaseUrlSource extends BaseSource { */ protected function isUrlStackEmpty () { // Determine it - $isEmpty = $this->getStackerInstance()->isStackEmpty('urls'); + $isEmpty = $this->getStackInstance()->isStackEmpty('urls'); // Return result return $isEmpty; diff --git a/application/hub/main/source/urls/class_CrawlerUploadedListUrlSource.php b/application/hub/main/source/urls/class_CrawlerUploadedListUrlSource.php index 0c7dd6055..605478d60 100644 --- a/application/hub/main/source/urls/class_CrawlerUploadedListUrlSource.php +++ b/application/hub/main/source/urls/class_CrawlerUploadedListUrlSource.php @@ -44,6 +44,7 @@ class CrawlerUploadedListUrlSource extends BaseUrlSource implements UrlSource, R // Init source $sourceInstance->initSource('crawler', 'uploaded_list'); + // Get a // Return the prepared instance return $sourceInstance; } @@ -56,10 +57,10 @@ class CrawlerUploadedListUrlSource extends BaseUrlSource implements UrlSource, R */ public function processStack () { // Does the stack have some entries left? - if ($this->isUrlStackEmpty()) { + if (!$this->isUrlStackEmpty()) { // Nothing to handle here - return; - } // END - if + $this->processNextEntry(); + } elseif ($this-> $this->partialStub('Please implement this method.'); } diff --git a/application/hub/main/template/announcement/class_XmlAnnouncementTemplateEngine.php b/application/hub/main/template/announcement/class_XmlAnnouncementTemplateEngine.php index cedc40901..5d75382d9 100644 --- a/application/hub/main/template/announcement/class_XmlAnnouncementTemplateEngine.php +++ b/application/hub/main/template/announcement/class_XmlAnnouncementTemplateEngine.php @@ -99,7 +99,7 @@ class XmlAnnouncementTemplateEngine extends BaseXmlTemplateEngine implements Com * Assign the found characters to variable and use the last entry from * stack as the name. */ - parent::assignVariable($this->getStackerInstance()->getNamed('node_announcement'), $characters); + parent::assignVariable($this->getStackInstance()->getNamed('node_announcement'), $characters); } /** @@ -118,7 +118,7 @@ class XmlAnnouncementTemplateEngine extends BaseXmlTemplateEngine implements Com */ protected function startAnnouncement () { // Push the node name on the stacker - $this->getStackerInstance()->pushNamed('node_announcement', 'announcement'); + $this->getStackInstance()->pushNamed('node_announcement', 'announcement'); } /** @@ -128,7 +128,7 @@ class XmlAnnouncementTemplateEngine extends BaseXmlTemplateEngine implements Com */ protected function startAnnouncementData () { // Push the node name on the stacker - $this->getStackerInstance()->pushNamed('node_announcement', 'announcement-data'); + $this->getStackInstance()->pushNamed('node_announcement', 'announcement-data'); } /** @@ -138,7 +138,7 @@ class XmlAnnouncementTemplateEngine extends BaseXmlTemplateEngine implements Com */ protected function startNodeStatus () { // Push the node name on the stacker - $this->getStackerInstance()->pushNamed('node_announcement', self::ANNOUNCEMENT_DATA_NODE_STATUS); + $this->getStackInstance()->pushNamed('node_announcement', self::ANNOUNCEMENT_DATA_NODE_STATUS); } /** @@ -148,7 +148,7 @@ class XmlAnnouncementTemplateEngine extends BaseXmlTemplateEngine implements Com */ protected function startNodeMode () { // Push the node name on the stacker - $this->getStackerInstance()->pushNamed('node_announcement', self::ANNOUNCEMENT_DATA_NODE_MODE); + $this->getStackInstance()->pushNamed('node_announcement', self::ANNOUNCEMENT_DATA_NODE_MODE); } /** @@ -158,7 +158,7 @@ class XmlAnnouncementTemplateEngine extends BaseXmlTemplateEngine implements Com */ protected function startListener () { // Push the node name on the stacker - $this->getStackerInstance()->pushNamed('node_announcement', 'listener'); + $this->getStackInstance()->pushNamed('node_announcement', 'listener'); } /** @@ -168,7 +168,7 @@ class XmlAnnouncementTemplateEngine extends BaseXmlTemplateEngine implements Com */ protected function startListenPort () { // Push the node name on the stacker - $this->getStackerInstance()->pushNamed('node_announcement', self::ANNOUNCEMENT_DATA_LISTEN_PORT); + $this->getStackInstance()->pushNamed('node_announcement', self::ANNOUNCEMENT_DATA_LISTEN_PORT); } /** @@ -178,7 +178,7 @@ class XmlAnnouncementTemplateEngine extends BaseXmlTemplateEngine implements Com */ protected function startSessionId () { // Push the node name on the stacker - $this->getStackerInstance()->pushNamed('node_announcement', self::ANNOUNCEMENT_DATA_SESSION_ID); + $this->getStackInstance()->pushNamed('node_announcement', self::ANNOUNCEMENT_DATA_SESSION_ID); } /** @@ -188,7 +188,7 @@ class XmlAnnouncementTemplateEngine extends BaseXmlTemplateEngine implements Com */ protected function startExternalIp () { // Push the node name on the stacker - $this->getStackerInstance()->pushNamed('node_announcement', self::ANNOUNCEMENT_DATA_EXTERNAL_IP); + $this->getStackInstance()->pushNamed('node_announcement', self::ANNOUNCEMENT_DATA_EXTERNAL_IP); } /** @@ -198,7 +198,7 @@ class XmlAnnouncementTemplateEngine extends BaseXmlTemplateEngine implements Com */ protected function startInternalIp () { // Push the node name on the stacker - $this->getStackerInstance()->pushNamed('node_announcement', self::ANNOUNCEMENT_DATA_INTERNAL_IP); + $this->getStackInstance()->pushNamed('node_announcement', self::ANNOUNCEMENT_DATA_INTERNAL_IP); } /** @@ -208,7 +208,7 @@ class XmlAnnouncementTemplateEngine extends BaseXmlTemplateEngine implements Com */ protected function startObjectTypeList () { // Push the node name on the stacker - $this->getStackerInstance()->pushNamed('node_announcement', 'object-type-list'); + $this->getStackInstance()->pushNamed('node_announcement', 'object-type-list'); } /** @@ -218,7 +218,7 @@ class XmlAnnouncementTemplateEngine extends BaseXmlTemplateEngine implements Com */ protected function startObjectType () { // Push the node name on the stacker - $this->getStackerInstance()->pushNamed('node_announcement', 'object-type'); + $this->getStackInstance()->pushNamed('node_announcement', 'object-type'); } /** @@ -228,7 +228,7 @@ class XmlAnnouncementTemplateEngine extends BaseXmlTemplateEngine implements Com */ protected function finishObjectType () { // Pop the last entry - $this->getStackerInstance()->popNamed('node_announcement'); + $this->getStackInstance()->popNamed('node_announcement'); } /** @@ -238,7 +238,7 @@ class XmlAnnouncementTemplateEngine extends BaseXmlTemplateEngine implements Com */ protected function finishObjectTypeList () { // Pop the last entry - $this->getStackerInstance()->popNamed('node_announcement'); + $this->getStackInstance()->popNamed('node_announcement'); } /** @@ -248,7 +248,7 @@ class XmlAnnouncementTemplateEngine extends BaseXmlTemplateEngine implements Com */ protected function finishSessionId () { // Pop the last entry - $this->getStackerInstance()->popNamed('node_announcement'); + $this->getStackInstance()->popNamed('node_announcement'); } /** @@ -258,7 +258,7 @@ class XmlAnnouncementTemplateEngine extends BaseXmlTemplateEngine implements Com */ protected function finishInternalIp () { // Pop the last entry - $this->getStackerInstance()->popNamed('node_announcement'); + $this->getStackInstance()->popNamed('node_announcement'); } /** @@ -268,7 +268,7 @@ class XmlAnnouncementTemplateEngine extends BaseXmlTemplateEngine implements Com */ protected function finishExternalIp () { // Pop the last entry - $this->getStackerInstance()->popNamed('node_announcement'); + $this->getStackInstance()->popNamed('node_announcement'); } /** @@ -278,7 +278,7 @@ class XmlAnnouncementTemplateEngine extends BaseXmlTemplateEngine implements Com */ protected function finishListenPort () { // Pop the last entry - $this->getStackerInstance()->popNamed('node_announcement'); + $this->getStackInstance()->popNamed('node_announcement'); } /** @@ -288,7 +288,7 @@ class XmlAnnouncementTemplateEngine extends BaseXmlTemplateEngine implements Com */ protected function finishListener () { // Pop the last entry - $this->getStackerInstance()->popNamed('node_announcement'); + $this->getStackInstance()->popNamed('node_announcement'); } /** @@ -298,7 +298,7 @@ class XmlAnnouncementTemplateEngine extends BaseXmlTemplateEngine implements Com */ protected function finishNodeMode () { // Pop the last entry - $this->getStackerInstance()->popNamed('node_announcement'); + $this->getStackInstance()->popNamed('node_announcement'); } /** @@ -308,7 +308,7 @@ class XmlAnnouncementTemplateEngine extends BaseXmlTemplateEngine implements Com */ protected function finishNodeStatus () { // Pop the last entry - $this->getStackerInstance()->popNamed('node_announcement'); + $this->getStackInstance()->popNamed('node_announcement'); } /** @@ -318,7 +318,7 @@ class XmlAnnouncementTemplateEngine extends BaseXmlTemplateEngine implements Com */ protected function finishAnnouncementData () { // Pop the last entry - $this->getStackerInstance()->popNamed('node_announcement'); + $this->getStackInstance()->popNamed('node_announcement'); } /** @@ -328,7 +328,7 @@ class XmlAnnouncementTemplateEngine extends BaseXmlTemplateEngine implements Com */ protected function finishAnnouncement () { // Pop the last entry - $this->getStackerInstance()->popNamed('node_announcement'); + $this->getStackInstance()->popNamed('node_announcement'); } } diff --git a/application/hub/main/template/answer/announcement/class_XmlAnnouncementAnswerTemplateEngine.php b/application/hub/main/template/answer/announcement/class_XmlAnnouncementAnswerTemplateEngine.php index a8b952260..c54dc9834 100644 --- a/application/hub/main/template/answer/announcement/class_XmlAnnouncementAnswerTemplateEngine.php +++ b/application/hub/main/template/answer/announcement/class_XmlAnnouncementAnswerTemplateEngine.php @@ -105,7 +105,7 @@ class XmlAnnouncementAnswerTemplateEngine extends BaseXmlAnswerTemplateEngine im * Assign the found characters to variable and use the last entry from * stack as the name. */ - parent::assignVariable($this->getStackerInstance()->getNamed('node_announcement_answer'), $characters); + parent::assignVariable($this->getStackInstance()->getNamed('node_announcement_answer'), $characters); } /** @@ -124,7 +124,7 @@ class XmlAnnouncementAnswerTemplateEngine extends BaseXmlAnswerTemplateEngine im */ protected function startAnnouncementAnswer () { // Push the node name on the stacker - $this->getStackerInstance()->pushNamed('node_announcement_answer', 'announcement-answer'); + $this->getStackInstance()->pushNamed('node_announcement_answer', 'announcement-answer'); } /** @@ -134,7 +134,7 @@ class XmlAnnouncementAnswerTemplateEngine extends BaseXmlAnswerTemplateEngine im */ protected function startMyData () { // Push the node name on the stacker - $this->getStackerInstance()->pushNamed('node_announcement_answer', 'my-data'); + $this->getStackInstance()->pushNamed('node_announcement_answer', 'my-data'); } /** @@ -144,7 +144,7 @@ class XmlAnnouncementAnswerTemplateEngine extends BaseXmlAnswerTemplateEngine im */ protected function startMyExternalIp () { // Push the node name on the stacker - $this->getStackerInstance()->pushNamed('node_announcement_answer', self::ANNOUNCEMENT_DATA_EXTERNAL_IP); + $this->getStackInstance()->pushNamed('node_announcement_answer', self::ANNOUNCEMENT_DATA_EXTERNAL_IP); } /** @@ -154,7 +154,7 @@ class XmlAnnouncementAnswerTemplateEngine extends BaseXmlAnswerTemplateEngine im */ protected function startMyInternalIp () { // Push the node name on the stacker - $this->getStackerInstance()->pushNamed('node_announcement_answer', self::ANNOUNCEMENT_DATA_INTERNAL_IP); + $this->getStackInstance()->pushNamed('node_announcement_answer', self::ANNOUNCEMENT_DATA_INTERNAL_IP); } /** @@ -164,7 +164,7 @@ class XmlAnnouncementAnswerTemplateEngine extends BaseXmlAnswerTemplateEngine im */ protected function startMyListenPort () { // Push the node name on the stacker - $this->getStackerInstance()->pushNamed('node_announcement_answer', self::ANNOUNCEMENT_DATA_LISTEN_PORT); + $this->getStackInstance()->pushNamed('node_announcement_answer', self::ANNOUNCEMENT_DATA_LISTEN_PORT); } /** @@ -174,7 +174,7 @@ class XmlAnnouncementAnswerTemplateEngine extends BaseXmlAnswerTemplateEngine im */ protected function startMySessionId () { // Push the node name on the stacker - $this->getStackerInstance()->pushNamed('node_announcement_answer', self::ANNOUNCEMENT_DATA_SESSION_ID); + $this->getStackInstance()->pushNamed('node_announcement_answer', self::ANNOUNCEMENT_DATA_SESSION_ID); } /** @@ -184,7 +184,7 @@ class XmlAnnouncementAnswerTemplateEngine extends BaseXmlAnswerTemplateEngine im */ protected function startMyStatus () { // Push the node name on the stacker - $this->getStackerInstance()->pushNamed('node_announcement_answer', self::ANNOUNCEMENT_DATA_NODE_STATUS); + $this->getStackInstance()->pushNamed('node_announcement_answer', self::ANNOUNCEMENT_DATA_NODE_STATUS); } /** @@ -194,7 +194,7 @@ class XmlAnnouncementAnswerTemplateEngine extends BaseXmlAnswerTemplateEngine im */ protected function finishMyStatus () { // Pop the last entry - $this->getStackerInstance()->popNamed('node_announcement_answer'); + $this->getStackInstance()->popNamed('node_announcement_answer'); } /** @@ -204,7 +204,7 @@ class XmlAnnouncementAnswerTemplateEngine extends BaseXmlAnswerTemplateEngine im */ protected function finishMySessionId () { // Pop the last entry - $this->getStackerInstance()->popNamed('node_announcement_answer'); + $this->getStackInstance()->popNamed('node_announcement_answer'); } /** @@ -214,7 +214,7 @@ class XmlAnnouncementAnswerTemplateEngine extends BaseXmlAnswerTemplateEngine im */ protected function finishMyListenPort () { // Pop the last entry - $this->getStackerInstance()->popNamed('node_announcement_answer'); + $this->getStackInstance()->popNamed('node_announcement_answer'); } /** @@ -224,7 +224,7 @@ class XmlAnnouncementAnswerTemplateEngine extends BaseXmlAnswerTemplateEngine im */ protected function finishMyInternalIp () { // Pop the last entry - $this->getStackerInstance()->popNamed('node_announcement_answer'); + $this->getStackInstance()->popNamed('node_announcement_answer'); } /** @@ -234,7 +234,7 @@ class XmlAnnouncementAnswerTemplateEngine extends BaseXmlAnswerTemplateEngine im */ protected function finishMyExternalIp () { // Pop the last entry - $this->getStackerInstance()->popNamed('node_announcement_answer'); + $this->getStackInstance()->popNamed('node_announcement_answer'); } /** @@ -244,7 +244,7 @@ class XmlAnnouncementAnswerTemplateEngine extends BaseXmlAnswerTemplateEngine im */ protected function finishMyData () { // Pop the last entry - $this->getStackerInstance()->popNamed('node_announcement_answer'); + $this->getStackInstance()->popNamed('node_announcement_answer'); } /** @@ -254,7 +254,7 @@ class XmlAnnouncementAnswerTemplateEngine extends BaseXmlAnswerTemplateEngine im */ protected function startYourData () { // Push the node name on the stacker - $this->getStackerInstance()->pushNamed('node_announcement_answer', 'your-data'); + $this->getStackInstance()->pushNamed('node_announcement_answer', 'your-data'); } /** @@ -264,7 +264,7 @@ class XmlAnnouncementAnswerTemplateEngine extends BaseXmlAnswerTemplateEngine im */ protected function startYourExternalIp () { // Push the node name on the stacker - $this->getStackerInstance()->pushNamed('node_announcement_answer', 'your-external-ip'); + $this->getStackInstance()->pushNamed('node_announcement_answer', 'your-external-ip'); } /** @@ -274,7 +274,7 @@ class XmlAnnouncementAnswerTemplateEngine extends BaseXmlAnswerTemplateEngine im */ protected function startYourInternalIp () { // Push the node name on the stacker - $this->getStackerInstance()->pushNamed('node_announcement_answer', 'your-internal-ip'); + $this->getStackInstance()->pushNamed('node_announcement_answer', 'your-internal-ip'); } /** @@ -284,7 +284,7 @@ class XmlAnnouncementAnswerTemplateEngine extends BaseXmlAnswerTemplateEngine im */ protected function startYourSessionId () { // Push the node name on the stacker - $this->getStackerInstance()->pushNamed('node_announcement_answer', 'your-session-id'); + $this->getStackInstance()->pushNamed('node_announcement_answer', 'your-session-id'); } /** @@ -294,7 +294,7 @@ class XmlAnnouncementAnswerTemplateEngine extends BaseXmlAnswerTemplateEngine im */ protected function finishYourSessionId () { // Pop the last entry - $this->getStackerInstance()->popNamed('node_announcement_answer'); + $this->getStackInstance()->popNamed('node_announcement_answer'); } /** @@ -304,7 +304,7 @@ class XmlAnnouncementAnswerTemplateEngine extends BaseXmlAnswerTemplateEngine im */ protected function finishYourInternalIp () { // Pop the last entry - $this->getStackerInstance()->popNamed('node_announcement_answer'); + $this->getStackInstance()->popNamed('node_announcement_answer'); } /** @@ -314,7 +314,7 @@ class XmlAnnouncementAnswerTemplateEngine extends BaseXmlAnswerTemplateEngine im */ protected function finishYourExternalIp () { // Pop the last entry - $this->getStackerInstance()->popNamed('node_announcement_answer'); + $this->getStackInstance()->popNamed('node_announcement_answer'); } /** @@ -324,7 +324,7 @@ class XmlAnnouncementAnswerTemplateEngine extends BaseXmlAnswerTemplateEngine im */ protected function finishYourData () { // Pop the last entry - $this->getStackerInstance()->popNamed('node_announcement_answer'); + $this->getStackInstance()->popNamed('node_announcement_answer'); } /** @@ -334,7 +334,7 @@ class XmlAnnouncementAnswerTemplateEngine extends BaseXmlAnswerTemplateEngine im */ protected function finishAnnouncementAnswer () { // Pop the last entry - $this->getStackerInstance()->popNamed('node_announcement_answer'); + $this->getStackInstance()->popNamed('node_announcement_answer'); } } diff --git a/application/hub/main/template/answer/class_ b/application/hub/main/template/answer/class_ index 9fe91b624..40957e928 100644 --- a/application/hub/main/template/answer/class_ +++ b/application/hub/main/template/answer/class_ @@ -73,7 +73,7 @@ class Xml???AnswerTemplateEngine extends BaseXmlAnswerTemplateEngine implements } // END - if // Assign data with matching variable here - parent::assignVariable($this->getStackerInstance()->getNamed('!!!'), $characters); + parent::assignVariable($this->getStackInstance()->getNamed('!!!'), $characters); } /** @@ -92,7 +92,7 @@ class Xml???AnswerTemplateEngine extends BaseXmlAnswerTemplateEngine implements */ protected function start??? () { // Push the node name on the stacker - $this->getStackerInstance()->pushNamed('!!!', '|||'); + $this->getStackInstance()->pushNamed('!!!', '|||'); } /** @@ -102,7 +102,7 @@ class Xml???AnswerTemplateEngine extends BaseXmlAnswerTemplateEngine implements */ protected function finish??? () { // Pop the last entry - $this->getStackerInstance()->popNamed('!!!'); + $this->getStackInstance()->popNamed('!!!'); } } diff --git a/application/hub/main/template/answer/class_BaseXmlAnswerTemplateEngine.php b/application/hub/main/template/answer/class_BaseXmlAnswerTemplateEngine.php index 15bfc1ded..c0dc7640a 100644 --- a/application/hub/main/template/answer/class_BaseXmlAnswerTemplateEngine.php +++ b/application/hub/main/template/answer/class_BaseXmlAnswerTemplateEngine.php @@ -46,7 +46,7 @@ class BaseXmlAnswerTemplateEngine extends BaseXmlTemplateEngine implements Compi */ protected function startAnswerStatus () { // Push the node name on the stacker - $this->getStackerInstance()->pushNamed($this->getStackerName(), self::ANSWER_STATUS); + $this->getStackInstance()->pushNamed($this->getStackerName(), self::ANSWER_STATUS); } /** @@ -56,7 +56,7 @@ class BaseXmlAnswerTemplateEngine extends BaseXmlTemplateEngine implements Compi */ protected function finishAnswerStatus () { // Pop the last entry - $this->getStackerInstance()->popNamed($this->getStackerName()); + $this->getStackInstance()->popNamed($this->getStackerName()); } } diff --git a/application/hub/main/template/answer/dht/class_XmlDhtBootstrapAnswerTemplateEngine.php b/application/hub/main/template/answer/dht/class_XmlDhtBootstrapAnswerTemplateEngine.php index 485c53419..93a6731c7 100644 --- a/application/hub/main/template/answer/dht/class_XmlDhtBootstrapAnswerTemplateEngine.php +++ b/application/hub/main/template/answer/dht/class_XmlDhtBootstrapAnswerTemplateEngine.php @@ -108,7 +108,7 @@ class XmlDhtBootstrapAnswerTemplateEngine extends BaseXmlAnswerTemplateEngine im * Assign the found characters to variable and use the last entry from * stack as the name. */ - parent::assignVariable($this->getStackerInstance()->getNamed('node_dht_bootstrap_answer'), $characters); + parent::assignVariable($this->getStackInstance()->getNamed('node_dht_bootstrap_answer'), $characters); } /** @@ -127,7 +127,7 @@ class XmlDhtBootstrapAnswerTemplateEngine extends BaseXmlAnswerTemplateEngine im */ protected function startDhtBootstrapAnswer () { // Push the node name on the stacker - $this->getStackerInstance()->pushNamed('node_dht_bootstrap_answer', 'dht_bootstrap-answer'); + $this->getStackInstance()->pushNamed('node_dht_bootstrap_answer', 'dht_bootstrap-answer'); } /** @@ -137,7 +137,7 @@ class XmlDhtBootstrapAnswerTemplateEngine extends BaseXmlAnswerTemplateEngine im */ protected function startMyData () { // Push the node name on the stacker - $this->getStackerInstance()->pushNamed('node_dht_bootstrap_answer', 'my-data'); + $this->getStackInstance()->pushNamed('node_dht_bootstrap_answer', 'my-data'); } /** @@ -147,7 +147,7 @@ class XmlDhtBootstrapAnswerTemplateEngine extends BaseXmlAnswerTemplateEngine im */ protected function startMyExternalIp () { // Push the node name on the stacker - $this->getStackerInstance()->pushNamed('node_dht_bootstrap_answer', self::DHT_BOOTSTRAP_DATA_EXTERNAL_IP); + $this->getStackInstance()->pushNamed('node_dht_bootstrap_answer', self::DHT_BOOTSTRAP_DATA_EXTERNAL_IP); } /** @@ -157,7 +157,7 @@ class XmlDhtBootstrapAnswerTemplateEngine extends BaseXmlAnswerTemplateEngine im */ protected function startMyInternalIp () { // Push the node name on the stacker - $this->getStackerInstance()->pushNamed('node_dht_bootstrap_answer', self::DHT_BOOTSTRAP_DATA_INTERNAL_IP); + $this->getStackInstance()->pushNamed('node_dht_bootstrap_answer', self::DHT_BOOTSTRAP_DATA_INTERNAL_IP); } /** @@ -167,7 +167,7 @@ class XmlDhtBootstrapAnswerTemplateEngine extends BaseXmlAnswerTemplateEngine im */ protected function startMyListenPort () { // Push the node name on the stacker - $this->getStackerInstance()->pushNamed('node_dht_bootstrap_answer', self::DHT_BOOTSTRAP_DATA_LISTEN_PORT); + $this->getStackInstance()->pushNamed('node_dht_bootstrap_answer', self::DHT_BOOTSTRAP_DATA_LISTEN_PORT); } /** @@ -177,7 +177,7 @@ class XmlDhtBootstrapAnswerTemplateEngine extends BaseXmlAnswerTemplateEngine im */ protected function startMySessionId () { // Push the node name on the stacker - $this->getStackerInstance()->pushNamed('node_dht_bootstrap_answer', self::DHT_BOOTSTRAP_DATA_SESSION_ID); + $this->getStackInstance()->pushNamed('node_dht_bootstrap_answer', self::DHT_BOOTSTRAP_DATA_SESSION_ID); } /** @@ -187,7 +187,7 @@ class XmlDhtBootstrapAnswerTemplateEngine extends BaseXmlAnswerTemplateEngine im */ protected function startMyStatus () { // Push the node name on the stacker - $this->getStackerInstance()->pushNamed('node_dht_bootstrap_answer', self::DHT_BOOTSTRAP_DATA_NODE_STATUS); + $this->getStackInstance()->pushNamed('node_dht_bootstrap_answer', self::DHT_BOOTSTRAP_DATA_NODE_STATUS); } /** @@ -197,7 +197,7 @@ class XmlDhtBootstrapAnswerTemplateEngine extends BaseXmlAnswerTemplateEngine im */ protected function startDhtNodesList () { // Push the node name on the stacker - $this->getStackerInstance()->pushNamed('node_dht_bootstrap_answer', self::DHT_BOOTSTRAP_DATA_NODE_LIST); + $this->getStackInstance()->pushNamed('node_dht_bootstrap_answer', self::DHT_BOOTSTRAP_DATA_NODE_LIST); } /** @@ -207,7 +207,7 @@ class XmlDhtBootstrapAnswerTemplateEngine extends BaseXmlAnswerTemplateEngine im */ protected function finishDhtNodesList () { // Pop the last entry - $this->getStackerInstance()->popNamed('node_dht_bootstrap_answer'); + $this->getStackInstance()->popNamed('node_dht_bootstrap_answer'); } /** @@ -217,7 +217,7 @@ class XmlDhtBootstrapAnswerTemplateEngine extends BaseXmlAnswerTemplateEngine im */ protected function finishMyStatus () { // Pop the last entry - $this->getStackerInstance()->popNamed('node_dht_bootstrap_answer'); + $this->getStackInstance()->popNamed('node_dht_bootstrap_answer'); } /** @@ -227,7 +227,7 @@ class XmlDhtBootstrapAnswerTemplateEngine extends BaseXmlAnswerTemplateEngine im */ protected function finishMySessionId () { // Pop the last entry - $this->getStackerInstance()->popNamed('node_dht_bootstrap_answer'); + $this->getStackInstance()->popNamed('node_dht_bootstrap_answer'); } /** @@ -237,7 +237,7 @@ class XmlDhtBootstrapAnswerTemplateEngine extends BaseXmlAnswerTemplateEngine im */ protected function finishMyListenPort () { // Pop the last entry - $this->getStackerInstance()->popNamed('node_dht_bootstrap_answer'); + $this->getStackInstance()->popNamed('node_dht_bootstrap_answer'); } /** @@ -247,7 +247,7 @@ class XmlDhtBootstrapAnswerTemplateEngine extends BaseXmlAnswerTemplateEngine im */ protected function finishMyInternalIp () { // Pop the last entry - $this->getStackerInstance()->popNamed('node_dht_bootstrap_answer'); + $this->getStackInstance()->popNamed('node_dht_bootstrap_answer'); } /** @@ -257,7 +257,7 @@ class XmlDhtBootstrapAnswerTemplateEngine extends BaseXmlAnswerTemplateEngine im */ protected function finishMyExternalIp () { // Pop the last entry - $this->getStackerInstance()->popNamed('node_dht_bootstrap_answer'); + $this->getStackInstance()->popNamed('node_dht_bootstrap_answer'); } /** @@ -267,7 +267,7 @@ class XmlDhtBootstrapAnswerTemplateEngine extends BaseXmlAnswerTemplateEngine im */ protected function finishMyData () { // Pop the last entry - $this->getStackerInstance()->popNamed('node_dht_bootstrap_answer'); + $this->getStackInstance()->popNamed('node_dht_bootstrap_answer'); } /** @@ -277,7 +277,7 @@ class XmlDhtBootstrapAnswerTemplateEngine extends BaseXmlAnswerTemplateEngine im */ protected function startYourData () { // Push the node name on the stacker - $this->getStackerInstance()->pushNamed('node_dht_bootstrap_answer', 'your-data'); + $this->getStackInstance()->pushNamed('node_dht_bootstrap_answer', 'your-data'); } /** @@ -287,7 +287,7 @@ class XmlDhtBootstrapAnswerTemplateEngine extends BaseXmlAnswerTemplateEngine im */ protected function startYourExternalIp () { // Push the node name on the stacker - $this->getStackerInstance()->pushNamed('node_dht_bootstrap_answer', 'your-external-ip'); + $this->getStackInstance()->pushNamed('node_dht_bootstrap_answer', 'your-external-ip'); } /** @@ -297,7 +297,7 @@ class XmlDhtBootstrapAnswerTemplateEngine extends BaseXmlAnswerTemplateEngine im */ protected function startYourInternalIp () { // Push the node name on the stacker - $this->getStackerInstance()->pushNamed('node_dht_bootstrap_answer', 'your-internal-ip'); + $this->getStackInstance()->pushNamed('node_dht_bootstrap_answer', 'your-internal-ip'); } /** @@ -307,7 +307,7 @@ class XmlDhtBootstrapAnswerTemplateEngine extends BaseXmlAnswerTemplateEngine im */ protected function startYourSessionId () { // Push the node name on the stacker - $this->getStackerInstance()->pushNamed('node_dht_bootstrap_answer', 'your-session-id'); + $this->getStackInstance()->pushNamed('node_dht_bootstrap_answer', 'your-session-id'); } /** @@ -317,7 +317,7 @@ class XmlDhtBootstrapAnswerTemplateEngine extends BaseXmlAnswerTemplateEngine im */ protected function finishYourSessionId () { // Pop the last entry - $this->getStackerInstance()->popNamed('node_dht_bootstrap_answer'); + $this->getStackInstance()->popNamed('node_dht_bootstrap_answer'); } /** @@ -327,7 +327,7 @@ class XmlDhtBootstrapAnswerTemplateEngine extends BaseXmlAnswerTemplateEngine im */ protected function finishYourInternalIp () { // Pop the last entry - $this->getStackerInstance()->popNamed('node_dht_bootstrap_answer'); + $this->getStackInstance()->popNamed('node_dht_bootstrap_answer'); } /** @@ -337,7 +337,7 @@ class XmlDhtBootstrapAnswerTemplateEngine extends BaseXmlAnswerTemplateEngine im */ protected function finishYourExternalIp () { // Pop the last entry - $this->getStackerInstance()->popNamed('node_dht_bootstrap_answer'); + $this->getStackInstance()->popNamed('node_dht_bootstrap_answer'); } /** @@ -347,7 +347,7 @@ class XmlDhtBootstrapAnswerTemplateEngine extends BaseXmlAnswerTemplateEngine im */ protected function finishYourData () { // Pop the last entry - $this->getStackerInstance()->popNamed('node_dht_bootstrap_answer'); + $this->getStackInstance()->popNamed('node_dht_bootstrap_answer'); } /** @@ -357,7 +357,7 @@ class XmlDhtBootstrapAnswerTemplateEngine extends BaseXmlAnswerTemplateEngine im */ protected function finishDhtBootstrapAnswer () { // Pop the last entry - $this->getStackerInstance()->popNamed('node_dht_bootstrap_answer'); + $this->getStackInstance()->popNamed('node_dht_bootstrap_answer'); } } diff --git a/application/hub/main/template/answer/requests/class_XmlRequestNodeListAnswerTemplateEngine.php b/application/hub/main/template/answer/requests/class_XmlRequestNodeListAnswerTemplateEngine.php index 011e32327..850644020 100644 --- a/application/hub/main/template/answer/requests/class_XmlRequestNodeListAnswerTemplateEngine.php +++ b/application/hub/main/template/answer/requests/class_XmlRequestNodeListAnswerTemplateEngine.php @@ -95,7 +95,7 @@ class XmlRequestNodeListAnswerTemplateEngine extends BaseXmlAnswerTemplateEngine * Assign the found characters to variable and use the last entry from * stack as the name. */ - parent::assignVariable($this->getStackerInstance()->getNamed('node_request_node_list_answer'), $characters); + parent::assignVariable($this->getStackInstance()->getNamed('node_request_node_list_answer'), $characters); } /** @@ -114,7 +114,7 @@ class XmlRequestNodeListAnswerTemplateEngine extends BaseXmlAnswerTemplateEngine */ protected function startRequestNodeListAnswer () { // Push the node name on the stacker - $this->getStackerInstance()->pushNamed('node_request_node_list_answer', 'request-node-list-answer'); + $this->getStackInstance()->pushNamed('node_request_node_list_answer', 'request-node-list-answer'); } /** @@ -124,7 +124,7 @@ class XmlRequestNodeListAnswerTemplateEngine extends BaseXmlAnswerTemplateEngine */ protected function startSessionId () { // Push the node name on the stacker - $this->getStackerInstance()->pushNamed('node_request_node_list_answer', self::REQUEST_DATA_SESSION_ID); + $this->getStackInstance()->pushNamed('node_request_node_list_answer', self::REQUEST_DATA_SESSION_ID); } /** @@ -134,7 +134,7 @@ class XmlRequestNodeListAnswerTemplateEngine extends BaseXmlAnswerTemplateEngine */ protected function startNodeList () { // Push the node name on the stacker - $this->getStackerInstance()->pushNamed('node_request_node_list_answer', self::REQUEST_DATA_NODE_LIST); + $this->getStackInstance()->pushNamed('node_request_node_list_answer', self::REQUEST_DATA_NODE_LIST); } /** @@ -144,7 +144,7 @@ class XmlRequestNodeListAnswerTemplateEngine extends BaseXmlAnswerTemplateEngine */ protected function finishNodeList () { // Pop the last entry - $this->getStackerInstance()->popNamed('node_request_node_list_answer'); + $this->getStackInstance()->popNamed('node_request_node_list_answer'); } /** @@ -154,7 +154,7 @@ class XmlRequestNodeListAnswerTemplateEngine extends BaseXmlAnswerTemplateEngine */ protected function finishSessionId () { // Pop the last entry - $this->getStackerInstance()->popNamed('node_request_node_list_answer'); + $this->getStackInstance()->popNamed('node_request_node_list_answer'); } /** @@ -164,7 +164,7 @@ class XmlRequestNodeListAnswerTemplateEngine extends BaseXmlAnswerTemplateEngine */ protected function finishRequestNodeListAnswer () { // Pop the last entry - $this->getStackerInstance()->popNamed('node_request_node_list_answer'); + $this->getStackInstance()->popNamed('node_request_node_list_answer'); } } diff --git a/application/hub/main/template/class_ b/application/hub/main/template/class_ index 5c2ae8fe5..6abb3f32e 100644 --- a/application/hub/main/template/class_ +++ b/application/hub/main/template/class_ @@ -73,7 +73,7 @@ class Xml???TemplateEngine extends BaseXmlTemplateEngine implements CompileableT } // END - if // Assign data with matching variable here - parent::assignVariable($this->getStackerInstance()->getNamed('!!!'), $characters); + parent::assignVariable($this->getStackInstance()->getNamed('!!!'), $characters); } /** @@ -92,7 +92,7 @@ class Xml???TemplateEngine extends BaseXmlTemplateEngine implements CompileableT */ protected function start??? () { // Push the node name on the stacker - $this->getStackerInstance()->pushNamed('!!!', '|||'); + $this->getStackInstance()->pushNamed('!!!', '|||'); } /** @@ -102,7 +102,7 @@ class Xml???TemplateEngine extends BaseXmlTemplateEngine implements CompileableT */ protected function finish??? () { // Pop the last entry - $this->getStackerInstance()->popNamed('!!!'); + $this->getStackInstance()->popNamed('!!!'); } } diff --git a/application/hub/main/template/class_BaseXmlTemplateEngine.php b/application/hub/main/template/class_BaseXmlTemplateEngine.php index 0f9ed2250..8d2c54de5 100644 --- a/application/hub/main/template/class_BaseXmlTemplateEngine.php +++ b/application/hub/main/template/class_BaseXmlTemplateEngine.php @@ -115,16 +115,16 @@ class BaseXmlTemplateEngine extends BaseTemplateEngine { $this->setCompileOutputPath($this->getConfigInstance()->getConfigEntry('base_path') . $this->getConfigInstance()->getConfigEntry('compile_output_path')); // Init a variable stacker - $stackerInstance = ObjectFactory::createObjectByConfiguredName($typePrefix . '_' . $xmlTemplateType . '_stacker_class'); + $stackInstance = ObjectFactory::createObjectByConfiguredName($typePrefix . '_' . $xmlTemplateType . '_stacker_class'); // Set name $this->stackerName = $typePrefix . '_' . $xmlTemplateType; // Init stacker - $stackerInstance->initStack($this->stackerName); + $stackInstance->initStack($this->stackerName); // Set it - $this->setStackerInstance($stackerInstance); + $this->setStackInstance($stackInstance); // Set XML template type and prefix $this->xmlTemplateType = $xmlTemplateType; diff --git a/application/hub/main/template/connect/class_XmlSelfConnectTemplateEngine.php b/application/hub/main/template/connect/class_XmlSelfConnectTemplateEngine.php index a8f9f7d8a..b971ee658 100644 --- a/application/hub/main/template/connect/class_XmlSelfConnectTemplateEngine.php +++ b/application/hub/main/template/connect/class_XmlSelfConnectTemplateEngine.php @@ -90,7 +90,7 @@ class XmlSelfConnectTemplateEngine extends BaseXmlTemplateEngine implements Comp * Assign the found characters to variable and use the last entry from * stack as the name */ - parent::assignVariable($this->getStackerInstance()->getNamed('node_self_connect'), $characters); + parent::assignVariable($this->getStackInstance()->getNamed('node_self_connect'), $characters); } /** @@ -109,7 +109,7 @@ class XmlSelfConnectTemplateEngine extends BaseXmlTemplateEngine implements Comp */ protected function startSelfConnect () { // Push the node name on the stacker - $this->getStackerInstance()->pushNamed('node_self_connect', 'self-connect'); + $this->getStackInstance()->pushNamed('node_self_connect', 'self-connect'); } /** @@ -119,7 +119,7 @@ class XmlSelfConnectTemplateEngine extends BaseXmlTemplateEngine implements Comp */ protected function startSelfConnectData () { // Push the node name on the stacker - $this->getStackerInstance()->pushNamed('node_self_connect', 'self-connect-data'); + $this->getStackInstance()->pushNamed('node_self_connect', 'self-connect-data'); } /** @@ -129,7 +129,7 @@ class XmlSelfConnectTemplateEngine extends BaseXmlTemplateEngine implements Comp */ protected function startNodeId () { // Push the node name on the stacker - $this->getStackerInstance()->pushNamed('node_self_connect', self::SELF_CONNECT_DATA_NODE_ID); + $this->getStackInstance()->pushNamed('node_self_connect', self::SELF_CONNECT_DATA_NODE_ID); } /** @@ -139,7 +139,7 @@ class XmlSelfConnectTemplateEngine extends BaseXmlTemplateEngine implements Comp */ protected function startSessionId () { // Push the node name on the stacker - $this->getStackerInstance()->pushNamed('node_self_connect', self::SELF_CONNECT_DATA_SESSION_ID); + $this->getStackInstance()->pushNamed('node_self_connect', self::SELF_CONNECT_DATA_SESSION_ID); } /** @@ -149,7 +149,7 @@ class XmlSelfConnectTemplateEngine extends BaseXmlTemplateEngine implements Comp */ protected function finishSessionId () { // Pop the last entry - $this->getStackerInstance()->popNamed('node_self_connect'); + $this->getStackInstance()->popNamed('node_self_connect'); } /** @@ -159,7 +159,7 @@ class XmlSelfConnectTemplateEngine extends BaseXmlTemplateEngine implements Comp */ protected function finishNodeId () { // Pop the last entry - $this->getStackerInstance()->popNamed('node_self_connect'); + $this->getStackInstance()->popNamed('node_self_connect'); } /** @@ -169,7 +169,7 @@ class XmlSelfConnectTemplateEngine extends BaseXmlTemplateEngine implements Comp */ protected function finishSelfConnectData () { // Pop the last entry - $this->getStackerInstance()->popNamed('node_self_connect'); + $this->getStackInstance()->popNamed('node_self_connect'); } /** @@ -179,7 +179,7 @@ class XmlSelfConnectTemplateEngine extends BaseXmlTemplateEngine implements Comp */ protected function finishSelfConnect () { // Pop the last entry - $this->getStackerInstance()->popNamed('node_self_connect'); + $this->getStackInstance()->popNamed('node_self_connect'); } } diff --git a/application/hub/main/template/dht/class_XmlDhtBootstrapTemplateEngine.php b/application/hub/main/template/dht/class_XmlDhtBootstrapTemplateEngine.php index ee7bd3c87..35a856e01 100644 --- a/application/hub/main/template/dht/class_XmlDhtBootstrapTemplateEngine.php +++ b/application/hub/main/template/dht/class_XmlDhtBootstrapTemplateEngine.php @@ -99,7 +99,7 @@ class XmlDhtBootstrapTemplateEngine extends BaseXmlTemplateEngine implements Com * Assign the found characters to variable and use the last entry from * stack as the name. */ - parent::assignVariable($this->getStackerInstance()->getNamed('dht_bootstrap'), $characters); + parent::assignVariable($this->getStackInstance()->getNamed('dht_bootstrap'), $characters); } /** @@ -118,7 +118,7 @@ class XmlDhtBootstrapTemplateEngine extends BaseXmlTemplateEngine implements Com */ protected function startDhtBootstrap () { // Push the node name on the stacker - $this->getStackerInstance()->pushNamed('dht_bootstrap', 'dht-bootstrap'); + $this->getStackInstance()->pushNamed('dht_bootstrap', 'dht-bootstrap'); } /** @@ -128,7 +128,7 @@ class XmlDhtBootstrapTemplateEngine extends BaseXmlTemplateEngine implements Com */ protected function startDhtBootstrapData () { // Push the node name on the stacker - $this->getStackerInstance()->pushNamed('dht_bootstrap', self::DHT_BOOTSTRAP_DATA_BOOTSTRAP_DATA); + $this->getStackInstance()->pushNamed('dht_bootstrap', self::DHT_BOOTSTRAP_DATA_BOOTSTRAP_DATA); } /** @@ -138,7 +138,7 @@ class XmlDhtBootstrapTemplateEngine extends BaseXmlTemplateEngine implements Com */ protected function startNodeStatus () { // Push the node name on the stacker - $this->getStackerInstance()->pushNamed('dht_bootstrap', self::DHT_BOOTSTRAP_DATA_NODE_STATUS); + $this->getStackInstance()->pushNamed('dht_bootstrap', self::DHT_BOOTSTRAP_DATA_NODE_STATUS); } /** @@ -148,7 +148,7 @@ class XmlDhtBootstrapTemplateEngine extends BaseXmlTemplateEngine implements Com */ protected function startNodeMode () { // Push the node name on the stacker - $this->getStackerInstance()->pushNamed('dht_bootstrap', self::DHT_BOOTSTRAP_DATA_NODE_MODE); + $this->getStackInstance()->pushNamed('dht_bootstrap', self::DHT_BOOTSTRAP_DATA_NODE_MODE); } /** @@ -158,7 +158,7 @@ class XmlDhtBootstrapTemplateEngine extends BaseXmlTemplateEngine implements Com */ protected function startListener () { // Push the node name on the stacker - $this->getStackerInstance()->pushNamed('dht_bootstrap', 'listener'); + $this->getStackInstance()->pushNamed('dht_bootstrap', 'listener'); } /** @@ -168,7 +168,7 @@ class XmlDhtBootstrapTemplateEngine extends BaseXmlTemplateEngine implements Com */ protected function startListenPort () { // Push the node name on the stacker - $this->getStackerInstance()->pushNamed('dht_bootstrap', self::DHT_BOOTSTRAP_DATA_LISTEN_PORT); + $this->getStackInstance()->pushNamed('dht_bootstrap', self::DHT_BOOTSTRAP_DATA_LISTEN_PORT); } /** @@ -178,7 +178,7 @@ class XmlDhtBootstrapTemplateEngine extends BaseXmlTemplateEngine implements Com */ protected function startExternalIp () { // Push the node name on the stacker - $this->getStackerInstance()->pushNamed('dht_bootstrap', self::DHT_BOOTSTRAP_DATA_EXTERNAL_IP); + $this->getStackInstance()->pushNamed('dht_bootstrap', self::DHT_BOOTSTRAP_DATA_EXTERNAL_IP); } /** @@ -188,7 +188,7 @@ class XmlDhtBootstrapTemplateEngine extends BaseXmlTemplateEngine implements Com */ protected function startInternalIp () { // Push the node name on the stacker - $this->getStackerInstance()->pushNamed('dht_bootstrap', self::DHT_BOOTSTRAP_DATA_INTERNAL_IP); + $this->getStackInstance()->pushNamed('dht_bootstrap', self::DHT_BOOTSTRAP_DATA_INTERNAL_IP); } /** @@ -198,7 +198,7 @@ class XmlDhtBootstrapTemplateEngine extends BaseXmlTemplateEngine implements Com */ protected function startSessionId () { // Push the node name on the stacker - $this->getStackerInstance()->pushNamed('dht_bootstrap', self::DHT_BOOTSTRAP_DATA_SESSION_ID); + $this->getStackInstance()->pushNamed('dht_bootstrap', self::DHT_BOOTSTRAP_DATA_SESSION_ID); } /** @@ -208,7 +208,7 @@ class XmlDhtBootstrapTemplateEngine extends BaseXmlTemplateEngine implements Com */ protected function finishSessionId () { // Pop the last entry - $this->getStackerInstance()->popNamed('dht_bootstrap'); + $this->getStackInstance()->popNamed('dht_bootstrap'); } /** @@ -218,7 +218,7 @@ class XmlDhtBootstrapTemplateEngine extends BaseXmlTemplateEngine implements Com */ protected function finishInternalIp () { // Pop the last entry - $this->getStackerInstance()->popNamed('dht_bootstrap'); + $this->getStackInstance()->popNamed('dht_bootstrap'); } /** @@ -228,7 +228,7 @@ class XmlDhtBootstrapTemplateEngine extends BaseXmlTemplateEngine implements Com */ protected function finishExternalIp () { // Pop the last entry - $this->getStackerInstance()->popNamed('dht_bootstrap'); + $this->getStackInstance()->popNamed('dht_bootstrap'); } /** @@ -238,7 +238,7 @@ class XmlDhtBootstrapTemplateEngine extends BaseXmlTemplateEngine implements Com */ protected function finishListenPort () { // Pop the last entry - $this->getStackerInstance()->popNamed('dht_bootstrap'); + $this->getStackInstance()->popNamed('dht_bootstrap'); } /** @@ -248,7 +248,7 @@ class XmlDhtBootstrapTemplateEngine extends BaseXmlTemplateEngine implements Com */ protected function finishListener () { // Pop the last entry - $this->getStackerInstance()->popNamed('dht_bootstrap'); + $this->getStackInstance()->popNamed('dht_bootstrap'); } /** @@ -258,7 +258,7 @@ class XmlDhtBootstrapTemplateEngine extends BaseXmlTemplateEngine implements Com */ protected function finishNodeMode () { // Pop the last entry - $this->getStackerInstance()->popNamed('dht_bootstrap'); + $this->getStackInstance()->popNamed('dht_bootstrap'); } /** @@ -268,7 +268,7 @@ class XmlDhtBootstrapTemplateEngine extends BaseXmlTemplateEngine implements Com */ protected function finishNodeStatus () { // Pop the last entry - $this->getStackerInstance()->popNamed('dht_bootstrap'); + $this->getStackInstance()->popNamed('dht_bootstrap'); } /** @@ -278,7 +278,7 @@ class XmlDhtBootstrapTemplateEngine extends BaseXmlTemplateEngine implements Com */ protected function finishDhtBootstrapData () { // Pop the last entry - $this->getStackerInstance()->popNamed('dht_bootstrap'); + $this->getStackInstance()->popNamed('dht_bootstrap'); } /** @@ -288,7 +288,7 @@ class XmlDhtBootstrapTemplateEngine extends BaseXmlTemplateEngine implements Com */ protected function finishDhtBootstrap () { // Pop the last entry - $this->getStackerInstance()->popNamed('dht_bootstrap'); + $this->getStackInstance()->popNamed('dht_bootstrap'); } } diff --git a/application/hub/main/template/entries/class_XmlRequestNodeListEntryTemplateEngine.php b/application/hub/main/template/entries/class_XmlRequestNodeListEntryTemplateEngine.php index 223f5ea35..568bb9440 100644 --- a/application/hub/main/template/entries/class_XmlRequestNodeListEntryTemplateEngine.php +++ b/application/hub/main/template/entries/class_XmlRequestNodeListEntryTemplateEngine.php @@ -74,7 +74,7 @@ class XmlRequestNodeListEntryTemplateEngine extends BaseXmlTemplateEngine implem } // END - if // Assign data with matching variable here - parent::assignVariable($this->getStackerInstance()->getNamed('node_request_node_list_entry'), $characters); + parent::assignVariable($this->getStackInstance()->getNamed('node_request_node_list_entry'), $characters); } /** @@ -93,7 +93,7 @@ class XmlRequestNodeListEntryTemplateEngine extends BaseXmlTemplateEngine implem */ protected function startRequestNodeListEntry () { // Push the node name on the stacker - $this->getStackerInstance()->pushNamed('node_request_node_list_entry', 'request-node-list-entry'); + $this->getStackInstance()->pushNamed('node_request_node_list_entry', 'request-node-list-entry'); } /** @@ -103,7 +103,7 @@ class XmlRequestNodeListEntryTemplateEngine extends BaseXmlTemplateEngine implem */ protected function finishRequestNodeListEntry () { // Pop the last entry - $this->getStackerInstance()->popNamed('node_request_node_list_entry'); + $this->getStackInstance()->popNamed('node_request_node_list_entry'); } } diff --git a/application/hub/main/template/objects/class_XmlObjectRegistryTemplateEngine.php b/application/hub/main/template/objects/class_XmlObjectRegistryTemplateEngine.php index 9763d4baa..3c9795027 100644 --- a/application/hub/main/template/objects/class_XmlObjectRegistryTemplateEngine.php +++ b/application/hub/main/template/objects/class_XmlObjectRegistryTemplateEngine.php @@ -100,7 +100,7 @@ class XmlObjectRegistryTemplateEngine extends BaseXmlTemplateEngine implements C } // END - if // Get current XML node name as an array index - $nodeName = $this->getStackerInstance()->getNamed('node_object_registry'); + $nodeName = $this->getStackInstance()->getNamed('node_object_registry'); // Is the node name self::OBJECT_TYPE_DATA_NAME? if ($nodeName == self::OBJECT_TYPE_DATA_NAME) { @@ -128,7 +128,7 @@ class XmlObjectRegistryTemplateEngine extends BaseXmlTemplateEngine implements C */ protected function startObjectRegistry () { // Push the node name on the stacker - $this->getStackerInstance()->pushNamed('node_object_registry', 'object-registry'); + $this->getStackInstance()->pushNamed('node_object_registry', 'object-registry'); } /** @@ -140,7 +140,7 @@ class XmlObjectRegistryTemplateEngine extends BaseXmlTemplateEngine implements C */ protected function startObjectList ($objectCount) { // Push the node name on the stacker - $this->getStackerInstance()->pushNamed('node_object_registry', 'object-list'); + $this->getStackInstance()->pushNamed('node_object_registry', 'object-list'); } /** @@ -150,7 +150,7 @@ class XmlObjectRegistryTemplateEngine extends BaseXmlTemplateEngine implements C */ protected function startObjectListEntry () { // Push the node name on the stacker - $this->getStackerInstance()->pushNamed('node_object_registry', 'object-list-entry'); + $this->getStackInstance()->pushNamed('node_object_registry', 'object-list-entry'); } /** @@ -160,7 +160,7 @@ class XmlObjectRegistryTemplateEngine extends BaseXmlTemplateEngine implements C */ protected function startObjectName () { // Push the node name on the stacker - $this->getStackerInstance()->pushNamed('node_object_registry', self::OBJECT_TYPE_DATA_NAME); + $this->getStackInstance()->pushNamed('node_object_registry', self::OBJECT_TYPE_DATA_NAME); } /** @@ -170,7 +170,7 @@ class XmlObjectRegistryTemplateEngine extends BaseXmlTemplateEngine implements C */ protected function startObjectRecipientLimitation () { // Push the node name on the stacker - $this->getStackerInstance()->pushNamed('node_object_registry', self::OBJECT_TYPE_DATA_RECIPIENT_LIMITATION); + $this->getStackInstance()->pushNamed('node_object_registry', self::OBJECT_TYPE_DATA_RECIPIENT_LIMITATION); } /** @@ -180,7 +180,7 @@ class XmlObjectRegistryTemplateEngine extends BaseXmlTemplateEngine implements C */ protected function startObjectMaxSpread () { // Push the node name on the stacker - $this->getStackerInstance()->pushNamed('node_object_registry', self::OBJECT_TYPE_DATA_MAX_SPREAD); + $this->getStackInstance()->pushNamed('node_object_registry', self::OBJECT_TYPE_DATA_MAX_SPREAD); } /** @@ -190,7 +190,7 @@ class XmlObjectRegistryTemplateEngine extends BaseXmlTemplateEngine implements C */ protected function startObjectProtocol () { // Push the node name on the stacker - $this->getStackerInstance()->pushNamed('node_object_registry', self::OBJECT_TYPE_DATA_PROTOCOL); + $this->getStackInstance()->pushNamed('node_object_registry', self::OBJECT_TYPE_DATA_PROTOCOL); } /** @@ -200,7 +200,7 @@ class XmlObjectRegistryTemplateEngine extends BaseXmlTemplateEngine implements C */ protected function startObjectRecipientType () { // Push the node name on the stacker - $this->getStackerInstance()->pushNamed('node_object_registry', self::OBJECT_TYPE_DATA_RECIPIENT_TYPE); + $this->getStackInstance()->pushNamed('node_object_registry', self::OBJECT_TYPE_DATA_RECIPIENT_TYPE); } /** @@ -210,7 +210,7 @@ class XmlObjectRegistryTemplateEngine extends BaseXmlTemplateEngine implements C */ protected function finishObjectRecipientType () { // Pop the last entry - $this->getStackerInstance()->popNamed('node_object_registry'); + $this->getStackInstance()->popNamed('node_object_registry'); } /** @@ -220,7 +220,7 @@ class XmlObjectRegistryTemplateEngine extends BaseXmlTemplateEngine implements C */ protected function finishObjectProtocol () { // Pop the last entry - $this->getStackerInstance()->popNamed('node_object_registry'); + $this->getStackInstance()->popNamed('node_object_registry'); } /** @@ -230,7 +230,7 @@ class XmlObjectRegistryTemplateEngine extends BaseXmlTemplateEngine implements C */ protected function finishObjectMaxSpread () { // Pop the last entry - $this->getStackerInstance()->popNamed('node_object_registry'); + $this->getStackInstance()->popNamed('node_object_registry'); } /** @@ -240,7 +240,7 @@ class XmlObjectRegistryTemplateEngine extends BaseXmlTemplateEngine implements C */ protected function finishObjectRecipientLimitation () { // Pop the last entry - $this->getStackerInstance()->popNamed('node_object_registry'); + $this->getStackInstance()->popNamed('node_object_registry'); } /** @@ -250,7 +250,7 @@ class XmlObjectRegistryTemplateEngine extends BaseXmlTemplateEngine implements C */ protected function finishObjectName () { // Pop the last entry - $this->getStackerInstance()->popNamed('node_object_registry'); + $this->getStackInstance()->popNamed('node_object_registry'); } /** @@ -260,7 +260,7 @@ class XmlObjectRegistryTemplateEngine extends BaseXmlTemplateEngine implements C */ protected function finishObjectListEntry () { // Pop the last entry - $this->getStackerInstance()->popNamed('node_object_registry'); + $this->getStackInstance()->popNamed('node_object_registry'); } /** @@ -270,7 +270,7 @@ class XmlObjectRegistryTemplateEngine extends BaseXmlTemplateEngine implements C */ protected function finishObjectList () { // Pop the last entry - $this->getStackerInstance()->popNamed('node_object_registry'); + $this->getStackInstance()->popNamed('node_object_registry'); } /** @@ -280,7 +280,7 @@ class XmlObjectRegistryTemplateEngine extends BaseXmlTemplateEngine implements C */ protected function finishObjectRegistry () { // Pop the last entry - $this->getStackerInstance()->popNamed('node_object_registry'); + $this->getStackInstance()->popNamed('node_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 78c9e1f11..ab739f92f 100644 --- a/application/hub/main/template/producer/test_units/class_XmlCruncherTestUnitTemplateEngine.php +++ b/application/hub/main/template/producer/test_units/class_XmlCruncherTestUnitTemplateEngine.php @@ -90,7 +90,7 @@ class XmlCruncherTestUnitTemplateEngine extends BaseXmlTemplateEngine implements // Assign the found characters to variable and use the last entry from // stack as the name - parent::assignVariable($this->getStackerInstance()->getNamed('cruncher_test_unit'), $characters); + parent::assignVariable($this->getStackInstance()->getNamed('cruncher_test_unit'), $characters); } /** @@ -109,7 +109,7 @@ class XmlCruncherTestUnitTemplateEngine extends BaseXmlTemplateEngine implements */ protected function startTestUnit () { // Push the node name on the stacker - $this->getStackerInstance()->pushNamed('cruncher_test_unit', 'cruncher-test-unit'); + $this->getStackInstance()->pushNamed('cruncher_test_unit', 'cruncher-test-unit'); } /** @@ -119,7 +119,7 @@ class XmlCruncherTestUnitTemplateEngine extends BaseXmlTemplateEngine implements */ protected function startMetaData () { // Push the node name on the stacker - $this->getStackerInstance()->pushNamed('cruncher_test_unit', 'meta-data'); + $this->getStackInstance()->pushNamed('cruncher_test_unit', 'meta-data'); } /** @@ -129,7 +129,7 @@ class XmlCruncherTestUnitTemplateEngine extends BaseXmlTemplateEngine implements */ protected function startGlobalProjectIdentifier () { // Push the node name on the stacker - $this->getStackerInstance()->pushNamed('cruncher_test_unit', 'global-project-identifier'); + $this->getStackInstance()->pushNamed('cruncher_test_unit', 'global-project-identifier'); } /** @@ -139,7 +139,7 @@ class XmlCruncherTestUnitTemplateEngine extends BaseXmlTemplateEngine implements */ protected function finishGlobalProjectIdentifier () { // Pop the last entry - $this->getStackerInstance()->popNamed('cruncher_test_unit'); + $this->getStackInstance()->popNamed('cruncher_test_unit'); } /** @@ -149,7 +149,7 @@ class XmlCruncherTestUnitTemplateEngine extends BaseXmlTemplateEngine implements */ protected function startTestUnitCreated () { // Push the node name on the stacker - $this->getStackerInstance()->pushNamed('cruncher_test_unit', 'test-unit-created'); + $this->getStackInstance()->pushNamed('cruncher_test_unit', 'test-unit-created'); } /** @@ -159,7 +159,7 @@ class XmlCruncherTestUnitTemplateEngine extends BaseXmlTemplateEngine implements */ protected function finishTestUnitCreated () { // Pop the last entry - $this->getStackerInstance()->popNamed('cruncher_test_unit'); + $this->getStackInstance()->popNamed('cruncher_test_unit'); } /** @@ -169,7 +169,7 @@ class XmlCruncherTestUnitTemplateEngine extends BaseXmlTemplateEngine implements */ protected function startCipher () { // Push the node name on the stacker - $this->getStackerInstance()->pushNamed('cruncher_test_unit', 'cipher'); + $this->getStackInstance()->pushNamed('cruncher_test_unit', 'cipher'); } /** @@ -179,7 +179,7 @@ class XmlCruncherTestUnitTemplateEngine extends BaseXmlTemplateEngine implements */ protected function startCipherFunction () { // Push the node name on the stacker - $this->getStackerInstance()->pushNamed('cruncher_test_unit', 'cipher-function'); + $this->getStackInstance()->pushNamed('cruncher_test_unit', 'cipher-function'); } /** @@ -189,7 +189,7 @@ class XmlCruncherTestUnitTemplateEngine extends BaseXmlTemplateEngine implements */ protected function finishCipherFunction () { // Pop the last entry - $this->getStackerInstance()->popNamed('cruncher_test_unit'); + $this->getStackInstance()->popNamed('cruncher_test_unit'); } /** @@ -199,7 +199,7 @@ class XmlCruncherTestUnitTemplateEngine extends BaseXmlTemplateEngine implements */ protected function startCipherName () { // Push the node name on the stacker - $this->getStackerInstance()->pushNamed('cruncher_test_unit', 'cipher-name'); + $this->getStackInstance()->pushNamed('cruncher_test_unit', 'cipher-name'); } /** @@ -209,7 +209,7 @@ class XmlCruncherTestUnitTemplateEngine extends BaseXmlTemplateEngine implements */ protected function finishCipherName () { // Pop the last entry - $this->getStackerInstance()->popNamed('cruncher_test_unit'); + $this->getStackInstance()->popNamed('cruncher_test_unit'); } /** @@ -219,7 +219,7 @@ class XmlCruncherTestUnitTemplateEngine extends BaseXmlTemplateEngine implements */ protected function finishCipher () { // Pop the last entry - $this->getStackerInstance()->popNamed('cruncher_test_unit'); + $this->getStackInstance()->popNamed('cruncher_test_unit'); } /** @@ -229,7 +229,7 @@ class XmlCruncherTestUnitTemplateEngine extends BaseXmlTemplateEngine implements */ protected function finishMetaData () { // Pop the last entry - $this->getStackerInstance()->popNamed('cruncher_test_unit'); + $this->getStackInstance()->popNamed('cruncher_test_unit'); } /** @@ -239,7 +239,7 @@ class XmlCruncherTestUnitTemplateEngine extends BaseXmlTemplateEngine implements */ protected function startUnprocessedData () { // Push the node name on the stacker - $this->getStackerInstance()->pushNamed('cruncher_test_unit', 'unprocessed-data'); + $this->getStackInstance()->pushNamed('cruncher_test_unit', 'unprocessed-data'); } /** @@ -249,7 +249,7 @@ class XmlCruncherTestUnitTemplateEngine extends BaseXmlTemplateEngine implements */ protected function startEncryptedMessage () { // Push the node name on the stacker - $this->getStackerInstance()->pushNamed('cruncher_test_unit', 'encrypted-message'); + $this->getStackInstance()->pushNamed('cruncher_test_unit', 'encrypted-message'); } /** @@ -259,7 +259,7 @@ class XmlCruncherTestUnitTemplateEngine extends BaseXmlTemplateEngine implements */ protected function finishEncryptedMessage () { // Pop the last entry - $this->getStackerInstance()->popNamed('cruncher_test_unit'); + $this->getStackInstance()->popNamed('cruncher_test_unit'); } /** @@ -271,7 +271,7 @@ class XmlCruncherTestUnitTemplateEngine extends BaseXmlTemplateEngine implements */ protected function startCruncherKeyList ($keyCount) { // Push the node name on the stacker - $this->getStackerInstance()->pushNamed('cruncher_test_unit', 'cruncher-key-list'); + $this->getStackInstance()->pushNamed('cruncher_test_unit', 'cruncher-key-list'); } /** @@ -281,7 +281,7 @@ class XmlCruncherTestUnitTemplateEngine extends BaseXmlTemplateEngine implements */ protected function startCruncherKey () { // Push the node name on the stacker - $this->getStackerInstance()->pushNamed('cruncher_test_unit', 'cruncher-key'); + $this->getStackInstance()->pushNamed('cruncher_test_unit', 'cruncher-key'); } /** @@ -291,7 +291,7 @@ class XmlCruncherTestUnitTemplateEngine extends BaseXmlTemplateEngine implements */ protected function startKeyId () { // Push the node name on the stacker - $this->getStackerInstance()->pushNamed('cruncher_test_unit', 'key-id'); + $this->getStackInstance()->pushNamed('cruncher_test_unit', 'key-id'); } /** @@ -301,7 +301,7 @@ class XmlCruncherTestUnitTemplateEngine extends BaseXmlTemplateEngine implements */ protected function finishKeyId () { // Pop the last entry - $this->getStackerInstance()->popNamed('cruncher_test_unit'); + $this->getStackInstance()->popNamed('cruncher_test_unit'); } /** @@ -311,7 +311,7 @@ class XmlCruncherTestUnitTemplateEngine extends BaseXmlTemplateEngine implements */ protected function startKeyValue () { // Push the node name on the stacker - $this->getStackerInstance()->pushNamed('cruncher_test_unit', 'key-value'); + $this->getStackInstance()->pushNamed('cruncher_test_unit', 'key-value'); } /** @@ -321,7 +321,7 @@ class XmlCruncherTestUnitTemplateEngine extends BaseXmlTemplateEngine implements */ protected function finishKeyValue () { // Pop the last entry - $this->getStackerInstance()->popNamed('cruncher_test_unit'); + $this->getStackInstance()->popNamed('cruncher_test_unit'); } /** @@ -331,7 +331,7 @@ class XmlCruncherTestUnitTemplateEngine extends BaseXmlTemplateEngine implements */ protected function finishCruncherKey () { // Pop the last entry - $this->getStackerInstance()->popNamed('cruncher_test_unit'); + $this->getStackInstance()->popNamed('cruncher_test_unit'); } /** @@ -341,7 +341,7 @@ class XmlCruncherTestUnitTemplateEngine extends BaseXmlTemplateEngine implements */ protected function finishCruncherKeyList () { // Pop the last entry - $this->getStackerInstance()->popNamed('cruncher_test_unit'); + $this->getStackInstance()->popNamed('cruncher_test_unit'); } /** @@ -351,7 +351,7 @@ class XmlCruncherTestUnitTemplateEngine extends BaseXmlTemplateEngine implements */ protected function finishUnprocessedData () { // Pop the last entry - $this->getStackerInstance()->popNamed('cruncher_test_unit'); + $this->getStackInstance()->popNamed('cruncher_test_unit'); } /** @@ -361,7 +361,7 @@ class XmlCruncherTestUnitTemplateEngine extends BaseXmlTemplateEngine implements */ protected function finishTestUnit () { // Pop the last entry - $this->getStackerInstance()->popNamed('cruncher_test_unit'); + $this->getStackInstance()->popNamed('cruncher_test_unit'); } } diff --git a/application/hub/main/template/publish/class_XmlDhtPublishEntryTemplateEngine.php b/application/hub/main/template/publish/class_XmlDhtPublishEntryTemplateEngine.php index fc3ff943e..fb98fa8f6 100644 --- a/application/hub/main/template/publish/class_XmlDhtPublishEntryTemplateEngine.php +++ b/application/hub/main/template/publish/class_XmlDhtPublishEntryTemplateEngine.php @@ -103,7 +103,7 @@ class XmlDhtPublishEntryTemplateEngine extends BaseXmlTemplateEngine implements * Assign the found characters to variable and use the last entry from * stack as the name. */ - parent::assignVariable($this->getStackerInstance()->getNamed('dht_publish'), $characters); + parent::assignVariable($this->getStackInstance()->getNamed('dht_publish'), $characters); } /** @@ -122,7 +122,7 @@ class XmlDhtPublishEntryTemplateEngine extends BaseXmlTemplateEngine implements */ protected function startPublish () { // Push the node name on the stacker - $this->getStackerInstance()->pushNamed('dht_publish', 'publish'); + $this->getStackInstance()->pushNamed('dht_publish', 'publish'); } /** @@ -132,7 +132,7 @@ class XmlDhtPublishEntryTemplateEngine extends BaseXmlTemplateEngine implements */ protected function startPublishData () { // Push the node name on the stacker - $this->getStackerInstance()->pushNamed('dht_publish', 'publish-data'); + $this->getStackInstance()->pushNamed('dht_publish', 'publish-data'); } /** @@ -142,7 +142,7 @@ class XmlDhtPublishEntryTemplateEngine extends BaseXmlTemplateEngine implements */ protected function startNodeStatus () { // Push the node name on the stacker - $this->getStackerInstance()->pushNamed('dht_publish', self::PUBLISH_DATA_NODE_STATUS); + $this->getStackInstance()->pushNamed('dht_publish', self::PUBLISH_DATA_NODE_STATUS); } /** @@ -152,7 +152,7 @@ class XmlDhtPublishEntryTemplateEngine extends BaseXmlTemplateEngine implements */ protected function startNodeMode () { // Push the node name on the stacker - $this->getStackerInstance()->pushNamed('dht_publish', self::PUBLISH_DATA_NODE_MODE); + $this->getStackInstance()->pushNamed('dht_publish', self::PUBLISH_DATA_NODE_MODE); } /** @@ -162,7 +162,7 @@ class XmlDhtPublishEntryTemplateEngine extends BaseXmlTemplateEngine implements */ protected function startListener () { // Push the node name on the stacker - $this->getStackerInstance()->pushNamed('dht_publish', 'listener'); + $this->getStackInstance()->pushNamed('dht_publish', 'listener'); } /** @@ -172,7 +172,7 @@ class XmlDhtPublishEntryTemplateEngine extends BaseXmlTemplateEngine implements */ protected function startListenPort () { // Push the node name on the stacker - $this->getStackerInstance()->pushNamed('dht_publish', self::PUBLISH_DATA_LISTEN_PORT); + $this->getStackInstance()->pushNamed('dht_publish', self::PUBLISH_DATA_LISTEN_PORT); } /** @@ -182,7 +182,7 @@ class XmlDhtPublishEntryTemplateEngine extends BaseXmlTemplateEngine implements */ protected function startAcceptedObjectTypes () { // Push the node name on the stacker - $this->getStackerInstance()->pushNamed('dht_publish', self::PUBLISH_DATA_ACCEPTED_OBJECT_TYPES); + $this->getStackInstance()->pushNamed('dht_publish', self::PUBLISH_DATA_ACCEPTED_OBJECT_TYPES); } /** @@ -192,7 +192,7 @@ class XmlDhtPublishEntryTemplateEngine extends BaseXmlTemplateEngine implements */ protected function startPrivateKeyHash () { // Push the node name on the stacker - $this->getStackerInstance()->pushNamed('dht_publish', self::PUBLISH_DATA_PRIVATE_KEY_HASH); + $this->getStackInstance()->pushNamed('dht_publish', self::PUBLISH_DATA_PRIVATE_KEY_HASH); } /** @@ -202,7 +202,7 @@ class XmlDhtPublishEntryTemplateEngine extends BaseXmlTemplateEngine implements */ protected function startNodeId () { // Push the node name on the stacker - $this->getStackerInstance()->pushNamed('dht_publish', self::PUBLISH_DATA_NODE_ID); + $this->getStackInstance()->pushNamed('dht_publish', self::PUBLISH_DATA_NODE_ID); } /** @@ -212,7 +212,7 @@ class XmlDhtPublishEntryTemplateEngine extends BaseXmlTemplateEngine implements */ protected function startSessionId () { // Push the node name on the stacker - $this->getStackerInstance()->pushNamed('dht_publish', self::PUBLISH_DATA_SESSION_ID); + $this->getStackInstance()->pushNamed('dht_publish', self::PUBLISH_DATA_SESSION_ID); } /** @@ -222,7 +222,7 @@ class XmlDhtPublishEntryTemplateEngine extends BaseXmlTemplateEngine implements */ protected function startExternalIp () { // Push the node name on the stacker - $this->getStackerInstance()->pushNamed('dht_publish', self::PUBLISH_DATA_EXTERNAL_IP); + $this->getStackInstance()->pushNamed('dht_publish', self::PUBLISH_DATA_EXTERNAL_IP); } /** @@ -232,7 +232,7 @@ class XmlDhtPublishEntryTemplateEngine extends BaseXmlTemplateEngine implements */ protected function startObjectTypeList () { // Push the node name on the stacker - $this->getStackerInstance()->pushNamed('dht_publish', 'object-type-list'); + $this->getStackInstance()->pushNamed('dht_publish', 'object-type-list'); } /** @@ -242,7 +242,7 @@ class XmlDhtPublishEntryTemplateEngine extends BaseXmlTemplateEngine implements */ protected function startObjectType () { // Push the node name on the stacker - $this->getStackerInstance()->pushNamed('dht_publish', 'object-type'); + $this->getStackInstance()->pushNamed('dht_publish', 'object-type'); } /** @@ -252,7 +252,7 @@ class XmlDhtPublishEntryTemplateEngine extends BaseXmlTemplateEngine implements */ protected function finishObjectType () { // Pop the last entry - $this->getStackerInstance()->popNamed('dht_publish'); + $this->getStackInstance()->popNamed('dht_publish'); } /** @@ -262,7 +262,7 @@ class XmlDhtPublishEntryTemplateEngine extends BaseXmlTemplateEngine implements */ protected function finishObjectTypeList () { // Pop the last entry - $this->getStackerInstance()->popNamed('dht_publish'); + $this->getStackInstance()->popNamed('dht_publish'); } /** @@ -272,7 +272,7 @@ class XmlDhtPublishEntryTemplateEngine extends BaseXmlTemplateEngine implements */ protected function finishSessionId () { // Pop the last entry - $this->getStackerInstance()->popNamed('dht_publish'); + $this->getStackInstance()->popNamed('dht_publish'); } /** @@ -282,7 +282,7 @@ class XmlDhtPublishEntryTemplateEngine extends BaseXmlTemplateEngine implements */ protected function finishNodeId () { // Pop the last entry - $this->getStackerInstance()->popNamed('dht_publish'); + $this->getStackInstance()->popNamed('dht_publish'); } /** @@ -292,7 +292,7 @@ class XmlDhtPublishEntryTemplateEngine extends BaseXmlTemplateEngine implements */ protected function finishExternalIp () { // Pop the last entry - $this->getStackerInstance()->popNamed('dht_publish'); + $this->getStackInstance()->popNamed('dht_publish'); } /** @@ -302,7 +302,7 @@ class XmlDhtPublishEntryTemplateEngine extends BaseXmlTemplateEngine implements */ protected function finishListenPort () { // Pop the last entry - $this->getStackerInstance()->popNamed('dht_publish'); + $this->getStackInstance()->popNamed('dht_publish'); } /** @@ -312,7 +312,7 @@ class XmlDhtPublishEntryTemplateEngine extends BaseXmlTemplateEngine implements */ protected function finishPrivateKeyHash () { // Pop the last entry - $this->getStackerInstance()->popNamed('dht_publish'); + $this->getStackInstance()->popNamed('dht_publish'); } /** @@ -322,7 +322,7 @@ class XmlDhtPublishEntryTemplateEngine extends BaseXmlTemplateEngine implements */ protected function finishAcceptedObjectTypes () { // Pop the last entry - $this->getStackerInstance()->popNamed('dht_publish'); + $this->getStackInstance()->popNamed('dht_publish'); } /** @@ -332,7 +332,7 @@ class XmlDhtPublishEntryTemplateEngine extends BaseXmlTemplateEngine implements */ protected function finishListener () { // Pop the last entry - $this->getStackerInstance()->popNamed('dht_publish'); + $this->getStackInstance()->popNamed('dht_publish'); } /** @@ -342,7 +342,7 @@ class XmlDhtPublishEntryTemplateEngine extends BaseXmlTemplateEngine implements */ protected function finishNodeMode () { // Pop the last entry - $this->getStackerInstance()->popNamed('dht_publish'); + $this->getStackInstance()->popNamed('dht_publish'); } /** @@ -352,7 +352,7 @@ class XmlDhtPublishEntryTemplateEngine extends BaseXmlTemplateEngine implements */ protected function finishNodeStatus () { // Pop the last entry - $this->getStackerInstance()->popNamed('dht_publish'); + $this->getStackInstance()->popNamed('dht_publish'); } /** @@ -362,7 +362,7 @@ class XmlDhtPublishEntryTemplateEngine extends BaseXmlTemplateEngine implements */ protected function finishPublishData () { // Pop the last entry - $this->getStackerInstance()->popNamed('dht_publish'); + $this->getStackInstance()->popNamed('dht_publish'); } /** @@ -372,7 +372,7 @@ class XmlDhtPublishEntryTemplateEngine extends BaseXmlTemplateEngine implements */ protected function finishPublish () { // Pop the last entry - $this->getStackerInstance()->popNamed('dht_publish'); + $this->getStackInstance()->popNamed('dht_publish'); } } diff --git a/application/hub/main/template/requests/class_XmlRequestNodeListTemplateEngine.php b/application/hub/main/template/requests/class_XmlRequestNodeListTemplateEngine.php index ad583f745..04dd6c623 100644 --- a/application/hub/main/template/requests/class_XmlRequestNodeListTemplateEngine.php +++ b/application/hub/main/template/requests/class_XmlRequestNodeListTemplateEngine.php @@ -84,7 +84,7 @@ class XmlRequestNodeListTemplateEngine extends BaseXmlTemplateEngine implements } // END - if // Assign data with matching variable here - parent::assignVariable($this->getStackerInstance()->getNamed('node_request_node_list'), $characters); + parent::assignVariable($this->getStackInstance()->getNamed('node_request_node_list'), $characters); } /** @@ -103,7 +103,7 @@ class XmlRequestNodeListTemplateEngine extends BaseXmlTemplateEngine implements */ protected function startRequestNodeList () { // Push the node name on the stacker - $this->getStackerInstance()->pushNamed('node_request_node_list', 'node-request-node-list'); + $this->getStackInstance()->pushNamed('node_request_node_list', 'node-request-node-list'); } /** @@ -113,7 +113,7 @@ class XmlRequestNodeListTemplateEngine extends BaseXmlTemplateEngine implements */ protected function startAcceptedObjectTypes () { // Push the node name on the stacker - $this->getStackerInstance()->pushNamed('node_request_node_list', self::REQUEST_DATA_ACCEPTED_OBJECT_TYPES); + $this->getStackInstance()->pushNamed('node_request_node_list', self::REQUEST_DATA_ACCEPTED_OBJECT_TYPES); } /** @@ -123,7 +123,7 @@ class XmlRequestNodeListTemplateEngine extends BaseXmlTemplateEngine implements */ protected function startSessionId () { // Push the node name on the stacker - $this->getStackerInstance()->pushNamed('node_request_node_list', self::REQUEST_DATA_SESSION_ID); + $this->getStackInstance()->pushNamed('node_request_node_list', self::REQUEST_DATA_SESSION_ID); } /** @@ -133,7 +133,7 @@ class XmlRequestNodeListTemplateEngine extends BaseXmlTemplateEngine implements */ protected function finishSessionId () { // Pop the last entry - $this->getStackerInstance()->popNamed('node_request_node_list'); + $this->getStackInstance()->popNamed('node_request_node_list'); } /** @@ -143,7 +143,7 @@ class XmlRequestNodeListTemplateEngine extends BaseXmlTemplateEngine implements */ protected function finishAcceptedObjectTypes () { // Pop the last entry - $this->getStackerInstance()->popNamed('node_request_node_list'); + $this->getStackInstance()->popNamed('node_request_node_list'); } /** @@ -153,7 +153,7 @@ class XmlRequestNodeListTemplateEngine extends BaseXmlTemplateEngine implements */ protected function finishRequestNodeList () { // Pop the last entry - $this->getStackerInstance()->popNamed('node_request_node_list'); + $this->getStackInstance()->popNamed('node_request_node_list'); } } diff --git a/core b/core index 695f33514..4b3bc49a6 160000 --- a/core +++ b/core @@ -1 +1 @@ -Subproject commit 695f33514481689f765e61ee0653522c55c394d8 +Subproject commit 4b3bc49a694dcfe6ba3e0e5ee5e495a9c14d1a20