X-Git-Url: https://git.mxchange.org/?p=core.git;a=blobdiff_plain;f=inc%2Fclasses%2Fmain%2Fresolver%2Fcontroller%2Fimage%2Fclass_ImageControllerResolver.php;h=92dd54066d71e86e4fddb72c78013217666ea589;hp=ad6354fd73e6dff9297111244e25809261a55f7d;hb=3e1fbf30a631cf1cd64562b69228452c49e0033f;hpb=84e2207412d3c6ea9f940a83b2cdd4503509808a diff --git a/inc/classes/main/resolver/controller/image/class_ImageControllerResolver.php b/inc/classes/main/resolver/controller/image/class_ImageControllerResolver.php index ad6354fd..92dd5406 100644 --- 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 * @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 @@ -42,19 +42,19 @@ class ImageControllerResolver extends BaseControllerResolver implements Controll parent::__construct(__CLASS__); // Set prefix to 'Image' - $this->setControllerPrefix('Image'); + $this->setClassPrefix('Image'); } /** * 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 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(); @@ -103,7 +103,7 @@ class ImageControllerResolver extends BaseControllerResolver implements Controll } // END - if // Set last controller - $this->lastControllerInstance = $controllerInstance; + $this->setResolvedInstance($controllerInstance); // Return the maybe resolved instance return $controllerInstance;