X-Git-Url: https://git.mxchange.org/?p=core.git;a=blobdiff_plain;f=inc%2Fclasses%2Fmain%2Fresolver%2Fcontroller%2Fimage%2Fclass_ImageControllerResolver.php;h=912d7065206ded92108acd27d4157b0c545762bf;hp=ad6354fd73e6dff9297111244e25809261a55f7d;hb=fdc6a02b5e6c2155cda61fcc345c7583b734ab85;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..912d7065 100644
--- a/inc/classes/main/resolver/controller/image/class_ImageControllerResolver.php
+++ b/inc/classes/main/resolver/controller/image/class_ImageControllerResolver.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, 2010 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 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();
 
@@ -62,13 +62,13 @@ class ImageControllerResolver extends BaseControllerResolver implements Controll
 		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 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;