Fixed with prefix

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

diff --git a/inc/classes/main/resolver/command/class_BaseCommandResolver.php b/inc/classes/main/resolver/command/class_BaseCommandResolver.php
index 4900c617a5336fb822077017559a89b36a792290..fa19bbb5e459c4b16ddea46ac6d4567c7326869d 100644 (file)
--- a/inc/classes/main/resolver/command/class_BaseCommandResolver.php
+++ b/inc/classes/main/resolver/command/class_BaseCommandResolver.php
@@ -4,7 +4,7 @@
  *
  * @author             Roland Haeder <webmaster@ship-simu.org>
  * @version            0.0.0
- * @copyright  Copyright (c) 2007, 2008 Roland Haeder, this is free software
+ * @copyright  Copyright (c) 2007, 2008 Roland Haeder, 2009 Core Developer Team
  * @license            GNU GPL 3.0 or any newer version
  * @link               http://www.ship-simu.org
  *
@@ -25,12 +25,12 @@ class BaseCommandResolver extends BaseResolver {
        /**
         * Prefix for local, remote or other resolver
         */
-       private $commandPrefix = "";
+       private $commandPrefix = '';
 
        /**
         * Validated command name
         */
-       private $commandName = "";
+       private $commandName = '';
 
        /**
         * Protected constructor
@@ -43,6 +43,15 @@ class BaseCommandResolver extends BaseResolver {
                parent::__construct($className);
        }
 
+       /**
+        * Getter for command prefix
+        *
+        * @return      $commandPrefix  Last validated commandPrefix
+        */
+       protected final function getCommandPrefix () {
+               return $this->commandPrefix;
+       }
+
        /**
         * Setter for command prefix
         *
@@ -87,13 +96,13 @@ class BaseCommandResolver extends BaseResolver {
                if (empty($commandName)) {
                        // Then thrown an exception here
                        throw new EmptyVariableException(array($this, 'commandName'), self::EXCEPTION_UNEXPECTED_EMPTY_STRING);
-               }
+               } // END - if
+
+               // Create the full class name
+               $className = $this->commandPrefix . $this->convertToClassName($commandName) . 'Command';
 
                // Now, let us create the full name of the command class
-               $this->setClassName(sprintf("%s%sCommand",
-                       $this->commandPrefix,
-                       $this->convertToClassName($commandName)
-               ));
+               $this->setClassName($className);
 
                // Is this class already loaded?
                if (class_exists($this->getClassName())) {