Continued:

[city.git] / application / city / classes / database / frontend / city / class_CityInformationDatabaseFrontend.php

diff --git a/application/city/classes/database/frontend/city/class_CityInformationDatabaseFrontend.php b/application/city/classes/database/frontend/city/class_CityInformationDatabaseFrontend.php
index 9b69ed2f92ce4406bbd75a30930e127c1836f108..0eff8572ed066e23cb665204a62f85f7c5eb2cca 100644 (file)
--- a/application/city/classes/database/frontend/city/class_CityInformationDatabaseFrontend.php
+++ b/application/city/classes/database/frontend/city/class_CityInformationDatabaseFrontend.php
@@ -11,7 +11,7 @@ use Org\Mxchange\City\Manager\City\ManageableCity;
 // Import framework stuff
 use Org\Mxchange\CoreFramework\Database\Frontend\BaseDatabaseFrontend;
 use Org\Mxchange\CoreFramework\Factory\Object\ObjectFactory;
-use Org\Mxchange\CoreFramework\Registry\GenericRegistry;
+use Org\Mxchange\CoreFramework\Registry\Object\ObjectRegistry;
 use Org\Mxchange\CoreFramework\Registry\Registerable;
 use Org\Mxchange\CoreFramework\Request\Requestable;
 
@@ -132,7 +132,7 @@ class CityInformationDatabaseFrontend extends BaseDatabaseFrontend implements Ci
         */
        public function removeNonPublicDataFromArray(array $data) {
                // Currently call only inner method
-               /* NOISY-DEBUG: */ self::createDebugInstance(__CLASS__)->debugMessage('CITY-WRAPPER[' . __METHOD__ . ':' . __LINE__ . ']: Calling parent::removeNonPublicDataFromArray(data) ...');
+               /* NOISY-DEBUG: */ self::createDebugInstance(__CLASS__, __LINE__)->debugMessage('CITY-WRAPPER[' . __METHOD__ . ':' . __LINE__ . ']: Calling parent::removeNonPublicDataFromArray(data) ...');
                $data = parent::removeNonPublicDataFromArray($data);
 
                // Return cleaned data
@@ -146,7 +146,7 @@ class CityInformationDatabaseFrontend extends BaseDatabaseFrontend implements Ci
         */
        public function ifUserHasFoundedCity () {
                // Get user instance
-               $userInstance = GenericRegistry::getRegistry()->getInstance('user');
+               $userInstance = ObjectRegistry::getRegistry('generic')->getInstance('user');
 
                // Now get a search criteria instance
                $searchInstance = ObjectFactory::createObjectByConfiguredName('search_criteria_class');
@@ -224,7 +224,7 @@ class CityInformationDatabaseFrontend extends BaseDatabaseFrontend implements Ci
                assert(!$this->ifCityExists($cityName));
 
                // Get user instance
-               $userInstance = GenericRegistry::getRegistry()->getInstance('user');
+               $userInstance = ObjectRegistry::getRegistry('generic')->getInstance('user');
 
                // Get a dataset instance
                $dataSetInstance = ObjectFactory::createObjectByConfiguredName('dataset_criteria_class', array(self::DB_TABLE_CITY_INFORMATION));