*
* @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, 2010 Core Developer Team
* @license GNU GPL 3.0 or any newer version
* @link http://www.ship-simu.org
*
/**
* Protected constructor
*
+ * @param $className Name of this class
* @return void
*/
- protected function __construct () {
+ protected function __construct ($className = __CLASS__) {
// Call parent constructor
- parent::__construct(__CLASS__);
+ parent::__construct($className);
}
/**
* @param $className Name of the class we shall construct
* @param $args Arguments in an indexed array
* @return $objectInstance An instance of the requested object
- * @throws ClassNotFoundException If the requested class was not found
+ * @throws NoClassException If the requested class was not found
* @throws EmptyVariableException If a variable is empty unexpectly
*/
- public final static function createObjectByName ($className, array $args=array()) {
+ public static final function createObjectByName ($className, array $args=array()) {
// First get an instance of this factory
$factoryInstance = new ObjectFactory();
throw new EmptyVariableException(array($factoryInstance, 'className'), self::EXCEPTION_UNEXPECTED_EMPTY_STRING);
} elseif (!class_exists($className)) {
// Then throw an exception
- throw new ClassNotFoundException(array($factoryInstance, $className), self::EXCEPTION_CLASS_NOT_FOUND);
+ throw new NoClassException(array($factoryInstance, $className), self::EXCEPTION_CLASS_NOT_FOUND);
}
// Create method name
* @param $args Arguments in an indexed array
* @return $objectInstance An instance of the requested object
*/
- public final static function createObjectByConfiguredName ($configEntry, array $args=array()) {
+ public static final function createObjectByConfiguredName ($configEntry, array $args=array()) {
// Read the configuration entry
- $className = FrameworkConfiguration::getInstance()->readConfig($configEntry);
+ $className = FrameworkConfiguration::getInstance()->getConfigEntry($configEntry);
// Send this to the other factory...
$objectInstance = self::createObjectByName($className, $args);
*
* @return $total Total amount of generated objects
*/
- public final static function getTotal () {
+ public static final function getTotal () {
return self::$total;
}
}