Some updates:

[core.git] / framework / main / classes / handler / class_BaseHandler.php

diff --git a/framework/main/classes/handler/class_BaseHandler.php b/framework/main/classes/handler/class_BaseHandler.php
index 945ebeb63a47a94f34d540b24686bdadb398fdc2..48a6b084fa9a16f2cc956d3687c6e5e616a0f166 100644 (file)
--- 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
         */