X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=inc%2Fclasses%2Fmain%2Fresolver%2Fcontroller%2Fimage%2Fclass_ImageControllerResolver.php;h=8a14a722f704986dcab329b721f7a907135a4ef8;hb=5203f9bd014ad46fbc7ee54e7223dcd46e14e3b4;hp=dc664e87cefa98684daee07b1cabb05f8fc8ee67;hpb=3107989f93cfb5808ce9d75f1c7d2b7ee3d83d18;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 dc664e87..8a14a722 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 - 2009 Roland Haeder, this is free software
+ * @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
@@ -22,16 +22,6 @@
  * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 class ImageControllerResolver extends BaseControllerResolver implements ControllerResolver {
-	/**
-	 * Last successfull resolved controller (name)
-	 */
-	private $lastControllerName = '';
-
-	/**
-	 * Last successfull resolved controller (instance)
-	 */
-	private $lastControllerInstance = null;
-
 	/**
 	 * Protected constructor
 	 *
@@ -41,120 +31,41 @@ 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
+	 * Creates an instance of a resolver class with a given controller
 	 *
 	 * @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	EmptyVariableException		Thrown if default controller 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();
 
-		// Is the variable $controllerName set and the command is valid?
+		// Is the variable $controllerName set and the controller is valid?
 		if (empty($controllerName)) {
 			// Then thrown an exception here
-			throw new EmptyVariableException(array($resolverInstance, 'commandName'), self::EXCEPTION_UNEXPECTED_EMPTY_STRING);
-		} elseif ($resolverInstance->isControllerValid($controllerName) === false) {
-			// Invalid command found
+			throw new EmptyVariableException(array($resolverInstance, 'controllerName'), self::EXCEPTION_UNEXPECTED_EMPTY_STRING);
+		} elseif ($resolverInstance->isControllerValid($controllerName) === FALSE) {
+			// Invalid controller found
 			throw new InvalidControllerException(array($resolverInstance, $controllerName), self::EXCEPTION_INVALID_CONTROLLER);
 		}
 
 		// Set the application instance
-		$resolverInstance->setApplicationInstance($appInstance);
+		$resolverInstance->setApplicationInstance($applicationInstance);
 
-		// Set command name
+		// Set controller name
 		$resolverInstance->setControllerName($controllerName);
 
 		// Return the prepared instance
 		return $resolverInstance;
 	}
-
-	/**
-	 * Resolves the default controller of the given command
-	 *
-	 * @return	$controllerInstance		A controller instance for the default
-	 *									command
-	 * @throws	InvalidControllerInstanceException	Thrown if $controllerInstance
-	 *												is invalid
-	 */
-	public function resolveController () {
-		// Init variables
-		$controllerName = '';
-		$controllerInstance = null;
-
-		// Get the command name 
-		$controllerName = $this->getControllerName();
-
-		// Get the command
-		$controllerInstance = $this->loadController($controllerName);
-
-		// And validate it
-		if ((!is_object($controllerInstance)) || (!$controllerInstance instanceof Controller)) {
-			// This command has an invalid instance!
-			throw new InvalidControllerInstanceException(array($this, $controllerName), self::EXCEPTION_INVALID_CONTROLLER);
-		} // END - if
-
-		// Set last controller
-		$this->lastControllerInstance = $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
-			$this->setClassName(sprintf("Image%sController",
-				$this->convertToClassName($controllerName)
-			));
-		} // 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));
-
-		// Remove resolver
-		unset($resolverInstance);
-
-		// Return the result
-		return $controllerInstance;
-	}
 }
 
 // [EOF]