Continued:

[core.git] / application / tests / class_ApplicationHelper.php

diff --git a/application/tests/class_ApplicationHelper.php b/application/tests/class_ApplicationHelper.php
index 6b234b436defa8a230624c09df15676c49ebe1b7..008bda16236d71432d82befac927f74d24857e3b 100644 (file)
--- a/application/tests/class_ApplicationHelper.php
+++ b/application/tests/class_ApplicationHelper.php
@@ -1,17 +1,15 @@
 <?php
 // Must be this namespace, else the launcher cannot find the class.
-namespace CoreFramework\Helper\Application;
+namespace Org\Mxchange\CoreFramework\Helper\Application;
 
 // Import framework stuff
-use CoreFramework\Bootstrap\FrameworkBootstrap;
-use CoreFramework\Configuration\FrameworkConfiguration;
-use CoreFramework\Factory\ObjectFactory;
-use CoreFramework\Loader\ClassLoader;
-use CoreFramework\Manager\ManageableApplication;
-use CoreFramework\Object\BaseFrameworkSystem;
-use CoreFramework\Registry\Registerable;
-use CoreFramework\Registry\Registry;
-use CoreFramework\Template\CompileableTemplate;
+use Org\Mxchange\CoreFramework\Application\BaseApplication;
+use Org\Mxchange\CoreFramework\Bootstrap\FrameworkBootstrap;
+use Org\Mxchange\CoreFramework\Factory\ObjectFactory;
+use Org\Mxchange\CoreFramework\Loader\ClassLoader;
+use Org\Mxchange\CoreFramework\Manager\ManageableApplication;
+use Org\Mxchange\CoreFramework\Registry\Registerable;
+use Org\Mxchange\CoreFramework\Template\CompileableTemplate;
 
 /**
  * A class holding general data about the application and some methods for
@@ -52,7 +50,7 @@ use CoreFramework\Template\CompileableTemplate;
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-class ApplicationHelper extends BaseFrameworkSystem implements ManageableApplication, Registerable {
+class ApplicationHelper extends BaseApplication implements ManageableApplication, Registerable {
        /**
         * The version number of this application
         */
@@ -176,7 +174,7 @@ class ApplicationHelper extends BaseFrameworkSystem implements ManageableApplica
         */
        public function initApplication () {
                // Get config instance
-               $cfg = FrameworkConfiguration::getSelfInstance();
+               $cfg = FrameworkBootstrap::getConfigurationInstance();
 
                // Initialize output system
                self::createDebugInstance('ApplicationHelper');
@@ -221,14 +219,14 @@ class ApplicationHelper extends BaseFrameworkSystem implements ManageableApplica
 
                // Get a controller resolver
                $resolverClass = sprintf(
-                       'CoreFramework\Tests\Resolver\Controller\%s',
+                       'Org\Mxchange\CoreFramework\Tests\Resolver\Controller\%s',
                        self::convertToClassName(sprintf(
                                '%s_%s_controller_resolver',
                                $this->getAppShortName(),
                                FrameworkBootstrap::getRequestTypeFromSystem()
                        ))
                );
-               $resolverInstance = ObjectFactory::createObjectByName($resolverClass, array($commandName, $this));
+               $resolverInstance = ObjectFactory::createObjectByName($resolverClass, array($commandName));
 
                // Get a controller instance as well
                $this->setControllerInstance($resolverInstance->resolveController());