Rewrites for client factory, added methods for HttpClient (mostly from ConsoleClient).

[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 4a6f0d42c7324fce4d77c9b83bf08dd4b3897886..a323b32a2959259584f625a41e6473c1b3544737 100644 (file)
--- a/inc/classes/main/factories/objects/class_ObjectFactory.php
+++ b/inc/classes/main/factories/objects/class_ObjectFactory.php
@@ -2,11 +2,11 @@
 /**
  * An general object factory
  *
- * @author             Roland Haeder <webmaster@ship-simu.org>
+ * @author             Roland Haeder <webmaster@shipsimu.org>
  * @version            0.0.0
- * @copyright  Copyright (c) 2007, 2008 Roland Haeder, 2009 Core Developer Team
+ * @copyright  Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2013 Core Developer Team
  * @license            GNU GPL 3.0 or any newer version
- * @link               http://www.ship-simu.org
+ * @link               http://www.shipsimu.org
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -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);
        }
 
        /**
@@ -48,7 +44,7 @@ class ObjectFactory extends BaseFactory {
         * @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();
 
@@ -62,15 +58,13 @@ class ObjectFactory extends BaseFactory {
                }
 
                // Create method name
-               $methodName = sprintf("create%s",
-                       $className
-               );
+               $methodName = sprintf('create%s', $className);
 
                // 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 +77,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 +87,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]