More debug lines and renamed ->

[core.git] / inc / classes / main / debug / class_DebugConsoleOutput.php

diff --git a/inc/classes/main/debug/class_DebugConsoleOutput.php b/inc/classes/main/debug/class_DebugConsoleOutput.php
index 2d76aa159a6c97506edb28b770fd7cac42f5add0..2c06c1f7ecc81f1733d6ee4e55865c28100b204e 100644 (file)
--- a/inc/classes/main/debug/class_DebugConsoleOutput.php
+++ b/inc/classes/main/debug/class_DebugConsoleOutput.php
@@ -4,7 +4,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 - 2012 Core Developer Team
  * @license            GNU GPL 3.0 or any newer version
  * @link               http://www.ship-simu.org
  *
@@ -35,9 +35,9 @@ class DebugConsoleOutput extends BaseFrameworkSystem implements Debugger, Output
        /**
         * Creates an instance of this class
         *
-        * @return      $debugInstance          The prepared debug instance
+        * @return      $debugInstance  The prepared debug instance
         */
-       public final static function createDebugConsoleOutput () {
+       public static final function createDebugConsoleOutput () {
                // Get a new instance
                $debugInstance = new DebugConsoleOutput();
 
@@ -48,23 +48,21 @@ class DebugConsoleOutput extends BaseFrameworkSystem implements Debugger, Output
        /**
         * Outputs the given data without HTML tags
         *
-        * @param               $output The HTML'ed output
+        * @param       $output         The HTML'ed output
         * @return      void
         */
        public final function outputStream ($output) {
-               print(html_entity_decode(strip_tags(stripslashes($output))));
-       }
+               // Prepare the output
+               $output = trim(html_entity_decode(strip_tags(stripslashes($output))));
 
-       /**
-        * Assigns a variable for output
-        *
-        * @param               $var            The variable we shall assign
-        * @param               $value  The value to store in the variable
-        * @return      void
-        */
-       public final function assignVariable ($var, $value) {
-               // Empty stub!
-               trigger_error(__METHOD__.": Stub!");
+               // Are debug times enabled?
+               if ($this->getConfigInstance()->getConfigEntry('debug_output_timings') == 'Y') {
+                       // Output it first
+                       print($this->getPrintableExecutionTime());
+               } // END - if
+
+               // And print it out...
+               printf('%s%s', $output, chr(10));
        }
 
        /**
@@ -72,11 +70,23 @@ class DebugConsoleOutput extends BaseFrameworkSystem implements Debugger, Output
         *
         * @return      void
         */
-       public final function output ($outStream=false) {
+       public final function output ($outStream = false) {
                // Empty output will be silently ignored
                if ($outStream !== false) {
                        $this->outputStream($outStream);
-               }
+               } // END - if
+       }
+
+       /**
+        * Streams the data and maybe does something to it
+        *
+        * @param       $data   The data (string mostly) to "stream"
+        * @return      $data   The data (string mostly) to "stream"
+        * @throws      UnsupportedOperationException   If this method is called
+        */
+       public function streamData ($data) {
+               $this->debugOutput('Unhandled ' . strlen($data) . ' bytes in this stream.');
+               throw new UnsupportedOperationException(array($this, __FUNCTION__), self::EXCEPTION_UNSPPORTED_OPERATION);
        }
 }