Some cleanups, more usage of ObjectFactory:

[core.git] / inc / classes / main / resolver / controller / image / class_ImageControllerResolver.php

diff --git a/inc/classes/main/resolver/controller/image/class_ImageControllerResolver.php b/inc/classes/main/resolver/controller/image/class_ImageControllerResolver.php
index 41d66facb7b6a4711f793a0741163666bc751cc8..92dd54066d71e86e4fddb72c78013217666ea589 100644 (file)
--- a/inc/classes/main/resolver/controller/image/class_ImageControllerResolver.php
+++ b/inc/classes/main/resolver/controller/image/class_ImageControllerResolver.php
@@ -4,7 +4,7 @@
  *
  * @author             Roland Haeder <webmaster@ship-simu.org>
  * @version            0.0.0
- * @copyright  Copyright (c) 2007, 2008 Roland Haeder, 2009, 2010 Core Developer Team
+ * @copyright  Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2011 Core Developer Team
  * @license            GNU GPL 3.0 or any newer version
  * @link               http://www.ship-simu.org
  *
@@ -30,7 +30,7 @@ class ImageControllerResolver extends BaseControllerResolver implements Controll
        /**
         * Last successfull resolved controller (instance)
         */
-       private $lastControllerInstance = null;
+       private $lastControllerInstance = NULL;
 
        /**
         * Protected constructor
@@ -49,12 +49,12 @@ class ImageControllerResolver extends BaseControllerResolver implements Controll
         * 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 static final function createImageControllerResolver ($controllerName, ManageableApplication $appInstance) {
+       public static final function createImageControllerResolver ($controllerName, ManageableApplication $applicationInstance) {
                // Create the new instance
                $resolverInstance = new ImageControllerResolver();
 
@@ -68,7 +68,7 @@ class ImageControllerResolver extends BaseControllerResolver implements Controll
                }
 
                // Set the application instance
-               $resolverInstance->setApplicationInstance($appInstance);
+               $resolverInstance->setApplicationInstance($applicationInstance);
 
                // Set command name
                $resolverInstance->setControllerName($controllerName);
@@ -88,7 +88,7 @@ class ImageControllerResolver extends BaseControllerResolver implements Controll
        public function resolveController () {
                // Init variables
                $controllerName = '';
-               $controllerInstance = null;
+               $controllerInstance = NULL;
 
                // Get the command name 
                $controllerName = $this->getControllerName();