X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=inc%2Fclasses%2Fmain%2Fresolver%2Fcontroller%2Fimage%2Fclass_ImageControllerResolver.php;h=18b4ce22ac5e9441d598173e25d464fc98155f8b;hb=d26e71af1e28dc1429823bdec244df6303f9b2fb;hp=a8b136aa73c1fd202472fc3723cd2461b755ab59;hpb=0cd57c3885f00ad77fc599e53ed2f2d5e7ac267f;p=core.git

diff --git a/inc/classes/main/resolver/controller/image/class_ImageControllerResolver.php b/inc/classes/main/resolver/controller/image/class_ImageControllerResolver.php
index a8b136aa..18b4ce22 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 Core Developer Team
+ * @copyright	Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2015 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
@@ -41,20 +41,20 @@ class ImageControllerResolver extends BaseControllerResolver implements Controll
 		// Call parent constructor
 		parent::__construct(__CLASS__);
 
-		// Set prefix to "Image"
-		$this->setControllerPrefix("Image");
+		// Set prefix to '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,65 +103,11 @@ class ImageControllerResolver extends BaseControllerResolver implements Controll
 		} // END - if
 
 		// Set last controller
-		$this->lastControllerInstance = $controllerInstance;
+		$this->setResolvedInstance($controllerInstance);
 
 		// Return the maybe resolved instance
 		return $controllerInstance;
 	}
-
-	/**
-	 * "Loads" a given controller and instances it if not yet cached. If the
-	 * controller was not found one of the default controllers will be used
-	 * depending on wether news shall be displayed.
-	 *
-	 * @param	$controllerName			A controller name we shall look for
-	 * @return	$controllerInstance		A loaded controller instance
-	 * @throws	InvalidControllerException	Thrown if even the requested
-	 *										controller class is missing (bad!)
-	 */
-	private function loadController ($controllerName) {
-		// Cache default command
-		$defaultController = $this->getConfigInstance()->readConfig('default_image_command');
-
-		// Init controller instance
-		$controllerInstance = null;
-
-		// Default controller
-		$this->setClassName($defaultController);
-
-		// Generate the class name
-		//* DEBUG: */ echo __METHOD__.": Controller=".$controllerName;
-		if ($controllerName != $defaultController) {
-			// Create controller class name
-			$className = 'Image' . $this->convertToClassName($controllerName) . 'Controller';
-
-			// ... and set it
-			$this->setClassName($className);
-		} // END - if
-		//* DEBUG: */ echo ", controller=".$this->getClassName()."<br />\n";
-
-		// Is this class loaded?
-		if (!class_exists($this->getClassName())) {
-			// Class not found, so or throw an exception
-			throw new InvalidControllerException(array($this, $controllerName), self::EXCEPTION_INVALID_CONTROLLER);
-		} // END - if
-
-		// Initiate the resolver and controller
-		$resolverInstance = ObjectFactory::createObjectByConfiguredName(
-			'image_cmd_resolver_class',
-			array(
-				$controllerName,
-				$this->getApplicationInstance()
-			)
-		);
-		$controllerInstance = ObjectFactory::createObjectByName(
-			$this->getClassName(),
-			array($resolverInstance)
-		);
-
-		// Return the result
-		return $controllerInstance;
-	}
 }
 
 // [EOF]