Added new general I/O stream classes and interfaces. Still the interfaces have no...

[core.git] / inc / classes / main / output / class_ConsoleOutput.php

diff --git a/inc/classes/main/output/class_ConsoleOutput.php b/inc/classes/main/output/class_ConsoleOutput.php
index a03b9512a76c758b1b3b8b7a8f9eb1db5eb0b0fc..38379b289eb857a1c9c713604b6240641a0a165f 100644 (file)
--- a/inc/classes/main/output/class_ConsoleOutput.php
+++ b/inc/classes/main/output/class_ConsoleOutput.php
@@ -5,7 +5,7 @@
  *
  * @author             Roland Haeder <webmaster@ship-simu.org>
  * @version            0.0.0
- * @copyright  Copyright (c) 2007, 2008 Roland Haeder, 2009, 2010 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
  *
@@ -44,7 +44,7 @@ class ConsoleOutput extends BaseFrameworkSystem implements OutputStreamer {
         * @param       $contentType    A valid content-type
         * @return      $debugInstance  An instance of this middleware class
         */
-       public final static function createConsoleOutput ($contentType) {
+       public static final function createConsoleOutput ($contentType) {
                // Cast the content-type to string
                $contentType = (string) $contentType;
                $contentType = trim($contentType);
@@ -69,11 +69,14 @@ class ConsoleOutput extends BaseFrameworkSystem implements OutputStreamer {
         *
         * @return      $consoleInstance        An instance of this class
         */
-       public final static function getInstance() {
+       public static final function getInstance() {
+               // Is the self-instance already set?
                if (is_null(self::$consoleInstance)) {
                        $contentType = FrameworkConfiguration::getInstance()->getConfigEntry('web_content_type');
                        self::$consoleInstance = ConsoleOutput::createConsoleOutput($contentType);
-               }
+               } // END - if
+
+               // Return the instance
                return self::$consoleInstance;
        }