Static method getInstance() conflicts with getInstance() in class BaseRegistry,

[core.git] / inc / classes / main / factories / objects / class_ObjectFactory.php

diff --git a/inc/classes/main/factories/objects/class_ObjectFactory.php b/inc/classes/main/factories/objects/class_ObjectFactory.php
index e3be9d289cd998ca81f0622cff12f2f5a8507498..c089ba32beb46c3697f10db1bdfebb2d6d20198e 100644 (file)
--- a/inc/classes/main/factories/objects/class_ObjectFactory.php
+++ b/inc/classes/main/factories/objects/class_ObjectFactory.php
@@ -4,7 +4,7 @@
  *
  * @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 - 2011 Core Developer Team
  * @license            GNU GPL 3.0 or any newer version
  * @link               http://www.ship-simu.org
  *
@@ -22,19 +22,15 @@
  * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 class ObjectFactory extends BaseFactory {
-       /**
-        * Total objects generated
-        */
-       private static $total = 0;
-
        /**
         * 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);
        }
 
        /**
@@ -45,10 +41,10 @@ class ObjectFactory extends BaseFactory {
         * @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();
 
@@ -58,7 +54,7 @@ class ObjectFactory extends BaseFactory {
                        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
@@ -69,8 +65,8 @@ class ObjectFactory extends BaseFactory {
                // Run the user function
                $objectInstance = call_user_func_array(array($className, $methodName), $args);
 
-               // Count generated objects up
-               self::$total++;
+               // Count this one up
+               self::countObject($className);
 
                // Return the prepared instance
                return $objectInstance;
@@ -83,9 +79,9 @@ class ObjectFactory extends BaseFactory {
         * @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()->getConfigEntry($configEntry);
+               $className = FrameworkConfiguration::getSelfInstance()->getConfigEntry($configEntry);
 
                // Send this to the other factory...
                $objectInstance = self::createObjectByName($className, $args);
@@ -93,15 +89,6 @@ class ObjectFactory extends BaseFactory {
                // Return the instance
                return $objectInstance;
        }
-
-       /**
-        * Static getter for total object count
-        *
-        * @return      $total  Total amount of generated objects
-        */
-       public final static function getTotal () {
-               return self::$total;
-       }
 }
 
 // [EOF]