X-Git-Url: https://git.mxchange.org/?p=core.git;a=blobdiff_plain;f=inc%2Fmain%2Fclasses%2Fresolver%2Fcontroller%2Fhtml%2Fclass_HtmlControllerResolver.php;h=0890dff5da22dac72df8f598af0e305bcb71c9fb;hp=c50f32a71d460c4d2c6bc235a799ba4fd57adf2c;hb=015c9d406c90225160488fcaaebe4575ce5cf61a;hpb=751f9e6c51f00dba27757b72fc85490e51fd3797

diff --git a/inc/main/classes/resolver/controller/html/class_HtmlControllerResolver.php b/inc/main/classes/resolver/controller/html/class_HtmlControllerResolver.php
index c50f32a7..0890dff5 100644
--- a/inc/main/classes/resolver/controller/html/class_HtmlControllerResolver.php
+++ b/inc/main/classes/resolver/controller/html/class_HtmlControllerResolver.php
@@ -1,10 +1,17 @@
 <?php
+// Own namespace
+namespace CoreFramework\Resolver\Controller;
+
+// Import framework stuff
+use CoreFramework\Controller\BaseController;
+use CoreFramework\Manager\ManageableApplication;
+
 /**
  * A resolver for resolving controllers locally
  *
  * @author		Roland Haeder <webmaster@shipsimu.org>
  * @version		0.0.0
- * @copyright	Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2015 Core Developer Team
+ * @copyright	Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2017 Core Developer Team
  * @license		GNU GPL 3.0 or any newer version
  * @link		http://www.shipsimu.org
  *
@@ -38,13 +45,14 @@ class HtmlControllerResolver extends BaseControllerResolver implements Controlle
 	/**
 	 * Creates an instance of a resolver class with a given controller
 	 *
+	 * @param	$namespace					Namespace to look in
 	 * @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 createHtmlControllerResolver ($controllerName, ManageableApplication $applicationInstance) {
+	public static final function createHtmlControllerResolver ($namespace, $controllerName, ManageableApplication $applicationInstance) {
 		// Create the new instance
 		$resolverInstance = new HtmlControllerResolver();
 
@@ -52,7 +60,7 @@ class HtmlControllerResolver extends BaseControllerResolver implements Controlle
 		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($namespace, $controllerName) === FALSE) {
 			// Invalid controller found
 			throw new InvalidControllerException(array($resolverInstance, $controllerName), self::EXCEPTION_INVALID_CONTROLLER);
 		}
@@ -66,7 +74,5 @@ class HtmlControllerResolver extends BaseControllerResolver implements Controlle
 		// Return the prepared instance
 		return $resolverInstance;
 	}
-}
 
-// [EOF]
-?>
+}