Continued:

[core.git] / framework / main / classes / controller / class_BaseController.php

diff --git a/framework/main/classes/controller/class_BaseController.php b/framework/main/classes/controller/class_BaseController.php
index 6f8a1ec548fcca8f0f6b7669acac8610b7160f49..c871c0e31fe553e237b000bd5d4207c5a7738e29 100644 (file)
--- a/framework/main/classes/controller/class_BaseController.php
+++ b/framework/main/classes/controller/class_BaseController.php
@@ -1,16 +1,16 @@
 <?php
 // Own namespace
 <?php
 // Own namespace

-namespace CoreFramework\Controller;
+namespace Org\Mxchange\CoreFramework\Controller;

 
 // Import framework stuff
 
 // Import framework stuff

-use CoreFramework\Chain\Filter\InvalidFilterChainException;
-use CoreFramework\Factory\ObjectFactory;
-use CoreFramework\Filter\Filterable;
-use CoreFramework\Object\BaseFrameworkSystem;
-use CoreFramework\Registry\Registry;
-use CoreFramework\Registry\Registerable;
-use CoreFramework\Request\Requestable;
-use CoreFramework\Response\Responseable;
+use Org\Mxchange\CoreFramework\Chain\Filter\InvalidFilterChainException;
+use Org\Mxchange\CoreFramework\Factory\ObjectFactory;
+use Org\Mxchange\CoreFramework\Filter\Filterable;
+use Org\Mxchange\CoreFramework\Object\BaseFrameworkSystem;
+use Org\Mxchange\CoreFramework\Registry\GenericRegistry;
+use Org\Mxchange\CoreFramework\Registry\Registerable;
+use Org\Mxchange\CoreFramework\Request\Requestable;
+use Org\Mxchange\CoreFramework\Response\Responseable;

 
 /**
  * A generic controller class. You should extend this base class if you want to
 
 /**
  * A generic controller class. You should extend this base class if you want to


@@ -36,7 +36,7 @@ use CoreFramework\Response\Responseable;
  * You should have received a copy of the GNU General Public License
  * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
  * You should have received a copy of the GNU General Public License
  * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */

-class BaseController extends BaseFrameworkSystem implements Registerable {
+abstract class BaseController extends BaseFrameworkSystem implements Registerable {

        // Exception constants
        const EXCEPTION_FILTER_CHAIN_INVALID = 0xf10;
 
        // Exception constants
        const EXCEPTION_FILTER_CHAIN_INVALID = 0xf10;
 


@@ -64,7 +64,7 @@ class BaseController extends BaseFrameworkSystem implements Registerable {
                $this->initFilterChain(self::FILTER_CHAIN_POST_COMMAND);
 
                // Add this controller to the registry
                $this->initFilterChain(self::FILTER_CHAIN_POST_COMMAND);
 
                // Add this controller to the registry

-               Registry::getRegistry()->addInstance('controller', $this);
+               GenericRegistry::getRegistry()->addInstance('controller', $this);

        }
 
        /**
        }
 
        /**


@@ -135,7 +135,7 @@ class BaseController extends BaseFrameworkSystem implements Registerable {
                        // Execute the command
                        $commandInstance->execute($requestInstance, $responseInstance);
 
                        // Execute the command
                        $commandInstance->execute($requestInstance, $responseInstance);
 

-                       // Execute *very* generic ppost filters
+                       // Execute *very* generic post filters

                        $this->executePostFilters($requestInstance, $responseInstance);
                } // END - if
 
                        $this->executePostFilters($requestInstance, $responseInstance);
                } // END - if
 


@@ -176,7 +176,7 @@ class BaseController extends BaseFrameworkSystem implements Registerable {
                // Execute the command
                $commandInstance->execute($requestInstance, $responseInstance);
 
                // Execute the command
                $commandInstance->execute($requestInstance, $responseInstance);
 

-               // Run the pre filters
+               // Run the post filters

                $this->executePostFilters($requestInstance, $responseInstance);
 
                // Flush the response out
                $this->executePostFilters($requestInstance, $responseInstance);
 
                // Flush the response out