*
* @author Roland Haeder <webmaster@ship-simu.org>
* @version 0.0.0
- * @copyright Copyright (c) 2007, 2008 Roland Haeder, 2009 Core Developer Team
+ * @copyright Copyright (c) 2007, 2008 Roland Haeder, 2009, 2010 Core Developer Team
* @license GNU GPL 3.0 or any newer version
* @link http://www.ship-simu.org
*
parent::__construct(__CLASS__);
// Set prefix to "Web"
- $this->setCommandPrefix("Web");
+ $this->setClassPrefix('Web');
}
/**
* @throws EmptyVariableException Thrown if default command is not set
* @throws InvalidCommandException Thrown if default command is invalid
*/
- public final static function createWebCommandResolver ($commandName, ManageableApplication $appInstance) {
+ public static final function createWebCommandResolver ($commandName, ManageableApplication $appInstance) {
// Create the new instance
$resolverInstance = new WebCommandResolver();
$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_web_command');
+ if (empty($commandName)) {
+ $commandName = $this->getConfigInstance()->getConfigEntry('default_web_command');
+ } // END - if
// Check if command is valid
if ($this->isCommandValid($commandName) === false) {
} // END - if
// Set last command
- $this->lastCommandInstance = $commandInstance;
+ $this->setResolvedInstance($commandInstance);
// Return the resolved command instance
return $commandInstance;
$commandInstance = null;
// Is the command empty? Then fall back to default command
- if (empty($commandName)) $commandName = $this->getConfigInstance()->readConfig('default_web_command');
+ if (empty($commandName)) {
+ $commandName = $this->getConfigInstance()->getConfigEntry('default_web_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);
* command class is missing (bad!)
*/
private function loadCommand ($commandName) {
- // Cache default command
- $defaultCommand = $this->getConfigInstance()->readConfig('default_web_command');
-
// Init command instance
$commandInstance = null;
- // Create class name
- $className = 'Web' . $this->convertToClassName($commandName) . 'Command';
-
- // Create command class name
- $this->setClassName($className);
-
// 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