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

[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 0e78c8a22b68acd359a51fa6b87c7b6f723ec063..3fc2bcc01f9a73e309ae7afd4dc8ba4bb1917623 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 - 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
  *
@@ -26,12 +26,7 @@ class ConsoleOutput extends BaseFrameworkSystem implements OutputStreamer {
        /**
         * The instance for the singleton design pattern
         */
-       private static $consoleInstance = null;
-
-       /**
-        * Assigned variables
-        */
-       private $vars = array();
+       private static $consoleInstance = NULL;
 
        /**
         * Protected constructor
@@ -49,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);
@@ -58,11 +53,12 @@ class ConsoleOutput extends BaseFrameworkSystem implements OutputStreamer {
                self::$consoleInstance = new ConsoleOutput();
 
                // Set the content type
+               // @TODO Need to rewrite this to $requestInstance->addHeader()
                if (!empty($contentType)) {
                        @header(sprintf("Content-type: %s",
                                $contentType
                        ));
-               }
+               } // END - if
 
                // Return instance
                return self::$consoleInstance;
@@ -73,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()->readConfig('web_content_type');
+                       $contentType = FrameworkConfiguration::getSelfInstance()->getConfigEntry('web_content_type');
                        self::$consoleInstance = ConsoleOutput::createConsoleOutput($contentType);
-               }
+               } // END - if
+
+               // Return the instance
                return self::$consoleInstance;
        }
 
@@ -87,27 +86,8 @@ class ConsoleOutput extends BaseFrameworkSystem implements OutputStreamer {
         * @param       $outStream      Something we shall sent to the console
         * @return      void
         */
-       public final function output ($outStream=false) {
-               if ($outStream === false) {
-                       // Output something here...
-                       foreach ($this->vars as $var => $value) {
-                               $this->output("var=".$var.", value=".$value."");
-                       }
-               } else {
-                       // Output it to the console
-                       printf("%s\n", trim(html_entity_decode(strip_tags(stripslashes($outStream)))));
-               }
-       }
-
-       /**
-        * Assigns a variable for output
-        *
-        * @param       $var    The variable we shall assign
-        * @param       $value  The value to store in the variable
-        * @return      void
-        */
-       public function assignVariable ($var, $value) {
-               $this->vars[$var] = $value;
+       public final function output ($outStream = false) {
+               print trim($outStream) . chr(10);
        }
 }