X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;ds=sidebyside;f=inc%2Fclasses%2Fmain%2Fresolver%2Fcommand%2Fconsole%2Fclass_ConsoleCommandResolver.php;h=a24fdeb1582e40b12b56e0442c8d68ec90ef1d09;hb=607a11e2c22949ea0647568c17d62a605595e83b;hp=6611129a7a7b9a7027c88a321091dd1e5b9703b9;hpb=a3fa89c7cbc54491fc74f13db0927d14acf550c8;p=core.git

diff --git a/inc/classes/main/resolver/command/console/class_ConsoleCommandResolver.php b/inc/classes/main/resolver/command/console/class_ConsoleCommandResolver.php
index 6611129a..a24fdeb1 100644
--- a/inc/classes/main/resolver/command/console/class_ConsoleCommandResolver.php
+++ b/inc/classes/main/resolver/command/console/class_ConsoleCommandResolver.php
@@ -4,7 +4,7 @@
  *
  * @author		Roland Haeder <webmaster@ship-simu.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 - 2012 Core Developer Team
  * @license		GNU GPL 3.0 or any newer version
  * @link		http://www.ship-simu.org
  *
@@ -22,11 +22,6 @@
  * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 class ConsoleCommandResolver extends BaseCommandResolver implements CommandResolver {
-	/**
-	 * Last successfull resolved command
-	 */
-	private $lastCommandInstance = null;
-
 	/**
 	 * Protected constructor
 	 *
@@ -37,19 +32,19 @@ class ConsoleCommandResolver extends BaseCommandResolver implements CommandResol
 		parent::__construct(__CLASS__);
 
 		// Set prefix to "Console"
-		$this->setCommandPrefix('Console');
+		$this->setClassPrefix('Console');
 	}
 
 	/**
 	 * Creates an instance of a Console command resolver with a given default command
 	 *
 	 * @param	$commandName				The default command we shall execute
-	 * @param	$appInstance				An instance of a manageable application helper class
+	 * @param	$applicationInstance		An instance of a manageable application helper class
 	 * @return	$resolverInstance			The prepared command resolver instance
 	 * @throws	EmptyVariableException		Thrown if default command is not set
 	 * @throws	InvalidCommandException		Thrown if default command is invalid
 	 */
-	public static final function createConsoleCommandResolver ($commandName, ManageableApplication $appInstance) {
+	public static final function createConsoleCommandResolver ($commandName, ManageableApplication $applicationInstance) {
 		// Create the new instance
 		$resolverInstance = new ConsoleCommandResolver();
 
@@ -63,7 +58,7 @@ class ConsoleCommandResolver extends BaseCommandResolver implements CommandResol
 		}
 
 		// Set the application instance
-		$resolverInstance->setApplicationInstance($appInstance);
+		$resolverInstance->setApplicationInstance($applicationInstance);
 
 		// Return the prepared instance
 		return $resolverInstance;
@@ -83,13 +78,15 @@ class ConsoleCommandResolver extends BaseCommandResolver implements CommandResol
 	public function resolveCommandByRequest (Requestable $requestInstance) {
 		// Init variables
 		$commandName = '';
-		$commandInstance = null;
+		$commandInstance = NULL;
 
 		// This goes fine so let's resolve the command
 		$commandName = $requestInstance->getRequestElement('command');
 
 		// Is the command empty? Then fall back to default command
-		if (empty($commandName)) $commandName = $this->getConfigInstance()->getConfigEntry('default_console_command');
+		if (empty($commandName)) {
+			$commandName = $this->getConfigInstance()->getConfigEntry('default_console_command');
+		} // END - if
 
 		// Check if command is valid
 		if ($this->isCommandValid($commandName) === false) {
@@ -107,7 +104,7 @@ class ConsoleCommandResolver extends BaseCommandResolver implements CommandResol
 		} // END - if
 
 		// Set last command
-		$this->lastCommandInstance = $commandInstance;
+		$this->setResolvedInstance($commandInstance);
 
 		// Return the resolved command instance
 		return $commandInstance;
@@ -122,16 +119,18 @@ class ConsoleCommandResolver extends BaseCommandResolver implements CommandResol
 	 */
 	public function resolveCommand ($commandName) {
 		// Initiate the instance variable
-		$commandInstance = null;
+		$commandInstance = NULL;
 
 		// Is the command empty? Then fall back to default command
-		if (empty($commandName)) $commandName = $this->getConfigInstance()->getConfigEntry('default_console_command');
+		if (empty($commandName)) {
+			$commandName = $this->getConfigInstance()->getConfigEntry('default_console_command');
+		} // END - if
 
 		// Check if command is valid
 		if ($this->isCommandValid($commandName) === false) {
 			// This command is invalid!
 			throw new InvalidCommandException(array($this, $commandName), self::EXCEPTION_INVALID_COMMAND);
-		}
+		} // END - if
 
 		// Get the command
 		$commandInstance = $this->loadCommand($commandName);
@@ -150,10 +149,10 @@ class ConsoleCommandResolver extends BaseCommandResolver implements CommandResol
 	 */
 	private function loadCommand ($commandName) {
 		// Init command instance
-		$commandInstance = null;
+		$commandInstance = NULL;
 
 		// Create class name
-		$className = $this->getCommandPrefix() . $this->convertToClassName($commandName) . 'Command';
+		$className = $this->getClassPrefix() . $this->convertToClassName($commandName) . 'Command';
 
 		// Create command class name
 		$this->setClassName($className);