Registry rewritten, exception added #2

[core.git] / inc / classes / main / class_BaseFrameworkSystem.php

diff --git a/inc/classes/main/class_BaseFrameworkSystem.php b/inc/classes/main/class_BaseFrameworkSystem.php
index f297db74122d5f41ec0c7d49af7c2076891c85c5..27e33b8f07a496554f4cac2131e0ecac52bbee42 100644 (file)
--- a/inc/classes/main/class_BaseFrameworkSystem.php
+++ b/inc/classes/main/class_BaseFrameworkSystem.php
@@ -5,7 +5,7 @@
  *
  * @author             Roland Haeder <webmaster@ship-simu.org>
  * @version            0.0.0
- * @copyright  Copyright (c) 2007, 2008 Roland Haeder, 2009 Core Developer Team
+ * @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
  *
@@ -93,6 +93,26 @@ class BaseFrameworkSystem extends stdClass implements FrameworkInterface {
         */
        private $menuInstance = null;
 
+       /**
+        * Instance of the image
+        */
+       private $imageInstance = null;
+
+       /**
+        * Instance of the stacker
+        */
+       private $stackerInstance = null;
+
+       /**
+        * A Compressor instance
+        */
+       private $compressorInstance = null;
+
+       /**
+        * A Parseable instance
+        */
+       private $parserInstance = null;
+
        /**
         * The real class name
         */
@@ -226,7 +246,7 @@ class BaseFrameworkSystem extends stdClass implements FrameworkInterface {
                        // Some arguments are there
                        foreach ($args as $arg) {
                                // Add the type
-                               $argsString .= $arg . ' (' . gettype($arg);
+                               $argsString .= $this->replaceControlCharacters($arg) . ' (' . gettype($arg);
 
                                // Add length if type is string
                                if (gettype($arg) == 'string') $argsString .= ', '.strlen($arg);
@@ -679,7 +699,7 @@ class BaseFrameworkSystem extends stdClass implements FrameworkInterface {
                }
 
                // Initialize the template engine
-               $templateInstance = ObjectFactory::createObjectByConfiguredName('template_class', array($appInstance));
+               $templateInstance = ObjectFactory::createObjectByConfiguredName('web_template_class', array($appInstance));
 
                // Return the prepared instance
                return $templateInstance;
@@ -721,6 +741,25 @@ class BaseFrameworkSystem extends stdClass implements FrameworkInterface {
                ));
        }
 
+       /**
+        * Replaces control characters with printable output
+        *
+        * @param       $str    String with control characters
+        * @return      $str    Replaced string
+        */
+       protected function replaceControlCharacters ($str) {
+               // Replace them
+               $str = str_replace(
+                       "\r", '[r]', str_replace(
+                       "\n", '[n]', str_replace(
+                       "\t", '[t]',
+                       $str
+               )));
+
+               // Return it
+               return $str;
+       }
+
        /**
         * Output a partial stub message for the caller method
         *
@@ -924,7 +963,7 @@ class BaseFrameworkSystem extends stdClass implements FrameworkInterface {
         * @return      $localized      Localized value
         */
        public function doFilterFormatNumber ($value) {
-               // Generate it from config and localize depencies
+               // Generate it from config and localize dependencies
                switch ($this->getLanguageInstance()->getLanguageCode()) {
                        case 'de': // German format is a bit different to default
                                $localized = number_format($value, $this->getConfigInstance()->getConfigEntry('decimals'), ',', '.');
@@ -1229,6 +1268,82 @@ class BaseFrameworkSystem extends stdClass implements FrameworkInterface {
        protected final function getMenuInstance () {
                return $this->menuInstance;
        }
+
+       /**
+        * Setter for image instanxe
+        *
+        * @param       $imageInstance  An instance of an image
+        * @return      void
+        */
+       public final function setImageInstance (BaseImage $imageInstance) {
+               $this->imageInstance = $imageInstance;
+       }
+
+       /**
+        * Getter for image instanxe
+        *
+        * @return      $imageInstance  An instance of an image
+        */
+       public final function getImageInstance () {
+               return $this->imageInstance;
+       }
+
+       /**
+        * Setter for stacker instanxe
+        *
+        * @param       $stackerInstance        An instance of an stacker
+        * @return      void
+        */
+       public final function setStackerInstance (Stackable $stackerInstance) {
+               $this->stackerInstance = $stackerInstance;
+       }
+
+       /**
+        * Getter for stacker instanxe
+        *
+        * @return      $stackerInstance        An instance of an stacker
+        */
+       public final function getStackerInstance () {
+               return $this->stackerInstance;
+       }
+
+       /**
+        * Setter for compressor instanxe
+        *
+        * @param       $compressorInstance     An instance of an compressor
+        * @return      void
+        */
+       public final function setCompressorInstance (Compressor $compressorInstance) {
+               $this->compressorInstance = $compressorInstance;
+       }
+
+       /**
+        * Getter for compressor instanxe
+        *
+        * @return      $compressorInstance     An instance of an compressor
+        */
+       public final function getCompressorInstance () {
+               return $this->compressorInstance;
+       }
+
+       /**
+        * Setter for Parseable instanxe
+        *
+        * @param       $parserInstance An instance of an Parseable
+        * @return      void
+        */
+       public final function setParserInstance (Parseable $parserInstance) {
+               $this->parserInstance = $parserInstance;
+       }
+
+       /**
+        * Getter for Parseable instanxe
+        *
+        * @return      $parserInstance An instance of an Parseable
+        */
+       public final function getParserInstance () {
+               return $this->parserInstance;
+       }
 }
 
 // [EOF]