Copyright year updated, converted double->single quotes

[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 35430d4342cd94d17c060e526b6874af14d262e6..1701148963f953fcc29be1c7d59cf4c4e7aa4de7 100644 (file)
--- a/inc/classes/main/resolver/controller/console/class_ConsoleControllerResolver.php
+++ b/inc/classes/main/resolver/controller/console/class_ConsoleControllerResolver.php
@@ -2,11 +2,11 @@
 /**
  * A resolver for resolving controllers locally
  *
- * @author             Roland Haeder <webmaster@ship-simu.org>
+ * @author             Roland Haeder <webmaster@shipsimu.org>
  * @version            0.0.0
- * @copyright  Copyright (c) 2007, 2008 Roland Haeder, 2009 Core Developer Team
+ * @copyright  Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2013 Core Developer Team
  * @license            GNU GPL 3.0 or any newer version
- * @link               http://www.ship-simu.org
+ * @link               http://www.shipsimu.org
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -30,7 +30,7 @@ class ConsoleControllerResolver extends BaseControllerResolver implements Contro
        /**
         * Last successfull resolved controller (instance)
         */
-       private $lastControllerInstance = null;
+       private $lastControllerInstance = NULL;
 
        /**
         * Protected constructor
@@ -42,19 +42,19 @@ class ConsoleControllerResolver extends BaseControllerResolver implements Contro
                parent::__construct(__CLASS__);
 
                // Set prefix to "Console"
-               $this->setControllerPrefix("Console");
+               $this->setClassPrefix('Console');
        }
 
        /**
         * Creates an instance of a resolver class with a given command
         *
         * @param       $controllerName                         The controller we shall resolve
-        * @param       $appInstance                            An instance of a manageable application helper class
+        * @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      InvalidControllerException      Thrown if default controller is invalid
         */
-       public final static function createConsoleControllerResolver ($controllerName, ManageableApplication $appInstance) {
+       public static final function createConsoleControllerResolver ($controllerName, ManageableApplication $applicationInstance) {
                // Create the new instance
                $resolverInstance = new ConsoleControllerResolver();
 
@@ -62,13 +62,13 @@ class ConsoleControllerResolver extends BaseControllerResolver implements Contro
                if (empty($controllerName)) {
                        // Then thrown an exception here
                        throw new EmptyVariableException(array($resolverInstance, 'commandName'), self::EXCEPTION_UNEXPECTED_EMPTY_STRING);
-               } elseif ($resolverInstance->isControllerValid($controllerName) === false) {
+               } elseif ($resolverInstance->isControllerValid($controllerName) === FALSE) {
                        // Invalid command found
                        throw new InvalidControllerException(array($resolverInstance, $controllerName), self::EXCEPTION_INVALID_CONTROLLER);
                }
 
                // Set the application instance
-               $resolverInstance->setApplicationInstance($appInstance);
+               $resolverInstance->setApplicationInstance($applicationInstance);
 
                // Set command name
                $resolverInstance->setControllerName($controllerName);
@@ -88,7 +88,7 @@ class ConsoleControllerResolver extends BaseControllerResolver implements Contro
        public function resolveController () {
                // Init variables
                $controllerName = '';
-               $controllerInstance = null;
+               $controllerInstance = NULL;
 
                // Get the command name 
                $controllerName = $this->getControllerName();
@@ -103,7 +103,7 @@ class ConsoleControllerResolver extends BaseControllerResolver implements Contro
                } // END - if
 
                // Set last controller
-               $this->lastControllerInstance = $controllerInstance;
+               $this->setResolvedInstance($controllerInstance);
 
                // Return the maybe resolved instance
                return $controllerInstance;