Renamed some methods to make them more clear

diff --git a/application/hub/interfaces/package/class_Receivable.php b/application/hub/interfaces/package/class_Receivable.php
index 821c8178e299757cbf60c9149c7a9926a93fe280..3022572e145ef103b4e462ebcca728dd5bbe6e81 100644 (file)
--- a/application/hub/interfaces/package/class_Receivable.php
+++ b/application/hub/interfaces/package/class_Receivable.php
@@ -37,7 +37,7 @@ interface Receivable extends FrameworkInterface {
         *
         * @return      void
         */
-       function handleIncomingRawData ();
+       function handleIncomingDecodedData ();
 
        /**
         * Checks whether incoming decoded data is handled.
@@ -52,7 +52,7 @@ interface Receivable extends FrameworkInterface {
         *
         * @return      void
         */
-       function assembleRawDataToPackage ();
+       function assembleDecodedDataToPackage ();
 
        /**
         * Checks whether a new message has arrived

diff --git a/application/hub/main/package/assembler/class_PackageAssembler.php b/application/hub/main/package/assembler/class_PackageAssembler.php
index 641204f239c72ef3afdb4b89e52b8173b7182a5e..de0148813512b373bf51dda2e49588cdb44153b7 100644 (file)
--- a/application/hub/main/package/assembler/class_PackageAssembler.php
+++ b/application/hub/main/package/assembler/class_PackageAssembler.php
@@ -130,14 +130,13 @@ class PackageAssembler extends BaseHubSystem implements Assembler, Registerable
         **************************************************************************/
 
        /**
-        * Call-back handler to handle unhandled packages. This method "explodes"
-        * the string with the chunk separator from PackageFragmenter class, does
-        * some low checks on it and feeds it into another queue for verification
-        * and re-request for bad chunks.
+        * Call-back handler to handle unhandled package data. This method
+        * "explodes" the string with the chunk separator from PackageFragmenter
+        * class, does some low checks on it and feeds it into another queue for
+        * verification and re-request for bad chunks.
         *
         * @param       $packageContent         An array with two elements: 'raw_data' and 'error_code'
         * @return      void
-        * @throws      FinalChunkVerificationException         If the final chunk does not start with 'EOP:'
         */
        private function handlePackageByUnhandledPackage (array $packageContent) {
                // Debug message

diff --git a/application/hub/main/package/class_NetworkPackage.php b/application/hub/main/package/class_NetworkPackage.php
index 81f262119f17f74b4907a499ea5021166ea6b5b4..d0e07208737727ea8c6c8abe8ea66279cc2f7f68 100644 (file)
--- a/application/hub/main/package/class_NetworkPackage.php
+++ b/application/hub/main/package/class_NetworkPackage.php
@@ -802,7 +802,7 @@ class NetworkPackage extends BaseHubSystem implements Deliverable, Receivable, R
         *
         * @return      void
         */
-       public function handleIncomingRawData () {
+       public function handleIncomingDecodedData () {
                /*
                 * This method should only be called if decoded raw data is pending,
                 * so check it again.
@@ -907,11 +907,11 @@ class NetworkPackage extends BaseHubSystem implements Deliverable, Receivable, R
         *
         * @return      void
         */
-       public function assembleRawDataToPackage () {
+       public function assembleDecodedDataToPackage () {
                // Make sure the raw decoded package data is handled
                assert($this->isIncomingRawDataHandled());
 
-               // Get current package content (an array with two elements; see handleIncomingRawData() for details)
+               // Get current package content (an array with two elements; see handleIncomingDecodedData() for details)
                $packageContent = $this->getStackerInstance()->getNamed(self::STACKER_NAME_DECODED_HANDLED);
 
                // Start assembling the raw package data array by chunking it

diff --git a/application/hub/main/tasks/network/class_NetworkPackageReaderTask.php b/application/hub/main/tasks/network/class_NetworkPackageReaderTask.php
index 8f7971ea698929c07d6604929ad8b5523099f9ea..4a9537d5baee378fdeb42e309408e557dac899fe 100644 (file)
--- a/application/hub/main/tasks/network/class_NetworkPackageReaderTask.php
+++ b/application/hub/main/tasks/network/class_NetworkPackageReaderTask.php
@@ -96,10 +96,10 @@ class NetworkPackageReaderTask extends BaseTask implements Taskable, Visitable {
                         * be assembled back to a "package array". Please see NetworkPackage
                         * for further details (what array elements are required et cetera).
                         */
-                       $this->getPackageInstance()->assembleRawDataToPackage();
+                       $this->getPackageInstance()->assembleDecodedDataToPackage();
                } elseif ($this->getPackageInstance()->isNewRawDataPending($this->getListenerPoolInstance())) {
                        // Raw, decoded data has been received
-                       $this->getPackageInstance()->handleIncomingRawData();
+                       $this->getPackageInstance()->handleIncomingDecodedData();
                } elseif ($this->getPackageInstance()->ifAssemblerHasPendingDataLeft()) {
                        // Handle any pending data from the package assembler
                        $this->getPackageInstance()->handleAssemblerPendingData();