Continued:

[core.git] / framework / main / classes / helper / html / links / class_HtmlLinkHelper.php

diff --git a/framework/main/classes/helper/html/links/class_HtmlLinkHelper.php b/framework/main/classes/helper/html/links/class_HtmlLinkHelper.php
index b9df4c065b408badfb5ca07d69256aab9b523c07..13552a20490f712cf8cf673d51ff593b443ab3ac 100644 (file)
--- a/framework/main/classes/helper/html/links/class_HtmlLinkHelper.php
+++ b/framework/main/classes/helper/html/links/class_HtmlLinkHelper.php
@@ -1,20 +1,22 @@
 <?php
 // Own namespace
-namespace CoreFramework\Helper;
+namespace Org\Mxchange\CoreFramework\Helper;
 
 // Import framework stuff
-use CoreFramework\Bootstrap\FrameworkBootstrap;
-use CoreFramework\Configuration\FrameworkConfiguration;
-use CoreFramework\Generic\NullPointerException;
-use CoreFramework\Registry\Registry;
-use CoreFramework\Template\CompileableTemplate;
+use Org\Mxchange\CoreFramework\Bootstrap\FrameworkBootstrap;
+use Org\Mxchange\CoreFramework\Configuration\FrameworkConfiguration;
+use Org\Mxchange\CoreFramework\Generic\NullPointerException;
+use Org\Mxchange\CoreFramework\Helper\Template\HelpableTemplate;
+use Org\Mxchange\CoreFramework\Registry\GenericRegistry;
+use Org\Mxchange\CoreFramework\Utils\String\StringUtils;
+use Org\Mxchange\CoreFramework\Template\CompileableTemplate;
 
 /**
  * A helper for web links
  *
  * @author             Roland Haeder <webmaster@shipsimu.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 - 2020 Core Developer Team
  * @license            GNU GPL 3.0 or any newer version
  * @link               http://www.shipsimu.org
  *
@@ -82,7 +84,7 @@ class HtmlLinkHelper extends BaseHtmlHelper implements HelpableTemplate {
                $helperInstance->setLinkName($linkName);
 
                // Get the application instance
-               $applicationInstance = Registry::getRegistry()->getInstance('application');
+               $applicationInstance = GenericRegistry::getRegistry()->getInstance('application');
 
                // Get the request instance
                $requestInstance = FrameworkBootstrap::getRequestInstance();
@@ -94,7 +96,7 @@ class HtmlLinkHelper extends BaseHtmlHelper implements HelpableTemplate {
                } // END - if
 
                // Get page (this will throw an exception if not set)
-               $command = $helperInstance->convertDashesToUnderscores($requestInstance->getRequestElement('command'));
+               $command = StringUtils::convertDashesToUnderscores($requestInstance->getRequestElement('command'));
 
                // Construct config entry
                $configEntry = $command . '_' . $linkName . '_action_url';
@@ -107,7 +109,7 @@ class HtmlLinkHelper extends BaseHtmlHelper implements HelpableTemplate {
 
                // Determine link base from config now and 'command' request
                try {
-                       $newLinkBase = $helperInstance->getConfigInstance()->getConfigEntry($configEntry);
+                       $newLinkBase = FrameworkBootstrap::getConfigurationInstance()->getConfigEntry($configEntry);
                        $linkBase = $newLinkBase;
                } catch (NoConfigEntryException $e) {
                        // Is the deprecated linkBase not set?