X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=application%2Fcity%2Fclasses%2Fresolver%2Fcontroller%2Fhtml%2Fclass_CityHtmlControllerResolver.php;h=d522506766ecad50b3700e010c8a2255e191501b;hb=537f153cc0b5f0bae914e8a5fe6acefdcbab5949;hp=45168d72e388416313bcf45c08dae65e3ba7ac6c;hpb=2e0e0091899925b6fd5e1b147dfcf7f3481614af;p=city.git

diff --git a/application/city/classes/resolver/controller/html/class_CityHtmlControllerResolver.php b/application/city/classes/resolver/controller/html/class_CityHtmlControllerResolver.php
index 45168d7..d522506 100644
--- a/application/city/classes/resolver/controller/html/class_CityHtmlControllerResolver.php
+++ b/application/city/classes/resolver/controller/html/class_CityHtmlControllerResolver.php
@@ -1,4 +1,12 @@
 <?php
+// Own namespace
+namespace Org\Mxchange\City\Resolver\Controller;
+
+// Import framework stuff
+use Org\Mxchange\CoreFramework\Controller\InvalidControllerException;
+use Org\Mxchange\CoreFramework\Resolver\Controller\BaseControllerResolver;
+use Org\Mxchange\CoreFramework\Resolver\Controller\ControllerResolver;
+
 /**
  * A resolver for resolving controllers locally
  *
@@ -39,12 +47,11 @@ class CityHtmlControllerResolver extends BaseControllerResolver implements Contr
 	 * Creates an instance of a resolver class with a given controller
 	 *
 	 * @param	$controllerName				The controller we shall resolve
-	 * @param	$applicationInstance		An instance of a manageable application helper class
 	 * @return	$resolverInstance			The prepared controller resolver instance
 	 * @throws	EmptyVariableException		Thrown if default controller is not set
 	 * @throws	InvalidControllerException	Thrown if default controller is invalid
 	 */
-	public static final function createCityHtmlControllerResolver ($controllerName, ManageableApplication $applicationInstance) {
+	public static final function createCityHtmlControllerResolver ($controllerName) {
 		// Create the new instance
 		$resolverInstance = new CityHtmlControllerResolver();
 
@@ -52,18 +59,17 @@ class CityHtmlControllerResolver extends BaseControllerResolver implements Contr
 		if (empty($controllerName)) {
 			// Then thrown an exception here
 			throw new EmptyVariableException(array($resolverInstance, 'controllerName'), self::EXCEPTION_UNEXPECTED_EMPTY_STRING);
-		} elseif ($resolverInstance->isControllerValid($controllerName) === FALSE) {
+		} elseif ($resolverInstance->isControllerValid('Org\Mxchange\City\Controller', $controllerName) === FALSE) {
 			// Invalid controller found
 			throw new InvalidControllerException(array($resolverInstance, $controllerName), self::EXCEPTION_INVALID_CONTROLLER);
 		}
 
-		// Set the application instance
-		$resolverInstance->setApplicationInstance($applicationInstance);
-
-		// Set controller name
+		// Set namespace and controller name
+		$resolverInstance->setNamespace('Org\Mxchange\City\Controller');
 		$resolverInstance->setControllerName($controllerName);
 
 		// Return the prepared instance
 		return $resolverInstance;
 	}
+
 }