Continued:

[core.git] / framework / main / classes / feature / class_FrameworkFeature.php

diff --git a/framework/main/classes/feature/class_FrameworkFeature.php b/framework/main/classes/feature/class_FrameworkFeature.php
index 5ae331275f674b30f873e943b807f9d7942fb95b..4f4bfa4e928576559cbd24860e2ffee75b3e1452 100644 (file)
--- a/framework/main/classes/feature/class_FrameworkFeature.php
+++ b/framework/main/classes/feature/class_FrameworkFeature.php
@@ -1,12 +1,12 @@
 <?php
 // Own namespace
-namespace CoreFramework\Feature;
+namespace Org\Mxchange\CoreFramework\Feature;
 
 // Import framework stuff
-use CoreFramework\Configuration\FrameworkConfiguration;
-use CoreFramework\Factory\ObjectFactory;
-use CoreFramework\Loader\NoClassException;
-use CoreFramework\Object\BaseFrameworkSystem;
+use Org\Mxchange\CoreFramework\Bootstrap\FrameworkBootstrap;
+use Org\Mxchange\CoreFramework\Factory\ObjectFactory;
+use Org\Mxchange\CoreFramework\Loader\NoClassException;
+use Org\Mxchange\CoreFramework\Object\BaseFrameworkSystem;
 
 /**
  * The general feature management class. No instance is needed as this class
@@ -14,7 +14,7 @@ use CoreFramework\Object\BaseFrameworkSystem;
  *
  * @author             Roland Haeder <webmaster@ship-simu.org>
  * @version            0.0.0
- * @copyright  Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2017 Core Developer Team
+ * @copyright  Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2019 Core Developer Team
  * @license            GNU GPL 3.0 or any newer version
  * @link               http://www.ship-simu.org
  *
@@ -41,16 +41,16 @@ class FrameworkFeature extends BaseFrameworkSystem {
         * A typical available entry looks like this:
         *
         * array(
-        *     'is_enabled'   => TRUE,
-        *     'is_available' => TRUE,
+        *     'is_enabled'   => true,
+        *     'is_available' => true,
         *     'instance'     => SomeFeature Object
         * )
         *
         * And a typical disabled entry looks like this:
         *
         * array(
-        *     'is_enabled'   => FALSE,
-        *     'is_available' => FALSE,
+        *     'is_enabled'   => false,
+        *     'is_available' => false,
         *     'instance'     => NULL
         * )
         */
@@ -80,7 +80,7 @@ class FrameworkFeature extends BaseFrameworkSystem {
                        $configKey = sprintf('enable_feature_%s', $featureName);
 
                        // Check configuration
-                       self::$enabledFeatures[$featureName]['is_enabled'] = (FrameworkConfiguration::getSelfInstance()->getConfigEntry($configKey) === 'Y');
+                       self::$enabledFeatures[$featureName]['is_enabled'] = (FrameworkBootstrap::getConfigurationInstance()->getConfigEntry($configKey) === 'Y');
                } // END - if
 
                // Return "cached" status
@@ -104,14 +104,14 @@ class FrameworkFeature extends BaseFrameworkSystem {
                // Is the cache set?
                if (!isset(self::$enabledFeatures[$featureName]['is_available'])) {
                        // Default is not available
-                       self::$enabledFeatures[$featureName]['is_available'] = FALSE;
+                       self::$enabledFeatures[$featureName]['is_available'] = false;
                        self::$enabledFeatures[$featureName]['instance']     = NULL;
 
                        // Is the feature enabled?
                        if (!self::isFeatureEnabled($featureName)) {
                                // Then it can't be available
                                self::createDebugInstance(__CLASS__, __LINE__)->debugOutput(sprintf('[%s:%d]: Feature "%s"is not enabled.', __METHOD__, __LINE__, $featureName));
-                               return FALSE;
+                               return false;
                        } // END - if
 
                        // Create config key (for feature class lookup)
@@ -154,7 +154,7 @@ class FrameworkFeature extends BaseFrameworkSystem {
        public static function callFeature ($featureName, $featureMethod, array $args = NULL) {
                /*
                 * Please make sure that isFeatureAvailable() has been called and it has
-                * returned TRUE before calling this method.
+                * returned true before calling this method.
                 */
                assert(self::isFeatureAvailable($featureName));