X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=framework%2Fmain%2Finterfaces%2Fresolver%2Factions%2Fclass_ActionResolver.php;h=3af3fe2273df66ae0160fc5fba5b9e53db078da2;hb=cad1ab5ecb2935a6ebf678555860c3bd96b525b0;hp=c63382fb671dc39678851dc6d9812f0103fd2a20;hpb=78a010fef84895720e796842208f01dfb619c332;p=core.git

diff --git a/framework/main/interfaces/resolver/actions/class_ActionResolver.php b/framework/main/interfaces/resolver/actions/class_ActionResolver.php
index c63382fb..3af3fe22 100644
--- a/framework/main/interfaces/resolver/actions/class_ActionResolver.php
+++ b/framework/main/interfaces/resolver/actions/class_ActionResolver.php
@@ -1,17 +1,21 @@
 <?php
 // Own namespace
-namespace CoreFramework\Resolver\Action;
+namespace Org\Mxchange\CoreFramework\Resolver\Action;
 
 // Import framework stuff
-use CoreFramework\Request\Requestable;
-use CoreFramework\Resolver\Resolver;
+use Org\Mxchange\CoreFramework\Request\Requestable;
+use Org\Mxchange\CoreFramework\Resolver\Resolver;
 
 /**
  * An instance for action resolver classes
  *
  * @author		Roland Haeder <webmaster@shipsimu.org>
  * @version		0.0.0
+<<<<<<< HEAD:framework/main/interfaces/resolver/actions/class_ActionResolver.php
  * @copyright	Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2017 Core Developer Team
+=======
+ * @copyright	Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2016 Core Developer Team
+>>>>>>> Some updates::inc/main/interfaces/resolver/actions/class_ActionResolver.php
  * @license		GNU GPL 3.0 or any newer version
  * @link		http://www.shipsimu.org
  *
@@ -45,12 +49,13 @@ interface ActionResolver extends Resolver {
 	function resolveActionByRequest (Requestable $requestInstance);
 
 	/**
-	 * Checks whether the given action is valid
+	 * Checks whether the given action is valid within namespace
 	 *
+	 * @param	$namespace		Namespace to check
 	 * @param	$actionName		The default action we shall execute
 	 * @return	$isValid		Whether the given action is valid
-	 * @throws	EmptyVariableException	Thrown if given action is not set
+	 * @throws	InvalidArgumentException	Thrown if namespace or action is not set
 	 */
-	function isActionValid ($actionName);
+	function isActionValid ($namespace, $actionName);
 
 }