X-Git-Url: https://git.mxchange.org/?p=core.git;a=blobdiff_plain;f=framework%2Fmain%2Fclasses%2Fresolver%2Fcontroller%2Fclass_BaseControllerResolver.php;h=ff10fc88143361f430ed58cd770b1b13093cd70a;hp=f2a3f3ec5e9dcd2d93ea173b998c3269858e7c87;hb=b002c5909aa0f781505dde5414964b0f014cde01;hpb=146c8b3c929a1b0ab17d6605e5ae949ac44899c1

diff --git a/framework/main/classes/resolver/controller/class_BaseControllerResolver.php b/framework/main/classes/resolver/controller/class_BaseControllerResolver.php
index f2a3f3ec..ff10fc88 100644
--- a/framework/main/classes/resolver/controller/class_BaseControllerResolver.php
+++ b/framework/main/classes/resolver/controller/class_BaseControllerResolver.php
@@ -1,15 +1,17 @@
 <?php
 // Own namespace
-namespace CoreFramework\Resolver\Controller;
+namespace Org\Mxchange\CoreFramework\Resolver\Controller;
 
 // Import framework stuff
-use CoreFramework\Controller\DefaultControllerException;
-use CoreFramework\Controller\Controller;
-use CoreFramework\Factory\ObjectFactory;
-use CoreFramework\Generic\EmptyVariableException;
-use CoreFramework\Registry\Registry;
-use CoreFramework\Resolver\BaseResolver;
-use CoreFramework\Resolver\Controller\ControllerResolver;
+use Org\Mxchange\CoreFramework\Controller\DefaultControllerException;
+use Org\Mxchange\CoreFramework\Controller\Controller;
+use Org\Mxchange\CoreFramework\Factory\ObjectFactory;
+use Org\Mxchange\CoreFramework\Registry\GenericRegistry;
+use Org\Mxchange\CoreFramework\Resolver\BaseResolver;
+use Org\Mxchange\CoreFramework\Resolver\Controller\ControllerResolver;
+
+// Import SPL stuff
+use \InvalidArgumentException;
 
 /**
  * A generic controller resolver class
@@ -33,7 +35,7 @@ use CoreFramework\Resolver\Controller\ControllerResolver;
  * 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 BaseControllerResolver extends BaseResolver {
+abstract class BaseControllerResolver extends BaseResolver {
 	/**
 	 * Protected constructor
 	 *
@@ -78,7 +80,7 @@ class BaseControllerResolver extends BaseResolver {
 			// Create controller class name
 			$className = sprintf(
 				'%s\%s%sController',
-				$namespace,
+				$this->getNamespace(),
 				$this->getCapitalizedClassPrefix(),
 				self::convertToClassName($controllerName)
 			);
@@ -129,7 +131,7 @@ class BaseControllerResolver extends BaseResolver {
 	 * @param	$namespace			Namespace to look in, no trailing backslash
 	 * @param	$controllerName		The default controller we shall execute
 	 * @return	$isValid			Whether the given controller is valid
-	 * @throws	EmptyVariableException		Thrown if given controller is not set
+	 * @throws	InvalidArgumentException		Thrown if given controller is not set
 	 * @throws	DefaultControllerException	Thrown if default controller was not found
 	 */
 	protected function isControllerValid ($namespace, $controllerName) {
@@ -139,11 +141,11 @@ class BaseControllerResolver extends BaseResolver {
 		// Is namespace and controller name set?
 		if (empty($namespace)) {
 			// Then thrown an exception here
-			throw new EmptyVariableException(array($this, 'namespace'), self::EXCEPTION_UNEXPECTED_EMPTY_STRING);
+			throw new InvalidArgumentException('Parameter "namespace" is empty');
 		} elseif (empty($controllerName)) {
 			// Then thrown an exception here
-			throw new EmptyVariableException(array($this, 'controllerName'), self::EXCEPTION_UNEXPECTED_EMPTY_STRING);
-		} // END - if
+			throw new InvalidArgumentException('Parameter "controllerName" is empty');
+		}
 
 		// Create class name
 		$className = sprintf(