Continued:

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

diff --git a/framework/main/classes/class_BaseFrameworkSystem.php b/framework/main/classes/class_BaseFrameworkSystem.php
index 34076636662401fb63df5dc5c02c8407c6c14be1..2fe41474f065ae006d9778ecc384a24550ad6fca 100644 (file)
--- a/framework/main/classes/class_BaseFrameworkSystem.php
+++ b/framework/main/classes/class_BaseFrameworkSystem.php
@@ -4,8 +4,6 @@ namespace Org\Mxchange\CoreFramework\Object;
 
 // Import framework stuff
 use Org\Mxchange\CoreFramework\Bootstrap\FrameworkBootstrap;
-use Org\Mxchange\CoreFramework\Compressor\Compressor;
-use Org\Mxchange\CoreFramework\Connection\Database\DatabaseConnection;
 use Org\Mxchange\CoreFramework\Criteria\Criteria;
 use Org\Mxchange\CoreFramework\Criteria\Local\LocalSearchCriteria;
 use Org\Mxchange\CoreFramework\Criteria\Local\LocalUpdateCriteria;
@@ -30,7 +28,6 @@ use Org\Mxchange\CoreFramework\Loader\ClassLoader;
 use Org\Mxchange\CoreFramework\Localization\ManageableLanguage;
 use Org\Mxchange\CoreFramework\Manager\ManageableApplication;
 use Org\Mxchange\CoreFramework\Menu\RenderableMenu;
-use Org\Mxchange\CoreFramework\Middleware\Compressor\CompressorChannel;
 use Org\Mxchange\CoreFramework\Middleware\Debug\DebugMiddleware;
 use Org\Mxchange\CoreFramework\Parser\Parseable;
 use Org\Mxchange\CoreFramework\Registry\GenericRegistry;
@@ -152,21 +149,11 @@ abstract class BaseFrameworkSystem extends stdClass implements FrameworkInterfac
         */
        private $stackInstance = NULL;
 
-       /**
-        * A Compressor instance
-        */
-       private $compressorInstance = NULL;
-
        /**
         * A Parseable instance
         */
        private $parserInstance = NULL;
 
-       /**
-        * A database wrapper instance
-        */
-       private $databaseInstance = NULL;
-
        /**
         * A helper instance for the form
         */
@@ -717,49 +704,6 @@ abstract class BaseFrameworkSystem extends stdClass implements FrameworkInterfac
                return $webOutputInstance;
        }
 
-       /**
-        * Setter for database instance
-        *
-        * @param       $databaseInstance       The instance for the database connection (forced DatabaseConnection)
-        * @return      void
-        */
-       public final function setDatabaseInstance (DatabaseConnection $databaseInstance) {
-               GenericRegistry::getRegistry()->addInstance('db_instance', $databaseInstance);
-       }
-
-       /**
-        * Getter for database layer
-        *
-        * @return      $databaseInstance       The database layer instance
-        */
-       public final function getDatabaseInstance () {
-               // Get instance
-               $databaseInstance = GenericRegistry::getRegistry()->getInstance('db_instance');
-
-               // Return instance
-               return $databaseInstance;
-       }
-
-       /**
-        * Setter for compressor channel
-        *
-        * @param       $compressorInstance             An instance of CompressorChannel
-        * @return      void
-        */
-       public final function setCompressorChannel (CompressorChannel $compressorInstance) {
-               GenericRegistry::getRegistry()->addInstance('compressor', $compressorInstance);
-       }
-
-       /**
-        * Getter for compressor channel
-        *
-        * @return      $compressorInstance             The compressor channel
-        */
-       public final function getCompressorChannel () {
-               $compressorInstance = GenericRegistry::getRegistry()->getInstance('compressor');
-               return $compressorInstance;
-       }
-
        /**
         * Private getter for language instance
         *
@@ -914,25 +858,6 @@ abstract class BaseFrameworkSystem extends stdClass implements FrameworkInterfac
                return $this->stackInstance;
        }
 
-       /**
-        * Setter for compressor instance
-        *
-        * @param       $compressorInstance     An instance of an compressor
-        * @return      void
-        */
-       public final function setCompressorInstance (Compressor $compressorInstance) {
-               $this->compressorInstance = $compressorInstance;
-       }
-
-       /**
-        * Getter for compressor instance
-        *
-        * @return      $compressorInstance     An instance of an compressor
-        */
-       public final function getCompressorInstance () {
-               return $this->compressorInstance;
-       }
-
        /**
         * Setter for Parseable instance
         *