X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;ds=sidebyside;f=inc%2Fclasses%2Fmain%2Fresolver%2Fcontroller%2Fconsole%2Fclass_ConsoleControllerResolver.php;h=1701148963f953fcc29be1c7d59cf4c4e7aa4de7;hb=fdc6a02b5e6c2155cda61fcc345c7583b734ab85;hp=f5cbe43f18c7849a01a806011b74749ff136a835;hpb=aa7ec363e1fd2d22ddda871d6c36cd78b753692c;p=core.git

diff --git a/inc/classes/main/resolver/controller/console/class_ConsoleControllerResolver.php b/inc/classes/main/resolver/controller/console/class_ConsoleControllerResolver.php
index f5cbe43f..17011489 100644
--- a/inc/classes/main/resolver/controller/console/class_ConsoleControllerResolver.php
+++ b/inc/classes/main/resolver/controller/console/class_ConsoleControllerResolver.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 - 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 ConsoleControllerResolver extends BaseControllerResolver implements Contro
 	/**
 	 * Last successfull resolved controller (instance)
 	 */
-	private $lastControllerInstance = null;
+	private $lastControllerInstance = NULL;
 
 	/**
 	 * Protected constructor
@@ -42,19 +42,19 @@ class ConsoleControllerResolver extends BaseControllerResolver implements Contro
 		parent::__construct(__CLASS__);
 
 		// Set prefix to "Console"
-		$this->setControllerPrefix("Console");
+		$this->setClassPrefix('Console');
 	}
 
 	/**
 	 * 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 createConsoleControllerResolver ($controllerName, ManageableApplication $appInstance) {
+	public static final function createConsoleControllerResolver ($controllerName, ManageableApplication $applicationInstance) {
 		// Create the new instance
 		$resolverInstance = new ConsoleControllerResolver();
 
@@ -62,13 +62,13 @@ class ConsoleControllerResolver extends BaseControllerResolver implements Contro
 		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 ConsoleControllerResolver extends BaseControllerResolver implements Contro
 	public function resolveController () {
 		// Init variables
 		$controllerName = '';
-		$controllerInstance = null;
+		$controllerInstance = NULL;
 
 		// Get the command name 
 		$controllerName = $this->getControllerName();
@@ -103,84 +103,11 @@ class ConsoleControllerResolver extends BaseControllerResolver implements Contro
 		} // 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_console_command');
-
-		// Init controller instance
-		$controllerInstance = null;
-
-		// Default controller
-		$this->setClassName('ConsoleDefaultNewsController');
-
-		// Generate the class name
-		//* DEBUG: */ echo __METHOD__.": Controller=".$controllerName;
-		if ($controllerName != $defaultController) {
-			// Create controller class name
-			$className = 'Console' . $this->convertToClassName($controllerName) . 'Controller';
-
-			// ... and set it
-			$this->setClassName($className);
-		} else {
-			// No news at main command or non-news command
-			$this->setClassName('ConsoleDefaultNewsController');
-		}
-		//* DEBUG: */ echo ", controller=".$this->getClassName()."<br />\n";
-
-		// Is this class loaded?
-		if (!class_exists($this->getClassName())) {
-			// Throw an exception here
-			throw new InvalidControllerException(array($this, $controllerName), self::EXCEPTION_INVALID_CONTROLLER);
-		} // END - if
-
-		// Set default resolver config name
-		$resolverConfigEntry = '';
-
-		// Try to read a config entry for our resolver including controller name... ;-)
-		try {
-			// Create the resolver name
-			$resolverConfigEntry = sprintf("console_cmd_%s_resolver_class", strtolower($controllerName));
-
-			// Get the config, this will throw an exception if there is no special command resolver
-			$resolverClass = $this->getConfigInstance()->readConfig($resolverConfigEntry);
-		} catch (ConfigEntryNotFoundException $e) {
-			// Use default resolver entry
-			// @TODO Maybe we need to log this?
-			$resolverConfigEntry = 'console_cmd_resolver_class';
-		}
-
-		// Initiate the resolver and controller
-		$resolverInstance = ObjectFactory::createObjectByConfiguredName(
-			$resolverConfigEntry,
-			array(
-				$controllerName,
-				$this->getApplicationInstance()
-			)
-		);
-		$controllerInstance = ObjectFactory::createObjectByName(
-			$this->getClassName(),
-			array($resolverInstance)
-		);
-
-		// Return the result
-		return $controllerInstance;
-	}
 }
 
 // [EOF]