Registry rewritten, exception added #2

[core.git] / inc / classes / main / factories / class_BaseFactory.php

diff --git a/inc/classes/main/factories/class_BaseFactory.php b/inc/classes/main/factories/class_BaseFactory.php
index 52e52fa2aee306d4f7e6fcd01e21d5b8a7af335c..98fd48ed941aa80ed0a713669a0184a82171dd8e 100644 (file)
--- a/inc/classes/main/factories/class_BaseFactory.php
+++ b/inc/classes/main/factories/class_BaseFactory.php
@@ -4,7 +4,7 @@
  *
  * @author             Roland Haeder <webmaster@ship-simu.org>
  * @version            0.0.0
  *
  * @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
  *
  * @license            GNU GPL 3.0 or any newer version
  * @link               http://www.ship-simu.org
  *


@@ -22,11 +22,6 @@
  * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 class BaseFactory extends BaseFrameworkSystem {
  * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 class BaseFactory extends BaseFrameworkSystem {

-       /**
-        * An instance of the real factory class
-        */
-       private $realFactoryInstance = null;
-

        /**
         * Protected constructor
         *
        /**
         * Protected constructor
         *


@@ -36,29 +31,6 @@ class BaseFactory extends BaseFrameworkSystem {
        protected function __construct ($className) {
                // Call parent constructor
                parent::__construct($className);
        protected function __construct ($className) {
                // Call parent constructor
                parent::__construct($className);

-
-               // Clean up a little
-               $this->removeNumberFormaters();
-               $this->removeSystemArray();
-       }
-
-       /**
-        * Setter for the *real* factory instance
-        *
-        * @param       $realFactoryInstance    An instance of the real factory class
-        * @return      void
-        */
-       public final function setRealFactoryInstance (BaseFrameworkSystem $realFactoryInstance) {
-               $this->realFactoryInstance = $realFactoryInstance;
-       }
-
-       /**
-        * Getter for the *real* factory instance
-        *
-        * @return      $realFactoryInstance    An instance of the real factory class
-        */
-       protected final function getRealFactoryInstance () {
-               return $this->realFactoryInstance;

        }
 }
 
        }
 }