X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=framework%2Fmain%2Fclasses%2Fhandler%2Fclass_BaseHandler.php;h=48a6b084fa9a16f2cc956d3687c6e5e616a0f166;hb=cad1ab5ecb2935a6ebf678555860c3bd96b525b0;hp=945ebeb63a47a94f34d540b24686bdadb398fdc2;hpb=78a010fef84895720e796842208f01dfb619c332;p=core.git

diff --git a/framework/main/classes/handler/class_BaseHandler.php b/framework/main/classes/handler/class_BaseHandler.php
index 945ebeb6..48a6b084 100644
--- a/framework/main/classes/handler/class_BaseHandler.php
+++ b/framework/main/classes/handler/class_BaseHandler.php
@@ -1,17 +1,22 @@
 <?php
 // Own namespace
-namespace CoreFramework\Handler;
+namespace Org\Mxchange\CoreFramework\Handler;
 
 // Import framework stuff
-use CoreFramework\Criteria\Storing\StoreableCriteria;
-use CoreFramework\Object\BaseFrameworkSystem;
+use Org\Mxchange\CoreFramework\Criteria\Storing\StoreableCriteria;
+use Org\Mxchange\CoreFramework\Handler\DataSet\HandleableDataSet;
+use Org\Mxchange\CoreFramework\Object\BaseFrameworkSystem;
 
 /**
  * A general Handler
  *
  * @author		Roland Haeder <webmaster@shipsimu.org>
  * @version		0.0.0
+<<<<<<< HEAD:framework/main/classes/handler/class_BaseHandler.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/classes/handler/class_BaseHandler.php
  * @license		GNU GPL 3.0 or any newer version
  * @link		http://www.shipsimu.org
  *
@@ -28,7 +33,7 @@ use CoreFramework\Object\BaseFrameworkSystem;
  * 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 BaseHandler extends BaseFrameworkSystem implements HandleableDataSet {
+abstract class BaseHandler extends BaseFrameworkSystem implements HandleableDataSet {
 	/**
 	 * Handler name
 	 */