As of a good naming convention, do not short-cut variables

[core.git] / inc / classes / main / resolver / command / image / class_ImageCommandResolver.php

diff --git a/inc/classes/main/resolver/command/image/class_ImageCommandResolver.php b/inc/classes/main/resolver/command/image/class_ImageCommandResolver.php
index 1924e49adfe877cd452f1b1c260157dc9e98fb0d..204aebb5242e40da21ba7aee6321eddb212cc614 100644 (file)
--- a/inc/classes/main/resolver/command/image/class_ImageCommandResolver.php
+++ b/inc/classes/main/resolver/command/image/class_ImageCommandResolver.php
@@ -4,7 +4,7 @@
  *
  * @author             Roland Haeder <webmaster@ship-simu.org>
  * @version            0.0.0
- * @copyright  Copyright (c) 2007 - 2009 Roland Haeder, this is free software
+ * @copyright  Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2011 Core Developer Team
  * @license            GNU GPL 3.0 or any newer version
  * @link               http://www.ship-simu.org
  *
@@ -37,19 +37,19 @@ class ImageCommandResolver extends BaseCommandResolver implements CommandResolve
                parent::__construct(__CLASS__);
 
                // Set prefix to "Image"
-               $this->setCommandPrefix("Image");
+               $this->setClassPrefix('Image');
        }
 
        /**
         * Creates an instance of a Image 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 final static function createImageCommandResolver ($commandName, ManageableApplication $appInstance) {
+       public static final function createImageCommandResolver ($commandName, ManageableApplication $applicationInstance) {
                // Create the new instance
                $resolverInstance = new ImageCommandResolver();
 
@@ -63,7 +63,7 @@ class ImageCommandResolver extends BaseCommandResolver implements CommandResolve
                }
 
                // Set the application instance
-               $resolverInstance->setApplicationInstance($appInstance);
+               $resolverInstance->setApplicationInstance($applicationInstance);
 
                // Return the prepared instance
                return $resolverInstance;
@@ -82,14 +82,16 @@ class ImageCommandResolver extends BaseCommandResolver implements CommandResolve
         */
        public function resolveCommandByRequest (Requestable $requestInstance) {
                // Init variables
-               $commandName = "";
+               $commandName = '';
                $commandInstance = null;
 
-               // This goes fine so let's resolv the command
+               // This goes fine so let's resolve the command
                $commandName = $requestInstance->getRequestElement('page');
 
                // Is the command empty? Then fall back to default command
-               if (empty($commandName)) $commandName = $this->getConfigInstance()->readConfig('default_image_command');
+               if (empty($commandName)) {
+                       $commandName = $this->getConfigInstance()->getConfigEntry('default_image_command');
+               } // END - if
 
                // Check if command is valid
                if ($this->isCommandValid($commandName) === false) {
@@ -107,7 +109,7 @@ class ImageCommandResolver extends BaseCommandResolver implements CommandResolve
                } // END - if
 
                // Set last command
-               $this->lastCommandInstance = $commandInstance;
+               $this->setResolvedInstance($commandInstance);
 
                // Return the resolved command instance
                return $commandInstance;
@@ -125,13 +127,15 @@ class ImageCommandResolver extends BaseCommandResolver implements CommandResolve
                $commandInstance = null;
 
                // Is the command empty? Then fall back to default command
-               if (empty($commandName)) $commandName = $this->getConfigInstance()->readConfig('default_image_command');
+               if (empty($commandName)) {
+                       $commandName = $this->getConfigInstance()->getConfigEntry('default_image_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);
@@ -149,21 +153,16 @@ class ImageCommandResolver extends BaseCommandResolver implements CommandResolve
         *                                                                              command class is missing (bad!)
         */
        private function loadCommand ($commandName) {
-               // Cache default command
-               $defaultCommand = $this->getConfigInstance()->readConfig('default_image_command');
-
                // Init command instance
                $commandInstance = null;
 
-               // Create command class name
-               $this->setClassName(sprintf("Image%sCommand",
-                       $this->convertToClassName($commandName)
-               ));
+               // Create class name
+               $className = $this->getClassPrefix() . $this->convertToClassName($commandName) . 'Command';
 
                // Is this class loaded?
                if (!class_exists($this->getClassName())) {
                        // Class not found, so throw an exception
-                       throw new InvalidCommandException(array($this, $defaultCommand), self::EXCEPTION_INVALID_COMMAND);
+                       throw new InvalidCommandException(array($this, $commandName), self::EXCEPTION_INVALID_COMMAND);
                } // END - if
 
                // Initiate the command