Renamed Registry -> GenericRegistry to make it clear that this registry does

[core.git] / framework / main / classes / helper / class_BaseHelper.php

diff --git a/framework/main/classes/helper/class_BaseHelper.php b/framework/main/classes/helper/class_BaseHelper.php
index 53a68b6dfdf0a6526c5045b4bba43f35eb22e63a..625220f718fbca7ec1b19754f9856ff9165f3665 100644 (file)
--- a/framework/main/classes/helper/class_BaseHelper.php
+++ b/framework/main/classes/helper/class_BaseHelper.php
@@ -7,7 +7,7 @@ use Org\Mxchange\CoreFramework\Factory\ObjectFactory;
 use Org\Mxchange\CoreFramework\Generic\FrameworkInterface;
 use Org\Mxchange\CoreFramework\Generic\NullPointerException;
 use Org\Mxchange\CoreFramework\Object\BaseFrameworkSystem;
-use Org\Mxchange\CoreFramework\Registry\Registry;
+use Org\Mxchange\CoreFramework\Registry\GenericRegistry;
 
 /**
  * A generic helper class with generic methods
@@ -31,7 +31,7 @@ use Org\Mxchange\CoreFramework\Registry\Registry;
  * 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 BaseHelper extends BaseFrameworkSystem {
+abstract class BaseHelper extends BaseFrameworkSystem {
        /**
         * Instance to the class which provides field values
         */
@@ -216,7 +216,7 @@ class BaseHelper extends BaseFrameworkSystem {
                //* DEBUG: */ self::createDebugInstance(__CLASS__, __LINE__)->debugOutput('O:'.$registryKey.'/'.$extraKey);
                try {
                        // Get the required instance
-                       $this->valueInstance = Registry::getRegistry()->getInstance($registryKey);
+                       $this->valueInstance = GenericRegistry::getRegistry()->getInstance($registryKey);
                } catch (NullPointerException $e) {
                        // Not set in registry
                        // @TODO Try to log it here
@@ -227,7 +227,7 @@ class BaseHelper extends BaseFrameworkSystem {
                if (!is_null($extraKey)) {
                        try {
                                // Get the extra instance.
-                               $this->extraInstance = Registry::getRegistry()->getInstance($extraKey);
+                               $this->extraInstance = GenericRegistry::getRegistry()->getInstance($extraKey);
                        } catch (NullPointerException $e) {
                                // Try to create it
                                $this->extraInstance = ObjectFactory::createObjectByConfiguredName($extraKey . '_class', array($this->valueInstance));