Continued:

[core.git] / inc / main / classes / resolver / controller / image / class_ImageControllerResolver.php

diff --git a/inc/main/classes/resolver/controller/image/class_ImageControllerResolver.php b/inc/main/classes/resolver/controller/image/class_ImageControllerResolver.php
index 8a14a722f704986dcab329b721f7a907135a4ef8..18016bb4793ffce3118473cab6f316b7c5512a7c 100644 (file)
--- a/inc/main/classes/resolver/controller/image/class_ImageControllerResolver.php
+++ b/inc/main/classes/resolver/controller/image/class_ImageControllerResolver.php
@@ -1,10 +1,20 @@
 <?php
+// Own namespace
+namespace CoreFramework\Resolver\Controller;
+
+// Import framework stuff
+use CoreFramework\Controller\BaseController;
+use CoreFramework\Generic\EmptyVariableException;
+use CoreFramework\Manager\ManageableApplication;
+use CoreFramework\Resolver\Controller\ControllerResolver;
+use CoreFramework\Resolver\Controller\BaseControllerResolver;
+
 /**
  * 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 +48,14 @@ class ImageControllerResolver extends BaseControllerResolver implements Controll
        /**
         * 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 createImageControllerResolver ($controllerName, ManageableApplication $applicationInstance) {
+       public static final function createImageControllerResolver ($namespace, $controllerName, ManageableApplication $applicationInstance) {
                // Create the new instance
                $resolverInstance = new ImageControllerResolver();
 
@@ -52,7 +63,7 @@ class ImageControllerResolver extends BaseControllerResolver implements Controll
                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 +77,5 @@ class ImageControllerResolver extends BaseControllerResolver implements Controll
                // Return the prepared instance
                return $resolverInstance;
        }
-}
 
-// [EOF]
-?>
+}