Gee, found more copy-paste errors ...

[core.git] / inc / classes / main / resolver / controller / console / class_ConsoleControllerResolver.php

diff --git a/inc/classes/main/resolver/controller/console/class_ConsoleControllerResolver.php b/inc/classes/main/resolver/controller/console/class_ConsoleControllerResolver.php
index 3eb6c21010ca67b70344d077e3879142111d8b16..d0e5280d759b5a7a474d8ed3bfa40d3fab01866d 100644 (file)
--- a/inc/classes/main/resolver/controller/console/class_ConsoleControllerResolver.php
+++ b/inc/classes/main/resolver/controller/console/class_ConsoleControllerResolver.php
@@ -22,16 +22,6 @@
  * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 class ConsoleControllerResolver extends BaseControllerResolver implements ControllerResolver {
-       /**
-        * Last successfull resolved controller (name)
-        */
-       private $lastControllerName = '';
-
-       /**
-        * Last successfull resolved controller (instance)
-        */
-       private $lastControllerInstance = NULL;
-
        /**
         * Protected constructor
         *
@@ -42,72 +32,40 @@ class ConsoleControllerResolver extends BaseControllerResolver implements Contro
                parent::__construct(__CLASS__);
 
                // Set prefix to "Console"
-               $this->setClassPrefix('Console');
+               $this->setClassPrefix('console');
        }
 
        /**
-        * Creates an instance of a resolver class with a given command
+        * Creates an instance of a resolver class with a given controller
         *
         * @param       $controllerName                         The controller we shall resolve
         * @param       $applicationInstance            An instance of a manageable application helper class
         * @return      $resolverInstance                       The prepared controller resolver instance
-        * @throws      EmptyVariableException          Thrown if default command is not set
+        * @throws      EmptyVariableException          Thrown if default controller is not set
         * @throws      InvalidControllerException      Thrown if default controller is invalid
         */
        public static final function createConsoleControllerResolver ($controllerName, ManageableApplication $applicationInstance) {
                // Create the new instance
                $resolverInstance = new ConsoleControllerResolver();
 
-               // Is the variable $controllerName set and the command is valid?
+               // Is the variable $controllerName set and the controller is valid?
                if (empty($controllerName)) {
                        // Then thrown an exception here
-                       throw new EmptyVariableException(array($resolverInstance, 'commandName'), self::EXCEPTION_UNEXPECTED_EMPTY_STRING);
+                       throw new EmptyVariableException(array($resolverInstance, 'controllerName'), self::EXCEPTION_UNEXPECTED_EMPTY_STRING);
                } elseif ($resolverInstance->isControllerValid($controllerName) === FALSE) {
-                       // Invalid command found
+                       // Invalid controller found
                        throw new InvalidControllerException(array($resolverInstance, $controllerName), self::EXCEPTION_INVALID_CONTROLLER);
                }
 
                // Set the application instance
                $resolverInstance->setApplicationInstance($applicationInstance);
 
-               // Set command name
+               // Set controller name
                $resolverInstance->setControllerName($controllerName);
 
                // Return the prepared instance
                return $resolverInstance;
        }
-
-       /**
-        * Resolves the default controller of the given command
-        *
-        * @return      $controllerInstance             A controller instance for the default
-        *                                                                      command
-        * @throws      InvalidControllerInstanceException      Thrown if $controllerInstance
-        *                                                                                              is invalid
-        */
-       public function resolveController () {
-               // Init variables
-               $controllerName = '';
-               $controllerInstance = NULL;
-
-               // Get the command name 
-               $controllerName = $this->getControllerName();
-
-               // Get the command
-               $controllerInstance = $this->loadController($controllerName);
-
-               // And validate it
-               if ((!is_object($controllerInstance)) || (!$controllerInstance instanceof Controller)) {
-                       // This command has an invalid instance!
-                       throw new InvalidControllerInstanceException(array($this, $controllerName), self::EXCEPTION_INVALID_CONTROLLER);
-               } // END - if
-
-               // Set last controller
-               $this->setResolvedInstance($controllerInstance);
-
-               // Return the maybe resolved instance
-               return $controllerInstance;
-       }
 }
 
 // [EOF]