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

[core.git] / inc / classes / middleware / debug / class_DebugMiddleware.php

diff --git a/inc/classes/middleware/debug/class_DebugMiddleware.php b/inc/classes/middleware/debug/class_DebugMiddleware.php
index 8d25477eca28c459171c86131b3fe43e2e92ee95..14901161715315e47ea5bd1ff98310913e915505 100644 (file)
--- a/inc/classes/middleware/debug/class_DebugMiddleware.php
+++ b/inc/classes/middleware/debug/class_DebugMiddleware.php
@@ -6,7 +6,7 @@
  *
  * @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 - 2011 Core Developer Team
  * @license            GNU GPL 3.0 or any newer version
  * @link               http://www.ship-simu.org
  *
@@ -27,12 +27,12 @@ class DebugMiddleware extends BaseMiddleware implements Registerable {
        /**
         * The concrete output instance
         */
-       private $outputInstance = null;
+       private $outputInstance = NULL;
 
        /**
         * An instance of this class
         */
-       private static $thisInstance = null;
+       private static $thisInstance = NULL;
 
        /**
         * Protected constructor
@@ -45,6 +45,9 @@ class DebugMiddleware extends BaseMiddleware implements Registerable {
 
                // Set own instance
                self::$thisInstance = $this;
+
+               // Set it so all can use it
+               $this->setDebugInstance($this);
        }
 
        /**
@@ -56,7 +59,7 @@ class DebugMiddleware extends BaseMiddleware implements Registerable {
         *                                                      registering the *real* debug output
         * @return      $debugInstance  An instance of this middleware class
         */
-       public final static function createDebugMiddleware ($debuggerClass) {
+       public static final function createDebugMiddleware ($debuggerClass) {
                // Create an instance if this middleware
                $debugInstance = new DebugMiddleware();
 
@@ -81,7 +84,7 @@ class DebugMiddleware extends BaseMiddleware implements Registerable {
         *
         * @return      $thisInstance           An instance of this class
         */
-       public final static function getInstance() {
+       public static final function getSelfInstance() {
                return self::$thisInstance;
        }
 
@@ -100,13 +103,13 @@ class DebugMiddleware extends BaseMiddleware implements Registerable {
         * browser or debug lines for a log file, etc. to the registered debug
         * output instance.
         *
-        * @param       $outStream      Data we shall "stream" out to the world
+        * @param       $outStream      Data we shall 'stream' out to the world
         * @return      void
         */
        public final function output ($outStream) {
                // Is the output stream set
                if (empty($outStream)) {
-                       // Initialization phase
+                       // @TODO Initialization phase
                        return;
                } // END - if