Renamed Registry -> GenericRegistry to make it clear that this registry does

indeed accept any type of data and therefor is very generic.

Signed-off-by: Roland Haeder <roland@mxchange.org>

diff --git a/application/tests/class_ApplicationHelper.php b/application/tests/class_ApplicationHelper.php
index 0111e92413854dae00bfee9c7b5362ae7b4404c7..eab5a2c70052e6465f7c54fa76c292b56657c3ec 100644 (file)
--- a/application/tests/class_ApplicationHelper.php
+++ b/application/tests/class_ApplicationHelper.php
@@ -8,8 +8,8 @@ use Org\Mxchange\CoreFramework\Factory\ObjectFactory;
 use Org\Mxchange\CoreFramework\Loader\ClassLoader;
 use Org\Mxchange\CoreFramework\Manager\ManageableApplication;
 use Org\Mxchange\CoreFramework\Object\BaseFrameworkSystem;
+use Org\Mxchange\CoreFramework\Registry\GenericRegistry;
 use Org\Mxchange\CoreFramework\Registry\Registerable;
-use Org\Mxchange\CoreFramework\Registry\Registry;
 use Org\Mxchange\CoreFramework\Template\CompileableTemplate;
 
 /**

diff --git a/application/tests/data.php b/application/tests/data.php
index 36175015473275a7eb3caab3b014c57958f73b3a..9e8bfdda11443558d96d8243f7ba0068c2e336da 100644 (file)
--- a/application/tests/data.php
+++ b/application/tests/data.php
@@ -38,6 +38,3 @@ $app = call_user_func_array(
 $app->setAppName('Unit tests and more');
 $app->setAppVersion('0.0.0');
 $app->setAppShortName('tests');
-
-// [EOF]
-?>

diff --git a/application/tests/init.php b/application/tests/init.php
index 256eb5616b78abc2c58f06e54124cc1ae11e4152..7d6dceec926b2c790d8a6cc64b29a822d57f79e9 100644 (file)
--- a/application/tests/init.php
+++ b/application/tests/init.php
@@ -1,31 +1,2 @@
 <?php
-/**
- * Application initializer
- *
- * Please remember that this include file is being loaded *before* the class
- * loader is loading classes from "exceptions", "interfaces" and "main"!
- *
- * @author             Roland Haeder <webmaster@shipsimu.org>
- * @version            0.0
- * @copyright  Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2016 Core Developer Team
- * @license            GNU GPL 3.0 or any newer version
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-// Get config instance
-$cfg = FrameworkConfiguration::getSelfInstance();
-
-// [EOF]
-?>
+// @DEPRECATED

diff --git a/application/tests/loader.php b/application/tests/loader.php
index be84b0268e8a90731d0a1cf947471b802e4ec5af..7ddcb41f464ee43f4512423d4f46cbbb27aebf70 100644 (file)
--- a/application/tests/loader.php
+++ b/application/tests/loader.php
@@ -23,6 +23,3 @@
 
 // Scan for application's classes, exceptions and interfaces
 ClassLoader::scanApplicationClasses();
-
-// [EOF]
-?>

diff --git a/application/tests/starter.php b/application/tests/starter.php
index bb6a79dff12559fbdb58ea2537a8fb4491326acd..9898ac368ef8427710879f716dde9eb034b716a6 100644 (file)
--- a/application/tests/starter.php
+++ b/application/tests/starter.php
@@ -52,6 +52,3 @@ if ((empty($app)) || (is_null($app))) {
 
 // Call user function
 call_user_func_array(array($app, FrameworkConfiguration::getSelfInstance()->getConfigEntry('entry_method')), array());
-
-// [EOF]
-?>

diff --git a/framework/bootstrap/class_FrameworkBootstrap.php b/framework/bootstrap/class_FrameworkBootstrap.php
index fb7d036546afdf63443efd202aa74f3fb5244cc3..c18593ebcc11fd90bbba33d6e196df252d0633c0 100644 (file)
--- a/framework/bootstrap/class_FrameworkBootstrap.php
+++ b/framework/bootstrap/class_FrameworkBootstrap.php
@@ -15,7 +15,7 @@ use Org\Mxchange\CoreFramework\Loader\ClassLoader;
 use Org\Mxchange\CoreFramework\Manager\ManageableApplication;
 use Org\Mxchange\CoreFramework\Middleware\Debug\DebugMiddleware;
 use Org\Mxchange\CoreFramework\Object\BaseFrameworkSystem;
-use Org\Mxchange\CoreFramework\Registry\Registry;
+use Org\Mxchange\CoreFramework\Registry\GenericRegistry;
 use Org\Mxchange\CoreFramework\Request\Requestable;
 use Org\Mxchange\CoreFramework\Response\Responseable;
 

diff --git a/framework/loader/class_ClassLoader.php b/framework/loader/class_ClassLoader.php
index 3fd420fa11d62c2d963b94eba70aa8b2a7af1960..fab4e559a640c56363f79845b2d64fffaa42ce80 100644 (file)
--- a/framework/loader/class_ClassLoader.php
+++ b/framework/loader/class_ClassLoader.php
@@ -16,13 +16,8 @@ use \SplFileInfo;
  * This class loads class include files with a specific prefix and suffix
  *
  * @author             Roland Haeder <webmaster@shipsimu.org>
-<<<<<<< HEAD:framework/loader/class_ClassLoader.php
  * @version            1.5.0
  * @copyright  Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2017 Core Developer Team
-=======
- * @version            0.0.0
- * @copyright  Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2016 Core Developer Team
->>>>>>> Some updates::inc/loader/class_ClassLoader.php
  * @license            GNU GPL 3.0 or any newer version
  * @link               http://www.shipsimu.org
  *

diff --git a/framework/main/classes/actions/class_ b/framework/main/classes/actions/class_
index a5d9364c3bf83f7af4a460b344aa4466c7648c8b..786e8349293f85184e34b6c56e1ba066dd393640 100644 (file)
--- a/framework/main/classes/actions/class_
+++ b/framework/main/classes/actions/class_
@@ -10,11 +10,7 @@ use Org\Mxchange\CoreFramework\Action\BaseAction;
  *
  * @author             Roland Haeder <webmaster@ship-simu.org>
  * @version            0.0.0
-<<<<<<< HEAD:framework/main/classes/actions/class_
  * @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/actions/class_
  * @license            GNU GPL 3.0 or any newer version
  * @link               http://www.ship-simu.org
  *

diff --git a/framework/main/classes/actions/class_BaseAction.php b/framework/main/classes/actions/class_BaseAction.php
index e8fdaf99900042150e76c890c90ddea47c71fc2b..4205c9eac000d7af928e41473a2bfdde56d2af01 100644 (file)
--- a/framework/main/classes/actions/class_BaseAction.php
+++ b/framework/main/classes/actions/class_BaseAction.php
@@ -12,11 +12,7 @@ use Org\Mxchange\CoreFramework\Object\BaseFrameworkSystem;
  *
  * @author             Roland Haeder <webmaster@shipsimu.org>
  * @version            0.0.0
-<<<<<<< HEAD:framework/main/classes/actions/class_BaseAction.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/actions/class_BaseAction.php
  * @license            GNU GPL 3.0 or any newer version
  * @link               http://www.shipsimu.org
  *

diff --git a/framework/main/classes/actions/html/class_HtmlLoginProfileAction.php b/framework/main/classes/actions/html/class_HtmlLoginProfileAction.php
index 7430f5622d4acc174bcc7dafc635f854da27cfa4..44e9c5ef72cec8e59c9c5372f2fb9612852058e7 100644 (file)
--- a/framework/main/classes/actions/html/class_HtmlLoginProfileAction.php
+++ b/framework/main/classes/actions/html/class_HtmlLoginProfileAction.php
@@ -16,11 +16,7 @@ use Org\Mxchange\CoreFramework\Response\Responseable;
  *
  * @author             Roland Haeder <webmaster@shipsimu.org>
  * @version            0.0.0
-<<<<<<< HEAD:framework/main/classes/actions/html/class_HtmlLoginProfileAction.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/actions/html/class_HtmlLoginProfileAction.php
  * @license            GNU GPL 3.0 or any newer version
  * @link               http://www.shipsimu.org
  *

diff --git a/framework/main/classes/actions/post_registration/class_LoginAfterRegistrationAction.php b/framework/main/classes/actions/post_registration/class_LoginAfterRegistrationAction.php
index 061617c6a8ace1da2b7c8d21833f32219a89ad93..0903d931eb5c3c71e8ff301feceda7b247806d7a 100644 (file)
--- a/framework/main/classes/actions/post_registration/class_LoginAfterRegistrationAction.php
+++ b/framework/main/classes/actions/post_registration/class_LoginAfterRegistrationAction.php
@@ -14,11 +14,7 @@ use Org\Mxchange\CoreFramework\Response\Responseable;
  *
  * @author             Roland Haeder <webmaster@shipsimu.org>
  * @version            0.0.0
-<<<<<<< HEAD:framework/main/classes/actions/post_registration/class_LoginAfterRegistrationAction.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/actions/post_registration/class_LoginAfterRegistrationAction.php
  * @license            GNU GPL 3.0 or any newer version
  * @link               http://www.shipsimu.org
  *

diff --git a/framework/main/classes/application/class_BaseApplication.php b/framework/main/classes/application/class_BaseApplication.php
index e18a620cb4de64c09271fd59d282be0eeda38044..ea60fb1c889ed7be3c9e3299a810b7b88b87c70c 100644 (file)
--- a/framework/main/classes/application/class_BaseApplication.php
+++ b/framework/main/classes/application/class_BaseApplication.php
@@ -4,18 +4,14 @@ namespace Org\Mxchange\CoreFramework\Application;
 
 // Import framework stuff
 use Org\Mxchange\CoreFramework\Object\BaseFrameworkSystem;
-use Org\Mxchange\CoreFramework\Registry\Registry;
+use Org\Mxchange\CoreFramework\Registry\GenericRegistry;
 
 /**
  * A general application class for the ApplicationHelper classes.
  *
  * @author             Roland Haeder <webmaster@shipsimu.org>
  * @version            0.0.0
-<<<<<<< HEAD:framework/main/classes/application/class_BaseApplication.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/application/class_BaseApplication.php
  * @license            GNU GPL 3.0 or any newer version
  * @link               http://www.shipsimu.org
  *
@@ -44,7 +40,7 @@ abstract class BaseApplication extends BaseFrameworkSystem {
                parent::__construct($className);
 
                // Get registry instance
-               $registryInstance = Registry::getRegistry();
+               $registryInstance = GenericRegistry::getRegistry();
 
                // Add this instance
                $registryInstance->addInstance('application', $this);

diff --git a/framework/main/classes/auth/class_CookieAuth.php b/framework/main/classes/auth/class_CookieAuth.php
index 0652bb173a19bcc896a2210f5f1baf9a6c3ba5d7..6cd6559a7264868197174fad08420afe5c14f43e 100644 (file)
--- a/framework/main/classes/auth/class_CookieAuth.php
+++ b/framework/main/classes/auth/class_CookieAuth.php
@@ -13,11 +13,7 @@ use Org\Mxchange\CoreFramework\Response\Responseable;
  *
  * @author             Roland Haeder <webmaster@shipsimu.org>
  * @version            0.0.0
-<<<<<<< HEAD:framework/main/classes/auth/class_CookieAuth.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/auth/class_CookieAuth.php
  * @license            GNU GPL 3.0 or any newer version
  * @link               http://www.shipsimu.org
  *

diff --git a/framework/main/classes/cache/class_MemoryCache.php b/framework/main/classes/cache/class_MemoryCache.php
index ee5cf263c0058213a25662b9f25922bbd0577929..8762a34df9ccd4a83ecf1a383b5cb847a7f0c15b 100644 (file)
--- a/framework/main/classes/cache/class_MemoryCache.php
+++ b/framework/main/classes/cache/class_MemoryCache.php
@@ -11,11 +11,7 @@ use Org\Mxchange\CoreFramework\Object\BaseFrameworkSystem;
  *
  * @author             Roland Haeder <webmaster@shipsimu.org>
  * @version            0.0.0
-<<<<<<< HEAD:framework/main/classes/cache/class_MemoryCache.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/cache/class_MemoryCache.php
  * @license            GNU GPL 3.0 or any newer version
  * @link               http://www.shipsimu.org
  * @todo               Rename to InProgressCache

diff --git a/framework/main/classes/class_ b/framework/main/classes/class_
index a2afb21ab8380056bc33d617db2223ce01780eef..a6c0d3ba79446bd3faaffeafbe154f5173834549 100644 (file)
--- a/framework/main/classes/class_
+++ b/framework/main/classes/class_
@@ -4,11 +4,7 @@
  *
  * @author             Roland Haeder <webmaster@ship-simu.org>
  * @version            0.0.0
-<<<<<<< HEAD:framework/main/classes/class_
  * @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/class_
  * @license            GNU GPL 3.0 or any newer version
  * @link               http://www.ship-simu.org
  *

diff --git a/framework/main/classes/class_Base b/framework/main/classes/class_Base
index b2eb7bf5c3e18dc571e66cd27f0002983b7d86ee..fa83634580d13ad3893ab0641ede25637d2e51ea 100644 (file)
--- a/framework/main/classes/class_Base
+++ b/framework/main/classes/class_Base
@@ -4,11 +4,7 @@
  *
  * @author             Roland Haeder <webmaster@ship-simu.org>
  * @version            0.0.0
-<<<<<<< HEAD:framework/main/classes/class_Base
  * @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/class_Base
  * @license            GNU GPL 3.0 or any newer version
  * @link               http://www.ship-simu.org
  *

diff --git a/framework/main/classes/class_BaseFrameworkSystem.php b/framework/main/classes/class_BaseFrameworkSystem.php
index e015b575aa08bf988dbec8d779caaf2f844d2584..0390d528d228f141e3462efa265ca7552185fc46 100644 (file)
--- a/framework/main/classes/class_BaseFrameworkSystem.php
+++ b/framework/main/classes/class_BaseFrameworkSystem.php
@@ -34,8 +34,8 @@ use Org\Mxchange\CoreFramework\Manager\ManageableApplication;
 use Org\Mxchange\CoreFramework\Middleware\Compressor\CompressorChannel;
 use Org\Mxchange\CoreFramework\Middleware\Debug\DebugMiddleware;
 use Org\Mxchange\CoreFramework\Parser\Parseable;
+use Org\Mxchange\CoreFramework\Registry\GenericRegistry;
 use Org\Mxchange\CoreFramework\Registry\Register;
-use Org\Mxchange\CoreFramework\Registry\Registry;
 use Org\Mxchange\CoreFramework\Resolver\Resolver;
 use Org\Mxchange\CoreFramework\Result\Database\CachedDatabaseResult;
 use Org\Mxchange\CoreFramework\Result\Search\SearchableResult;
@@ -61,11 +61,7 @@ use \SplFileInfo;
  *
  * @author             Roland Haeder <webmaster@shipsimu.org>
  * @version            0.0.0
-<<<<<<< HEAD:framework/main/classes/class_BaseFrameworkSystem.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/class_BaseFrameworkSystem.php
  * @license            GNU GPL 3.0 or any newer version
  * @link               http://www.shipsimu.org
  *
@@ -787,7 +783,7 @@ abstract class BaseFrameworkSystem extends stdClass implements FrameworkInterfac
         * @return      $configInstance         Configuration instance
         */
        public final function getConfigInstance () {
-               $configInstance = Registry::getRegistry()->getInstance('config');
+               $configInstance = GenericRegistry::getRegistry()->getInstance('config');
                return $configInstance;
        }
 
@@ -808,7 +804,7 @@ abstract class BaseFrameworkSystem extends stdClass implements FrameworkInterfac
         */
        public final function getDebugInstance () {
                // Get debug instance
-               $debugInstance = Registry::getRegistry()->getInstance('debug');
+               $debugInstance = GenericRegistry::getRegistry()->getInstance('debug');
 
                // Return it
                return $debugInstance;
@@ -830,7 +826,7 @@ abstract class BaseFrameworkSystem extends stdClass implements FrameworkInterfac
         * @return      $webOutputInstance - Instance to class WebOutput
         */
        public final function getWebOutputInstance () {
-               $webOutputInstance = Registry::getRegistry()->getInstance('web_output');
+               $webOutputInstance = GenericRegistry::getRegistry()->getInstance('web_output');
                return $webOutputInstance;
        }
 
@@ -851,7 +847,7 @@ abstract class BaseFrameworkSystem extends stdClass implements FrameworkInterfac
         */
        public final function getDatabaseInstance () {
                // Get instance
-               $databaseInstance = Registry::getRegistry()->getInstance('db_instance');
+               $databaseInstance = GenericRegistry::getRegistry()->getInstance('db_instance');
 
                // Return instance
                return $databaseInstance;
@@ -873,7 +869,7 @@ abstract class BaseFrameworkSystem extends stdClass implements FrameworkInterfac
         * @return      $compressorInstance             The compressor channel
         */
        public final function getCompressorChannel () {
-               $compressorInstance = Registry::getRegistry()->getInstance('compressor');
+               $compressorInstance = GenericRegistry::getRegistry()->getInstance('compressor');
                return $compressorInstance;
        }
 
@@ -883,7 +879,7 @@ abstract class BaseFrameworkSystem extends stdClass implements FrameworkInterfac
         * @return      $applicationInstance    An instance of a manageable application helper class
         */
        protected final function getApplicationInstance () {
-               $applicationInstance = Registry::getRegistry()->getInstance('app');
+               $applicationInstance = GenericRegistry::getRegistry()->getInstance('application');
                return $applicationInstance;
        }
 
@@ -903,7 +899,7 @@ abstract class BaseFrameworkSystem extends stdClass implements FrameworkInterfac
         * @return      $langInstance   An instance to the language sub-system
         */
        protected final function getLanguageInstance () {
-               $langInstance = Registry::getRegistry()->getInstance('language');
+               $langInstance = GenericRegistry::getRegistry()->getInstance('language');
                return $langInstance;
        }
 
@@ -1636,7 +1632,7 @@ abstract class BaseFrameworkSystem extends stdClass implements FrameworkInterfac
                // Is the application instance set?
                if (is_null($applicationInstance)) {
                        // Get the current instance
-                       $applicationInstance = Registry::getRegistry()->getInstance('app');
+                       $applicationInstance = GenericRegistry::getRegistry()->getInstance('app');
 
                        // Still null?
                        if (is_null($applicationInstance)) {
@@ -1799,7 +1795,7 @@ Loaded includes:
                        Registry::getRegistry()->addInstance('debug', $debugInstance);
                } else {
                        // Get instance from registry
-                       $debugInstance = Registry::getRegistry()->getInstance('debug');
+                       $debugInstance = GenericRegistry::getRegistry()->getDebugInstance();
                }
 
                // Return it
@@ -3127,7 +3123,7 @@ Loaded includes:
         */
        protected function initWebOutputInstance () {
                // Get application instance
-               $applicationInstance = Registry::getRegistry()->getInstance('app');
+               $applicationInstance = GenericRegistry::getRegistry()->getInstance('app');
 
                // Init web output instance
                $outputInstance = ObjectFactory::createObjectByConfiguredName('output_class', array($applicationInstance));

diff --git a/framework/main/classes/class_FrameworkArrayObject.php b/framework/main/classes/class_FrameworkArrayObject.php
index 8d68eaba653339ee862f39568fd89f026ab3997f..a75c861accd0b614940c42f0ff1b262368217595 100644 (file)
--- a/framework/main/classes/class_FrameworkArrayObject.php
+++ b/framework/main/classes/class_FrameworkArrayObject.php
@@ -12,11 +12,7 @@ use \ArrayObject;
  *
  * @author             Roland Haeder <webmaster@shipsimu.org>
  * @version            0.0.0
-<<<<<<< HEAD:framework/main/classes/class_FrameworkArrayObject.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/class_FrameworkArrayObject.php
  * @license            GNU GPL 3.0 or any newer version
  * @link               http://www.shipsimu.org
  *

diff --git a/framework/main/classes/client/class_ b/framework/main/classes/client/class_
index cc14e154d59bec32a3f9f61776144d898a2aafbb..363cc00a293a330792117685fa8edebb936afd1f 100644 (file)
--- a/framework/main/classes/client/class_
+++ b/framework/main/classes/client/class_
@@ -4,11 +4,7 @@
  *
  * @author             Roland Haeder <webmaster@ship-simu.org>
  * @version            0.0.0
-<<<<<<< HEAD:framework/main/classes/client/class_
  * @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/client/class_
  * @license            GNU GPL 3.0 or any newer version
  * @link               http://www.ship-simu.org
  *

diff --git a/framework/main/classes/client/class_BaseClient.php b/framework/main/classes/client/class_BaseClient.php
index 79333d5c527585318287999ea2b0305fe1e723c8..72f9f253692f2ca339284ab7ad4d2f5b8f7529bd 100644 (file)
--- a/framework/main/classes/client/class_BaseClient.php
+++ b/framework/main/classes/client/class_BaseClient.php
@@ -10,11 +10,7 @@ use Org\Mxchange\CoreFramework\Object\BaseFrameworkSystem;
  *
  * @author             Roland Haeder <webmaster@ship-simu.org>
  * @version            0.0.0
-<<<<<<< HEAD:framework/main/classes/client/class_BaseClient.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/client/class_BaseClient.php
  * @license            GNU GPL 3.0 or any newer version
  * @link               http://www.ship-simu.org
  *

diff --git a/framework/main/classes/commands/class_ b/framework/main/classes/commands/class_
index cf8c6bafe1e56a6e54721f5255a12b05a51a926e..40181f411d7a349010bd886d152398f6c071e48b 100644 (file)
--- a/framework/main/classes/commands/class_
+++ b/framework/main/classes/commands/class_
@@ -4,11 +4,7 @@
  *
  * @author             Roland Haeder <webmaster@ship-simu.org>
  * @version            0.0.0
-<<<<<<< HEAD:framework/main/classes/commands/class_
  * @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/commands/class_
  * @license            GNU GPL 3.0 or any newer version
  * @link               http://www.ship-simu.org
  *

diff --git a/framework/main/classes/commands/class_BaseCommand.php b/framework/main/classes/commands/class_BaseCommand.php
index b66949885f9e03039bef9caeb95ea14b176bb0c8..8417f019398162d076837f3c5f440f8306448979 100644 (file)
--- a/framework/main/classes/commands/class_BaseCommand.php
+++ b/framework/main/classes/commands/class_BaseCommand.php
@@ -5,7 +5,7 @@ namespace Org\Mxchange\CoreFramework\Command;
 // Import framework stuff
 use Org\Mxchange\CoreFramework\Factory\ObjectFactory;
 use Org\Mxchange\CoreFramework\Object\BaseFrameworkSystem;
-use Org\Mxchange\CoreFramework\Registry\Registry;
+use Org\Mxchange\CoreFramework\Registry\GenericRegistry;
 use Org\Mxchange\CoreFramework\Request\Requestable;
 use Org\Mxchange\CoreFramework\Response\Responseable;
 
@@ -14,11 +14,7 @@ use Org\Mxchange\CoreFramework\Response\Responseable;
  *
  * @author             Roland Haeder <webmaster@shipsimu.org>
  * @version            0.0.0
-<<<<<<< HEAD:framework/main/classes/commands/class_BaseCommand.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/commands/class_BaseCommand.php
  * @license            GNU GPL 3.0 or any newer version
  * @link               http://www.shipsimu.org
  *
@@ -60,7 +56,7 @@ abstract class BaseCommand extends BaseFrameworkSystem {
                assert(!$requestInstance->isPostRequestMethod());
 
                // Get the application instance
-               $applicationInstance = Registry::getRegistry()->getInstance('app');
+               $applicationInstance = GenericRegistry::getRegistry()->getInstance('app');
 
                // Prepare a template instance
                $templateInstance = $this->prepareTemplateInstance($applicationInstance);

diff --git a/framework/main/classes/commands/console/class_Console b/framework/main/classes/commands/console/class_Console
index d7be83464dbc1fac5fc9ba0ff06e6d12802ec39b..55ca37ceccffbe6deba509afac0c047509bec3d1 100644 (file)
--- a/framework/main/classes/commands/console/class_Console
+++ b/framework/main/classes/commands/console/class_Console
@@ -4,11 +4,7 @@
  *
  * @author             Roland Haeder <webmaster@ship-simu.org>
  * @version            0.0.0
-<<<<<<< HEAD:framework/main/classes/commands/console/class_Console
  * @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/commands/console/class_Console
  * @license            GNU GPL 3.0 or any newer version
  * @link               http://www.ship-simu.org
  *

diff --git a/framework/main/classes/commands/console/class_ConsoleFuseCommand.php b/framework/main/classes/commands/console/class_ConsoleFuseCommand.php
index 2d6452458d1a4d2a28334f85e3aa097d18e608a5..3744c1cff1e32125ed07a78ded407bd372f566e6 100644 (file)
--- a/framework/main/classes/commands/console/class_ConsoleFuseCommand.php
+++ b/framework/main/classes/commands/console/class_ConsoleFuseCommand.php
@@ -16,11 +16,7 @@ use Org\Mxchange\CoreFramework\Response\Responseable;
  *
  * @author             Roland Haeder <webmaster@ship-simu.org>
  * @version            0.0.0
-<<<<<<< HEAD:framework/main/classes/commands/console/class_ConsoleFuseCommand.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/commands/console/class_ConsoleFuseCommand.php
  * @license            GNU GPL 3.0 or any newer version
  * @link               http://www.ship-simu.org
  *

diff --git a/framework/main/classes/commands/html/class_Html b/framework/main/classes/commands/html/class_Html
index cbe3fa4765b0bbafa3096553b536daf57ca86abc..917c94cfcececd6342df690bcdade8b38f0766eb 100644 (file)
--- a/framework/main/classes/commands/html/class_Html
+++ b/framework/main/classes/commands/html/class_Html
@@ -4,11 +4,7 @@
  *
  * @author             Roland Haeder <webmaster@ship-simu.org>
  * @version            0.0.0
-<<<<<<< HEAD:framework/main/classes/commands/html/class_Html
  * @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/commands/html/class_Html
  * @license            GNU GPL 3.0 or any newer version
  * @link               http://www.ship-simu.org
  *

diff --git a/framework/main/classes/commands/html/class_HtmlConfirmCommand.php b/framework/main/classes/commands/html/class_HtmlConfirmCommand.php
index 689ece383cf68bf0f591c5c6a95355aea6b0dd4e..cc074a86dc28ceeb2fb3e917e9ef2266df7d80c2 100644 (file)
--- a/framework/main/classes/commands/html/class_HtmlConfirmCommand.php
+++ b/framework/main/classes/commands/html/class_HtmlConfirmCommand.php
@@ -9,7 +9,7 @@ use Org\Mxchange\CoreFramework\Controller\Controller;
 use Org\Mxchange\CoreFramework\Database\Frontend\User\UserDatabaseWrapper;
 use Org\Mxchange\CoreFramework\Factory\ObjectFactory;
 use Org\Mxchange\CoreFramework\Generic\NullPointerException;
-use Org\Mxchange\CoreFramework\Registry\Registry;
+use Org\Mxchange\CoreFramework\Registry\GenericRegistry;
 use Org\Mxchange\CoreFramework\Request\Requestable;
 use Org\Mxchange\CoreFramework\Resolver\Command\CommandResolver;
 use Org\Mxchange\CoreFramework\Response\Responseable;
@@ -19,11 +19,7 @@ use Org\Mxchange\CoreFramework\Response\Responseable;
  *
  * @author             Roland Haeder <webmaster@shipsimu.org>
  * @version            0.0.0
-<<<<<<< HEAD:framework/main/classes/commands/html/class_HtmlConfirmCommand.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/commands/html/class_HtmlConfirmCommand.php
  * @license            GNU GPL 3.0 or any newer version
  * @link               http://www.shipsimu.org
  *
@@ -77,7 +73,7 @@ class HtmlConfirmCommand extends BaseCommand implements Commandable {
         */
        public function execute (Requestable $requestInstance, Responseable $responseInstance) {
                // Get the application instance
-               $applicationInstance = Registry::getRegistry()->getInstance('app');
+               $applicationInstance = GenericRegistry::getRegistry()->getInstance('app');
 
                // Prepare a template instance
                $templateInstance = $this->prepareTemplateInstance($applicationInstance);
@@ -119,7 +115,7 @@ class HtmlConfirmCommand extends BaseCommand implements Commandable {
 
                // Get user instance
                try {
-                       $userInstance = Registry::getRegistry()->getInstance('user');
+                       $userInstance = GenericRegistry::getRegistry()->getInstance('user');
                } catch (NullPointerException $e) {
                        // Not found user, e.g. when the user is somehow invalid
                        $responseInstance->redirectToConfiguredUrl('html_cmd_user_is_null');

diff --git a/framework/main/classes/commands/html/class_HtmlDoFormCommand.php b/framework/main/classes/commands/html/class_HtmlDoFormCommand.php
index 4d681500979f840860f6a6a7e1da6f754274e32b..d844e3e51f853019cd73cc2879a8e9c77594fa19 100644 (file)
--- a/framework/main/classes/commands/html/class_HtmlDoFormCommand.php
+++ b/framework/main/classes/commands/html/class_HtmlDoFormCommand.php
@@ -15,11 +15,7 @@ use Org\Mxchange\CoreFramework\Response\Responseable;
  *
  * @author             Roland Haeder <webmaster@shipsimu.org>
  * @version            0.0.0
-<<<<<<< HEAD:framework/main/classes/commands/html/class_HtmlDoFormCommand.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/commands/html/class_HtmlDoFormCommand.php
  * @license            GNU GPL 3.0 or any newer version
  * @link               http://www.shipsimu.org
  *

diff --git a/framework/main/classes/commands/html/class_HtmlHomeCommand.php b/framework/main/classes/commands/html/class_HtmlHomeCommand.php
index dff305b7f02d379ed0a1613747d2d8a6889ccc6a..7ed5a75145a0e96adf145abf8c2ce7cb026e1db2 100644 (file)
--- a/framework/main/classes/commands/html/class_HtmlHomeCommand.php
+++ b/framework/main/classes/commands/html/class_HtmlHomeCommand.php
@@ -7,7 +7,7 @@ use Org\Mxchange\CoreFramework\Command\BaseCommand;
 use Org\Mxchange\CoreFramework\Command\Commandable;
 use Org\Mxchange\CoreFramework\Controller\Controller;
 use Org\Mxchange\CoreFramework\Factory\ObjectFactory;
-use Org\Mxchange\CoreFramework\Registry\Registry;
+use Org\Mxchange\CoreFramework\Registry\GenericRegistry;
 use Org\Mxchange\CoreFramework\Request\Requestable;
 use Org\Mxchange\CoreFramework\Resolver\Command\CommandResolver;
 use Org\Mxchange\CoreFramework\Response\Responseable;
@@ -17,11 +17,7 @@ use Org\Mxchange\CoreFramework\Response\Responseable;
  *
  * @author             Roland Haeder <webmaster@shipsimu.org>
  * @version            0.0.0
-<<<<<<< HEAD:framework/main/classes/commands/html/class_HtmlHomeCommand.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/commands/html/class_HtmlHomeCommand.php
  * @license            GNU GPL 3.0 or any newer version
  * @link               http://www.shipsimu.org
  *
@@ -75,7 +71,7 @@ class HtmlHomeCommand extends BaseCommand implements Commandable {
         */
        public function execute (Requestable $requestInstance, Responseable $responseInstance) {
                // Get the application instance
-               $applicationInstance = Registry::getRegistry()->getInstance('app');
+               $applicationInstance = GenericRegistry::getRegistry()->getInstance('app');
 
                // Prepare a template instance
                $templateInstance = $this->prepareTemplateInstance($applicationInstance);

diff --git a/framework/main/classes/commands/html/class_HtmlLoginAreaCommand.php b/framework/main/classes/commands/html/class_HtmlLoginAreaCommand.php
index 728fcddb9e7dd890c339c6b1ee1e9dc6bc413d27..dbbd45185249229c45b1269f440e46836069aa63 100644 (file)
--- a/framework/main/classes/commands/html/class_HtmlLoginAreaCommand.php
+++ b/framework/main/classes/commands/html/class_HtmlLoginAreaCommand.php
@@ -8,7 +8,7 @@ use Org\Mxchange\CoreFramework\Command\BaseCommand;
 use Org\Mxchange\CoreFramework\Command\Commandable;
 use Org\Mxchange\CoreFramework\Controller\Controller;
 use Org\Mxchange\CoreFramework\Factory\ObjectFactory;
-use Org\Mxchange\CoreFramework\Registry\Registry;
+use Org\Mxchange\CoreFramework\Registry\GenericRegistry;
 use Org\Mxchange\CoreFramework\Request\Requestable;
 use Org\Mxchange\CoreFramework\Resolver\Command\CommandResolver;
 use Org\Mxchange\CoreFramework\Response\Responseable;
@@ -18,11 +18,7 @@ use Org\Mxchange\CoreFramework\Response\Responseable;
  *
  * @author             Roland Haeder <webmaster@shipsimu.org>
  * @version            0.0.0
-<<<<<<< HEAD:framework/main/classes/commands/html/class_HtmlLoginAreaCommand.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/commands/html/class_HtmlLoginAreaCommand.php
  * @license            GNU GPL 3.0 or any newer version
  * @link               http://www.shipsimu.org
  *
@@ -93,7 +89,7 @@ class HtmlLoginAreaCommand extends BaseCommand implements Commandable {
         */
        public function execute (Requestable $requestInstance, Responseable $responseInstance) {
                // Get the action instance from registry
-               $actionInstance = Registry::getRegistry()->getInstance('action');
+               $actionInstance = GenericRegistry::getRegistry()->getInstance('action');
 
                // Do we have an action here?
                if ($actionInstance instanceof PerformableAction) {
@@ -102,7 +98,7 @@ class HtmlLoginAreaCommand extends BaseCommand implements Commandable {
                } // END - if
 
                // Get the application instance
-               $applicationInstance = Registry::getRegistry()->getInstance('app');
+               $applicationInstance = GenericRegistry::getRegistry()->getInstance('app');
 
                // Prepare a template instance
                $templateInstance = $this->prepareTemplateInstance($applicationInstance);
@@ -183,7 +179,7 @@ class HtmlLoginAreaCommand extends BaseCommand implements Commandable {
                $actionInstance = NULL;
 
                // Get registry
-               $registryInstance = Registry::getRegistry();
+               $registryInstance = GenericRegistry::getRegistry();
 
                // Get our application instance from the registry
                $applicationInstance = $registryInstance->getInstance('application');
@@ -201,7 +197,7 @@ class HtmlLoginAreaCommand extends BaseCommand implements Commandable {
                } // END - if
 
                // Get application instance
-               $applicationInstance = Registry::getRegistry()->getInstance('app');
+               $applicationInstance = GenericRegistry::getRegistry()->getInstance('app');
 
                // Get a resolver
                $actionResolver = HtmlActionResolver::createHtmlActionResolver($this->actionName, $applicationInstance);

diff --git a/framework/main/classes/commands/html/class_HtmlLoginCommand.php b/framework/main/classes/commands/html/class_HtmlLoginCommand.php
index b70067303e9b626878d9dbc139a39706870d53e7..4b317f30acdd0f3a83fc954e77112526c07d3892 100644 (file)
--- a/framework/main/classes/commands/html/class_HtmlLoginCommand.php
+++ b/framework/main/classes/commands/html/class_HtmlLoginCommand.php
@@ -7,7 +7,7 @@ use Org\Mxchange\CoreFramework\Command\BaseCommand;
 use Org\Mxchange\CoreFramework\Command\Commandable;
 use Org\Mxchange\CoreFramework\Controller\Controller;
 use Org\Mxchange\CoreFramework\Factory\ObjectFactory;
-use Org\Mxchange\CoreFramework\Registry\Registry;
+use Org\Mxchange\CoreFramework\Registry\GenericRegistry;
 use Org\Mxchange\CoreFramework\Request\Requestable;
 use Org\Mxchange\CoreFramework\Resolver\Command\CommandResolver;
 use Org\Mxchange\CoreFramework\Response\Responseable;
@@ -17,11 +17,7 @@ use Org\Mxchange\CoreFramework\Response\Responseable;
  *
  * @author             Roland Haeder <webmaster@shipsimu.org>
  * @version            0.0.0
-<<<<<<< HEAD:framework/main/classes/commands/html/class_HtmlLoginCommand.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/commands/html/class_HtmlLoginCommand.php
  * @license            GNU GPL 3.0 or any newer version
  * @link               http://www.shipsimu.org
  *
@@ -78,7 +74,7 @@ class HtmlLoginCommand extends BaseCommand implements Commandable {
                Registry::getRegistry()->addInstance('extra', $this);
 
                // Get the application instance
-               $applicationInstance = Registry::getRegistry()->getInstance('app');
+               $applicationInstance = GenericRegistry::getRegistry()->getInstance('app');
 
                // Prepare a template instance
                $templateInstance = $this->prepareTemplateInstance($applicationInstance);

diff --git a/framework/main/classes/commands/html/class_HtmlLoginFailedCommand.php b/framework/main/classes/commands/html/class_HtmlLoginFailedCommand.php
index 6b299c359a6ffb3c8049744f96307af39f1b85d4..47e2c72541f6839a49d7978db05828e7d8f4d2fd 100644 (file)
--- a/framework/main/classes/commands/html/class_HtmlLoginFailedCommand.php
+++ b/framework/main/classes/commands/html/class_HtmlLoginFailedCommand.php
@@ -7,7 +7,7 @@ use Org\Mxchange\CoreFramework\Command\BaseCommand;
 use Org\Mxchange\CoreFramework\Command\Commandable;
 use Org\Mxchange\CoreFramework\Controller\Controller;
 use Org\Mxchange\CoreFramework\Factory\ObjectFactory;
-use Org\Mxchange\CoreFramework\Registry\Registry;
+use Org\Mxchange\CoreFramework\Registry\GenericRegistry;
 use Org\Mxchange\CoreFramework\Request\Requestable;
 use Org\Mxchange\CoreFramework\Resolver\Command\CommandResolver;
 use Org\Mxchange\CoreFramework\Response\Responseable;
@@ -17,11 +17,7 @@ use Org\Mxchange\CoreFramework\Response\Responseable;
  *
  * @author             Roland Haeder <webmaster@shipsimu.org>
  * @version            0.0.0
-<<<<<<< HEAD:framework/main/classes/commands/html/class_HtmlLoginFailedCommand.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/commands/html/class_HtmlLoginFailedCommand.php
  * @license            GNU GPL 3.0 or any newer version
  * @link               http://www.shipsimu.org
  *
@@ -75,7 +71,7 @@ class HtmlLoginFailedCommand extends BaseCommand implements Commandable {
         */
        public function execute (Requestable $requestInstance, Responseable $responseInstance) {
                // Get the application instance
-               $applicationInstance = Registry::getRegistry()->getInstance('app');
+               $applicationInstance = GenericRegistry::getRegistry()->getInstance('app');
 
                // Prepare a template instance
                $templateInstance = $this->prepareTemplateInstance($applicationInstance);

diff --git a/framework/main/classes/commands/html/class_HtmlLogoutCommand.php b/framework/main/classes/commands/html/class_HtmlLogoutCommand.php
index b8471401e2b320dc6662d1e41366389a0cbcb7ce..38624b10ce2dd08398ae68f65899c41ea57c4599 100644 (file)
--- a/framework/main/classes/commands/html/class_HtmlLogoutCommand.php
+++ b/framework/main/classes/commands/html/class_HtmlLogoutCommand.php
@@ -7,7 +7,7 @@ use Org\Mxchange\CoreFramework\Command\BaseCommand;
 use Org\Mxchange\CoreFramework\Command\Commandable;
 use Org\Mxchange\CoreFramework\Controller\Controller;
 use Org\Mxchange\CoreFramework\Factory\ObjectFactory;
-use Org\Mxchange\CoreFramework\Registry\Registry;
+use Org\Mxchange\CoreFramework\Registry\GenericRegistry;
 use Org\Mxchange\CoreFramework\Request\Requestable;
 use Org\Mxchange\CoreFramework\Resolver\Command\CommandResolver;
 use Org\Mxchange\CoreFramework\Response\Responseable;
@@ -17,11 +17,7 @@ use Org\Mxchange\CoreFramework\Response\Responseable;
  *
  * @author             Roland Haeder <webmaster@shipsimu.org>
  * @version            0.0.0
-<<<<<<< HEAD:framework/main/classes/commands/html/class_HtmlLogoutCommand.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/commands/html/class_HtmlLogoutCommand.php
  * @license            GNU GPL 3.0 or any newer version
  * @link               http://www.shipsimu.org
  *

diff --git a/framework/main/classes/commands/html/class_HtmlLogoutDoneCommand.php b/framework/main/classes/commands/html/class_HtmlLogoutDoneCommand.php
index 7a7a281d75a66debae7744d59d2168f919913400..120229f622b1c8e16dee09f0cc1df4d152eb530b 100644 (file)
--- a/framework/main/classes/commands/html/class_HtmlLogoutDoneCommand.php
+++ b/framework/main/classes/commands/html/class_HtmlLogoutDoneCommand.php
@@ -7,7 +7,7 @@ use Org\Mxchange\CoreFramework\Command\BaseCommand;
 use Org\Mxchange\CoreFramework\Command\Commandable;
 use Org\Mxchange\CoreFramework\Controller\Controller;
 use Org\Mxchange\CoreFramework\Factory\ObjectFactory;
-use Org\Mxchange\CoreFramework\Registry\Registry;
+use Org\Mxchange\CoreFramework\Registry\GenericRegistry;
 use Org\Mxchange\CoreFramework\Request\Requestable;
 use Org\Mxchange\CoreFramework\Resolver\Command\CommandResolver;
 use Org\Mxchange\CoreFramework\Response\Responseable;
@@ -17,11 +17,7 @@ use Org\Mxchange\CoreFramework\Response\Responseable;
  *
  * @author             Roland Haeder <webmaster@shipsimu.org>
  * @version            0.0.0
-<<<<<<< HEAD:framework/main/classes/commands/html/class_HtmlLogoutDoneCommand.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/commands/html/class_HtmlLogoutDoneCommand.php
  * @license            GNU GPL 3.0 or any newer version
  * @link               http://www.shipsimu.org
  *
@@ -75,7 +71,7 @@ class HtmlLogoutDoneCommand extends BaseCommand implements Commandable {
         */
        public function execute (Requestable $requestInstance, Responseable $responseInstance) {
                // Get the application instance
-               $applicationInstance = Registry::getRegistry()->getInstance('app');
+               $applicationInstance = GenericRegistry::getRegistry()->getInstance('app');
 
                // Prepare a template instance
                $templateInstance = $this->prepareTemplateInstance($applicationInstance);

diff --git a/framework/main/classes/commands/html/class_HtmlProblemCommand.php b/framework/main/classes/commands/html/class_HtmlProblemCommand.php
index 0abf7e2f91a5c618dc7b0fdf2cee7970097f8e6b..98f78fa43d76a22e8423e1895b97daec656ef421 100644 (file)
--- a/framework/main/classes/commands/html/class_HtmlProblemCommand.php
+++ b/framework/main/classes/commands/html/class_HtmlProblemCommand.php
@@ -6,7 +6,7 @@ namespace Org\Mxchange\CoreFramework\Command\Failed;
 use Org\Mxchange\CoreFramework\Command\BaseCommand;
 use Org\Mxchange\CoreFramework\Command\Commandable;
 use Org\Mxchange\CoreFramework\Controller\Controller;
-use Org\Mxchange\CoreFramework\Registry\Registry;
+use Org\Mxchange\CoreFramework\Registry\GenericRegistry;
 use Org\Mxchange\CoreFramework\Request\Requestable;
 use Org\Mxchange\CoreFramework\Resolver\Command\CommandResolver;
 use Org\Mxchange\CoreFramework\Response\Responseable;
@@ -16,11 +16,7 @@ use Org\Mxchange\CoreFramework\Response\Responseable;
  *
  * @author             Roland Haeder <webmaster@shipsimu.org>
  * @version            0.0.0
-<<<<<<< HEAD:framework/main/classes/commands/html/class_HtmlProblemCommand.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/commands/html/class_HtmlProblemCommand.php
  * @license            GNU GPL 3.0 or any newer version
  * @link               http://www.shipsimu.org
  *

diff --git a/framework/main/classes/commands/html/class_HtmlRegisterCommand.php b/framework/main/classes/commands/html/class_HtmlRegisterCommand.php
index 92c3efad400a5060f6ee1a3b613b4c5c2958f2e5..5fa9543f90ebedc7244ce05f4f6127f70bf65da1 100644 (file)
--- a/framework/main/classes/commands/html/class_HtmlRegisterCommand.php
+++ b/framework/main/classes/commands/html/class_HtmlRegisterCommand.php
@@ -7,7 +7,7 @@ use Org\Mxchange\CoreFramework\Command\BaseCommand;
 use Org\Mxchange\CoreFramework\Command\Commandable;
 use Org\Mxchange\CoreFramework\Controller\Controller;
 use Org\Mxchange\CoreFramework\Factory\ObjectFactory;
-use Org\Mxchange\CoreFramework\Registry\Registry;
+use Org\Mxchange\CoreFramework\Registry\GenericRegistry;
 use Org\Mxchange\CoreFramework\Request\Requestable;
 use Org\Mxchange\CoreFramework\Resolver\Command\CommandResolver;
 use Org\Mxchange\CoreFramework\Response\Responseable;
@@ -17,11 +17,7 @@ use Org\Mxchange\CoreFramework\Response\Responseable;
  *
  * @author             Roland Haeder <webmaster@shipsimu.org>
  * @version            0.0.0
-<<<<<<< HEAD:framework/main/classes/commands/html/class_HtmlRegisterCommand.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/commands/html/class_HtmlRegisterCommand.php
  * @license            GNU GPL 3.0 or any newer version
  * @link               http://www.shipsimu.org
  *
@@ -78,7 +74,7 @@ class HtmlRegisterCommand extends BaseCommand implements Commandable {
                Registry::getRegistry()->addInstance('extra', $this);
 
                // Get the application instance
-               $applicationInstance = Registry::getRegistry()->getInstance('app');
+               $applicationInstance = GenericRegistry::getRegistry()->getInstance('app');
 
                // Prepare a template instance
                $templateInstance = $this->prepareTemplateInstance($applicationInstance);

diff --git a/framework/main/classes/commands/html/class_HtmlResendLinkCommand.php b/framework/main/classes/commands/html/class_HtmlResendLinkCommand.php
index e4ea48aab23ff616dfb0da6de2c7b7c3a01398ba..f16c7fbc2dd3eba20cd365f999022463f3db238c 100644 (file)
--- a/framework/main/classes/commands/html/class_HtmlResendLinkCommand.php
+++ b/framework/main/classes/commands/html/class_HtmlResendLinkCommand.php
@@ -8,7 +8,7 @@ use Org\Mxchange\CoreFramework\Command\Commandable;
 use Org\Mxchange\CoreFramework\Controller\Controller;
 use Org\Mxchange\CoreFramework\Database\Frontend\User\UserDatabaseWrapper;
 use Org\Mxchange\CoreFramework\Factory\ObjectFactory;
-use Org\Mxchange\CoreFramework\Registry\Registry;
+use Org\Mxchange\CoreFramework\Registry\GenericRegistry;
 use Org\Mxchange\CoreFramework\Request\Requestable;
 use Org\Mxchange\CoreFramework\Resolver\Command\CommandResolver;
 use Org\Mxchange\CoreFramework\Response\Responseable;
@@ -18,11 +18,7 @@ use Org\Mxchange\CoreFramework\Response\Responseable;
  *
  * @author             Roland Haeder <webmaster@shipsimu.org>
  * @version            0.0.0
-<<<<<<< HEAD:framework/main/classes/commands/html/class_HtmlResendLinkCommand.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/commands/html/class_HtmlResendLinkCommand.php
  * @license            GNU GPL 3.0 or any newer version
  * @link               http://www.shipsimu.org
  *
@@ -76,10 +72,10 @@ class HtmlResendLinkCommand extends BaseCommand implements Commandable {
         */
        public function execute (Requestable $requestInstance, Responseable $responseInstance) {
                // Get user instance from registry
-               $userInstance = Registry::getRegistry()->getInstance('user');
+               $userInstance = GenericRegistry::getRegistry()->getInstance('user');
 
                // Get an application instance
-               $applicationInstance = Registry::getRegistry()->getInstance('app');
+               $applicationInstance = GenericRegistry::getRegistry()->getInstance('app');
 
                // Get a RNG instance (Random Number Generator)
                $rngInstance = ObjectFactory::createObjectByConfiguredName('rng_class');

diff --git a/framework/main/classes/commands/html/class_HtmlStatusCommand.php b/framework/main/classes/commands/html/class_HtmlStatusCommand.php
index 429e3719abb004fdd1485ba690bb2a2c4808c526..08167e293040c2091d9236367f06c1c59a619bb9 100644 (file)
--- a/framework/main/classes/commands/html/class_HtmlStatusCommand.php
+++ b/framework/main/classes/commands/html/class_HtmlStatusCommand.php
@@ -16,11 +16,7 @@ use Org\Mxchange\CoreFramework\Response\Responseable;
  *
  * @author             Roland Haeder <webmaster@shipsimu.org>
  * @version            0.0.0
-<<<<<<< HEAD:framework/main/classes/commands/html/class_HtmlStatusCommand.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/commands/html/class_HtmlStatusCommand.php
  * @license            GNU GPL 3.0 or any newer version
  * @link               http://www.shipsimu.org
  *
@@ -75,7 +71,7 @@ class HtmlStatusCommand extends BaseCommand implements Commandable {
         */
        public function execute (Requestable $requestInstance, Responseable $responseInstance) {
                // Get the application instance
-               $applicationInstance = Registry::getRegistry()->getInstance('app');
+               $applicationInstance = GenericRegistry::getRegistry()->getInstance('app');
 
                // Prepare a template instance
                $templateInstance = $this->prepareTemplateInstance($applicationInstance);

diff --git a/framework/main/classes/commands/image/class_ImageCodeCaptchaCommand.php b/framework/main/classes/commands/image/class_ImageCodeCaptchaCommand.php
index ef36945cc149e092ac9d0dd9076da4cb7f1d3ee0..34c1d00bfaba9c77055cdfa1a2bd182c0c6bda16 100644 (file)
--- a/framework/main/classes/commands/image/class_ImageCodeCaptchaCommand.php
+++ b/framework/main/classes/commands/image/class_ImageCodeCaptchaCommand.php
@@ -6,7 +6,7 @@ namespace Org\Mxchange\CoreFramework\Command\Captcha;
 use Org\Mxchange\CoreFramework\Command\BaseCommand;
 use Org\Mxchange\CoreFramework\Command\Commandable;
 use Org\Mxchange\CoreFramework\Controller\Controller;
-use Org\Mxchange\CoreFramework\Registry\Registry;
+use Org\Mxchange\CoreFramework\Registry\GenericRegistry;
 use Org\Mxchange\CoreFramework\Request\Requestable;
 use Org\Mxchange\CoreFramework\Resolver\Command\CommandResolver;
 use Org\Mxchange\CoreFramework\Response\Responseable;
@@ -16,11 +16,7 @@ use Org\Mxchange\CoreFramework\Response\Responseable;
  *
  * @author             Roland Haeder <webmaster@shipsimu.org>
  * @version            0.0.0
-<<<<<<< HEAD:framework/main/classes/commands/image/class_ImageCodeCaptchaCommand.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/commands/image/class_ImageCodeCaptchaCommand.php
  * @license            GNU GPL 3.0 or any newer version
  * @link               http://www.shipsimu.org
  *
@@ -77,7 +73,7 @@ class ImageCodeCaptchaCommand extends BaseCommand implements Commandable {
                $decryptedCode = $requestInstance->getRequestElement('decrypted');
 
                // Get the application instance
-               $applicationInstance = Registry::getRegistry()->getInstance('app');
+               $applicationInstance = GenericRegistry::getRegistry()->getInstance('app');
 
                // Prepare a template instance
                $templateInstance = $this->prepareTemplateInstance($applicationInstance);

diff --git a/framework/main/classes/compressor/class_Bzip2Compressor.php b/framework/main/classes/compressor/class_Bzip2Compressor.php
index 71d35e267588e7952f5a87f11fa30f956383828b..bf19554a77b538e390e3d1df3274ee7043a9c772 100644 (file)
--- a/framework/main/classes/compressor/class_Bzip2Compressor.php
+++ b/framework/main/classes/compressor/class_Bzip2Compressor.php
@@ -11,11 +11,7 @@ use Org\Mxchange\CoreFramework\Object\BaseFrameworkSystem;
  *
  * @author             Roland Haeder <webmaster@shipsimu.org>
  * @version            0.0.0
-<<<<<<< HEAD:framework/main/classes/compressor/class_Bzip2Compressor.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/compressor/class_Bzip2Compressor.php
  * @license            GNU GPL 3.0 or any newer version
  * @link               http://www.shipsimu.org
  *

diff --git a/framework/main/classes/compressor/class_GzipCompressor.php b/framework/main/classes/compressor/class_GzipCompressor.php
index 41792611112f174447b802c1818393d86d782b40..3163c9e70596d1bd67b2826c8d8ae9879b7fdabf 100644 (file)
--- a/framework/main/classes/compressor/class_GzipCompressor.php
+++ b/framework/main/classes/compressor/class_GzipCompressor.php
@@ -11,11 +11,7 @@ use Org\Mxchange\CoreFramework\Object\BaseFrameworkSystem;
  *
  * @author             Roland Haeder <webmaster@shipsimu.org>
  * @version            0.0.0
-<<<<<<< HEAD:framework/main/classes/compressor/class_GzipCompressor.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/compressor/class_GzipCompressor.php
  * @license            GNU GPL 3.0 or any newer version
  * @link               http://www.shipsimu.org
  *

diff --git a/framework/main/classes/compressor/class_NullCompressor.php b/framework/main/classes/compressor/class_NullCompressor.php
index 50722313b15b231a871d81a0a4ac822ffe18f96e..3bc22cc8049fdb735285dd2f8fb2607f7aee7b1f 100644 (file)
--- a/framework/main/classes/compressor/class_NullCompressor.php
+++ b/framework/main/classes/compressor/class_NullCompressor.php
@@ -11,11 +11,7 @@ use Org\Mxchange\CoreFramework\Object\BaseFrameworkSystem;
  *
  * @author             Roland Haeder <webmaster@shipsimu.org>
  * @version            0.0.0
-<<<<<<< HEAD:framework/main/classes/compressor/class_NullCompressor.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/compressor/class_NullCompressor.php
  * @license            GNU GPL 3.0 or any newer version
  * @link               http://www.shipsimu.org
  *

diff --git a/framework/main/classes/compressor/class_ZlibCompressor.php b/framework/main/classes/compressor/class_ZlibCompressor.php
index 690668e2a06ddb63aaa4d20e3382c280cf018896..8992b4c30cac29d1485325d630a5ee8b043b7bda 100644 (file)
--- a/framework/main/classes/compressor/class_ZlibCompressor.php
+++ b/framework/main/classes/compressor/class_ZlibCompressor.php
@@ -11,11 +11,7 @@ use Org\Mxchange\CoreFramework\Object\BaseFrameworkSystem;
  *
  * @author             Roland Haeder <webmaster@shipsimu.org>
  * @version            0.0.0
-<<<<<<< HEAD:framework/main/classes/compressor/class_ZlibCompressor.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/compressor/class_ZlibCompressor.php
  * @license            GNU GPL 3.0 or any newer version
  * @link               http://www.shipsimu.org
  *

diff --git a/framework/main/classes/container/class_ b/framework/main/classes/container/class_
index 82fd673852a65de7a55971a85104217e7a765c9c..c3bf332e7f00ba27551e4f14b59633d68cd264f0 100644 (file)
--- a/framework/main/classes/container/class_
+++ b/framework/main/classes/container/class_
@@ -11,11 +11,7 @@ use Org\Mxchange\CoreFramework\Registry\Registerable;
  *
  * @author             Roland Haeder <webmaster@ship-simu.org>
  * @version            0.0.0
-<<<<<<< HEAD:framework/main/classes/container/class_
  * @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/container/class_
  * @license            GNU GPL 3.0 or any newer version
  * @link               http://www.ship-simu.org
  *

diff --git a/framework/main/classes/container/class_BaseContainer.php b/framework/main/classes/container/class_BaseContainer.php
index 4b9da3829c31dcec3fabd1043e1674a526ceb041..b55c5b4d752a8ca85d84283f850a8c43b3f16c74 100644 (file)
--- a/framework/main/classes/container/class_BaseContainer.php
+++ b/framework/main/classes/container/class_BaseContainer.php
@@ -10,11 +10,7 @@ use Org\Mxchange\CoreFramework\Object\BaseFrameworkSystem;
  *
  * @author             Roland Haeder <webmaster@shipsimu.org>
  * @version            0.0.0
-<<<<<<< HEAD:framework/main/classes/container/class_BaseContainer.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/container/class_BaseContainer.php
  * @license            GNU GPL 3.0 or any newer version
  * @link               http://www.shipsimu.org
  *

diff --git a/framework/main/classes/controller/class_ b/framework/main/classes/controller/class_
index 75be2d3de031a090f70a89e62592bd6a63110ed2..79c7a5963c96f427db89342761ebd6110ba80b07 100644 (file)
--- a/framework/main/classes/controller/class_
+++ b/framework/main/classes/controller/class_
@@ -4,11 +4,7 @@
  *
  * @author             Roland Haeder <webmaster@ship-simu.org>
  * @version            0.0.0
-<<<<<<< HEAD:framework/main/classes/controller/class_
  * @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/controller/class_
  * @license            GNU GPL 3.0 or any newer version
  * @link               http://www.ship-simu.org
  *

diff --git a/framework/main/classes/controller/class_BaseController.php b/framework/main/classes/controller/class_BaseController.php
index 729f51e1dd1108fb6dd7ac9ed00a4ba52c6a5c31..e32b6781f30924f98df7a4eb442413cadc3d4f79 100644 (file)
--- a/framework/main/classes/controller/class_BaseController.php
+++ b/framework/main/classes/controller/class_BaseController.php
@@ -7,7 +7,7 @@ use Org\Mxchange\CoreFramework\Chain\Filter\InvalidFilterChainException;
 use Org\Mxchange\CoreFramework\Factory\ObjectFactory;
 use Org\Mxchange\CoreFramework\Filter\Filterable;
 use Org\Mxchange\CoreFramework\Object\BaseFrameworkSystem;
-use Org\Mxchange\CoreFramework\Registry\Registry;
+use Org\Mxchange\CoreFramework\Registry\GenericRegistry;
 use Org\Mxchange\CoreFramework\Registry\Registerable;
 use Org\Mxchange\CoreFramework\Request\Requestable;
 use Org\Mxchange\CoreFramework\Response\Responseable;
@@ -19,11 +19,7 @@ use Org\Mxchange\CoreFramework\Response\Responseable;
  *
  * @author             Roland Haeder <webmaster@shipsimu.org>
  * @version            0.0.0
-<<<<<<< HEAD:framework/main/classes/controller/class_BaseController.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/controller/class_BaseController.php
  * @license            GNU GPL 3.0 or any newer version
  * @link               http://www.shipsimu.org
  *

diff --git a/framework/main/classes/controller/console/class_ConsoleDefaultController.php b/framework/main/classes/controller/console/class_ConsoleDefaultController.php
index dc0918784951a236d08a3f6c6af6dede1897ebdd..4157c72a167f8ff4c2c0b5b2579127b6faa2641f 100644 (file)
--- a/framework/main/classes/controller/console/class_ConsoleDefaultController.php
+++ b/framework/main/classes/controller/console/class_ConsoleDefaultController.php
@@ -13,11 +13,7 @@ use Org\Mxchange\CoreFramework\Response\Responseable;
  *
  * @author             Roland Haeder <webmaster@shipsimu.org>
  * @version            0.0.0
-<<<<<<< HEAD:framework/main/classes/controller/console/class_ConsoleDefaultController.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/controller/console/class_ConsoleDefaultController.php
  * @license            GNU GPL 3.0 or any newer version
  * @link               http://www.shipsimu.org
  * @todo               This controller shall still provide some headlines for sidebars

diff --git a/framework/main/classes/controller/console/class_ConsoleDefaultNewsController.php b/framework/main/classes/controller/console/class_ConsoleDefaultNewsController.php
index adc8ca8e0bb69aa56dc017560b5771f52335b700..c8870c8b553c3e45bd0ce71b8b616db62504ad6f 100644 (file)
--- a/framework/main/classes/controller/console/class_ConsoleDefaultNewsController.php
+++ b/framework/main/classes/controller/console/class_ConsoleDefaultNewsController.php
@@ -15,11 +15,7 @@ use Org\Mxchange\CoreFramework\Response\Responseable;
  *
  * @author             Roland Haeder <webmaster@shipsimu.org>
  * @version            0.0.0
-<<<<<<< HEAD:framework/main/classes/controller/console/class_ConsoleDefaultNewsController.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/controller/console/class_ConsoleDefaultNewsController.php
  * @license            GNU GPL 3.0 or any newer version
  * @link               http://www.shipsimu.org
  *

diff --git a/framework/main/classes/controller/html/class_Html b/framework/main/classes/controller/html/class_Html
index 06bc37cf7a49254dfb74ed100efadfe1a881370b..dbecaee8d69c8d13317d14f87b8a045bad0aea63 100644 (file)
--- a/framework/main/classes/controller/html/class_Html
+++ b/framework/main/classes/controller/html/class_Html
@@ -15,11 +15,7 @@ use Org\Mxchange\CoreFramework\Response\Responseable;
  *
  * @author             Roland Haeder <webmaster@ship-simu.org>
  * @version            0.0.0
-<<<<<<< HEAD:framework/main/classes/controller/html/class_Html
  * @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/controller/html/class_Html
  * @license            GNU GPL 3.0 or any newer version
  * @link               http://www.ship-simu.org
  *

diff --git a/framework/main/classes/controller/html/class_HtmlConfirmController.php b/framework/main/classes/controller/html/class_HtmlConfirmController.php
index c9d5c184d0df8dca3924e2c0fccce2f96d5f5e82..fc82cccb99078a78a18137f437c4d85db562d57f 100644 (file)
--- a/framework/main/classes/controller/html/class_HtmlConfirmController.php
+++ b/framework/main/classes/controller/html/class_HtmlConfirmController.php
@@ -15,11 +15,7 @@ use Org\Mxchange\CoreFramework\Response\Responseable;
  *
  * @author             Roland Haeder <webmaster@shipsimu.org>
  * @version            0.0.0
-<<<<<<< HEAD:framework/main/classes/controller/html/class_HtmlConfirmController.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/controller/html/class_HtmlConfirmController.php
  * @license            GNU GPL 3.0 or any newer version
  * @link               http://www.shipsimu.org
  *

diff --git a/framework/main/classes/controller/html/class_HtmlDefaultController.php b/framework/main/classes/controller/html/class_HtmlDefaultController.php
index 55f6b1a7b01df1953009249b0164808db0fdb4ff..c2e579daa510bc97da68a385aa7153a6751f81bf 100644 (file)
--- a/framework/main/classes/controller/html/class_HtmlDefaultController.php
+++ b/framework/main/classes/controller/html/class_HtmlDefaultController.php
@@ -14,11 +14,7 @@ use Org\Mxchange\CoreFramework\Response\Responseable;
  *
  * @author             Roland Haeder <webmaster@shipsimu.org>
  * @version            0.0.0
-<<<<<<< HEAD:framework/main/classes/controller/html/class_HtmlDefaultController.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/controller/html/class_HtmlDefaultController.php
  * @license            GNU GPL 3.0 or any newer version
  * @link               http://www.shipsimu.org
  * @todo               This controller shall still provide some headlines for sidebars

diff --git a/framework/main/classes/controller/html/class_HtmlDefaultNewsController.php b/framework/main/classes/controller/html/class_HtmlDefaultNewsController.php
index 6806dd898bfa8759cfbd0557845de10f6a34c5d4..96cdf2d32c52bd6f38347212fcf5abf46fdf90b6 100644 (file)
--- a/framework/main/classes/controller/html/class_HtmlDefaultNewsController.php
+++ b/framework/main/classes/controller/html/class_HtmlDefaultNewsController.php
@@ -15,11 +15,7 @@ use Org\Mxchange\CoreFramework\Response\Responseable;
  *
  * @author             Roland Haeder <webmaster@shipsimu.org>
  * @version            0.0.0
-<<<<<<< HEAD:framework/main/classes/controller/html/class_HtmlDefaultNewsController.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/controller/html/class_HtmlDefaultNewsController.php
  * @license            GNU GPL 3.0 or any newer version
  * @link               http://www.shipsimu.org
  *

diff --git a/framework/main/classes/controller/html/class_HtmlLoginController.php b/framework/main/classes/controller/html/class_HtmlLoginController.php
index 5170d4ca9e75cbb64dc2564a8aa96222660f2a30..d643b9dd60d19c33f43ffd267d7e58894c2c906f 100644 (file)
--- a/framework/main/classes/controller/html/class_HtmlLoginController.php
+++ b/framework/main/classes/controller/html/class_HtmlLoginController.php
@@ -15,11 +15,7 @@ use Org\Mxchange\CoreFramework\Response\Responseable;
  *
  * @author             Roland Haeder <webmaster@shipsimu.org>
  * @version            0.0.0
-<<<<<<< HEAD:framework/main/classes/controller/html/class_HtmlLoginController.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/controller/html/class_HtmlLoginController.php
  * @license            GNU GPL 3.0 or any newer version
  * @link               http://www.shipsimu.org
  *

diff --git a/framework/main/classes/controller/html/class_HtmlLoginFailedController.php b/framework/main/classes/controller/html/class_HtmlLoginFailedController.php
index 6b9419676ec13322f97dbdade3326706a98256bd..696f3b1ddaf98a091eeff71648eae4b3ccc616ac 100644 (file)
--- a/framework/main/classes/controller/html/class_HtmlLoginFailedController.php
+++ b/framework/main/classes/controller/html/class_HtmlLoginFailedController.php
@@ -14,11 +14,7 @@ use Org\Mxchange\CoreFramework\Response\Responseable;
  *
  * @author             Roland Haeder <webmaster@shipsimu.org>
  * @version            0.0.0
-<<<<<<< HEAD:framework/main/classes/controller/html/class_HtmlLoginFailedController.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/controller/html/class_HtmlLoginFailedController.php
  * @license            GNU GPL 3.0 or any newer version
  * @link               http://www.shipsimu.org
  *

diff --git a/framework/main/classes/controller/html/class_HtmlLogoutController.php b/framework/main/classes/controller/html/class_HtmlLogoutController.php
index 4d2c7822665b46a3fafd06d018621a9615326c75..59399733aba28f79995533bf8646dac4969322e9 100644 (file)
--- a/framework/main/classes/controller/html/class_HtmlLogoutController.php
+++ b/framework/main/classes/controller/html/class_HtmlLogoutController.php
@@ -15,11 +15,7 @@ use Org\Mxchange\CoreFramework\Response\Responseable;
  *
  * @author             Roland Haeder <webmaster@shipsimu.org>
  * @version            0.0.0
-<<<<<<< HEAD:framework/main/classes/controller/html/class_HtmlLogoutController.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/controller/html/class_HtmlLogoutController.php
  * @license            GNU GPL 3.0 or any newer version
  * @link               http://www.shipsimu.org
  * @todo               This controller shall still provide some headlines for sidebars

diff --git a/framework/main/classes/controller/html/class_HtmlLogoutDoneController.php b/framework/main/classes/controller/html/class_HtmlLogoutDoneController.php
index f906a76cb8ac35621ab6b6569be99b18620d3be5..484a5bdcb482a2f8dc8f87507646e540d0c4ba93 100644 (file)
--- a/framework/main/classes/controller/html/class_HtmlLogoutDoneController.php
+++ b/framework/main/classes/controller/html/class_HtmlLogoutDoneController.php
@@ -14,11 +14,7 @@ use Org\Mxchange\CoreFramework\Response\Responseable;
  *
  * @author             Roland Haeder <webmaster@shipsimu.org>
  * @version            0.0.0
-<<<<<<< HEAD:framework/main/classes/controller/html/class_HtmlLogoutDoneController.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/controller/html/class_HtmlLogoutDoneController.php
  * @license            GNU GPL 3.0 or any newer version
  * @link               http://www.shipsimu.org
  *

diff --git a/framework/main/classes/controller/html/class_HtmlRegisterController.php b/framework/main/classes/controller/html/class_HtmlRegisterController.php
index 64d289a8e315736bb6e94f5442856a893615d37f..6f2a36f13ca1037479b5a284ab51857a6b33c75c 100644 (file)
--- a/framework/main/classes/controller/html/class_HtmlRegisterController.php
+++ b/framework/main/classes/controller/html/class_HtmlRegisterController.php
@@ -14,11 +14,7 @@ use Org\Mxchange\CoreFramework\Response\Responseable;
  *
  * @author             Roland Haeder <webmaster@shipsimu.org>
  * @version            0.0.0
-<<<<<<< HEAD:framework/main/classes/controller/html/class_HtmlRegisterController.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/controller/html/class_HtmlRegisterController.php
  * @license            GNU GPL 3.0 or any newer version
  * @link               http://www.shipsimu.org
  *

diff --git a/framework/main/classes/controller/html/class_HtmlStatusController.php b/framework/main/classes/controller/html/class_HtmlStatusController.php
index 9b82d4cfb37d5642c77e4fea3cfea10c47d245c0..eb5c5ab61d747b94cceb997c9464984a230d96c2 100644 (file)
--- a/framework/main/classes/controller/html/class_HtmlStatusController.php
+++ b/framework/main/classes/controller/html/class_HtmlStatusController.php
@@ -14,11 +14,7 @@ use Org\Mxchange\CoreFramework\Response\Responseable;
  *
  * @author             Roland Haeder <webmaster@shipsimu.org>
  * @version            0.0.0
-<<<<<<< HEAD:framework/main/classes/controller/html/class_HtmlStatusController.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/controller/html/class_HtmlStatusController.php
  * @license            GNU GPL 3.0 or any newer version
  * @link               http://www.shipsimu.org
  * @todo               This controller shall still provide some headlines for sidebars

diff --git a/framework/main/classes/controller/html/form/class_HtmlDoFormController.php b/framework/main/classes/controller/html/form/class_HtmlDoFormController.php
index f4a4479cd4fd513982fd3ab1b5ee16c61e904a71..fad03b89a49de33a714f21342d9dc72ec4a87480 100644 (file)
--- a/framework/main/classes/controller/html/form/class_HtmlDoFormController.php
+++ b/framework/main/classes/controller/html/form/class_HtmlDoFormController.php
@@ -14,11 +14,7 @@ use Org\Mxchange\CoreFramework\Response\Responseable;
  *
  * @author             Roland Haeder <webmaster@shipsimu.org>
  * @version            0.0.0
-<<<<<<< HEAD:framework/main/classes/controller/html/form/class_HtmlDoFormController.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/controller/html/form/class_HtmlDoFormController.php
  * @license            GNU GPL 3.0 or any newer version
  * @link               http://www.shipsimu.org
  *

diff --git a/framework/main/classes/controller/html/login/class_HtmlLoginAreaController.php b/framework/main/classes/controller/html/login/class_HtmlLoginAreaController.php
index 761ab3869133ecd5d68a63b2bd6a02b3e44602a4..9466de757337d90b2be31db944f490e5e7ff1885 100644 (file)
--- a/framework/main/classes/controller/html/login/class_HtmlLoginAreaController.php
+++ b/framework/main/classes/controller/html/login/class_HtmlLoginAreaController.php
@@ -15,11 +15,7 @@ use Org\Mxchange\CoreFramework\Response\Responseable;
  *
  * @author             Roland Haeder <webmaster@shipsimu.org>
  * @version            0.0.0
-<<<<<<< HEAD:framework/main/classes/controller/html/login/class_HtmlLoginAreaController.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/controller/html/login/class_HtmlLoginAreaController.php
  * @license            GNU GPL 3.0 or any newer version
  * @link               http://www.shipsimu.org
  *

diff --git a/framework/main/classes/controller/image/captcha/class_ImageCodeCaptchaController.php b/framework/main/classes/controller/image/captcha/class_ImageCodeCaptchaController.php
index cb98da0142ede2d651ebffca2e646ce1b5230f5c..522aef85ae68f71b93d4fedc2168da7f9716163e 100644 (file)
--- a/framework/main/classes/controller/image/captcha/class_ImageCodeCaptchaController.php
+++ b/framework/main/classes/controller/image/captcha/class_ImageCodeCaptchaController.php
@@ -15,11 +15,7 @@ use Org\Mxchange\CoreFramework\Response\Responseable;
  *
  * @author             Roland Haeder <webmaster@shipsimu.org>
  * @version            0.0.0
-<<<<<<< HEAD:framework/main/classes/controller/image/captcha/class_ImageCodeCaptchaController.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/controller/image/captcha/class_ImageCodeCaptchaController.php
  * @license            GNU GPL 3.0 or any newer version
  * @link               http://www.shipsimu.org
  *

diff --git a/framework/main/classes/controller/image/class_ImageDefaultController.php b/framework/main/classes/controller/image/class_ImageDefaultController.php
index 1178684f0256fe04cdbb4289807f66141de236ef..7dc1bbda8a99c4c3a59d35aad5f4d3a362a5bd85 100644 (file)
--- a/framework/main/classes/controller/image/class_ImageDefaultController.php
+++ b/framework/main/classes/controller/image/class_ImageDefaultController.php
@@ -14,11 +14,7 @@ use Org\Mxchange\CoreFramework\Response\Responseable;
  *
  * @author             Roland Haeder <webmaster@shipsimu.org>
  * @version            0.0.0
-<<<<<<< HEAD:framework/main/classes/controller/image/class_ImageDefaultController.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/controller/image/class_ImageDefaultController.php
  * @license            GNU GPL 3.0 or any newer version
  * @link               http://www.shipsimu.org
  *

diff --git a/framework/main/classes/criteria/class_BaseCriteria.php b/framework/main/classes/criteria/class_BaseCriteria.php
index 4452760a6f3bf58b513478c358cfe5d8dda324a8..e9f9a853adf7084d8979c983e60dca7a8130e558 100644 (file)
--- a/framework/main/classes/criteria/class_BaseCriteria.php
+++ b/framework/main/classes/criteria/class_BaseCriteria.php
@@ -11,11 +11,7 @@ use Org\Mxchange\CoreFramework\Object\BaseFrameworkSystem;
  *
  * @author             Roland Haeder <webmaster@shipsimu.org>
  * @version            0.0.0
-<<<<<<< HEAD:framework/main/classes/criteria/class_BaseCriteria.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/criteria/class_BaseCriteria.php
  * @license            GNU GPL 3.0 or any newer version
  * @link               http://www.shipsimu.org
  *

diff --git a/framework/main/classes/criteria/dataset/class_DataSetCriteria.php b/framework/main/classes/criteria/dataset/class_DataSetCriteria.php
index ed36dd361417912e44808cc2b2cc268bc32a3956..f443623e870435c120263aa93c5feafc9e5d8e85 100644 (file)
--- a/framework/main/classes/criteria/dataset/class_DataSetCriteria.php
+++ b/framework/main/classes/criteria/dataset/class_DataSetCriteria.php
@@ -12,11 +12,7 @@ use Org\Mxchange\CoreFramework\EntryPoint\ApplicationEntryPoint;
  *
  * @author             Roland Haeder <webmaster@shipsimu.org>
  * @version            0.0.0
-<<<<<<< HEAD:framework/main/classes/criteria/dataset/class_DataSetCriteria.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/criteria/dataset/class_DataSetCriteria.php
  * @license            GNU GPL 3.0 or any newer version
  * @link               http://www.shipsimu.org
  *

diff --git a/framework/main/classes/criteria/search/class_SearchCriteria.php b/framework/main/classes/criteria/search/class_SearchCriteria.php
index db6a25268897d7a020739f7986a268c1f0fa3b56..7ab52f40c62e8444980cc5fe4bfb5f53cde22513 100644 (file)
--- a/framework/main/classes/criteria/search/class_SearchCriteria.php
+++ b/framework/main/classes/criteria/search/class_SearchCriteria.php
@@ -13,11 +13,7 @@ use Org\Mxchange\CoreFramework\Criteria\Local\LocalSearchCriteria;
  *
  * @author             Roland Haeder <webmaster@shipsimu.org>
  * @version            0.0.0
-<<<<<<< HEAD:framework/main/classes/criteria/search/class_SearchCriteria.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/criteria/search/class_SearchCriteria.php
  * @license            GNU GPL 3.0 or any newer version
  * @link               http://www.shipsimu.org
  *

diff --git a/framework/main/classes/criteria/update/class_UpdateCriteria.php b/framework/main/classes/criteria/update/class_UpdateCriteria.php
index cec42687d8ec015f4642fd0afa12fd0b314ad76e..1d9d1e9515a9a48afd55008611ea47819f94cd02 100644 (file)
--- a/framework/main/classes/criteria/update/class_UpdateCriteria.php
+++ b/framework/main/classes/criteria/update/class_UpdateCriteria.php
@@ -13,11 +13,7 @@ use Org\Mxchange\CoreFramework\Criteria\Local\LocalUpdateCriteria;
  *
  * @author             Roland Haeder <webmaster@shipsimu.org>
  * @version            0.0.0
-<<<<<<< HEAD:framework/main/classes/criteria/update/class_UpdateCriteria.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/criteria/update/class_UpdateCriteria.php
  * @license            GNU GPL 3.0 or any newer version
  * @link               http://www.shipsimu.org
  *

diff --git a/framework/main/classes/crypto/class_CryptoHelper.php b/framework/main/classes/crypto/class_CryptoHelper.php
index 830c23cc52c660326a047c629c6e320567abcf90..1bf22a341543eae677c2a64549013fa942f18bb5 100644 (file)
--- a/framework/main/classes/crypto/class_CryptoHelper.php
+++ b/framework/main/classes/crypto/class_CryptoHelper.php
@@ -12,11 +12,7 @@ use Org\Mxchange\CoreFramework\Object\BaseFrameworkSystem;
  *
  * @author             Roland Haeder <webmaster@shipsimu.org>
  * @version            0.0.0
-<<<<<<< HEAD:framework/main/classes/crypto/class_CryptoHelper.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/crypto/class_CryptoHelper.php
  * @license            GNU GPL 3.0 or any newer version
  * @link               http://www.shipsimu.org
  *

diff --git a/framework/main/classes/database/backend/lfdb_legacy/class_CachedLocalFileDatabase.php b/framework/main/classes/database/backend/lfdb_legacy/class_CachedLocalFileDatabase.php
index 2933d57c0a2e0cde11d9fb1dd74869032c89852c..dd8c3356ac11711998cf4c78424d89d97acab73e 100644 (file)
--- a/framework/main/classes/database/backend/lfdb_legacy/class_CachedLocalFileDatabase.php
+++ b/framework/main/classes/database/backend/lfdb_legacy/class_CachedLocalFileDatabase.php
@@ -26,11 +26,7 @@ use \SplFileInfo;
  *
  * @author             Roland Haeder <webmaster@shipsimu.org>
  * @version            0.0.0
-<<<<<<< HEAD:framework/main/classes/database/backend/lfdb_legacy/class_CachedLocalFileDatabase.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/database/backend/class_CachedLocalFileDatabase.php
  * @license            GNU GPL 3.0 or any newer version
  * @link               http://www.shipsimu.org
  *

diff --git a/framework/main/classes/database/class_ b/framework/main/classes/database/class_
index 1a8bf5fdf28f56601f11cfe2c384c9113e13621c..1e6e7a3e2db648c5693573f3b94b92b47ecf6ad5 100644 (file)
--- a/framework/main/classes/database/class_
+++ b/framework/main/classes/database/class_
@@ -5,11 +5,7 @@
  * @see                        DatabaseBackendInterface - An interface for database backends
  * @author             Roland Haeder <webmaster@ship-simu.org>
  * @version            0.0.0
-<<<<<<< HEAD:framework/main/classes/database/class_
  * @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/database/class_
  * @license            GNU GPL 3.0 or any newer version
  * @link               http://www.ship-simu.org
  *

diff --git a/framework/main/classes/database/class_BaseDatabaseBackend.php b/framework/main/classes/database/class_BaseDatabaseBackend.php
index ad33fae184cb44648d5e78ab358f16ddb0301258..025a9879059997d12672390d1ae1673dbe4cd4c4 100644 (file)
--- a/framework/main/classes/database/class_BaseDatabaseBackend.php
+++ b/framework/main/classes/database/class_BaseDatabaseBackend.php
@@ -13,11 +13,7 @@ use Org\Mxchange\CoreFramework\Object\BaseFrameworkSystem;
  * @see                        DatabaseBackend - An interface for database backends
  * @author             Roland Haeder <webmaster@shipsimu.org>
  * @version            0.0.0
-<<<<<<< HEAD:framework/main/classes/database/class_BaseDatabaseBackend.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/database/class_BaseDatabaseBackend.php
  * @license            GNU GPL 3.0 or any newer version
  * @link               http://www.shipsimu.org
  *

diff --git a/framework/main/classes/database/class_BaseDatabaseResult.php b/framework/main/classes/database/class_BaseDatabaseResult.php
index 5a78394a9f77f59021879f0474b2de6982686c08..e0f9a950992580f575663c07f012cdb43c7ce4fa 100644 (file)
--- a/framework/main/classes/database/class_BaseDatabaseResult.php
+++ b/framework/main/classes/database/class_BaseDatabaseResult.php
@@ -11,11 +11,7 @@ use Org\Mxchange\CoreFramework\Object\BaseFrameworkSystem;
  * @see                        DatabaseBackend - An interface for database backends
  * @author             Roland Haeder <webmaster@ship-simu.org>
  * @version            0.0.0
-<<<<<<< HEAD:framework/main/classes/database/class_BaseDatabaseResult.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/database/class_BaseDatabaseResult.php
  * @license            GNU GPL 3.0 or any newer version
  * @link               http://www.ship-simu.org
  *

diff --git a/framework/main/classes/database/class_BaseDatabaseWrapper.php b/framework/main/classes/database/class_BaseDatabaseWrapper.php
index ea4f3402e737005b2214de8495f21fbb994521f0..d8b47b5825101ec018b7320db9368baa1f396653 100644 (file)
--- a/framework/main/classes/database/class_BaseDatabaseWrapper.php
+++ b/framework/main/classes/database/class_BaseDatabaseWrapper.php
@@ -14,11 +14,7 @@ use Org\Mxchange\CoreFramework\Object\BaseFrameworkSystem;
  *
  * @author             Roland Haeder <webmaster@shipsimu.org>
  * @version            0.0.0
-<<<<<<< HEAD:framework/main/classes/database/class_BaseDatabaseWrapper.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/database/class_BaseDatabaseWrapper.php
  * @license            GNU GPL 3.0 or any newer version
  * @link               http://www.shipsimu.org
  *

diff --git a/framework/main/classes/database/frontend/class_NewsDatabaseWrapper.php b/framework/main/classes/database/frontend/class_NewsDatabaseWrapper.php
index 20874d8a7be25d7706d6d1541b216ef456807b41..88b98cbd05cafc4fae01ed8ad8d2bf78d9c38740 100644 (file)
--- a/framework/main/classes/database/frontend/class_NewsDatabaseWrapper.php
+++ b/framework/main/classes/database/frontend/class_NewsDatabaseWrapper.php
@@ -11,11 +11,7 @@ use Org\Mxchange\CoreFramework\Registry\Registerable;
  *
  * @author             Roland Haeder <webmaster@shipsimu.org>
  * @version            0.0.0
-<<<<<<< HEAD:framework/main/classes/database/frontend/class_NewsDatabaseWrapper.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/database/frontend/class_NewsDatabaseWrapper.php
  * @license            GNU GPL 3.0 or any newer version
  * @link               http://www.shipsimu.org
  * @todo               Add missing own interface for public methods

diff --git a/framework/main/classes/database/frontend/class_PaymentsDatabaseWrapper.php b/framework/main/classes/database/frontend/class_PaymentsDatabaseWrapper.php
index afd49a54872f4f7e9cbe978f792c734778f65ea3..116e474d8ea96bb4a0b8de2487424a26c6b009af 100644 (file)
--- a/framework/main/classes/database/frontend/class_PaymentsDatabaseWrapper.php
+++ b/framework/main/classes/database/frontend/class_PaymentsDatabaseWrapper.php
@@ -11,11 +11,7 @@ use Org\Mxchange\CoreFramework\Registry\Registerable;
  *
  * @author             Roland Haeder <webmaster@shipsimu.org>
  * @version            0.0.0
-<<<<<<< HEAD:framework/main/classes/database/frontend/class_PaymentsDatabaseWrapper.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/database/frontend/class_PaymentsDatabaseWrapper.php
  * @license            GNU GPL 3.0 or any newer version
  * @link               http://www.shipsimu.org
  * @todo               Add missing own interface for public methods

diff --git a/framework/main/classes/database/frontend/class_UserDatabaseWrapper.php b/framework/main/classes/database/frontend/class_UserDatabaseWrapper.php
index 59e2c376b0247a7a9479b79521270b32033b863f..9ed16737a210e71fd2b7f2d5ea2f4f20ce1a0e9c 100644 (file)
--- a/framework/main/classes/database/frontend/class_UserDatabaseWrapper.php
+++ b/framework/main/classes/database/frontend/class_UserDatabaseWrapper.php
@@ -16,11 +16,7 @@ use Org\Mxchange\CoreFramework\Wrapper\Account\ManageableAccountWrapper;
  *
  * @author             Roland Haeder <webmaster@shipsimu.org>
  * @version            0.0.0
-<<<<<<< HEAD:framework/main/classes/database/frontend/class_UserDatabaseWrapper.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/database/frontend/class_UserDatabaseWrapper.php
  * @license            GNU GPL 3.0 or any newer version
  * @link               http://www.shipsimu.org
  *

diff --git a/framework/main/classes/database/frontend/class_UserPointsDatabaseWrapper.php b/framework/main/classes/database/frontend/class_UserPointsDatabaseWrapper.php
index affde5b06788c607d0427e271f292435b34a4656..d9242d8aa8b60e547b6da819533a2191726fc8ee 100644 (file)
--- a/framework/main/classes/database/frontend/class_UserPointsDatabaseWrapper.php
+++ b/framework/main/classes/database/frontend/class_UserPointsDatabaseWrapper.php
@@ -13,11 +13,7 @@ use Org\Mxchange\CoreFramework\Result\Update\UpdateableResult;
  *
  * @author             Roland Haeder <webmaster@shipsimu.org>
  * @version            0.0.0
-<<<<<<< HEAD:framework/main/classes/database/frontend/class_UserPointsDatabaseWrapper.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/database/frontend/class_UserPointsDatabaseWrapper.php
  * @license            GNU GPL 3.0 or any newer version
  * @link               http://www.shipsimu.org
  *

diff --git a/framework/main/classes/database/result/class_CachedDatabaseResult.php b/framework/main/classes/database/result/class_CachedDatabaseResult.php
index 4064f21a0ed2dc9a1c14f43db6a2664828aabc0f..6c36cdc04c6004f510e769dc7a7637c64386037f 100644 (file)
--- a/framework/main/classes/database/result/class_CachedDatabaseResult.php
+++ b/framework/main/classes/database/result/class_CachedDatabaseResult.php
@@ -19,11 +19,7 @@ use \SeekableIterator;
  *
  * @author             Roland Haeder <webmaster@shipsimu.org>
  * @version            0.0.0
-<<<<<<< HEAD:framework/main/classes/database/result/class_CachedDatabaseResult.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/database/result/class_CachedDatabaseResult.php
  * @license            GNU GPL 3.0 or any newer version
  * @link               http://www.shipsimu.org
  *

diff --git a/framework/main/classes/decorator/class_BaseDecorator.php b/framework/main/classes/decorator/class_BaseDecorator.php
index e8f5ae237f3fd7b77b11acd0c584b4df8e9d39d0..5ab0019cfeb84fee3d0d4441b5bd29fae286674d 100644 (file)
--- a/framework/main/classes/decorator/class_BaseDecorator.php
+++ b/framework/main/classes/decorator/class_BaseDecorator.php
@@ -10,11 +10,7 @@ use Org\Mxchange\CoreFramework\Object\BaseFrameworkSystem;
  *
  * @author             Roland Haeder <webmaster@shipsimu.org>
  * @version            0.0.0
-<<<<<<< HEAD:framework/main/classes/decorator/class_BaseDecorator.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/decorator/class_BaseDecorator.php
  * @license            GNU GPL 3.0 or any newer version
  * @link               http://www.shipsimu.org
  *

diff --git a/framework/main/classes/decorator/template/class_XmlRewriterTemplateDecorator.php b/framework/main/classes/decorator/template/class_XmlRewriterTemplateDecorator.php
index 46ac2c5c456ecff66dcdf9c9d6d7c2f2d09a77de..4325fffc8a2a5934459adf92caf94ecae9d4e577 100644 (file)
--- a/framework/main/classes/decorator/template/class_XmlRewriterTemplateDecorator.php
+++ b/framework/main/classes/decorator/template/class_XmlRewriterTemplateDecorator.php
@@ -14,11 +14,7 @@ use Org\Mxchange\CoreFramework\Template\CompileableTemplate;
  *
  * @author             Roland Haeder <webmaster@shipsimu.org>
  * @version            0.0.0
-<<<<<<< HEAD:framework/main/classes/decorator/template/class_XmlRewriterTemplateDecorator.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/decorator/template/class_XmlRewriterTemplateDecorator.php
  * @license            GNU GPL 3.0 or any newer version
  * @link               http://www.shipsimu.org
  *

diff --git a/framework/main/classes/decorator/xml/class_XmlCompactorDecorator.php b/framework/main/classes/decorator/xml/class_XmlCompactorDecorator.php
index f5b4a407c18470e9e286429de6c263ee0841d270..bf35ecce34caad4da85ea3ca9930c9809365434b 100644 (file)
--- a/framework/main/classes/decorator/xml/class_XmlCompactorDecorator.php
+++ b/framework/main/classes/decorator/xml/class_XmlCompactorDecorator.php
@@ -12,11 +12,7 @@ use Org\Mxchange\CoreFramework\Parser\Parseable;
  *
  * @author             Roland Haeder <webmaster@shipsimu.org>
  * @version            0.0.0
-<<<<<<< HEAD:framework/main/classes/decorator/xml/class_XmlCompactorDecorator.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/decorator/xml/class_XmlCompactorDecorator.php
  * @license            GNU GPL 3.0 or any newer version
  * @link               http://www.shipsimu.org
  *

diff --git a/framework/main/classes/discovery/class_ b/framework/main/classes/discovery/class_
index baf610f97411e14da2666d17cac2d9b53240b323..f33d64f003a064d4432e43aad004365a26164075 100644 (file)
--- a/framework/main/classes/discovery/class_
+++ b/framework/main/classes/discovery/class_
@@ -10,11 +10,7 @@ use Org\Mxchange\CoreFramework\Helper\Template\HelpableTemplate;
  *
  * @author             Roland Haeder <webmaster@ship-simu.org>
  * @version            0.0.0
-<<<<<<< HEAD:framework/main/classes/discovery/class_
  * @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/discovery/class_
  * @license            GNU GPL 3.0 or any newer version
  * @link               http://www.ship-simu.org
  *

diff --git a/framework/main/classes/discovery/class_BaseDiscovery.php b/framework/main/classes/discovery/class_BaseDiscovery.php
index 1a812b03408c7d3788ec9eead231205be8c4f1f7..2b175c0d00f3354006d7cb484c62d0926d397069 100644 (file)
--- a/framework/main/classes/discovery/class_BaseDiscovery.php
+++ b/framework/main/classes/discovery/class_BaseDiscovery.php
@@ -10,11 +10,7 @@ use Org\Mxchange\CoreFramework\Object\BaseFrameworkSystem;
  *
  * @author             Roland Haeder <webmaster@shipsimu.org>
  * @version            0.0.0
-<<<<<<< HEAD:framework/main/classes/discovery/class_BaseDiscovery.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/discovery/class_BaseDiscovery.php
  * @license            GNU GPL 3.0 or any newer version
  * @link               http://www.shipsimu.org
  *

diff --git a/framework/main/classes/discovery/payment/class_LocalPaymentDiscovery.php b/framework/main/classes/discovery/payment/class_LocalPaymentDiscovery.php
index 8e314580ebf11b8d006c2384feb5455e38cd8b7e..79d2da4144b83f9a7eb95cf86d9a6207497cae62 100644 (file)
--- a/framework/main/classes/discovery/payment/class_LocalPaymentDiscovery.php
+++ b/framework/main/classes/discovery/payment/class_LocalPaymentDiscovery.php
@@ -19,11 +19,7 @@ use Org\Mxchange\CoreFramework\Request\Requestable;
  *
  * @author             Roland Haeder <webmaster@shipsimu.org>
  * @version            0.0.0
-<<<<<<< HEAD:framework/main/classes/discovery/payment/class_LocalPaymentDiscovery.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/discovery/payment/class_LocalPaymentDiscovery.php
  * @license            GNU GPL 3.0 or any newer version
  * @link               http://www.shipsimu.org
  *

diff --git a/framework/main/classes/factories/cache/class_CacheFactory.php b/framework/main/classes/factories/cache/class_CacheFactory.php
index 028bf4f411b72a9e77e7b858896f9316cb20d550..a32074496afb2918072661e33a611ed35721ba11 100644 (file)
--- a/framework/main/classes/factories/cache/class_CacheFactory.php
+++ b/framework/main/classes/factories/cache/class_CacheFactory.php
@@ -11,11 +11,7 @@ use Org\Mxchange\CoreFramework\Factory\ObjectFactory;
  *
  * @author             Roland Haeder <webmaster@shipsimu.org>
  * @version            0.0.0
-<<<<<<< HEAD:framework/main/classes/factories/cache/class_CacheFactory.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/factories/cache/class_CacheFactory.php
  * @license            GNU GPL 3.0 or any newer version
  * @link               http://www.shipsimu.org
  *

diff --git a/framework/main/classes/factories/class_ b/framework/main/classes/factories/class_
index 60182743700cf960a1bb3e0f78cda29c91b22bdc..9c9ab02692ef228fc16b847310694fe60b545d81 100644 (file)
--- a/framework/main/classes/factories/class_
+++ b/framework/main/classes/factories/class_
@@ -4,11 +4,7 @@
  *
  * @author             Roland Haeder <webmaster@shipsimu.org>
  * @version            0.0.0
-<<<<<<< HEAD:framework/main/classes/factories/class_
  * @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/factories/class_
  * @license            GNU GPL 3.0 or any newer version
  * @link               http://www.shipsimu.org
  *

diff --git a/framework/main/classes/factories/class_BaseFactory.php b/framework/main/classes/factories/class_BaseFactory.php
index fd76f21cf7fe454df986a19280b18b819aecbfb7..103d9215948a6ff6be42e813ed55582330886a81 100644 (file)
--- a/framework/main/classes/factories/class_BaseFactory.php
+++ b/framework/main/classes/factories/class_BaseFactory.php
@@ -10,11 +10,7 @@ use Org\Mxchange\CoreFramework\Object\BaseFrameworkSystem;
  *
  * @author             Roland Haeder <webmaster@shipsimu.org>
  * @version            0.0.0
-<<<<<<< HEAD:framework/main/classes/factories/class_BaseFactory.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/factories/class_BaseFactory.php
  * @license            GNU GPL 3.0 or any newer version
  * @link               http://www.shipsimu.org
  *

diff --git a/framework/main/classes/factories/database/class_DatabaseWrapperFactory.php b/framework/main/classes/factories/database/class_DatabaseWrapperFactory.php
index c082070e4de122df38e9bf6313107b525c69785c..a138a2454ac3aa04fc597a29e4202392672efa5b 100644 (file)
--- a/framework/main/classes/factories/database/class_DatabaseWrapperFactory.php
+++ b/framework/main/classes/factories/database/class_DatabaseWrapperFactory.php
@@ -4,18 +4,14 @@ namespace Org\Mxchange\CoreFramework\Factory\Database\Wrapper;
 
 // Import framework stuff
 use Org\Mxchange\CoreFramework\Factory\ObjectFactory;
-use Org\Mxchange\CoreFramework\Registry\Registry;
+use Org\Mxchange\CoreFramework\Registry\GenericRegistry;
 
 /**
  * A factory class for socket registries
  *
  * @author             Roland Haeder <webmaster@shipsimu.org>
  * @version            0.0.0
-<<<<<<< HEAD:framework/main/classes/factories/database/class_DatabaseWrapperFactory.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/factories/database/class_DatabaseWrapperFactory.php
  * @license            GNU GPL 3.0 or any newer version
  * @link               http://www.shipsimu.org
  *
@@ -52,7 +48,7 @@ class DatabaseWrapperFactory extends ObjectFactory {
         */
        public static final function createWrapperByConfiguredName ($wrapperName) {
                // Get registry instance
-               $registryInstance = Registry::getRegistry();
+               $registryInstance = GenericRegistry::getRegistry();
 
                // Do we have an instance in the registry?
                if ($registryInstance->instanceExists($wrapperName)) {

diff --git a/framework/main/classes/factories/html/class_HtmlNewsFactory.php b/framework/main/classes/factories/html/class_HtmlNewsFactory.php
index 062d6755d2d981151f4358b3b8d1b16efb00cbfb..880606a1092d1ba1b7812db4b4ffe6fcb1434d27 100644 (file)
--- a/framework/main/classes/factories/html/class_HtmlNewsFactory.php
+++ b/framework/main/classes/factories/html/class_HtmlNewsFactory.php
@@ -12,11 +12,7 @@ use Org\Mxchange\CoreFramework\Request\Requestable;
  *
  * @author             Roland Haeder <webmaster@shipsimu.org>
  * @version            0.0.0
-<<<<<<< HEAD:framework/main/classes/factories/html/class_HtmlNewsFactory.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/factories/html/class_HtmlNewsFactory.php
  * @license            GNU GPL 3.0 or any newer version
  * @link               http://www.shipsimu.org
  *

diff --git a/framework/main/classes/factories/index/class_FileStackIndexFactory.php b/framework/main/classes/factories/index/class_FileStackIndexFactory.php
index 0f7ffa3e999c8f79f2fbca4b00223f951f0ea942..b9c7130ffb54a5119683d31a5cef4e82bdcd3563 100644 (file)
--- a/framework/main/classes/factories/index/class_FileStackIndexFactory.php
+++ b/framework/main/classes/factories/index/class_FileStackIndexFactory.php
@@ -4,7 +4,7 @@ namespace Org\Mxchange\CoreFramework\Factory\Filesystem\Stack;
 
 // Import framework stuff
 use Org\Mxchange\CoreFramework\Factory\ObjectFactory;
-use Org\Mxchange\CoreFramework\Registry\Registry;
+use Org\Mxchange\CoreFramework\Registry\GenericRegistry;
 use Org\Mxchange\CoreFramework\Stacker\Index\IndexableStack;
 
 // Import SPL stuff
@@ -15,11 +15,7 @@ use \SplFileInfo;
  *
  * @author             Roland Haeder <webmaster@ship-simu.org>
  * @version            0.0.0
-<<<<<<< HEAD:framework/main/classes/factories/index/class_FileStackIndexFactory.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/factories/index/class_FileStackIndexFactory.php
  * @license            GNU GPL 3.0 or any newer version
  * @link               http://www.ship-simu.org
  *
@@ -55,9 +51,9 @@ class FileStackIndexFactory extends ObjectFactory {
         */
        public static final function createFileStackIndexInstance (SplFileInfo $infoInstance, $type) {
                // If there is no handler?
-               if (Registry::getRegistry()->instanceExists($type . '_index')) {
+               if (GenericRegistry::getRegistry()->instanceExists($type . '_index')) {
                        // Get handler from registry
-                       $indexInstance = Registry::getRegistry()->getInstance($type . '_index');
+                       $indexInstance = GenericRegistry::getRegistry()->getInstance($type . '_index');
                } else {
                        // Get the handler instance
                        $indexInstance = self::createObjectByConfiguredName($type . '_file_stack_index_class', array($infoInstance));

diff --git a/framework/main/classes/factories/logger/class_LoggerFactory.php b/framework/main/classes/factories/logger/class_LoggerFactory.php
index a0099eff83e44fcdebb70f24df6f361309ea6acb..952d14c4646d56a440a08485e93b6c286c11985f 100644 (file)
--- a/framework/main/classes/factories/logger/class_LoggerFactory.php
+++ b/framework/main/classes/factories/logger/class_LoggerFactory.php
@@ -11,11 +11,7 @@ use Org\Mxchange\CoreFramework\Generic\FrameworkInterface;
  *
  * @author             Roland Haeder <webmaster@shipsimu.org>
  * @version            0.0.0
-<<<<<<< HEAD:framework/main/classes/factories/logger/class_LoggerFactory.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/factories/logger/class_LoggerFactory.php
  * @license            GNU GPL 3.0 or any newer version
  * @link               http://www.shipsimu.org
  *

diff --git a/framework/main/classes/factories/login/class_LoginFactory.php b/framework/main/classes/factories/login/class_LoginFactory.php
index 29ba36c7a7d1c29d5734d2d10ac6ab784282c44e..bc8e86d97e8cfa8f28b0340023695c3609a84027 100644 (file)
--- a/framework/main/classes/factories/login/class_LoginFactory.php
+++ b/framework/main/classes/factories/login/class_LoginFactory.php
@@ -4,7 +4,7 @@ namespace Org\Mxchange\CoreFramework\Factory\Login;
 
 // Import framework stuff
 use Org\Mxchange\CoreFramework\Factory\ObjectFactory;
-use Org\Mxchange\CoreFramework\Registry\Registry;
+use Org\Mxchange\CoreFramework\Registry\GenericRegistry;
 use Org\Mxchange\CoreFramework\Request\Requestable;
 
 /**
@@ -12,11 +12,7 @@ use Org\Mxchange\CoreFramework\Request\Requestable;
  *
  * @author             Roland Haeder <webmaster@shipsimu.org>
  * @version            0.0.0
-<<<<<<< HEAD:framework/main/classes/factories/login/class_LoginFactory.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/factories/login/class_LoginFactory.php
  * @license            GNU GPL 3.0 or any newer version
  * @link               http://www.shipsimu.org
  *
@@ -52,7 +48,7 @@ class LoginFactory extends ObjectFactory {
         */
        public static final function createLoginObjectByRequest (Requestable $requestInstance) {
                // Get registry instance
-               $registryInstance = Registry::getRegistry();
+               $registryInstance = GenericRegistry::getRegistry();
 
                // Do we have an instance in the registry?
                if ($registryInstance->instanceExists('login_helper')) {

diff --git a/framework/main/classes/factories/objects/class_ObjectFactory.php b/framework/main/classes/factories/objects/class_ObjectFactory.php
index 5467f403fa62c616ae68bcf206d803e9abeb0f97..f06a70a16b6a82a4ff32738853114b89ffdbb4b9 100644 (file)
--- a/framework/main/classes/factories/objects/class_ObjectFactory.php
+++ b/framework/main/classes/factories/objects/class_ObjectFactory.php
@@ -14,11 +14,7 @@ use \InvalidArgumentException;
  *
  * @author             Roland Haeder <webmaster@shipsimu.org>
  * @version            0.0.0
-<<<<<<< HEAD:framework/main/classes/factories/objects/class_ObjectFactory.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/factories/objects/class_ObjectFactory.php
  * @license            GNU GPL 3.0 or any newer version
  * @link               http://www.shipsimu.org
  *

diff --git a/framework/main/classes/factories/registry/class_SocketRegistryFactory.php b/framework/main/classes/factories/registry/class_SocketRegistryFactory.php
index ed1442f0af5cd0dd650aea4f7f245bacdbfbe346..150acfaa7c4925cbef8a21f39c19ae5ef07691e9 100644 (file)
--- a/framework/main/classes/factories/registry/class_SocketRegistryFactory.php
+++ b/framework/main/classes/factories/registry/class_SocketRegistryFactory.php
@@ -4,18 +4,14 @@ namespace Org\Mxchange\CoreFramework\Factory\Registry\Socket;
 
 // Import framework stuff
 use Org\Mxchange\CoreFramework\Factory\ObjectFactory;
-use Org\Mxchange\CoreFramework\Registry\Registry;
+use Org\Mxchange\CoreFramework\Registry\GenericRegistry;
 
 /**
  * A factory class for socket registries
  *
  * @author             Roland Haeder <webmaster@shipsimu.org>
  * @version            0.0.0
-<<<<<<< HEAD:framework/main/classes/factories/registry/class_SocketRegistryFactory.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/factories/registry/class_SocketRegistryFactory.php
  * @license            GNU GPL 3.0 or any newer version
  * @link               http://www.shipsimu.org
  *
@@ -52,7 +48,7 @@ class SocketRegistryFactory extends ObjectFactory {
         */
        public static final function createSocketRegistryInstance () {
                // Get registry instance
-               $registryInstance = Registry::getRegistry();
+               $registryInstance = GenericRegistry::getRegistry();
 
                // Do we have an instance in the registry?
                if ($registryInstance->instanceExists('socket_registry')) {

diff --git a/framework/main/classes/factories/stacks/class_FileStackFactory.php b/framework/main/classes/factories/stacks/class_FileStackFactory.php
index 8b30ffea5aafe7b410aca836dbd01fa97683d663..5198806b16500143e57f510ab4be9da2eaf85878 100644 (file)
--- a/framework/main/classes/factories/stacks/class_FileStackFactory.php
+++ b/framework/main/classes/factories/stacks/class_FileStackFactory.php
@@ -5,7 +5,7 @@ namespace Org\Mxchange\CoreFramework\Factory\Stack;
 // Import framework stuff
 use Org\Mxchange\CoreFramework\Bootstrap\FrameworkBootstrap;
 use Org\Mxchange\CoreFramework\Factory\ObjectFactory;
-use Org\Mxchange\CoreFramework\Registry\Registry;
+use Org\Mxchange\CoreFramework\Registry\GenericRegistry;
 
 // Import SPL stuff
 use \SplFileInfo;
@@ -15,11 +15,7 @@ use \SplFileInfo;
  *
  * @author             Roland Haeder <webmaster@ship-simu.org>
  * @version            0.0.0
-<<<<<<< HEAD:framework/main/classes/factories/stacks/class_FileStackFactory.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/factories/stacks/class_FileStackFactory.php
  * @license            GNU GPL 3.0 or any newer version
  * @link               http://www.ship-simu.org
  *
@@ -64,9 +60,9 @@ class FileStackFactory extends ObjectFactory {
                ));
 
                // If there is no handler?
-               if (Registry::getRegistry()->instanceExists($stackName . '_stack')) {
+               if (GenericRegistry::getRegistry()->instanceExists($stackName . '_stack')) {
                        // Get handler from registry
-                       $stackInstance = Registry::getRegistry()->getInstance($stackName . '_stack');
+                       $stackInstance = GenericRegistry::getRegistry()->getInstance($stackName . '_stack');
                } else {
                        // Get the handler instance
                        $stackInstance = self::createObjectByConfiguredName($prefix . '_' . $stackName . '_stack_class', array($fileInfoInstance, $prefix . '_' . $stackName));

diff --git a/framework/main/classes/factories/user/class_UserFactory.php b/framework/main/classes/factories/user/class_UserFactory.php
index 2a84ea283821196c934c64d4d55caec186b748c8..d56ab74f798b596443cb4c2d81a5d7655768c989 100644 (file)
--- a/framework/main/classes/factories/user/class_UserFactory.php
+++ b/framework/main/classes/factories/user/class_UserFactory.php
@@ -5,7 +5,7 @@ namespace Org\Mxchange\CoreFramework\Factory\User;
 // Import framework stuff
 use Org\Mxchange\CoreFramework\Bootstrap\FrameworkBootstrap;
 use Org\Mxchange\CoreFramework\Factory\ObjectFactory;
-use Org\Mxchange\CoreFramework\Registry\Registry;
+use Org\Mxchange\CoreFramework\Registry\GenericRegistry;
 use Org\Mxchange\CoreFramework\Request\Requestable;
 
 /**
@@ -13,11 +13,7 @@ use Org\Mxchange\CoreFramework\Request\Requestable;
  *
  * @author             Roland Haeder <webmaster@shipsimu.org>
  * @version            0.0.0
-<<<<<<< HEAD:framework/main/classes/factories/user/class_UserFactory.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/factories/user/class_UserFactory.php
  * @license            GNU GPL 3.0 or any newer version
  * @link               http://www.shipsimu.org
  *
@@ -53,7 +49,7 @@ class UserFactory extends ObjectFactory {
         */
        public static final function createUserByRequest (Requestable $requestInstance) {
                // Get registry instance
-               $registryInstance = Registry::getRegistry();
+               $registryInstance = GenericRegistry::getRegistry();
 
                // Do we have an instance in the registry?
                if ($registryInstance->instanceExists('user')) {

diff --git a/framework/main/classes/factories/xml/class_XmlTemplateEngineFactory.php b/framework/main/classes/factories/xml/class_XmlTemplateEngineFactory.php
index 7b92ab7215d4766d43933a27752d4a214c68788f..7c544b6887ce58a402fd064a4ef7e230dbcae8ec 100644 (file)
--- a/framework/main/classes/factories/xml/class_XmlTemplateEngineFactory.php
+++ b/framework/main/classes/factories/xml/class_XmlTemplateEngineFactory.php
@@ -4,7 +4,7 @@ namespace Org\Mxchange\CoreFramework\Factory\Template;
 
 // Import framework stuff
 use Org\Mxchange\CoreFramework\Factory\ObjectFactory;
-use Org\Mxchange\CoreFramework\Registry\Registry;
+use Org\Mxchange\CoreFramework\Registry\GenericRegistry;
 
 /**
  * A factory class for XML template engines. All instances generated by this
@@ -13,11 +13,7 @@ use Org\Mxchange\CoreFramework\Registry\Registry;
  *
  * @author             Roland Haeder <webmaster@shipsimu.org>
  * @version            0.0.0
-<<<<<<< HEAD:framework/main/classes/factories/xml/class_XmlTemplateEngineFactory.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/factories/xml/class_XmlTemplateEngineFactory.php
  * @license            GNU GPL 3.0 or any newer version
  * @link               http://www.shipsimu.org
  *
@@ -55,9 +51,9 @@ class XmlTemplateEngineFactory extends ObjectFactory {
         */
        public static final function createXmlTemplateEngineInstance ($configEntry) {
                // Do we have an instance in the registry?
-               if (Registry::getRegistry()->instanceExists($configEntry)) {
+               if (GenericRegistry::getRegistry()->instanceExists($configEntry)) {
                        // Then use this instance
-                       $templateInstance = Registry::getRegistry()->getInstance($configEntry);
+                       $templateInstance = GenericRegistry::getRegistry()->getInstance($configEntry);
                } else {
                        // Now prepare the tags instance
                        $templateInstance = ObjectFactory::createObjectByConfiguredName($configEntry);

diff --git a/framework/main/classes/feature/class_ b/framework/main/classes/feature/class_
index e40f81e93ab5e8b4e49f9b0fad77f780f406466d..f48cd3cf286075cacecdea3031a91c97399c2a62 100644 (file)
--- a/framework/main/classes/feature/class_
+++ b/framework/main/classes/feature/class_
@@ -11,11 +11,7 @@ use Org\Mxchange\CoreFramework\Feature\Feature;
  *
  * @author             Roland Haeder <webmaster@ship-simu.org>
  * @version            0.0.0
-<<<<<<< HEAD:framework/main/classes/feature/class_
  * @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/feature/class_
  * @license            GNU GPL 3.0 or any newer version
  * @link               http://www.ship-simu.org
  *

diff --git a/framework/main/classes/feature/class_BaseFeature.php b/framework/main/classes/feature/class_BaseFeature.php
index e439104b760af50ea0db1b9f3fd919843ba996de..68a30fe9a4b50a7b89d749a2537160cc60d74240 100644 (file)
--- a/framework/main/classes/feature/class_BaseFeature.php
+++ b/framework/main/classes/feature/class_BaseFeature.php
@@ -10,11 +10,7 @@ use Org\Mxchange\CoreFramework\Object\BaseFrameworkSystem;
  *
  * @author             Roland Haeder <webmaster@ship-simu.org>
  * @version            0.0.0
-<<<<<<< HEAD:framework/main/classes/feature/class_BaseFeature.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/feature/class_BaseFeature.php
  * @license            GNU GPL 3.0 or any newer version
  * @link               http://www.ship-simu.org
  *

diff --git a/framework/main/classes/feature/class_FrameworkFeature.php b/framework/main/classes/feature/class_FrameworkFeature.php
index 371d2cda382ba288304c509fa1fac3f3458ebfea..84410bc36505fab91dcf50394fb0e412809b3a8c 100644 (file)
--- a/framework/main/classes/feature/class_FrameworkFeature.php
+++ b/framework/main/classes/feature/class_FrameworkFeature.php
@@ -14,11 +14,7 @@ use Org\Mxchange\CoreFramework\Object\BaseFrameworkSystem;
  *
  * @author             Roland Haeder <webmaster@ship-simu.org>
  * @version            0.0.0
-<<<<<<< HEAD:framework/main/classes/feature/class_FrameworkFeature.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/feature/class_FrameworkFeature.php
  * @license            GNU GPL 3.0 or any newer version
  * @link               http://www.ship-simu.org
  *

diff --git a/framework/main/classes/feature/fuse/class_FuseFeature.php b/framework/main/classes/feature/fuse/class_FuseFeature.php
index a42fda14a05b46f02dec96cd6222abf9892cc5dd..cd70e38f2383c3d2f5e80bbbdd7b8f5a2588fdd8 100644 (file)
--- a/framework/main/classes/feature/fuse/class_FuseFeature.php
+++ b/framework/main/classes/feature/fuse/class_FuseFeature.php
@@ -11,11 +11,7 @@ use Org\Mxchange\CoreFramework\Feature\Feature;
  *
  * @author             Roland Haeder <webmaster@ship-simu.org>
  * @version            0.0.0
-<<<<<<< HEAD:framework/main/classes/feature/fuse/class_FuseFeature.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/feature/fuse/class_FuseFeature.php
  * @license            GNU GPL 3.0 or any newer version
  * @link               http://www.ship-simu.org
  *

diff --git a/framework/main/classes/file_directories/binary/class_BaseBinaryFile.php b/framework/main/classes/file_directories/binary/class_BaseBinaryFile.php
index 4c1f0e12024497ae002482ea929de477baba07b0..40a24c552f5970f5773e1cee0bb9cf1761996969 100644 (file)
--- a/framework/main/classes/file_directories/binary/class_BaseBinaryFile.php
+++ b/framework/main/classes/file_directories/binary/class_BaseBinaryFile.php
@@ -16,11 +16,7 @@ use \SplFileInfo;
  *
  * @author             Roland Haeder <webmaster@ship-simu.org>
  * @version            0.0.0
-<<<<<<< HEAD:framework/main/classes/file_directories/binary/class_BaseBinaryFile.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/file_directories/binary/class_BaseBinaryFile.php
  * @license            GNU GPL 3.0 or any newer version
  * @link               http://www.ship-simu.org
  *

diff --git a/framework/main/classes/file_directories/binary/index/class_IndexFile.php b/framework/main/classes/file_directories/binary/index/class_IndexFile.php
index 133f346c635ea74d7cfd74f32c696d8f0131131a..958792df018ceb9420f4eb1b6b9d6182eb2fa370 100644 (file)
--- a/framework/main/classes/file_directories/binary/index/class_IndexFile.php
+++ b/framework/main/classes/file_directories/binary/index/class_IndexFile.php
@@ -15,11 +15,7 @@ use \SplFileInfo;
  *
  * @author             Roland Haeder <webmaster@ship-simu.org>
  * @version            0.0.0
-<<<<<<< HEAD:framework/main/classes/file_directories/binary/index/class_IndexFile.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/file_directories/binary/index/class_IndexFile.php
  * @license            GNU GPL 3.0 or any newer version
  * @link               http://www.ship-simu.org
  *

diff --git a/framework/main/classes/file_directories/binary/stack/class_StackFile.php b/framework/main/classes/file_directories/binary/stack/class_StackFile.php
index 3c980fc8e082bb39685514bbc0aea4506104b6ed..444302ba74e7daa317816b0546a2ebe96cb325ab 100644 (file)
--- a/framework/main/classes/file_directories/binary/stack/class_StackFile.php
+++ b/framework/main/classes/file_directories/binary/stack/class_StackFile.php
@@ -15,11 +15,7 @@ use \SplFileInfo;
  *
  * @author             Roland Haeder <webmaster@ship-simu.org>
  * @version            0.0.0
-<<<<<<< HEAD:framework/main/classes/file_directories/binary/stack/class_StackFile.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/file_directories/binary/stack/class_StackFile.php
  * @license            GNU GPL 3.0 or any newer version
  * @link               http://www.ship-simu.org
  *

diff --git a/framework/main/classes/file_directories/class_BaseAbstractFile.php b/framework/main/classes/file_directories/class_BaseAbstractFile.php
index d9cb807a6b0e81f5048d207e9316e88f9cbde556..92b3f114dce1f1ad9b8cf9552ea5d1eb1ecbb921 100644 (file)
--- a/framework/main/classes/file_directories/class_BaseAbstractFile.php
+++ b/framework/main/classes/file_directories/class_BaseAbstractFile.php
@@ -13,11 +13,7 @@ use Org\Mxchange\CoreFramework\Object\BaseFrameworkSystem;
  *
  * @author             Roland Haeder <webmaster@ship-simu.org>
  * @version            0.0.0
-<<<<<<< HEAD:framework/main/classes/file_directories/class_BaseAbstractFile.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/file_directories/class_BaseAbstractFile.php
  * @license            GNU GPL 3.0 or any newer version
  * @link               http://www.ship-simu.org
  *

diff --git a/framework/main/classes/file_directories/class_BaseFileIo.php b/framework/main/classes/file_directories/class_BaseFileIo.php
index 72a6a1651b821e383ac251767d5dec8a56ac2a71..ce65bd898a9b8f087af82ffdd4ad13f3fa580295 100644 (file)
--- a/framework/main/classes/file_directories/class_BaseFileIo.php
+++ b/framework/main/classes/file_directories/class_BaseFileIo.php
@@ -16,11 +16,7 @@ use \SplFileObject;
  *
  * @author             Roland Haeder <webmaster@ship-simu.org>
  * @version            0.0.0
-<<<<<<< HEAD:framework/main/classes/file_directories/class_BaseFileIo.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/file_directories/class_BaseFileIo.php
  * @license            GNU GPL 3.0 or any newer version
  * @link               http://www.ship-simu.org
  *

diff --git a/framework/main/classes/file_directories/directory/class_FrameworkDirectoryPointer.php b/framework/main/classes/file_directories/directory/class_FrameworkDirectoryPointer.php
index 9695a7ab7e7767ca86924aaf091e4f8a426247c4..4c033024fac389928d9ee40f961e22d9e21ca572 100644 (file)
--- a/framework/main/classes/file_directories/directory/class_FrameworkDirectoryPointer.php
+++ b/framework/main/classes/file_directories/directory/class_FrameworkDirectoryPointer.php
@@ -15,11 +15,7 @@ use \DirectoryIterator;
  *
  * @author             Roland Haeder <webmaster@shipsimu.org>
  * @version            0.0.0
-<<<<<<< HEAD:framework/main/classes/file_directories/directory/class_FrameworkDirectoryPointer.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/file_directories/directory/class_FrameworkDirectoryPointer.php
  * @license            GNU GPL 3.0 or any newer version
  * @link               http://www.shipsimu.org
  *

diff --git a/framework/main/classes/file_directories/input/raw/class_FrameworkRawFileInputPointer.php b/framework/main/classes/file_directories/input/raw/class_FrameworkRawFileInputPointer.php
index 1481444f436de64a42c0c89eea2004469b4150b9..fc3ab6db530a6af9e537c1fb605f06116251ef0f 100644 (file)
--- a/framework/main/classes/file_directories/input/raw/class_FrameworkRawFileInputPointer.php
+++ b/framework/main/classes/file_directories/input/raw/class_FrameworkRawFileInputPointer.php
@@ -20,11 +20,7 @@ use \SplFileInfo;
  *
  * @author             Roland Haeder <webmaster@shipsimu.org>
  * @version            0.0.0
-<<<<<<< HEAD:framework/main/classes/file_directories/input/raw/class_FrameworkRawFileInputPointer.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/file_directories/input/raw/class_FrameworkRawFileInputPointer.php
  * @license            GNU GPL 3.0 or any newer version
  * @link               http://www.shipsimu.org
  *

diff --git a/framework/main/classes/file_directories/input/text/class_FrameworkTextFileInputPointer.php b/framework/main/classes/file_directories/input/text/class_FrameworkTextFileInputPointer.php
index 6694f00387ba252545977b9cc189014848b3e769..1b3c88eee1a338a85763a67f16b5a8770648f370 100644 (file)
--- a/framework/main/classes/file_directories/input/text/class_FrameworkTextFileInputPointer.php
+++ b/framework/main/classes/file_directories/input/text/class_FrameworkTextFileInputPointer.php
@@ -17,11 +17,7 @@ use Org\Mxchange\CoreFramework\Object\BaseFrameworkSystem;
  *
  * @author             Roland Haeder <webmaster@shipsimu.org>
  * @version            0.0.0
-<<<<<<< HEAD:framework/main/classes/file_directories/input/text/class_FrameworkTextFileInputPointer.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/file_directories/input/text/class_FrameworkTextFileInputPointer.php
  * @license            GNU GPL 3.0 or any newer version
  * @link               http://www.shipsimu.org
  *

diff --git a/framework/main/classes/file_directories/io/class_FrameworkFileInputOutputPointer.php b/framework/main/classes/file_directories/io/class_FrameworkFileInputOutputPointer.php
index b2a9ff8df0f8dff3c0c22becf2efae23867bb9be..971b3acaa468c6ab954ea18e058568f3a2f4b5b3 100644 (file)
--- a/framework/main/classes/file_directories/io/class_FrameworkFileInputOutputPointer.php
+++ b/framework/main/classes/file_directories/io/class_FrameworkFileInputOutputPointer.php
@@ -20,11 +20,7 @@ use \SplFileInfo;
  *
  * @author             Roland Haeder <webmaster@shipsimu.org>
  * @version            0.0.0
-<<<<<<< HEAD:framework/main/classes/file_directories/io/class_FrameworkFileInputOutputPointer.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/file_directories/io/class_FrameworkFileInputOutputPointer.php
  * @license            GNU GPL 3.0 or any newer version
  * @link               http://www.shipsimu.org
  *

diff --git a/framework/main/classes/file_directories/io_stream/class_FileIoStream.php b/framework/main/classes/file_directories/io_stream/class_FileIoStream.php
index dcd34e4201fc4e26ebeff6bc4d47e484b76e4af0..ae0f6352a8ba6ada1e392c0d850165eda510e680 100644 (file)
--- a/framework/main/classes/file_directories/io_stream/class_FileIoStream.php
+++ b/framework/main/classes/file_directories/io_stream/class_FileIoStream.php
@@ -19,11 +19,7 @@ use \SplFileInfo;
  *
  * @author             Roland Haeder <webmaster@shipsimu.org>
  * @version            0.0.0
-<<<<<<< HEAD:framework/main/classes/file_directories/io_stream/class_FileIoStream.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/file_directories/io_stream/class_FileIoStream.php
  * @license            GNU GPL 3.0 or any newer version
  * @link               http://www.shipsimu.org
  *

diff --git a/framework/main/classes/file_directories/output/raw/class_FrameworkRawFileOutputPointer.php b/framework/main/classes/file_directories/output/raw/class_FrameworkRawFileOutputPointer.php
index 7e596bd72fe508be2654e59526a3240617e2cf29..81bd343370059b3113137b50a7e1c59bba184041 100644 (file)
--- a/framework/main/classes/file_directories/output/raw/class_FrameworkRawFileOutputPointer.php
+++ b/framework/main/classes/file_directories/output/raw/class_FrameworkRawFileOutputPointer.php
@@ -16,11 +16,7 @@ use \SplFileInfo;
  *
  * @author             Roland Haeder <webmaster@shipsimu.org>
  * @version            0.0.0
-<<<<<<< HEAD:framework/main/classes/file_directories/output/raw/class_FrameworkRawFileOutputPointer.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/file_directories/output/raw/class_FrameworkRawFileOutputPointer.php
  * @license            GNU GPL 3.0 or any newer version
  * @link               http://www.shipsimu.org
  *

diff --git a/framework/main/classes/file_directories/output/text/class_FrameworkTextFileOutputPointer.php b/framework/main/classes/file_directories/output/text/class_FrameworkTextFileOutputPointer.php
index 56c502f477bc0cfc8ed7a1b3da22a8a5d4cac165..d94ec9ce86664f1203313ceee86a45b40ca88199 100644 (file)
--- a/framework/main/classes/file_directories/output/text/class_FrameworkTextFileOutputPointer.php
+++ b/framework/main/classes/file_directories/output/text/class_FrameworkTextFileOutputPointer.php
@@ -17,11 +17,7 @@ use \SplFileInfo;
  *
  * @author             Roland Haeder <webmaster@shipsimu.org>
  * @version            0.0.0
-<<<<<<< HEAD:framework/main/classes/file_directories/output/text/class_FrameworkTextFileOutputPointer.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/file_directories/output/text/class_FrameworkTextFileOutputPointer.php
  * @license            GNU GPL 3.0 or any newer version
  * @link               http://www.shipsimu.org
  *

diff --git a/framework/main/classes/file_directories/text/class_BaseTextFile.php b/framework/main/classes/file_directories/text/class_BaseTextFile.php
index f8dc38d5be7b919b12bd6962c06a241e6f002028..f56cc96e2556ac2fe7bb315fead6606d4178aa7f 100644 (file)
--- a/framework/main/classes/file_directories/text/class_BaseTextFile.php
+++ b/framework/main/classes/file_directories/text/class_BaseTextFile.php
@@ -14,11 +14,7 @@ use \SplFileInfo;
  *
  * @author             Roland Haeder <webmaster@ship-simu.org>
  * @version            0.0.0
-<<<<<<< HEAD:framework/main/classes/file_directories/text/class_BaseTextFile.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/file_directories/text/class_BaseTextFile.php
  * @license            GNU GPL 3.0 or any newer version
  * @link               http://www.ship-simu.org
  *

diff --git a/framework/main/classes/file_directories/text/input/class_BaseInputTextFile.php b/framework/main/classes/file_directories/text/input/class_BaseInputTextFile.php
index e4992bb0d170b3cba834828f7336fcd645a0f60c..1767a55a753c620b47976b431863a763456d8f15 100644 (file)
--- a/framework/main/classes/file_directories/text/input/class_BaseInputTextFile.php
+++ b/framework/main/classes/file_directories/text/input/class_BaseInputTextFile.php
@@ -11,11 +11,7 @@ use Org\Mxchange\CoreFramework\Filesystem\File\BaseTextFile;
  *
  * @author             Roland Haeder <webmaster@ship-simu.org>
  * @version            0.0.0
-<<<<<<< HEAD:framework/main/classes/file_directories/text/input/class_BaseInputTextFile.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/file_directories/text/input/class_BaseInputTextFile.php
  * @license            GNU GPL 3.0 or any newer version
  * @link               http://www.ship-simu.org
  *

diff --git a/framework/main/classes/file_directories/text/input/csv/class_CsvInputFile.php b/framework/main/classes/file_directories/text/input/csv/class_CsvInputFile.php
index a2e30e735d59b7b31a814aacc374e0bdce6d7151..3343c6dd6fe11b5551578752e877be333d54b0d9 100644 (file)
--- a/framework/main/classes/file_directories/text/input/csv/class_CsvInputFile.php
+++ b/framework/main/classes/file_directories/text/input/csv/class_CsvInputFile.php
@@ -11,11 +11,7 @@ use Org\Mxchange\CoreFramework\Stream\Filesystem\CsvInputStreamer;
  *
  * @author             Roland Haeder <webmaster@ship-simu.org>
  * @version            0.0.0
-<<<<<<< HEAD:framework/main/classes/file_directories/text/input/csv/class_CsvInputFile.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/file_directories/text/input/csv/class_CsvInputFile.php
  * @license            GNU GPL 3.0 or any newer version
  * @link               http://www.ship-simu.org
  *

diff --git a/framework/main/classes/file_directories/text/output/class_BaseOutputTextFile.php b/framework/main/classes/file_directories/text/output/class_BaseOutputTextFile.php
index 00894d0a73e3073391d3f14e2304d4e982566881..30212999244066aa58eaf965f39e48ddc653f06f 100644 (file)
--- a/framework/main/classes/file_directories/text/output/class_BaseOutputTextFile.php
+++ b/framework/main/classes/file_directories/text/output/class_BaseOutputTextFile.php
@@ -12,11 +12,7 @@ use Org\Mxchange\CoreFramework\Output\BaseOutput;
  *
  * @author             Roland Haeder <webmaster@ship-simu.org>
  * @version            0.0.0
-<<<<<<< HEAD:framework/main/classes/file_directories/text/output/class_BaseOutputTextFile.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/file_directories/text/output/class_BaseOutputTextFile.php
  * @license            GNU GPL 3.0 or any newer version
  * @link               http://www.ship-simu.org
  *

diff --git a/framework/main/classes/filesystem/class_ b/framework/main/classes/filesystem/class_
index a1cc285cec5246b715ea84e4c401132c32e8f3e3..2d5ea4677a3708ec94632aafea26abd377623f4a 100644 (file)
--- a/framework/main/classes/filesystem/class_
+++ b/framework/main/classes/filesystem/class_
@@ -4,11 +4,7 @@
  *
  * @author             Roland Haeder <webmaster@ship-simu.org>
  * @version            0.0.0
-<<<<<<< HEAD:framework/main/classes/filesystem/class_
  * @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/filesystem/class_
  * @license            GNU GPL 3.0 or any newer version
  * @link               http://www.ship-simu.org
  *

diff --git a/framework/main/classes/filesystem/class_BaseFilesystem.php b/framework/main/classes/filesystem/class_BaseFilesystem.php
index 64739adc99e3ebafedc364b8050941ac83f6e734..20c2fe10cc86eae288a9f726726e8b69df539671 100644 (file)
--- a/framework/main/classes/filesystem/class_BaseFilesystem.php
+++ b/framework/main/classes/filesystem/class_BaseFilesystem.php
@@ -11,11 +11,7 @@ use Org\Mxchange\CoreFramework\Object\BaseFrameworkSystem;
  *
  * @author             Roland Haeder <webmaster@ship-simu.org>
  * @version            0.0.0
-<<<<<<< HEAD:framework/main/classes/filesystem/class_BaseFilesystem.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/filesystem/class_BaseFilesystem.php
  * @license            GNU GPL 3.0 or any newer version
  * @link               http://www.ship-simu.org
  *

diff --git a/framework/main/classes/filter/auth/class_UserAuthFilter.php b/framework/main/classes/filter/auth/class_UserAuthFilter.php
index a6873b122c00d9649394c8ac9af5bc2cb7cad501..bfc185afafaa647ce014829eb07d4e26ae382c04 100644 (file)
--- a/framework/main/classes/filter/auth/class_UserAuthFilter.php
+++ b/framework/main/classes/filter/auth/class_UserAuthFilter.php
@@ -7,7 +7,7 @@ use Org\Mxchange\CoreFramework\Factory\ObjectFactory;
 use Org\Mxchange\CoreFramework\Filter\BaseFilter;
 use Org\Mxchange\CoreFramework\Filter\Filterable;
 use Org\Mxchange\CoreFramework\Loader\NoClassException;
-use Org\Mxchange\CoreFramework\Registry\Registry;
+use Org\Mxchange\CoreFramework\Registry\GenericRegistry;
 use Org\Mxchange\CoreFramework\Request\Requestable;
 use Org\Mxchange\CoreFramework\Response\Responseable;
 use Org\Mxchange\CoreFramework\User\BaseUser;
@@ -17,11 +17,7 @@ use Org\Mxchange\CoreFramework\User\BaseUser;
  *
  * @author             Roland Haeder <webmaster@shipsimu.org>
  * @version            0.0.0
-<<<<<<< HEAD:framework/main/classes/filter/auth/class_UserAuthFilter.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/filter/auth/class_UserAuthFilter.php
  * @license            GNU GPL 3.0 or any newer version
  * @link               http://www.shipsimu.org
  *

diff --git a/framework/main/classes/filter/change/class_EmailChangeFilter.php b/framework/main/classes/filter/change/class_EmailChangeFilter.php
index e7c3be06a997b3c8aadb2e012812adaf25baadc4..35ebd40043470272c8854f44054b80ddb6ac50f9 100644 (file)
--- a/framework/main/classes/filter/change/class_EmailChangeFilter.php
+++ b/framework/main/classes/filter/change/class_EmailChangeFilter.php
@@ -5,7 +5,7 @@ namespace Org\Mxchange\CoreFramework\Filter\Change\Email;
 // Import framework stuff
 use Org\Mxchange\CoreFramework\Filter\BaseFilter;
 use Org\Mxchange\CoreFramework\Filter\Filterable;
-use Org\Mxchange\CoreFramework\Registry\Registry;
+use Org\Mxchange\CoreFramework\Registry\GenericRegistry;
 use Org\Mxchange\CoreFramework\Request\Requestable;
 use Org\Mxchange\CoreFramework\Response\Responseable;
 
@@ -14,11 +14,7 @@ use Org\Mxchange\CoreFramework\Response\Responseable;
  *
  * @author             Roland Haeder <webmaster@shipsimu.org>
  * @version            0.0.0
-<<<<<<< HEAD:framework/main/classes/filter/change/class_EmailChangeFilter.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/filter/change/class_EmailChangeFilter.php
  * @license            GNU GPL 3.0 or any newer version
  * @link               http://www.shipsimu.org
  *
@@ -116,7 +112,7 @@ class EmailChangeFilter extends BaseFilter implements Filterable {
                } // END - if
 
                // Now, get a user instance for comparison
-               $userInstance = Registry::getRegistry()->getInstance('user');
+               $userInstance = GenericRegistry::getRegistry()->getInstance('user');
 
                // Get the email field
                $userEmail = $userInstance->getField('email');

diff --git a/framework/main/classes/filter/change/class_PasswordChangeFilter.php b/framework/main/classes/filter/change/class_PasswordChangeFilter.php
index ce6a1c463742548d1ca84c8134feed2f3ff13a0c..1a7ecdaab5648eb6bcc643647f8badddd8b7eef7 100644 (file)
--- a/framework/main/classes/filter/change/class_PasswordChangeFilter.php
+++ b/framework/main/classes/filter/change/class_PasswordChangeFilter.php
@@ -5,7 +5,7 @@ namespace Org\Mxchange\CoreFramework\Filter\Change\Password;
 // Import framework stuff
 use Org\Mxchange\CoreFramework\Filter\BaseFilter;
 use Org\Mxchange\CoreFramework\Filter\Filterable;
-use Org\Mxchange\CoreFramework\Registry\Registry;
+use Org\Mxchange\CoreFramework\Registry\GenericRegistry;
 use Org\Mxchange\CoreFramework\Request\Requestable;
 use Org\Mxchange\CoreFramework\Response\Responseable;
 
@@ -14,11 +14,7 @@ use Org\Mxchange\CoreFramework\Response\Responseable;
  *
  * @author             Roland Haeder <webmaster@shipsimu.org>
  * @version            0.0.0
-<<<<<<< HEAD:framework/main/classes/filter/change/class_PasswordChangeFilter.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/filter/change/class_PasswordChangeFilter.php
  * @license            GNU GPL 3.0 or any newer version
  * @link               http://www.shipsimu.org
  *
@@ -117,7 +113,7 @@ class PasswordChangeFilter extends BaseFilter implements Filterable {
                } // END - if
 
                // Now, get a user instance for comparison
-               $userInstance = Registry::getRegistry()->getInstance('user');
+               $userInstance = GenericRegistry::getRegistry()->getInstance('user');
 
                // Update the "password" field
                $this->partialStub('Unfinished part.');

diff --git a/framework/main/classes/filter/checkboxes/class_RulesAcceptedFilter.php b/framework/main/classes/filter/checkboxes/class_RulesAcceptedFilter.php
index 6fe6972df207575c0c6b104dbe20d725b034fab0..a5d882105c4d9ce0c07172dbab62ebe99794236d 100644 (file)
--- a/framework/main/classes/filter/checkboxes/class_RulesAcceptedFilter.php
+++ b/framework/main/classes/filter/checkboxes/class_RulesAcceptedFilter.php
@@ -15,11 +15,7 @@ use Org\Mxchange\CoreFramework\Response\Responseable;
  *
  * @author             Roland Haeder <webmaster@shipsimu.org>
  * @version            0.0.0
-<<<<<<< HEAD:framework/main/classes/filter/checkboxes/class_RulesAcceptedFilter.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/filter/checkboxes/class_RulesAcceptedFilter.php
  * @license            GNU GPL 3.0 or any newer version
  * @link               http://www.shipsimu.org
  *

diff --git a/framework/main/classes/filter/class_ b/framework/main/classes/filter/class_
index 11f46c9a88d9d5cd01016887ac4c5232b1e33a85..0bdc5e69d885464b99b2bc9d1277369477bd633b 100644 (file)
--- a/framework/main/classes/filter/class_
+++ b/framework/main/classes/filter/class_
@@ -13,11 +13,7 @@ use Org\Mxchange\CoreFramework\Response\Responseable;
  *
  * @author             Roland Haeder <webmaster@ship-simu.org>
  * @version            0.0.0
-<<<<<<< HEAD:framework/main/classes/filter/class_
  * @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/filter/class_
  * @license            GNU GPL 3.0 or any newer version
  * @link               http://www.ship-simu.org
  *

diff --git a/framework/main/classes/filter/class_BaseFilter.php b/framework/main/classes/filter/class_BaseFilter.php
index 7285f7513e243c16bc27acd0845dd97880b7006f..18c78800ba5b062f594d7edef3b6053a1eb3abbb 100644 (file)
--- a/framework/main/classes/filter/class_BaseFilter.php
+++ b/framework/main/classes/filter/class_BaseFilter.php
@@ -10,11 +10,7 @@ use Org\Mxchange\CoreFramework\Object\BaseFrameworkSystem;
  *
  * @author             Roland Haeder <webmaster@shipsimu.org>
  * @version            0.0.0
-<<<<<<< HEAD:framework/main/classes/filter/class_BaseFilter.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/filter/class_BaseFilter.php
  * @license            GNU GPL 3.0 or any newer version
  * @link               http://www.shipsimu.org
  *

diff --git a/framework/main/classes/filter/class_BaseFilterDecorator.php b/framework/main/classes/filter/class_BaseFilterDecorator.php
index 60d743bd5d1dfc53d4537e8a79ab9efcef12fe21..d4e81e7c7ae33c02cefc55dfcec531de5e51f8f2 100644 (file)
--- a/framework/main/classes/filter/class_BaseFilterDecorator.php
+++ b/framework/main/classes/filter/class_BaseFilterDecorator.php
@@ -12,11 +12,7 @@ use Org\Mxchange\CoreFramework\Response\Responseable;
  *
  * @author             Roland Haeder <webmaster@shipsimu.org>
  * @version            0.0.0
-<<<<<<< HEAD:framework/main/classes/filter/class_BaseFilterDecorator.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/filter/class_BaseFilterDecorator.php
  * @license            GNU GPL 3.0 or any newer version
  * @link               http://www.shipsimu.org
  *

diff --git a/framework/main/classes/filter/class_FilterChain.php b/framework/main/classes/filter/class_FilterChain.php
index 045deeee77550a3960731a28eebd38ddc0fdbecf..ad376f9b6dda5dc761de98dd9377bf4b5d5d6ba3 100644 (file)
--- a/framework/main/classes/filter/class_FilterChain.php
+++ b/framework/main/classes/filter/class_FilterChain.php
@@ -14,11 +14,7 @@ use Org\Mxchange\CoreFramework\Response\Responseable;
  *
  * @author             Roland Haeder <webmaster@shipsimu.org>
  * @version            0.0.0
-<<<<<<< HEAD:framework/main/classes/filter/class_FilterChain.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/filter/class_FilterChain.php
  * @license            GNU GPL 3.0 or any newer version
  * @link               http://www.shipsimu.org
  *

diff --git a/framework/main/classes/filter/crypto/class_CaptchaEncryptFilter.php b/framework/main/classes/filter/crypto/class_CaptchaEncryptFilter.php
index 955af1438f6b1f61cb7461b92f6a5756ad854ed9..128e06fab9ef40b81799e930b4936d639f810088 100644 (file)
--- a/framework/main/classes/filter/crypto/class_CaptchaEncryptFilter.php
+++ b/framework/main/classes/filter/crypto/class_CaptchaEncryptFilter.php
@@ -15,11 +15,7 @@ use Org\Mxchange\CoreFramework\Response\Responseable;
  *
  * @author             Roland Haeder <webmaster@shipsimu.org>
  * @version            0.0.0
-<<<<<<< HEAD:framework/main/classes/filter/crypto/class_CaptchaEncryptFilter.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/filter/crypto/class_CaptchaEncryptFilter.php
  * @license            GNU GPL 3.0 or any newer version
  * @link               http://www.shipsimu.org
  *

diff --git a/framework/main/classes/filter/guest/class_UserNameIsGuestFilter.php b/framework/main/classes/filter/guest/class_UserNameIsGuestFilter.php
index 3a2c21cf97aaca91b46beb8f57d2b486a049e30e..20683cb61f1c692fe46f71d7522d92fa60ac46b5 100644 (file)
--- a/framework/main/classes/filter/guest/class_UserNameIsGuestFilter.php
+++ b/framework/main/classes/filter/guest/class_UserNameIsGuestFilter.php
@@ -14,11 +14,7 @@ use Org\Mxchange\CoreFramework\Response\Responseable;
  *
  * @author             Roland Haeder <webmaster@shipsimu.org>
  * @version            0.0.0
-<<<<<<< HEAD:framework/main/classes/filter/guest/class_UserNameIsGuestFilter.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/filter/guest/class_UserNameIsGuestFilter.php
  * @license            GNU GPL 3.0 or any newer version
  * @link               http://www.shipsimu.org
  *

diff --git a/framework/main/classes/filter/news/class_NewsDownloadFilter.php b/framework/main/classes/filter/news/class_NewsDownloadFilter.php
index 205043cf6c1a006db01e81284e631c2abc442f89..e9f2f06cad1d068dc3ee4dd692ca9e099089b686 100644 (file)
--- a/framework/main/classes/filter/news/class_NewsDownloadFilter.php
+++ b/framework/main/classes/filter/news/class_NewsDownloadFilter.php
@@ -6,7 +6,7 @@ namespace Org\Mxchange\CoreFramework\Filter\News;
 use Org\Mxchange\CoreFramework\Factory\News\HtmlNewsFactory;
 use Org\Mxchange\CoreFramework\Filter\BaseFilter;
 use Org\Mxchange\CoreFramework\Filter\Filterable;
-use Org\Mxchange\CoreFramework\Registry\Registry;
+use Org\Mxchange\CoreFramework\Registry\GenericRegistry;
 use Org\Mxchange\CoreFramework\Request\Requestable;
 use Org\Mxchange\CoreFramework\Response\Responseable;
 
@@ -17,11 +17,7 @@ use Org\Mxchange\CoreFramework\Response\Responseable;
  *
  * @author             Roland Haeder <webmaster@shipsimu.org>
  * @version            0.0.0
-<<<<<<< HEAD:framework/main/classes/filter/news/class_NewsDownloadFilter.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/filter/news/class_NewsDownloadFilter.php
  * @license            GNU GPL 3.0 or any newer version
  * @link               http://www.shipsimu.org
  *

diff --git a/framework/main/classes/filter/news/class_NewsProcessFilter.php b/framework/main/classes/filter/news/class_NewsProcessFilter.php
index 3eae3714ffa0758ebc9ab3981c33879e19379e2b..adf18ed291a93448aa951189c29a90f522dcf0c3 100644 (file)
--- a/framework/main/classes/filter/news/class_NewsProcessFilter.php
+++ b/framework/main/classes/filter/news/class_NewsProcessFilter.php
@@ -14,11 +14,7 @@ use Org\Mxchange\CoreFramework\Response\Responseable;
  *
  * @author             Roland Haeder <webmaster@shipsimu.org>
  * @version            0.0.0
-<<<<<<< HEAD:framework/main/classes/filter/news/class_NewsProcessFilter.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/filter/news/class_NewsProcessFilter.php
  * @license            GNU GPL 3.0 or any newer version
  * @link               http://www.shipsimu.org
  *

diff --git a/framework/main/classes/filter/null/class_NullFilter.php b/framework/main/classes/filter/null/class_NullFilter.php
index 781312f9a585183a35cc00cf0d3c3bf05839a249..f8a92eaba7192ae1e1af1aaf38a60b5f877c5fce 100644 (file)
--- a/framework/main/classes/filter/null/class_NullFilter.php
+++ b/framework/main/classes/filter/null/class_NullFilter.php
@@ -14,11 +14,7 @@ use Org\Mxchange\CoreFramework\Response\Responseable;
  *
  * @author             Roland Haeder <webmaster@shipsimu.org>
  * @version            0.0.0
-<<<<<<< HEAD:framework/main/classes/filter/null/class_NullFilter.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/filter/null/class_NullFilter.php
  * @license            GNU GPL 3.0 or any newer version
  * @link               http://www.shipsimu.org
  *

diff --git a/framework/main/classes/filter/payment/class_PaymentDiscoveryFilter.php b/framework/main/classes/filter/payment/class_PaymentDiscoveryFilter.php
index 22b4317432b73b85a6f808d0d9bf508d11aa1cac..7ba94262f9bdc295f6c52b6b505f910c0925f194 100644 (file)
--- a/framework/main/classes/filter/payment/class_PaymentDiscoveryFilter.php
+++ b/framework/main/classes/filter/payment/class_PaymentDiscoveryFilter.php
@@ -9,7 +9,7 @@ use Org\Mxchange\CoreFramework\Filter\BaseFilter;
 use Org\Mxchange\CoreFramework\Filter\Filterable;
 use Org\Mxchange\CoreFramework\Generic\NullPointerException;
 use Org\Mxchange\CoreFramework\Loader\NoClassException;
-use Org\Mxchange\CoreFramework\Registry\Registry;
+use Org\Mxchange\CoreFramework\Registry\GenericRegistry;
 use Org\Mxchange\CoreFramework\Request\Requestable;
 use Org\Mxchange\CoreFramework\Response\Responseable;
 
@@ -20,11 +20,7 @@ use Org\Mxchange\CoreFramework\Response\Responseable;
  *
  * @author             Roland Haeder <webmaster@shipsimu.org>
  * @version            0.0.0
-<<<<<<< HEAD:framework/main/classes/filter/payment/class_PaymentDiscoveryFilter.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/filter/payment/class_PaymentDiscoveryFilter.php
  * @license            GNU GPL 3.0 or any newer version
  * @link               http://www.shipsimu.org
  *

diff --git a/framework/main/classes/filter/update/class_UserStatusConfimedUpdateFilter.php b/framework/main/classes/filter/update/class_UserStatusConfimedUpdateFilter.php
index 13e82f16514f79d1c04682d4c3aa8d24d47c141c..dc59912a43cb7655b899e284216424a8d9776615 100644 (file)
--- a/framework/main/classes/filter/update/class_UserStatusConfimedUpdateFilter.php
+++ b/framework/main/classes/filter/update/class_UserStatusConfimedUpdateFilter.php
@@ -6,7 +6,7 @@ namespace Org\Mxchange\CoreFramework\Filter\User\Status;
 use Org\Mxchange\CoreFramework\Database\Frontend\User\UserDatabaseWrapper;
 use Org\Mxchange\CoreFramework\Filter\BaseFilter;
 use Org\Mxchange\CoreFramework\Filter\Filterable;
-use Org\Mxchange\CoreFramework\Registry\Registry;
+use Org\Mxchange\CoreFramework\Registry\GenericRegistry;
 use Org\Mxchange\CoreFramework\Request\Requestable;
 use Org\Mxchange\CoreFramework\Response\Responseable;
 
@@ -15,11 +15,7 @@ use Org\Mxchange\CoreFramework\Response\Responseable;
  *
  * @author             Roland Haeder <webmaster@shipsimu.org>
  * @version            0.0.0
-<<<<<<< HEAD:framework/main/classes/filter/update/class_UserStatusConfimedUpdateFilter.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/filter/update/class_UserStatusConfimedUpdateFilter.php
  * @license            GNU GPL 3.0 or any newer version
  * @link               http://www.shipsimu.org
  *
@@ -69,7 +65,7 @@ class UserStatusConfimedUpdateFilter extends BaseFilter implements Filterable {
         */
        public function execute (Requestable $requestInstance, Responseable $responseInstance) {
                // Get user instance from registry
-               $userInstance = Registry::getRegistry()->getInstance('user');
+               $userInstance = GenericRegistry::getRegistry()->getInstance('user');
 
                // Get "confirmed" status from config
                $confirmed = $this->getConfigInstance()->getConfigEntry('user_status_confirmed');

diff --git a/framework/main/classes/filter/update/class_UserUpdateFilter.php b/framework/main/classes/filter/update/class_UserUpdateFilter.php
index c49bddfbf4a6220ff6ac7c4e3d01d70b79d3433b..551ae50084fd9fd1f6405dd1722d33b400d193a1 100644 (file)
--- a/framework/main/classes/filter/update/class_UserUpdateFilter.php
+++ b/framework/main/classes/filter/update/class_UserUpdateFilter.php
@@ -5,7 +5,7 @@ namespace Org\Mxchange\CoreFramework\Filter\User;
 // Import framework stuff
 use Org\Mxchange\CoreFramework\Filter\BaseFilter;
 use Org\Mxchange\CoreFramework\Filter\Filterable;
-use Org\Mxchange\CoreFramework\Registry\Registry;
+use Org\Mxchange\CoreFramework\Registry\GenericRegistry;
 use Org\Mxchange\CoreFramework\Request\Requestable;
 use Org\Mxchange\CoreFramework\Response\Responseable;
 
@@ -15,11 +15,7 @@ use Org\Mxchange\CoreFramework\Response\Responseable;
  *
  * @author             Roland Haeder <webmaster@shipsimu.org>
  * @version            0.0.0
-<<<<<<< HEAD:framework/main/classes/filter/update/class_UserUpdateFilter.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/filter/update/class_UserUpdateFilter.php
  * @license            GNU GPL 3.0 or any newer version
  * @link               http://www.shipsimu.org
  *
@@ -70,13 +66,13 @@ class UserUpdateFilter extends BaseFilter implements Filterable {
         */
        public function execute (Requestable $requestInstance, Responseable $responseInstance) {
                // Get user instance from registry
-               $userInstance = Registry::getRegistry()->getInstance('user');
+               $userInstance = GenericRegistry::getRegistry()->getInstance('user');
 
                // Now update last activity
                $userInstance->updateLastActivity($requestInstance);
 
                // Update auth data as well
-               $authInstance = Registry::getRegistry()->getInstance('auth');
+               $authInstance = GenericRegistry::getRegistry()->getInstance('auth');
                $authInstance->updateAuthData();
 
                // Write all updates to the database

diff --git a/framework/main/classes/filter/validator/class_EmailValidatorFilter.php b/framework/main/classes/filter/validator/class_EmailValidatorFilter.php
index 8e6fcf592ac09b5bb14327893efb51f73e584e93..d609d86573c4a2c15700dac7a0534e00c62da0fa 100644 (file)
--- a/framework/main/classes/filter/validator/class_EmailValidatorFilter.php
+++ b/framework/main/classes/filter/validator/class_EmailValidatorFilter.php
@@ -5,7 +5,7 @@ namespace Org\Mxchange\CoreFramework\Filter\Validator\Email;
 // Import framework stuff
 use Org\Mxchange\CoreFramework\Filter\BaseFilter;
 use Org\Mxchange\CoreFramework\Filter\Filterable;
-use Org\Mxchange\CoreFramework\Registry\Registry;
+use Org\Mxchange\CoreFramework\Registry\GenericRegistry;
 use Org\Mxchange\CoreFramework\Request\Requestable;
 use Org\Mxchange\CoreFramework\Response\Responseable;
 
@@ -17,11 +17,7 @@ use Org\Mxchange\CoreFramework\Response\Responseable;
  *
  * @author             Roland Haeder <webmaster@shipsimu.org>
  * @version            0.0.0
-<<<<<<< HEAD:framework/main/classes/filter/validator/class_EmailValidatorFilter.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/filter/validator/class_EmailValidatorFilter.php
  * @license            GNU GPL 3.0 or any newer version
  * @link               http://www.shipsimu.org
  *
@@ -153,7 +149,7 @@ class EmailValidatorFilter extends BaseFilter implements Filterable {
                $userInstance = NULL;
 
                // Get a registry instance
-               $registry = Registry::getRegistry();
+               $registry = GenericRegistry::getRegistry();
 
                // Is the user already there?
                if ($registry->instanceExists('user')) {

diff --git a/framework/main/classes/filter/validator/class_PasswordValidatorFilter.php b/framework/main/classes/filter/validator/class_PasswordValidatorFilter.php
index 3c0ad07113dd851db4002e3f62f93d53f5da7889..80a02acc80eb9edc31708a3ce46d2c4657681807 100644 (file)
--- a/framework/main/classes/filter/validator/class_PasswordValidatorFilter.php
+++ b/framework/main/classes/filter/validator/class_PasswordValidatorFilter.php
@@ -14,11 +14,7 @@ use Org\Mxchange\CoreFramework\Response\Responseable;
  *
  * @author             Roland Haeder <webmaster@shipsimu.org>
  * @version            0.0.0
-<<<<<<< HEAD:framework/main/classes/filter/validator/class_PasswordValidatorFilter.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/filter/validator/class_PasswordValidatorFilter.php
  * @license            GNU GPL 3.0 or any newer version
  * @link               http://www.shipsimu.org
  *

diff --git a/framework/main/classes/filter/validator/class_UserNameValidatorFilter.php b/framework/main/classes/filter/validator/class_UserNameValidatorFilter.php
index dac5153b9c3c5e30927dd13afe381ef1128b57dd..358a759dcb6fd6397af8a0669572332cffb95cd2 100644 (file)
--- a/framework/main/classes/filter/validator/class_UserNameValidatorFilter.php
+++ b/framework/main/classes/filter/validator/class_UserNameValidatorFilter.php
@@ -5,7 +5,7 @@ namespace Org\Mxchange\CoreFramework\Filter\Validator\Username;
 // Import framework stuff
 use Org\Mxchange\CoreFramework\Filter\BaseFilter;
 use Org\Mxchange\CoreFramework\Filter\Filterable;
-use Org\Mxchange\CoreFramework\Registry\Registry;
+use Org\Mxchange\CoreFramework\Registry\GenericRegistry;
 use Org\Mxchange\CoreFramework\Request\Requestable;
 use Org\Mxchange\CoreFramework\Response\Responseable;
 
@@ -16,11 +16,7 @@ use Org\Mxchange\CoreFramework\Response\Responseable;
  *
  * @author             Roland Haeder <webmaster@shipsimu.org>
  * @version            0.0.0
-<<<<<<< HEAD:framework/main/classes/filter/validator/class_UserNameValidatorFilter.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/filter/validator/class_UserNameValidatorFilter.php
  * @license            GNU GPL 3.0 or any newer version
  * @link               http://www.shipsimu.org
  *
@@ -118,7 +114,7 @@ class UserNameValidatorFilter extends BaseFilter implements Filterable {
                $userInstance = NULL;
 
                // Get a registry instance
-               $registry = Registry::getRegistry();
+               $registry = GenericRegistry::getRegistry();
 
                // Is the user already there?
                if ($registry->instanceExists('user')) {

diff --git a/framework/main/classes/filter/verifier/class_AccountPasswordVerifierFilter.php b/framework/main/classes/filter/verifier/class_AccountPasswordVerifierFilter.php
index a8c999701083ad225e552a987e99e865866176ee..8e4c0b807a82c02dd22d429183105226cc1ed33b 100644 (file)
--- a/framework/main/classes/filter/verifier/class_AccountPasswordVerifierFilter.php
+++ b/framework/main/classes/filter/verifier/class_AccountPasswordVerifierFilter.php
@@ -6,7 +6,7 @@ namespace Org\Mxchange\CoreFramework\Filter\Verifier\Password;
 use Org\Mxchange\CoreFramework\Filter\BaseFilter;
 use Org\Mxchange\CoreFramework\Filter\Filterable;
 use Org\Mxchange\CoreFramework\Factory\ObjectFactory;
-use Org\Mxchange\CoreFramework\Registry\Registry;
+use Org\Mxchange\CoreFramework\Registry\GenericRegistry;
 use Org\Mxchange\CoreFramework\Request\Requestable;
 use Org\Mxchange\CoreFramework\Response\Responseable;
 use Org\Mxchange\CoreFramework\User\BaseUser;
@@ -17,11 +17,7 @@ use Org\Mxchange\CoreFramework\User\BaseUser;
  *
  * @author             Roland Haeder <webmaster@shipsimu.org>
  * @version            0.0.0
-<<<<<<< HEAD:framework/main/classes/filter/verifier/class_AccountPasswordVerifierFilter.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/filter/verifier/class_AccountPasswordVerifierFilter.php
  * @license            GNU GPL 3.0 or any newer version
  * @link               http://www.shipsimu.org
  *
@@ -106,7 +102,7 @@ class AccountPasswordVerifierFilter extends BaseFilter implements Filterable {
                } // END - if
 
                // Get a user instance
-               $userInstance = Registry::getRegistry()->getInstance('user');
+               $userInstance = GenericRegistry::getRegistry()->getInstance('user');
 
                // Get current hash
                $currentHash = $userInstance->getField('pass_hash');

diff --git a/framework/main/classes/filter/verifier/class_BirthdayVerifierFilter.php b/framework/main/classes/filter/verifier/class_BirthdayVerifierFilter.php
index e824c3e8b65b00d0e4cbdd17fa18f49e372359af..cf608314896bcfb26a8ffd5d59e8f312072d6cd8 100644 (file)
--- a/framework/main/classes/filter/verifier/class_BirthdayVerifierFilter.php
+++ b/framework/main/classes/filter/verifier/class_BirthdayVerifierFilter.php
@@ -13,11 +13,7 @@ use Org\Mxchange\CoreFramework\Response\Responseable;
  *
  * @author             Roland Haeder <webmaster@shipsimu.org>
  * @version            0.0.0
-<<<<<<< HEAD:framework/main/classes/filter/verifier/class_BirthdayVerifierFilter.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/filter/verifier/class_BirthdayVerifierFilter.php
  * @license            GNU GPL 3.0 or any newer version
  * @link               http://www.shipsimu.org
  *

diff --git a/framework/main/classes/filter/verifier/class_ConfirmCodeVerifierFilter.php b/framework/main/classes/filter/verifier/class_ConfirmCodeVerifierFilter.php
index 474a81d3368a4b2b72d3c68b75b124ec0dc8af28..f0635c08f4916db62bf88dc97935414d86e72481 100644 (file)
--- a/framework/main/classes/filter/verifier/class_ConfirmCodeVerifierFilter.php
+++ b/framework/main/classes/filter/verifier/class_ConfirmCodeVerifierFilter.php
@@ -6,7 +6,7 @@ namespace Org\Mxchange\CoreFramework\Filter\Verifier\Confirmation;
 use Org\Mxchange\CoreFramework\Database\Frontend\User\UserDatabaseWrapper;
 use Org\Mxchange\CoreFramework\Filter\BaseFilter;
 use Org\Mxchange\CoreFramework\Filter\Filterable;
-use Org\Mxchange\CoreFramework\Registry\Registry;
+use Org\Mxchange\CoreFramework\Registry\GenericRegistry;
 use Org\Mxchange\CoreFramework\Request\Requestable;
 use Org\Mxchange\CoreFramework\Response\Responseable;
 
@@ -15,11 +15,7 @@ use Org\Mxchange\CoreFramework\Response\Responseable;
  *
  * @author             Roland Haeder <webmaster@shipsimu.org>
  * @version            0.0.0
-<<<<<<< HEAD:framework/main/classes/filter/verifier/class_ConfirmCodeVerifierFilter.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/filter/verifier/class_ConfirmCodeVerifierFilter.php
  * @license            GNU GPL 3.0 or any newer version
  * @link               http://www.shipsimu.org
  *
@@ -94,7 +90,7 @@ class ConfirmCodeVerifierFilter extends BaseFilter implements Filterable {
                }
 
                // Get a user instance from registry
-               $userInstance = Registry::getRegistry()->getInstance('user');
+               $userInstance = GenericRegistry::getRegistry()->getInstance('user');
 
                // Get the confirm code from user for comparison
                $userCode = $userInstance->getField(UserDatabaseWrapper::DB_COLUMN_CONFIRM_HASH);

diff --git a/framework/main/classes/filter/verifier/class_GraphicalCodeCaptchaVerifierFilter.php b/framework/main/classes/filter/verifier/class_GraphicalCodeCaptchaVerifierFilter.php
index db32135929f992b457edbaed0391c3c6d448e17b..3a123427a76ad3dee257457fbb66f5f1192a7371 100644 (file)
--- a/framework/main/classes/filter/verifier/class_GraphicalCodeCaptchaVerifierFilter.php
+++ b/framework/main/classes/filter/verifier/class_GraphicalCodeCaptchaVerifierFilter.php
@@ -14,11 +14,7 @@ use Org\Mxchange\CoreFramework\Response\Responseable;
  *
  * @author             Roland Haeder <webmaster@shipsimu.org>
  * @version            0.0.0
-<<<<<<< HEAD:framework/main/classes/filter/verifier/class_GraphicalCodeCaptchaVerifierFilter.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/filter/verifier/class_GraphicalCodeCaptchaVerifierFilter.php
  * @license            GNU GPL 3.0 or any newer version
  * @link               http://www.shipsimu.org
  *

diff --git a/framework/main/classes/filter/verifier/class_PasswordGuestVerifierFilter.php b/framework/main/classes/filter/verifier/class_PasswordGuestVerifierFilter.php
index 931f6a4c03c06d973d85527e0bd2c04d03ab45f5..faceca0225233d8345b1d4eb85c67e3e7f7580ac 100644 (file)
--- a/framework/main/classes/filter/verifier/class_PasswordGuestVerifierFilter.php
+++ b/framework/main/classes/filter/verifier/class_PasswordGuestVerifierFilter.php
@@ -14,11 +14,7 @@ use Org\Mxchange\CoreFramework\Response\Responseable;
  *
  * @author             Roland Haeder <webmaster@shipsimu.org>
  * @version            0.0.0
-<<<<<<< HEAD:framework/main/classes/filter/verifier/class_PasswordGuestVerifierFilter.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/filter/verifier/class_PasswordGuestVerifierFilter.php
  * @license            GNU GPL 3.0 or any newer version
  * @link               http://www.shipsimu.org
  *

diff --git a/framework/main/classes/filter/verifier/class_PasswordVerifierFilter.php b/framework/main/classes/filter/verifier/class_PasswordVerifierFilter.php
index 099fad3a404bf8af4fdd9f8b0a0d882a997f3ad4..1fff8de638996b07d6b91fdb7f31d0baeea80900 100644 (file)
--- a/framework/main/classes/filter/verifier/class_PasswordVerifierFilter.php
+++ b/framework/main/classes/filter/verifier/class_PasswordVerifierFilter.php
@@ -14,11 +14,7 @@ use Org\Mxchange\CoreFramework\Response\Responseable;
  *
  * @author             Roland Haeder <webmaster@shipsimu.org>
  * @version            0.0.0
-<<<<<<< HEAD:framework/main/classes/filter/verifier/class_PasswordVerifierFilter.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/filter/verifier/class_PasswordVerifierFilter.php
  * @license            GNU GPL 3.0 or any newer version
  * @link               http://www.shipsimu.org
  *

diff --git a/framework/main/classes/filter/verifier/class_UserGuestVerifierFilter.php b/framework/main/classes/filter/verifier/class_UserGuestVerifierFilter.php
index c6ec0215fa03442528a7b8e351aa9d3c7539421b..7ef16a6bad0109c64c52cb0ad5fa2d7ced4c94fa 100644 (file)
--- a/framework/main/classes/filter/verifier/class_UserGuestVerifierFilter.php
+++ b/framework/main/classes/filter/verifier/class_UserGuestVerifierFilter.php
@@ -5,7 +5,7 @@ namespace Org\Mxchange\CoreFramework\Filter\Verifier\User;
 // Import framework stuff
 use Org\Mxchange\CoreFramework\Filter\BaseFilter;
 use Org\Mxchange\CoreFramework\Filter\Filterable;
-use Org\Mxchange\CoreFramework\Registry\Registry;
+use Org\Mxchange\CoreFramework\Registry\GenericRegistry;
 use Org\Mxchange\CoreFramework\Request\Requestable;
 use Org\Mxchange\CoreFramework\Response\Responseable;
 
@@ -16,11 +16,7 @@ use Org\Mxchange\CoreFramework\Response\Responseable;
  *
  * @author             Roland Haeder <webmaster@shipsimu.org>
  * @version            0.0.0
-<<<<<<< HEAD:framework/main/classes/filter/verifier/class_UserGuestVerifierFilter.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/filter/verifier/class_UserGuestVerifierFilter.php
  * @license            GNU GPL 3.0 or any newer version
  * @link               http://www.shipsimu.org
  *
@@ -121,7 +117,7 @@ class UserGuestVerifierFilter extends BaseFilter implements Filterable {
                $userInstance = NULL;
 
                // Get a registry instance
-               $registry = Registry::getRegistry();
+               $registry = GenericRegistry::getRegistry();
 
                // Is the user already there?
                if ($registry->instanceExists('user')) {

diff --git a/framework/main/classes/filter/verifier/class_UserNameVerifierFilter.php b/framework/main/classes/filter/verifier/class_UserNameVerifierFilter.php
index c56c8c6fcfd7fa3573caed7cbaec8951ce6996ab..4a02455270c8ff1f39bf2756eddb4c3b534936ba 100644 (file)
--- a/framework/main/classes/filter/verifier/class_UserNameVerifierFilter.php
+++ b/framework/main/classes/filter/verifier/class_UserNameVerifierFilter.php
@@ -5,7 +5,7 @@ namespace Org\Mxchange\CoreFramework\Filter\Verifier\User;
 // Import framework stuff
 use Org\Mxchange\CoreFramework\Filter\BaseFilter;
 use Org\Mxchange\CoreFramework\Filter\Filterable;
-use Org\Mxchange\CoreFramework\Registry\Registry;
+use Org\Mxchange\CoreFramework\Registry\GenericRegistry;
 use Org\Mxchange\CoreFramework\Request\Requestable;
 use Org\Mxchange\CoreFramework\Response\Responseable;
 
@@ -16,11 +16,7 @@ use Org\Mxchange\CoreFramework\Response\Responseable;
  *
  * @author             Roland Haeder <webmaster@shipsimu.org>
  * @version            0.0.0
-<<<<<<< HEAD:framework/main/classes/filter/verifier/class_UserNameVerifierFilter.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/filter/verifier/class_UserNameVerifierFilter.php
  * @license            GNU GPL 3.0 or any newer version
  * @link               http://www.shipsimu.org
  *
@@ -118,7 +114,7 @@ class UserNameVerifierFilter extends BaseFilter implements Filterable {
                $userInstance = NULL;
 
                // Get a registry instance
-               $registry = Registry::getRegistry();
+               $registry = GenericRegistry::getRegistry();
 
                // Is the user already there?
                if ($registry->instanceExists('user')) {

diff --git a/framework/main/classes/filter/verifier/class_UserStatusVerifierFilter.php b/framework/main/classes/filter/verifier/class_UserStatusVerifierFilter.php
index b9f060bfc003b05e974c0111afced22f85c55848..6e1e074991e87c89df3cf7c0bf8dd2aaa4eaa462 100644 (file)
--- a/framework/main/classes/filter/verifier/class_UserStatusVerifierFilter.php
+++ b/framework/main/classes/filter/verifier/class_UserStatusVerifierFilter.php
@@ -5,7 +5,7 @@ namespace Org\Mxchange\CoreFramework\Filter\Verifier\User;
 // Import framework stuff
 use Org\Mxchange\CoreFramework\Filter\BaseFilter;
 use Org\Mxchange\CoreFramework\Filter\Filterable;
-use Org\Mxchange\CoreFramework\Registry\Registry;
+use Org\Mxchange\CoreFramework\Registry\GenericRegistry;
 use Org\Mxchange\CoreFramework\Request\Requestable;
 use Org\Mxchange\CoreFramework\Response\Responseable;
 
@@ -14,11 +14,7 @@ use Org\Mxchange\CoreFramework\Response\Responseable;
  *
  * @author             Roland Haeder <webmaster@shipsimu.org>
  * @version            0.0.0
-<<<<<<< HEAD:framework/main/classes/filter/verifier/class_UserStatusVerifierFilter.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/filter/verifier/class_UserStatusVerifierFilter.php
  * @license            GNU GPL 3.0 or any newer version
  * @link               http://www.shipsimu.org
  *
@@ -68,7 +64,7 @@ class UserStatusVerifierFilter extends BaseFilter implements Filterable {
         */
        public function execute (Requestable $requestInstance, Responseable $responseInstance) {
                // Get a user instance for comparison
-               $userInstance = Registry::getRegistry()->getInstance('user');
+               $userInstance = GenericRegistry::getRegistry()->getInstance('user');
 
                // Is the user account confirmed?
                if ((!$userInstance->isConfirmed()) && (!$userInstance->isGuest()) && ($requestInstance->getRequestElement('action') != $this->getConfigInstance()->getConfigEntry('action_status_problem'))) {

diff --git a/framework/main/classes/filter/verifier/class_UserUnconfirmedVerifierFilter.php b/framework/main/classes/filter/verifier/class_UserUnconfirmedVerifierFilter.php
index 2a064ba507f0f7cbce2485fc06b7f8b0504a1506..9c4e21b14d6ab94c8ab6b954ae1d76af94c01c23 100644 (file)
--- a/framework/main/classes/filter/verifier/class_UserUnconfirmedVerifierFilter.php
+++ b/framework/main/classes/filter/verifier/class_UserUnconfirmedVerifierFilter.php
@@ -6,7 +6,7 @@ namespace Org\Mxchange\CoreFramework\Filter\Verifier\User;
 use Org\Mxchange\CoreFramework\Database\Frontend\User\UserDatabaseWrapper;
 use Org\Mxchange\CoreFramework\Filter\BaseFilter;
 use Org\Mxchange\CoreFramework\Filter\Filterable;
-use Org\Mxchange\CoreFramework\Registry\Registry;
+use Org\Mxchange\CoreFramework\Registry\GenericRegistry;
 use Org\Mxchange\CoreFramework\Request\Requestable;
 use Org\Mxchange\CoreFramework\Response\Responseable;
 
@@ -15,11 +15,7 @@ use Org\Mxchange\CoreFramework\Response\Responseable;
  *
  * @author             Roland Haeder <webmaster@shipsimu.org>
  * @version            0.0.0
-<<<<<<< HEAD:framework/main/classes/filter/verifier/class_UserUnconfirmedVerifierFilter.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/filter/verifier/class_UserUnconfirmedVerifierFilter.php
  * @license            GNU GPL 3.0 or any newer version
  * @link               http://www.shipsimu.org
  *

diff --git a/framework/main/classes/fuse/class_FrameworkFuseWrapper.php_discontinued b/framework/main/classes/fuse/class_FrameworkFuseWrapper.php_discontinued
index 14a4c47af4326a90f987c5a073d178d814677c88..6f17387ca9e103a6c6ef1d52a5b72bb310e8075a 100644 (file)
--- a/framework/main/classes/fuse/class_FrameworkFuseWrapper.php_discontinued
+++ b/framework/main/classes/fuse/class_FrameworkFuseWrapper.php_discontinued
@@ -17,11 +17,7 @@ use \FuseWrapper;
  *
  * @author             Roland Haeder <webmaster@ship-simu.org>
  * @version            0.0.0
-<<<<<<< HEAD:framework/main/classes/fuse/class_FrameworkFuseWrapper.php_discontinued
  * @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/fuse/class_FrameworkFuseWrapper.php
  * @license            GNU GPL 3.0 or any newer version
  * @link               http://www.ship-simu.org
  *

diff --git a/framework/main/classes/handler/class_ b/framework/main/classes/handler/class_
index 4cb0398749051d4bc1b4c9513398ab7b41c16467..0faf72777193a627b325ffcda286a538f9afcfc7 100644 (file)
--- a/framework/main/classes/handler/class_
+++ b/framework/main/classes/handler/class_
@@ -10,11 +10,7 @@ use Org\Mxchange\CoreFramework\Handler\BaseHandler;
  *
  * @author             Roland Haeder <webmaster@ship-simu.org>
  * @version            0.0.0
-<<<<<<< HEAD:framework/main/classes/handler/class_
  * @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_
  * @license            GNU GPL 3.0 or any newer version
  * @link               http://www.ship-simu.org
  *

diff --git a/framework/main/classes/handler/class_BaseHandler.php b/framework/main/classes/handler/class_BaseHandler.php
index 48a6b084fa9a16f2cc956d3687c6e5e616a0f166..c5dcd4857f373cd5cd82c8eced287f1a17764ce7 100644 (file)
--- a/framework/main/classes/handler/class_BaseHandler.php
+++ b/framework/main/classes/handler/class_BaseHandler.php
@@ -12,11 +12,7 @@ use Org\Mxchange\CoreFramework\Object\BaseFrameworkSystem;
  *
  * @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
  *

diff --git a/framework/main/classes/handler/tasks/class_TaskHandler.php b/framework/main/classes/handler/tasks/class_TaskHandler.php
index be1c8fdea0694caa5a66b39a10fb4aea22a1246f..dfc0142281f1f3ce3a6663f386c0162d8534c6e6 100644 (file)
--- a/framework/main/classes/handler/tasks/class_TaskHandler.php
+++ b/framework/main/classes/handler/tasks/class_TaskHandler.php
@@ -15,11 +15,7 @@ use Org\Mxchange\CoreFramework\Visitor\Visitable;
  *
  * @author             Roland Haeder <webmaster@shipsimu.org>
  * @version            0.0.0
-<<<<<<< HEAD:framework/main/classes/handler/tasks/class_TaskHandler.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/tasks/class_TaskHandler.php
  * @license            GNU GPL 3.0 or any newer version
  * @link               http://www.shipsimu.org
  *

diff --git a/framework/main/classes/helper/captcha/class_ b/framework/main/classes/helper/captcha/class_
index 5eefd012e25cb534b537ed842d8e70968601ecaf..c293891800e342d2e8a23362a651205385c032bf 100644 (file)
--- a/framework/main/classes/helper/captcha/class_
+++ b/framework/main/classes/helper/captcha/class_
@@ -10,11 +10,7 @@ use Org\Mxchange\CoreFramework\Generic\FrameworkInterface;
  *
  * @author             Roland Haeder <webmaster@ship-simu.org>
  * @version            0.0.0
-<<<<<<< HEAD:framework/main/classes/helper/captcha/class_
  * @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/helper/captcha/class_
  * @license            GNU GPL 3.0 or any newer version
  * @link               http://www.ship-simu.org
  *

diff --git a/framework/main/classes/helper/captcha/class_BaseCaptcha.php b/framework/main/classes/helper/captcha/class_BaseCaptcha.php
index 385460f9a75f712bfa02e317888ba905974648aa..f0bb7aeb0245c9e5090e4b925cb0a69ffb754ad3 100644 (file)
--- a/framework/main/classes/helper/captcha/class_BaseCaptcha.php
+++ b/framework/main/classes/helper/captcha/class_BaseCaptcha.php
@@ -12,11 +12,7 @@ use Org\Mxchange\CoreFramework\Helper\BaseHelper;
  *
  * @author             Roland Haeder <webmaster@shipsimu.org>
  * @version            0.0.0
-<<<<<<< HEAD:framework/main/classes/helper/captcha/class_BaseCaptcha.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/helper/captcha/class_BaseCaptcha.php
  * @license            GNU GPL 3.0 or any newer version
  * @link               http://www.shipsimu.org
  *

diff --git a/framework/main/classes/helper/captcha/images/class_ImageHelper.php b/framework/main/classes/helper/captcha/images/class_ImageHelper.php
index 81f30c7e62c80d7ddf5367de1dbaffef5aa1fd04..da87bb80dcb72bde873c64b80b663ff1fcdd3e12 100644 (file)
--- a/framework/main/classes/helper/captcha/images/class_ImageHelper.php
+++ b/framework/main/classes/helper/captcha/images/class_ImageHelper.php
@@ -12,11 +12,7 @@ use Org\Mxchange\CoreFramework\Template\CompileableTemplate;
  *
  * @author             Roland Haeder <webmaster@shipsimu.org>
  * @version            0.0.0
-<<<<<<< HEAD:framework/main/classes/helper/captcha/images/class_ImageHelper.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/helper/captcha/images/class_ImageHelper.php
  * @license            GNU GPL 3.0 or any newer version
  * @link               http://www.shipsimu.org
  *

diff --git a/framework/main/classes/helper/captcha/web/class_GraphicalCodeCaptcha.php b/framework/main/classes/helper/captcha/web/class_GraphicalCodeCaptcha.php
index 9ffe45aa02885c7eeef9c83d49bd3c2fe623ed10..45eaf4a8f94b89aa8d715f7b6a6099732b264218 100644 (file)
--- a/framework/main/classes/helper/captcha/web/class_GraphicalCodeCaptcha.php
+++ b/framework/main/classes/helper/captcha/web/class_GraphicalCodeCaptcha.php
@@ -12,11 +12,7 @@ use Org\Mxchange\CoreFramework\Helper\Template\HelpableTemplate;
  *
  * @author             Roland Haeder <webmaster@shipsimu.org>
  * @version            0.0.0
-<<<<<<< HEAD:framework/main/classes/helper/captcha/web/class_GraphicalCodeCaptcha.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/helper/captcha/web/class_GraphicalCodeCaptcha.php
  * @license            GNU GPL 3.0 or any newer version
  * @link               http://www.shipsimu.org
  *

diff --git a/framework/main/classes/helper/class_ b/framework/main/classes/helper/class_
index bbeaf312eeed8f07a6c28d3c3e5cc6d48e3b4a0b..dd3b11b41e8d9b526e630c84571f22714162e559 100644 (file)
--- a/framework/main/classes/helper/class_
+++ b/framework/main/classes/helper/class_
@@ -4,11 +4,7 @@
  *
  * @author             Roland Haeder <webmaster@ship-simu.org>
  * @version            0.0.0
-<<<<<<< HEAD:framework/main/classes/helper/class_
  * @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/helper/class_
  * @license            GNU GPL 3.0 or any newer version
  * @link               http://www.ship-simu.org
  *

diff --git a/framework/main/classes/helper/class_BaseHelper.php b/framework/main/classes/helper/class_BaseHelper.php
index 3c40725f99224064745115996afe97dde3ef7ad7..625220f718fbca7ec1b19754f9856ff9165f3665 100644 (file)
--- a/framework/main/classes/helper/class_BaseHelper.php
+++ b/framework/main/classes/helper/class_BaseHelper.php
@@ -7,18 +7,14 @@ use Org\Mxchange\CoreFramework\Factory\ObjectFactory;
 use Org\Mxchange\CoreFramework\Generic\FrameworkInterface;
 use Org\Mxchange\CoreFramework\Generic\NullPointerException;
 use Org\Mxchange\CoreFramework\Object\BaseFrameworkSystem;
-use Org\Mxchange\CoreFramework\Registry\Registry;
+use Org\Mxchange\CoreFramework\Registry\GenericRegistry;
 
 /**
  * A generic helper class with generic methods
  *
  * @author             Roland Haeder <webmaster@shipsimu.org>
  * @version            0.0.0
-<<<<<<< HEAD:framework/main/classes/helper/class_BaseHelper.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/helper/class_BaseHelper.php
  * @license            GNU GPL 3.0 or any newer version
  * @link               http://www.shipsimu.org
  *
@@ -220,7 +216,7 @@ abstract class BaseHelper extends BaseFrameworkSystem {
                //* DEBUG: */ self::createDebugInstance(__CLASS__, __LINE__)->debugOutput('O:'.$registryKey.'/'.$extraKey);
                try {
                        // Get the required instance
-                       $this->valueInstance = Registry::getRegistry()->getInstance($registryKey);
+                       $this->valueInstance = GenericRegistry::getRegistry()->getInstance($registryKey);
                } catch (NullPointerException $e) {
                        // Not set in registry
                        // @TODO Try to log it here
@@ -231,7 +227,7 @@ abstract class BaseHelper extends BaseFrameworkSystem {
                if (!is_null($extraKey)) {
                        try {
                                // Get the extra instance.
-                               $this->extraInstance = Registry::getRegistry()->getInstance($extraKey);
+                               $this->extraInstance = GenericRegistry::getRegistry()->getInstance($extraKey);
                        } catch (NullPointerException $e) {
                                // Try to create it
                                $this->extraInstance = ObjectFactory::createObjectByConfiguredName($extraKey . '_class', array($this->valueInstance));

diff --git a/framework/main/classes/helper/html/blocks/class_HtmlBlockHelper.php b/framework/main/classes/helper/html/blocks/class_HtmlBlockHelper.php
index b81c8025ff7084b800bbadce738d07683adc6754..ac4c008aef1d99dd2c27ea1877cf77d0c565bae9 100644 (file)
--- a/framework/main/classes/helper/html/blocks/class_HtmlBlockHelper.php
+++ b/framework/main/classes/helper/html/blocks/class_HtmlBlockHelper.php
@@ -11,11 +11,7 @@ use Org\Mxchange\CoreFramework\Template\CompileableTemplate;
  *
  * @author             Roland Haeder <webmaster@shipsimu.org>
  * @version            0.0.0
-<<<<<<< HEAD:framework/main/classes/helper/html/blocks/class_HtmlBlockHelper.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/helper/html/blocks/class_HtmlBlockHelper.php
  * @license            GNU GPL 3.0 or any newer version
  * @link               http://www.shipsimu.org
  *

diff --git a/framework/main/classes/helper/html/class_ b/framework/main/classes/helper/html/class_
index ea0530687be53ef95fcf508e319b437067f3f468..7ddd9e5de57d377bae983df5686e9f52918f031d 100644 (file)
--- a/framework/main/classes/helper/html/class_
+++ b/framework/main/classes/helper/html/class_
@@ -10,11 +10,7 @@ use Org\Mxchange\CoreFramework\Helper\Template\HelpableTemplate;
  *
  * @author             Roland Haeder <webmaster@ship-simu.org>
  * @version            0.0.0
-<<<<<<< HEAD:framework/main/classes/helper/html/class_
  * @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/helper/html/class_
  * @license            GNU GPL 3.0 or any newer version
  * @link               http://www.ship-simu.org
  *

diff --git a/framework/main/classes/helper/html/class_BaseHtmlHelper.php b/framework/main/classes/helper/html/class_BaseHtmlHelper.php
index 5617d41e3cb64b050c86f658b9da3434e40b8ab1..1f439d8e4426b5cc7ef2be20a0925974c679bab9 100644 (file)
--- a/framework/main/classes/helper/html/class_BaseHtmlHelper.php
+++ b/framework/main/classes/helper/html/class_BaseHtmlHelper.php
@@ -11,11 +11,7 @@ use Org\Mxchange\CoreFramework\Helper\BaseHelper;
  *
  * @author             Roland Haeder <webmaster@shipsimu.org>
  * @version            0.0.0
-<<<<<<< HEAD:framework/main/classes/helper/html/class_BaseHtmlHelper.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/helper/html/class_BaseHtmlHelper.php
  * @license            GNU GPL 3.0 or any newer version
  * @link               http://www.shipsimu.org
  *

diff --git a/framework/main/classes/helper/html/forms/class_HtmlFormHelper.php b/framework/main/classes/helper/html/forms/class_HtmlFormHelper.php
index acfb8d0d66e2ff6535554acb40a29b9907c3becb..7927b353a084340ca40f8a494c30f00e64c0c7a6 100644 (file)
--- a/framework/main/classes/helper/html/forms/class_HtmlFormHelper.php
+++ b/framework/main/classes/helper/html/forms/class_HtmlFormHelper.php
@@ -7,7 +7,7 @@ use Org\Mxchange\CoreFramework\Database\Frontend\User\UserDatabaseWrapper;
 use Org\Mxchange\CoreFramework\Factory\ObjectFactory;
 use Org\Mxchange\CoreFramework\Generic\NullPointerException;
 use Org\Mxchange\CoreFramework\Helper\Template\HelpableTemplate;
-use Org\Mxchange\CoreFramework\Registry\Registry;
+use Org\Mxchange\CoreFramework\Registry\GenericRegistry;
 use Org\Mxchange\CoreFramework\Template\CompileableTemplate;
 
 // Import SPL stuff
@@ -18,11 +18,7 @@ use \InvalidArgumentException;
  *
  * @author             Roland Haeder <webmaster@shipsimu.org>
  * @version            0.0.0
-<<<<<<< HEAD:framework/main/classes/helper/html/forms/class_HtmlFormHelper.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/helper/html/forms/class_HtmlFormHelper.php
  * @license            GNU GPL 3.0 or any newer version
  * @link               http://www.shipsimu.org
  *
@@ -689,7 +685,7 @@ class HtmlFormHelper extends BaseHtmlHelper implements HelpableTemplate {
 
                try {
                        // Get last executed pre filter
-                       $extraInstance = Registry::getRegistry()->getInstance('extra');
+                       $extraInstance = GenericRegistry::getRegistry()->getInstance('extra');
                } catch (NullPointerException $e) {
                        // Instance in registry is not set (NULL)
                        // @TODO We need to log this later

diff --git a/framework/main/classes/helper/html/links/class_HtmlLinkHelper.php b/framework/main/classes/helper/html/links/class_HtmlLinkHelper.php
index f02a829295dc65ca2afd41768856568f7f1e85aa..3d163550839e292a1bb78d753c0e2a96d257a4ac 100644 (file)
--- a/framework/main/classes/helper/html/links/class_HtmlLinkHelper.php
+++ b/framework/main/classes/helper/html/links/class_HtmlLinkHelper.php
@@ -7,7 +7,7 @@ use Org\Mxchange\CoreFramework\Bootstrap\FrameworkBootstrap;
 use Org\Mxchange\CoreFramework\Configuration\FrameworkConfiguration;
 use Org\Mxchange\CoreFramework\Generic\NullPointerException;
 use Org\Mxchange\CoreFramework\Helper\Template\HelpableTemplate;
-use Org\Mxchange\CoreFramework\Registry\Registry;
+use Org\Mxchange\CoreFramework\Registry\GenericRegistry;
 use Org\Mxchange\CoreFramework\Template\CompileableTemplate;
 
 /**
@@ -15,11 +15,7 @@ use Org\Mxchange\CoreFramework\Template\CompileableTemplate;
  *
  * @author             Roland Haeder <webmaster@shipsimu.org>
  * @version            0.0.0
-<<<<<<< HEAD:framework/main/classes/helper/html/links/class_HtmlLinkHelper.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/helper/html/links/class_HtmlLinkHelper.php
  * @license            GNU GPL 3.0 or any newer version
  * @link               http://www.shipsimu.org
  *
@@ -87,7 +83,7 @@ class HtmlLinkHelper extends BaseHtmlHelper implements HelpableTemplate {
                $helperInstance->setLinkName($linkName);
 
                // Get the application instance
-               $applicationInstance = Registry::getRegistry()->getInstance('application');
+               $applicationInstance = GenericRegistry::getRegistry()->getInstance('application');
 
                // Get the request instance
                $requestInstance = FrameworkBootstrap::getRequestInstance();

diff --git a/framework/main/classes/helper/login/class_BaseLoginHelper.php b/framework/main/classes/helper/login/class_BaseLoginHelper.php
index 4d1130431e26a185a6e281602c609bb2f63b21d6..2957c93780747fb18c881f6a2a7e2f38be57e375 100644 (file)
--- a/framework/main/classes/helper/login/class_BaseLoginHelper.php
+++ b/framework/main/classes/helper/login/class_BaseLoginHelper.php
@@ -10,11 +10,7 @@ use Org\Mxchange\CoreFramework\Helper\BaseHelper;
  *
  * @author             Roland Haeder <webmaster@shipsimu.org>
  * @version            0.0.0
-<<<<<<< HEAD:framework/main/classes/helper/login/class_BaseLoginHelper.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/helper/login/class_BaseLoginHelper.php
  * @license            GNU GPL 3.0 or any newer version
  * @link               http://www.shipsimu.org
  *

diff --git a/framework/main/classes/images/class_ b/framework/main/classes/images/class_
index 67f9fda2a4cbf0993a32a2c0be341a28b6dde7cd..2197725e6e098e3f6722e6743482c31aeb77cda2 100644 (file)
--- a/framework/main/classes/images/class_
+++ b/framework/main/classes/images/class_
@@ -4,11 +4,7 @@
  *
  * @author             Roland Haeder <webmaster@ship-simu.org>
  * @version            0.0.0
-<<<<<<< HEAD:framework/main/classes/images/class_
  * @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/images/class_
  * @license            GNU GPL 3.0 or any newer version
  * @link               http://www.ship-simu.org
  *

diff --git a/framework/main/classes/images/class_BaseImage.php b/framework/main/classes/images/class_BaseImage.php
index d7cf32e3e0e603b6a32cb17cad8bfe8b274d9740..e83375f9953c95608efa99ef07d3638f89c05cb5 100644 (file)
--- a/framework/main/classes/images/class_BaseImage.php
+++ b/framework/main/classes/images/class_BaseImage.php
@@ -11,11 +11,7 @@ use Org\Mxchange\CoreFramework\Registry\Registerable;
  *
  * @author             Roland Haeder <webmaster@shipsimu.org>
  * @version            0.0.0
-<<<<<<< HEAD:framework/main/classes/images/class_BaseImage.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/images/class_BaseImage.php
  * @license            GNU GPL 3.0 or any newer version
  * @link               http://www.shipsimu.org
  *

diff --git a/framework/main/classes/images/extended/class_PngImage.php b/framework/main/classes/images/extended/class_PngImage.php
index ae77b5cb949af30f5f69854ff41a424bea6354f0..86f6124cd25a6db57b25527e166a32999db2b986 100644 (file)
--- a/framework/main/classes/images/extended/class_PngImage.php
+++ b/framework/main/classes/images/extended/class_PngImage.php
@@ -14,11 +14,7 @@ use \SplFileInfo;
  *
  * @author             Roland Haeder <webmaster@shipsimu.org>
  * @version            0.0.0
-<<<<<<< HEAD:framework/main/classes/images/extended/class_PngImage.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/images/extended/class_PngImage.php
  * @license            GNU GPL 3.0 or any newer version
  * @link               http://www.shipsimu.org
  *

diff --git a/framework/main/classes/index/class_ b/framework/main/classes/index/class_
index 1e9ca1649cd166b4d938b3a9fb91979c3038ef24..4bda48c0dd07271df918864b14eb6631b6128685 100644 (file)
--- a/framework/main/classes/index/class_
+++ b/framework/main/classes/index/class_
@@ -11,11 +11,7 @@ use Org\Mxchange\CoreFramework\Index\Indexable;
  *
  * @author             Roland Haeder <webmaster@ship-simu.org>
  * @version            0.0.0
-<<<<<<< HEAD:framework/main/classes/index/class_
  * @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/index/class_
  * @license            GNU GPL 3.0 or any newer version
  * @link               http://www.ship-simu.org
  *

diff --git a/framework/main/classes/index/class_BaseIndex.php b/framework/main/classes/index/class_BaseIndex.php
index 24e9f79dc2a25bf601f18861bdb1be3b5b316c19..dbc65fe8b79a46c5a40b5eb8705409ed1bf9d2b2 100644 (file)
--- a/framework/main/classes/index/class_BaseIndex.php
+++ b/framework/main/classes/index/class_BaseIndex.php
@@ -17,11 +17,7 @@ use \SplFileInfo;
  *
  * @author             Roland Haeder <webmaster@ship-simu.org>
  * @version            0.0.0
-<<<<<<< HEAD:framework/main/classes/index/class_BaseIndex.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/index/class_BaseIndex.php
  * @license            GNU GPL 3.0 or any newer version
  * @link               http://www.ship-simu.org
  *

diff --git a/framework/main/classes/index/file_stack/class_FileStackIndex.php b/framework/main/classes/index/file_stack/class_FileStackIndex.php
index 7e8bc50cb03cbab2b795d42aa52e27115b0382c2..7d3306090e8d3d5a7ea9a171633f7a78e11b8806 100644 (file)
--- a/framework/main/classes/index/file_stack/class_FileStackIndex.php
+++ b/framework/main/classes/index/file_stack/class_FileStackIndex.php
@@ -17,11 +17,7 @@ use \SplFileInfo;
  *
  * @author             Roland Haeder <webmaster@ship-simu.org>
  * @version            0.0.0
-<<<<<<< HEAD:framework/main/classes/index/file_stack/class_FileStackIndex.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/index/file_stack/class_FileStackIndex.php
  * @license            GNU GPL 3.0 or any newer version
  * @link               http://www.ship-simu.org
  *

diff --git a/framework/main/classes/iterator/class_ b/framework/main/classes/iterator/class_
index d04bc16b2cd560d02f93a28834ea36a81997518b..37ff89a9b3aebdbe70027f0d4662f6a2418400a2 100644 (file)
--- a/framework/main/classes/iterator/class_
+++ b/framework/main/classes/iterator/class_
@@ -13,11 +13,7 @@ use \Iterator;
  *
  * @author             Roland Haeder <webmaster@ship-simu.org>
  * @version            0.0.0
-<<<<<<< HEAD:framework/main/classes/iterator/class_
  * @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/iterator/class_
  * @license            GNU GPL 3.0 or any newer version
  * @link               http://www.ship-simu.org
  *

diff --git a/framework/main/classes/iterator/class_BaseIterator.php b/framework/main/classes/iterator/class_BaseIterator.php
index eb9ae21e64902300331e9bb02f39955ad481fe2d..36f1bb0e30647b2f0759cd7ece4af27712b50898 100644 (file)
--- a/framework/main/classes/iterator/class_BaseIterator.php
+++ b/framework/main/classes/iterator/class_BaseIterator.php
@@ -13,11 +13,7 @@ use \Iterator;
  *
  * @author             Roland Haeder <webmaster@shipsimu.org>
  * @version            0.0.0
-<<<<<<< HEAD:framework/main/classes/iterator/class_BaseIterator.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/iterator/class_BaseIterator.php
  * @license            GNU GPL 3.0 or any newer version
  * @link               http://www.shipsimu.org
  *

diff --git a/framework/main/classes/iterator/default/class_DefaultIterator.php b/framework/main/classes/iterator/default/class_DefaultIterator.php
index 79e9f788d2b1155cadeac650a031adaf2fa47c2f..5b482861a81073e35e199a901614fabe463995d1 100644 (file)
--- a/framework/main/classes/iterator/default/class_DefaultIterator.php
+++ b/framework/main/classes/iterator/default/class_DefaultIterator.php
@@ -15,11 +15,7 @@ use \Iterator;
  *
  * @author             Roland Haeder <webmaster@shipsimu.org>
  * @version            0.0.0
-<<<<<<< HEAD:framework/main/classes/iterator/default/class_DefaultIterator.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/iterator/default/class_DefaultIterator.php
  * @license            GNU GPL 3.0 or any newer version
  * @link               http://www.shipsimu.org
  *

diff --git a/framework/main/classes/iterator/file/class_FileIterator.php b/framework/main/classes/iterator/file/class_FileIterator.php
index ba9fd2c8b45271de45faf8280daf719923bc84bc..b4945aeec1dbc92110aba430fc892f027456a7b1 100644 (file)
--- a/framework/main/classes/iterator/file/class_FileIterator.php
+++ b/framework/main/classes/iterator/file/class_FileIterator.php
@@ -12,11 +12,7 @@ use Org\Mxchange\CoreFramework\Iterator\Filesystem\SeekableWritableFileIterator;
  *
  * @author             Roland Haeder <webmaster@ship-simu.org>
  * @version            0.0.0
-<<<<<<< HEAD:framework/main/classes/iterator/file/class_FileIterator.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/iterator/file/class_FileIterator.php
  * @license            GNU GPL 3.0 or any newer version
  * @link               http://www.ship-simu.org
  *

diff --git a/framework/main/classes/language/class_LanguageSystem.php b/framework/main/classes/language/class_LanguageSystem.php
index 566302bdd22c350a4064363539d5e5984b8ed62f..99df420951bee5bbac8c46b50098256e73c25d25 100644 (file)
--- a/framework/main/classes/language/class_LanguageSystem.php
+++ b/framework/main/classes/language/class_LanguageSystem.php
@@ -6,7 +6,7 @@ namespace Org\Mxchange\CoreFramework\Localization;
 use Org\Mxchange\CoreFramework\Bootstrap\FrameworkBootstrap;
 use Org\Mxchange\CoreFramework\Object\BaseFrameworkSystem;
 use Org\Mxchange\CoreFramework\Registry\Registerable;
-use Org\Mxchange\CoreFramework\Registry\Registry;
+use Org\Mxchange\CoreFramework\Registry\GenericRegistry;
 
 // Import SPL stuff
 use \InvalidArgumentException;
@@ -17,11 +17,7 @@ use \InvalidArgumentException;
  *
  * @author             Roland Haeder <webmaster@shipsimu.org>
  * @version            0.0.0
-<<<<<<< HEAD:framework/main/classes/language/class_LanguageSystem.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/language/class_LanguageSystem.php
  * @license            GNU GPL 3.0 or any newer version
  * @link               http://www.shipsimu.org
  *
@@ -89,7 +85,7 @@ class LanguageSystem extends BaseFrameworkSystem implements ManageableLanguage,
                if (empty($languageBasePath)) {
                        // No, then attempt "auto-dection":
                        // 1) Get application
-                       $applicationInstance = Registry::getRegistry()->getInstance('app');
+                       $applicationInstance = GenericRegistry::getRegistry()->getInstance('app');
 
                        // 2) Try to build it
                        $languageBasePath = sprintf('%s%s/language/',

diff --git a/framework/main/classes/lists/class_ b/framework/main/classes/lists/class_
index c7ea5936c88e090838264dc3d2a53436538cebfe..a6dfa935743c97431de3b76aaa536a2d973cf3ed 100644 (file)
--- a/framework/main/classes/lists/class_
+++ b/framework/main/classes/lists/class_
@@ -4,11 +4,7 @@
  *
  * @author             Roland Haeder <webmaster@ship-simu.org>
  * @version            0.0.0
-<<<<<<< HEAD:framework/main/classes/lists/class_
  * @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/lists/class_
  * @license            GNU GPL 3.0 or any newer version
  * @link               http://www.ship-simu.org
  *

diff --git a/framework/main/classes/lists/class_BaseList.php b/framework/main/classes/lists/class_BaseList.php
index 599b1bb4464d6cf170e10453c1277348e6e3fdd3..bb58363627f216a7fff2c56cc2c68282b760f1d7 100644 (file)
--- a/framework/main/classes/lists/class_BaseList.php
+++ b/framework/main/classes/lists/class_BaseList.php
@@ -17,11 +17,7 @@ use \Countable;
  *
  * @author             Roland Haeder <webmaster@shipsimu.org>
  * @version            0.0.0
-<<<<<<< HEAD:framework/main/classes/lists/class_BaseList.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/lists/class_BaseList.php
  * @license            GNU GPL 3.0 or any newer version
  * @link               http://www.shipsimu.org
  *

diff --git a/framework/main/classes/lists/groups/class_ListGroupList.php b/framework/main/classes/lists/groups/class_ListGroupList.php
index 25462f80348392b011c6387d21a60043a8273814..0c0557dc631a0d53a43b765f6091bce7008293da 100644 (file)
--- a/framework/main/classes/lists/groups/class_ListGroupList.php
+++ b/framework/main/classes/lists/groups/class_ListGroupList.php
@@ -11,11 +11,7 @@ use Org\Mxchange\CoreFramework\Lists\Listable;
  *
  * @author             Roland Haeder <webmaster@shipsimu.org>
  * @version            0.0.0
-<<<<<<< HEAD:framework/main/classes/lists/groups/class_ListGroupList.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/lists/groups/class_ListGroupList.php
  * @license            GNU GPL 3.0 or any newer version
  * @link               http://www.shipsimu.org
  *

diff --git a/framework/main/classes/lists/tasks/class_TaskList.php b/framework/main/classes/lists/tasks/class_TaskList.php
index afe34e61d08fa6b6ebdb05d5293d2f5fd5b0cd89..722fa150a3fd6880c775e4de9c5a48d1388e58f1 100644 (file)
--- a/framework/main/classes/lists/tasks/class_TaskList.php
+++ b/framework/main/classes/lists/tasks/class_TaskList.php
@@ -11,11 +11,7 @@ use Org\Mxchange\CoreFramework\Lists\Listable;
  *
  * @author             Roland Haeder <webmaster@shipsimu.org>
  * @version            0.0.0
-<<<<<<< HEAD:framework/main/classes/lists/tasks/class_TaskList.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/lists/tasks/class_TaskList.php
  * @license            GNU GPL 3.0 or any newer version
  * @link               http://www.shipsimu.org
  *

diff --git a/framework/main/classes/mailer/class_ b/framework/main/classes/mailer/class_
index 344579bffe765fa52053cf638d3cdfaff5744b81..b25be3f6b30bbbbc30c96b1c1d098b739dc5d456 100644 (file)
--- a/framework/main/classes/mailer/class_
+++ b/framework/main/classes/mailer/class_
@@ -11,11 +11,7 @@ use Org\Mxchange\CoreFramework\Mailer\DeliverableMail;
  *
  * @author             Roland Haeder <webmaster@ship-simu.org>
  * @version            0.0.0
-<<<<<<< HEAD:framework/main/classes/mailer/class_
  * @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/mailer/class_
  * @license            GNU GPL 3.0 or any newer version
  * @link               http://www.ship-simu.org
  *

diff --git a/framework/main/classes/mailer/class_BaseMailer.php b/framework/main/classes/mailer/class_BaseMailer.php
index fe82ab31b00fa6be78265c7ca590c74efbc90bbd..6c0a52aa67820fe4d41d8c29a59f28a743b9e9f3 100644 (file)
--- a/framework/main/classes/mailer/class_BaseMailer.php
+++ b/framework/main/classes/mailer/class_BaseMailer.php
@@ -12,11 +12,7 @@ use Org\Mxchange\CoreFramework\Object\BaseFrameworkSystem;
  *
  * @author             Roland Haeder <webmaster@shipsimu.org>
  * @version            0.0.0
-<<<<<<< HEAD:framework/main/classes/mailer/class_BaseMailer.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/mailer/class_BaseMailer.php
  * @license            GNU GPL 3.0 or any newer version
  * @link               http://www.shipsimu.org
  *

diff --git a/framework/main/classes/mailer/debug/class_DebugMailer.php b/framework/main/classes/mailer/debug/class_DebugMailer.php
index 200a0ececf04383026a123dafe93c5078c7c532f..372aed8e067b9e316aaa008003b5be2a079d013a 100644 (file)
--- a/framework/main/classes/mailer/debug/class_DebugMailer.php
+++ b/framework/main/classes/mailer/debug/class_DebugMailer.php
@@ -9,7 +9,7 @@ use Org\Mxchange\CoreFramework\Mailer\BaseMailer;
 use Org\Mxchange\CoreFramework\Mailer\DeliverableMail;
 use Org\Mxchange\CoreFramework\Manager\Login\ManageableMember;
 use Org\Mxchange\CoreFramework\Manager\ManageableApplication;
-use Org\Mxchange\CoreFramework\Registry\Registry;
+use Org\Mxchange\CoreFramework\Registry\GenericRegistry;
 use Org\Mxchange\CoreFramework\Template\CompileableTemplate;
 
 /**
@@ -18,11 +18,7 @@ use Org\Mxchange\CoreFramework\Template\CompileableTemplate;
  *
  * @author             Roland Haeder <webmaster@shipsimu.org>
  * @version            0.0.0
-<<<<<<< HEAD:framework/main/classes/mailer/debug/class_DebugMailer.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/mailer/debug/class_DebugMailer.php
  * @license            GNU GPL 3.0 or any newer version
  * @link               http://www.shipsimu.org
  *

diff --git a/framework/main/classes/menu/class_BaseMenu.php b/framework/main/classes/menu/class_BaseMenu.php
index 4855031d95fdb025445a2d2c8c08f93c320d8b58..642a01ba79946e6023a5d49d3099cf3febd9606b 100644 (file)
--- a/framework/main/classes/menu/class_BaseMenu.php
+++ b/framework/main/classes/menu/class_BaseMenu.php
@@ -7,7 +7,7 @@ use Org\Mxchange\CoreFramework\Bootstrap\FrameworkBootstrap;
 use Org\Mxchange\CoreFramework\Factory\ObjectFactory;
 use Org\Mxchange\CoreFramework\Filesystem\FileNotFoundException;
 use Org\Mxchange\CoreFramework\Object\BaseFrameworkSystem;
-use Org\Mxchange\CoreFramework\Registry\Registry;
+use Org\Mxchange\CoreFramework\Registry\GenericRegistry;
 use Org\Mxchange\CoreFramework\Template\CompileableTemplate;
 
 /**
@@ -66,7 +66,7 @@ abstract class BaseMenu extends BaseFrameworkSystem {
                // If page is empty, choose default
                if (empty($command)) {
                        // Use default page as none has been specified
-                       $command = $this->getConfigInstance()->getConfigEntry('default_' . Registry::getRegistry()->getInstance('app')->getAppShortName() . '_' . FrameworkBootstrap::getRequestTypeFromSystem() . '_command');
+                       $command = $this->getConfigInstance()->getConfigEntry('default_' . GenericRegistry::getRegistry()->getInstance('app')->getAppShortName() . '_' . FrameworkBootstrap::getRequestTypeFromSystem() . '_command');
                } // END - if
 
                // Load the menu template for this page

diff --git a/framework/main/classes/output/class_ b/framework/main/classes/output/class_
index 60b0b2fd90f08b10e8e337d0524571a85aea5dd6..f2894d84dd155e046a7a69eeceb2947fdae4e0f7 100644 (file)
--- a/framework/main/classes/output/class_
+++ b/framework/main/classes/output/class_
@@ -11,11 +11,7 @@ use Org\Mxchange\CoreFramework\Generic\UnsupportedOperationException;
  *
  * @author             Roland Haeder <webmaster@shipsimu.org>
  * @version            0.0.0
-<<<<<<< HEAD:framework/main/classes/output/class_
  * @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/output/class_
  * @license            GNU GPL 3.0 or any newer version
  * @link               http://www.shipsimu.org
  *

diff --git a/framework/main/classes/output/class_BaseOutput.php b/framework/main/classes/output/class_BaseOutput.php
index 2507207bbceb402bdbeba71cd0c7e857a4fb3604..c4ba130555cbf45db160b0788ac5e0c364a41a31 100644 (file)
--- a/framework/main/classes/output/class_BaseOutput.php
+++ b/framework/main/classes/output/class_BaseOutput.php
@@ -10,11 +10,7 @@ use Org\Mxchange\CoreFramework\Object\BaseFrameworkSystem;
  *
  * @author             Roland Haeder <webmaster@shipsimu.org>
  * @version            0.0.0
-<<<<<<< HEAD:framework/main/classes/output/class_BaseOutput.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/output/class_BaseOutput.php
  * @license            GNU GPL 3.0 or any newer version
  * @link               http://www.shipsimu.org
  *

diff --git a/framework/main/classes/output/console/class_ConsoleOutput.php b/framework/main/classes/output/console/class_ConsoleOutput.php
index d48acd3097fef8ccec156f05732660682594a522..3d75464aef0eb4256b68cbff391e9d800359884e 100644 (file)
--- a/framework/main/classes/output/console/class_ConsoleOutput.php
+++ b/framework/main/classes/output/console/class_ConsoleOutput.php
@@ -14,11 +14,7 @@ use Org\Mxchange\CoreFramework\Stream\Output\OutputStreamer;
  *
  * @author             Roland Haeder <webmaster@shipsimu.org>
  * @version            0.0.0
-<<<<<<< HEAD:framework/main/classes/output/console/class_ConsoleOutput.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/output/console/class_ConsoleOutput.php
  * @license            GNU GPL 3.0 or any newer version
  * @link               http://www.shipsimu.org
  *

diff --git a/framework/main/classes/output/debug/class_BaseDebugOutput.php b/framework/main/classes/output/debug/class_BaseDebugOutput.php
index dd640de4391452e88b6f8857d9ad5d97f94d2c21..f4c826170ace0abf4f38ab81fa6afbdcf3c0c982 100644 (file)
--- a/framework/main/classes/output/debug/class_BaseDebugOutput.php
+++ b/framework/main/classes/output/debug/class_BaseDebugOutput.php
@@ -10,11 +10,7 @@ use Org\Mxchange\CoreFramework\Output\BaseOutput;
  *
  * @author             Roland Haeder <webmaster@shipsimu.org>
  * @version            0.0.0
-<<<<<<< HEAD:framework/main/classes/output/debug/class_BaseDebugOutput.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/output/debug/class_BaseDebugOutput.php
  * @license            GNU GPL 3.0 or any newer version
  * @link               http://www.shipsimu.org
  *

diff --git a/framework/main/classes/output/debug/console/class_DebugConsoleOutput.php b/framework/main/classes/output/debug/console/class_DebugConsoleOutput.php
index 22a146f2531e127ade3132935a50bfedac6437a5..113428a409b2af933b98191c03d703b8c5a07904 100644 (file)
--- a/framework/main/classes/output/debug/console/class_DebugConsoleOutput.php
+++ b/framework/main/classes/output/debug/console/class_DebugConsoleOutput.php
@@ -15,11 +15,7 @@ use Org\Mxchange\CoreFramework\Stream\Output\OutputStreamer;
  *
  * @author             Roland Haeder <webmaster@shipsimu.org>
  * @version            0.0.0
-<<<<<<< HEAD:framework/main/classes/output/debug/console/class_DebugConsoleOutput.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/output/debug/console/class_DebugConsoleOutput.php
  * @license            GNU GPL 3.0 or any newer version
  * @link               http://www.shipsimu.org
  *

diff --git a/framework/main/classes/output/debug/error/class_DebugErrorLogOutput.php b/framework/main/classes/output/debug/error/class_DebugErrorLogOutput.php
index 48911988e7be2e4159cd6cc6740daa8558659e79..2a7978695de5576ea631cf408a6aa0b84a305522 100644 (file)
--- a/framework/main/classes/output/debug/error/class_DebugErrorLogOutput.php
+++ b/framework/main/classes/output/debug/error/class_DebugErrorLogOutput.php
@@ -13,11 +13,7 @@ use Org\Mxchange\CoreFramework\Stream\Output\OutputStreamer;
  *
  * @author             Roland Haeder <webmaster@shipsimu.org>
  * @version            0.0.0
-<<<<<<< HEAD:framework/main/classes/output/debug/error/class_DebugErrorLogOutput.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/output/debug/error/class_DebugErrorLogOutput.php
  * @license            GNU GPL 3.0 or any newer version
  * @link               http://www.shipsimu.org
  *

diff --git a/framework/main/classes/output/debug/web/class_DebugWebOutput.php b/framework/main/classes/output/debug/web/class_DebugWebOutput.php
index 8cae7db609bc9e29ed0728a7c28a1d2a1a207feb..930ff9e69324845518c7f064d0f8151b46fc118b 100644 (file)
--- a/framework/main/classes/output/debug/web/class_DebugWebOutput.php
+++ b/framework/main/classes/output/debug/web/class_DebugWebOutput.php
@@ -13,11 +13,7 @@ use Org\Mxchange\CoreFramework\Stream\Output\OutputStreamer;
  *
  * @author             Roland Haeder <webmaster@shipsimu.org>
  * @version            0.0.0
-<<<<<<< HEAD:framework/main/classes/output/debug/web/class_DebugWebOutput.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/output/debug/web/class_DebugWebOutput.php
  * @license            GNU GPL 3.0 or any newer version
  * @link               http://www.shipsimu.org
  *

diff --git a/framework/main/classes/output/web/class_WebOutput.php b/framework/main/classes/output/web/class_WebOutput.php
index 267a4f604373491270ed88c051772adefb99eb9d..48ef11064772c471d64d62c288dca7cab6a111c3 100644 (file)
--- a/framework/main/classes/output/web/class_WebOutput.php
+++ b/framework/main/classes/output/web/class_WebOutput.php
@@ -16,11 +16,7 @@ use Org\Mxchange\CoreFramework\Stream\Output\OutputStreamer;
  *
  * @author             Roland Haeder <webmaster@shipsimu.org>
  * @version            0.0.0
-<<<<<<< HEAD:framework/main/classes/output/web/class_WebOutput.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/output/web/class_WebOutput.php
  * @license            GNU GPL 3.0 or any newer version
  * @link               http://www.shipsimu.org
  *

diff --git a/framework/main/classes/parser/class_ b/framework/main/classes/parser/class_
index 9271b7d9ae800bdce16bf8923dad0731f02cf6d5..d8721cb3ca99c73db7f62009a342cc0d31705e12 100644 (file)
--- a/framework/main/classes/parser/class_
+++ b/framework/main/classes/parser/class_
@@ -4,11 +4,7 @@
  *
  * @author             Roland Haeder <webmaster@ship-simu.org>
  * @version            0.0.0
-<<<<<<< HEAD:framework/main/classes/parser/class_
  * @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/parser/class_
  * @license            GNU GPL 3.0 or any newer version
  * @link               http://www.ship-simu.org
  *

diff --git a/framework/main/classes/parser/class_BaseParser.php b/framework/main/classes/parser/class_BaseParser.php
index dec3f0be8662430dcf365dd0145429e4b682381f..1020c0e9c1f776e22eef766f39cb6a9120e0d740 100644 (file)
--- a/framework/main/classes/parser/class_BaseParser.php
+++ b/framework/main/classes/parser/class_BaseParser.php
@@ -10,11 +10,7 @@ use Org\Mxchange\CoreFramework\Object\BaseFrameworkSystem;
  *
  * @author             Roland Haeder <webmaster@shipsimu.org>
  * @version            0.0.0
-<<<<<<< HEAD:framework/main/classes/parser/class_BaseParser.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/parser/class_BaseParser.php
  * @license            GNU GPL 3.0 or any newer version
  * @link               http://www.shipsimu.org
  *

diff --git a/framework/main/classes/parser/xml/class_XmlParser.php b/framework/main/classes/parser/xml/class_XmlParser.php
index f232c289f7a5815f72c05c65ee2859b562281224..9ebf852cf4107560556d3fcd244235ec7092f56e 100644 (file)
--- a/framework/main/classes/parser/xml/class_XmlParser.php
+++ b/framework/main/classes/parser/xml/class_XmlParser.php
@@ -12,11 +12,7 @@ use Org\Mxchange\CoreFramework\Template\CompileableTemplate;
  *
  * @author             Roland Haeder <webmaster@shipsimu.org>
  * @version            0.0.0
-<<<<<<< HEAD:framework/main/classes/parser/xml/class_XmlParser.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/parser/xml/class_XmlParser.php
  * @license            GNU GPL 3.0 or any newer version
  * @link               http://www.shipsimu.org
  *

diff --git a/framework/main/classes/points/class_UserPoints.php b/framework/main/classes/points/class_UserPoints.php
index 5f655a538f05ccfcb834b57ea415f6b25aebacae..786446c60bf3bc95bfa3fa96e987eb4b8e324113 100644 (file)
--- a/framework/main/classes/points/class_UserPoints.php
+++ b/framework/main/classes/points/class_UserPoints.php
@@ -15,11 +15,7 @@ use Org\Mxchange\CoreFramework\User\ManageableAccount;
  *
  * @author             Roland Haeder <webmaster@shipsimu.org>
  * @version            0.0.0
-<<<<<<< HEAD:framework/main/classes/points/class_UserPoints.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/points/class_UserPoints.php
  * @license            GNU GPL 3.0 or any newer version
  * @link               http://www.shipsimu.org
  *

diff --git a/framework/main/classes/reader/class_ConsoleNewsReader.php b/framework/main/classes/reader/class_ConsoleNewsReader.php
index 31e47ef92ec523218a18e1d5602bdc43aacb9d3b..dbbc8decc46bffd258485ba78ac3001a045115c3 100644 (file)
--- a/framework/main/classes/reader/class_ConsoleNewsReader.php
+++ b/framework/main/classes/reader/class_ConsoleNewsReader.php
@@ -16,11 +16,7 @@ use Org\Mxchange\CoreFramework\Request\Requestable;
  *
  * @author             Roland Haeder <webmaster@shipsimu.org>
  * @version            0.0.0
-<<<<<<< HEAD:framework/main/classes/reader/class_ConsoleNewsReader.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/reader/class_ConsoleNewsReader.php
  * @license            GNU GPL 3.0 or any newer version
  * @link               http://www.shipsimu.org
  *

diff --git a/framework/main/classes/reader/class_DefaultNewsReader.php b/framework/main/classes/reader/class_DefaultNewsReader.php
index b988f43ef867e9de7c7ef9aff6dc1c744718b60a..a79102bf1d745756466d4f53a44cc5135b8c9c3b 100644 (file)
--- a/framework/main/classes/reader/class_DefaultNewsReader.php
+++ b/framework/main/classes/reader/class_DefaultNewsReader.php
@@ -15,11 +15,7 @@ use Org\Mxchange\CoreFramework\Request\Requestable;
  *
  * @author             Roland Haeder <webmaster@shipsimu.org>
  * @version            0.0.0
-<<<<<<< HEAD:framework/main/classes/reader/class_DefaultNewsReader.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/reader/class_DefaultNewsReader.php
  * @license            GNU GPL 3.0 or any newer version
  * @link               http://www.shipsimu.org
  *

diff --git a/framework/main/classes/registration/class_BaseRegistration.php b/framework/main/classes/registration/class_BaseRegistration.php
index 9f6affe26101f329f4f910aa426d36698bacff14..6dad6fdff0634c47af61d84fb5bdf0c4f33e23cc 100644 (file)
--- a/framework/main/classes/registration/class_BaseRegistration.php
+++ b/framework/main/classes/registration/class_BaseRegistration.php
@@ -13,11 +13,7 @@ use Org\Mxchange\CoreFramework\Object\BaseFrameworkSystem;
  *
  * @author             Roland Haeder <webmaster@shipsimu.org>
  * @version            0.0.0
-<<<<<<< HEAD:framework/main/classes/registration/class_BaseRegistration.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/registration/class_BaseRegistration.php
  * @license            GNU GPL 3.0 or any newer version
  * @link               http://www.shipsimu.org
  *

diff --git a/framework/main/classes/registry/class_ b/framework/main/classes/registry/class_
index cd322446363abb64dd2032fa85cfca448a122779..7aa0e9138884a11c0780aa7ab098c68f6823d867 100644 (file)
--- a/framework/main/classes/registry/class_
+++ b/framework/main/classes/registry/class_
@@ -11,11 +11,7 @@ use Org\Mxchange\CoreFramework\Registry\Register;
  *
  * @author             Roland Haeder <webmaster@ship-simu.org>
  * @version            0.0.0
-<<<<<<< HEAD:framework/main/classes/registry/class_
  * @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/registry/class_
  * @license            GNU GPL 3.0 or any newer version
  * @link               http://www.ship-simu.org
  *

diff --git a/framework/main/classes/registry/class_BaseRegistry.php b/framework/main/classes/registry/class_BaseRegistry.php
index cf406493b1d11b628a71ab9122b8f9ce890a1b52..871975af6ab3e2645dd18b18a51cd51f91212ee0 100644 (file)
--- a/framework/main/classes/registry/class_BaseRegistry.php
+++ b/framework/main/classes/registry/class_BaseRegistry.php
@@ -15,11 +15,7 @@ use \IteratorAggregate;
  *
  * @author             Roland Haeder <webmaster@shipsimu.org>
  * @version            0.0.0
-<<<<<<< HEAD:framework/main/classes/registry/class_BaseRegistry.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/registry/class_BaseRegistry.php
  * @license            GNU GPL 3.0 or any newer version
  * @link               http://www.shipsimu.org
  *

diff --git a/framework/main/classes/registry/generic/class_Registry.php b/framework/main/classes/registry/generic/class_Registry.php
index ca9ec0999fae8813e56e48aacde4300dd0150795..476628e91d436bfb9c1ebd93131dfd725f0c8dcf 100644 (file)
--- a/framework/main/classes/registry/generic/class_Registry.php
+++ b/framework/main/classes/registry/generic/class_Registry.php
@@ -12,11 +12,7 @@ use Org\Mxchange\CoreFramework\Registry\Register;
  *
  * @author             Roland Haeder <webmaster@shipsimu.org>
  * @version            0.0.0
-<<<<<<< HEAD:framework/main/classes/registry/generic/class_Registry.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/registry/generic/class_Registry.php
  * @license            GNU GPL 3.0 or any newer version
  * @link               http://www.shipsimu.org
  *

diff --git a/framework/main/classes/registry/sub/class_SubRegistry.php b/framework/main/classes/registry/sub/class_SubRegistry.php
index e7725baa4f2b113d586ebe40ad196720a2d61446..1df76b280cb881b588d57e53758724cc915f5164 100644 (file)
--- a/framework/main/classes/registry/sub/class_SubRegistry.php
+++ b/framework/main/classes/registry/sub/class_SubRegistry.php
@@ -11,11 +11,7 @@ use Org\Mxchange\CoreFramework\Registry\Register;
  *
  * @author             Roland Haeder <webmaster@shipsimu.org>
  * @version            0.0.0
-<<<<<<< HEAD:framework/main/classes/registry/sub/class_SubRegistry.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/registry/sub/class_SubRegistry.php
  * @license            GNU GPL 3.0 or any newer version
  * @link               http://www.shipsimu.org
  *

diff --git a/framework/main/classes/request/class_ b/framework/main/classes/request/class_
index f46f50006d467635b989106dd61e9b81ad236fb1..48b31ceab0c1b3bdcd83f51b37fb5ed703cf1ae1 100644 (file)
--- a/framework/main/classes/request/class_
+++ b/framework/main/classes/request/class_
@@ -7,11 +7,7 @@ namespace CoreFramework\Request;
  *
  * @author             Roland Haeder <webmaster@ship-simu.org>
  * @version            0.0.0
-<<<<<<< HEAD:framework/main/classes/request/class_
  * @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/request/class_
  * @license            GNU GPL 3.0 or any newer version
  * @link               http://www.ship-simu.org
  *

diff --git a/framework/main/classes/request/class_BaseRequest.php b/framework/main/classes/request/class_BaseRequest.php
index 56ff6b06d0e9c3a8d7adbb024a4cffedb5467222..0fa759a1b8af043425cc9a8da2b4fe510d083111 100644 (file)
--- a/framework/main/classes/request/class_BaseRequest.php
+++ b/framework/main/classes/request/class_BaseRequest.php
@@ -10,11 +10,7 @@ use Org\Mxchange\CoreFramework\Object\BaseFrameworkSystem;
  *
  * @author             Roland Haeder <webmaster@shipsimu.org>
  * @version            0.0.0
-<<<<<<< HEAD:framework/main/classes/request/class_BaseRequest.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/request/class_BaseRequest.php
  * @license            GNU GPL 3.0 or any newer version
  * @link               http://www.shipsimu.org
  *

diff --git a/framework/main/classes/request/console/class_ConsoleRequest.php b/framework/main/classes/request/console/class_ConsoleRequest.php
index 3a85f3e2b495698177d8bbbc8badfafc5853c3ea..6aa36c57cda541477715eea99e277647fad49a44 100644 (file)
--- a/framework/main/classes/request/console/class_ConsoleRequest.php
+++ b/framework/main/classes/request/console/class_ConsoleRequest.php
@@ -11,11 +11,7 @@ use Org\Mxchange\CoreFramework\Request\Requestable;
  *
  * @author             Roland Haeder <webmaster@shipsimu.org>
  * @version            0.0.0
-<<<<<<< HEAD:framework/main/classes/request/console/class_ConsoleRequest.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/request/console/class_ConsoleRequest.php
  * @license            GNU GPL 3.0 or any newer version
  * @link               http://www.shipsimu.org
  *

diff --git a/framework/main/classes/request/html/class_HtmlRequest.php b/framework/main/classes/request/html/class_HtmlRequest.php
index 714b4cc08deb4c70553577f434c70ea012b9cefb..1326700259d049c14757b80d1b5b65974225b6ba 100644 (file)
--- a/framework/main/classes/request/html/class_HtmlRequest.php
+++ b/framework/main/classes/request/html/class_HtmlRequest.php
@@ -10,11 +10,7 @@ use Org\Mxchange\CoreFramework\Request\Requestable;
  *
  * @author             Roland Haeder <webmaster@shipsimu.org>
  * @version            0.0.0
-<<<<<<< HEAD:framework/main/classes/request/html/class_HtmlRequest.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/request/html/class_HtmlRequest.php
  * @license            GNU GPL 3.0 or any newer version
  * @link               http://www.shipsimu.org
  * @todo               Move out the cookie part to a seperate class, e.g. Cookie

diff --git a/framework/main/classes/resolver/action/class_BaseActionResolver.php b/framework/main/classes/resolver/action/class_BaseActionResolver.php
index 7136ba6989086cd4d9d3e9316dcaba412400dad0..58996de9a07894b275ec4ffa668b4e4d7ae2693f 100644 (file)
--- a/framework/main/classes/resolver/action/class_BaseActionResolver.php
+++ b/framework/main/classes/resolver/action/class_BaseActionResolver.php
@@ -14,11 +14,7 @@ use \InvalidArgumentException;
  *
  * @author             Roland Haeder <webmaster@shipsimu.org>
  * @version            0.0.0
-<<<<<<< HEAD:framework/main/classes/resolver/action/class_BaseActionResolver.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/resolver/action/class_BaseActionResolver.php
  * @license            GNU GPL 3.0 or any newer version
  * @link               http://www.shipsimu.org
  *

diff --git a/framework/main/classes/resolver/action/html/class_HtmlActionResolver.php b/framework/main/classes/resolver/action/html/class_HtmlActionResolver.php
index eb7862b620d17cc042d40b0a56102255a6d59b31..38040fd458faa4f5121502eff7c5a7dfde2ff279 100644 (file)
--- a/framework/main/classes/resolver/action/html/class_HtmlActionResolver.php
+++ b/framework/main/classes/resolver/action/html/class_HtmlActionResolver.php
@@ -14,11 +14,7 @@ use \InvalidArgumentException;
  *
  * @author             Roland Haeder <webmaster@shipsimu.org>
  * @version            0.0.0
-<<<<<<< HEAD:framework/main/classes/resolver/action/html/class_HtmlActionResolver.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/resolver/action/html/class_HtmlActionResolver.php
  * @license            GNU GPL 3.0 or any newer version
  * @link               http://www.shipsimu.org
  *

diff --git a/framework/main/classes/resolver/class_BaseResolver.php b/framework/main/classes/resolver/class_BaseResolver.php
index 177525e430a16b15f6af2ed57d0f5eb10e3e7933..e93bcd81dc5f1970090f1345de115e0c4f8d1ca8 100644 (file)
--- a/framework/main/classes/resolver/class_BaseResolver.php
+++ b/framework/main/classes/resolver/class_BaseResolver.php
@@ -11,11 +11,7 @@ use Org\Mxchange\CoreFramework\Object\BaseFrameworkSystem;
  *
  * @author             Roland Haeder <webmaster@shipsimu.org>
  * @version            0.0.0
-<<<<<<< HEAD:framework/main/classes/resolver/class_BaseResolver.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/resolver/class_BaseResolver.php
  * @license            GNU GPL 3.0 or any newer version
  * @link               http://www.shipsimu.org
  *

diff --git a/framework/main/classes/resolver/command/class_BaseCommandResolver.php b/framework/main/classes/resolver/command/class_BaseCommandResolver.php
index 6c463cd3368e3f5add1baf5b820b096fe7d78d58..b0ddb5cc6dc81368d057e1f48a9a5696776b6fbb 100644 (file)
--- a/framework/main/classes/resolver/command/class_BaseCommandResolver.php
+++ b/framework/main/classes/resolver/command/class_BaseCommandResolver.php
@@ -19,11 +19,7 @@ use \UnexpectedValueException;
  *
  * @author             Roland Haeder <webmaster@shipsimu.org>
  * @version            0.0.0
-<<<<<<< HEAD:framework/main/classes/resolver/command/class_BaseCommandResolver.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/resolver/command/class_BaseCommandResolver.php
  * @license            GNU GPL 3.0 or any newer version
  * @link               http://www.shipsimu.org
  *

diff --git a/framework/main/classes/resolver/command/console/class_ConsoleCommandResolver.php b/framework/main/classes/resolver/command/console/class_ConsoleCommandResolver.php
index 1793bf2df8d07af1754f0a3e5dde2042951fc28a..2a12036ecc8af86f3adade35895ff2545484a805 100644 (file)
--- a/framework/main/classes/resolver/command/console/class_ConsoleCommandResolver.php
+++ b/framework/main/classes/resolver/command/console/class_ConsoleCommandResolver.php
@@ -16,11 +16,7 @@ use \InvalidArgumentException;
  *
  * @author             Roland Haeder <webmaster@shipsimu.org>
  * @version            0.0.0
-<<<<<<< HEAD:framework/main/classes/resolver/command/console/class_ConsoleCommandResolver.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/resolver/command/console/class_ConsoleCommandResolver.php
  * @license            GNU GPL 3.0 or any newer version
  * @link               http://www.shipsimu.org
  *

diff --git a/framework/main/classes/resolver/command/html/class_Html b/framework/main/classes/resolver/command/html/class_Html
index 4f13473795a60ccbea7c47a664bff8eb493bcba7..06160b66f9eb826379ccebc2ebb6d1487cb25d99 100644 (file)
--- a/framework/main/classes/resolver/command/html/class_Html
+++ b/framework/main/classes/resolver/command/html/class_Html
@@ -4,11 +4,7 @@
  *
  * @author             Roland Haeder <webmaster@ship-simu.org>
  * @version            0.0.0
-<<<<<<< HEAD:framework/main/classes/resolver/command/html/class_Html
  * @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/resolver/command/html/class_Html
  * @license            GNU GPL 3.0 or any newer version
  * @link               http://www.ship-simu.org
  *

diff --git a/framework/main/classes/resolver/command/html/class_HtmlCommandResolver.php b/framework/main/classes/resolver/command/html/class_HtmlCommandResolver.php
index a164f720829b5da49c5371521d1fa4c008265233..df9262af0ba7d6e139bd9444e09a0a4dad029f75 100644 (file)
--- a/framework/main/classes/resolver/command/html/class_HtmlCommandResolver.php
+++ b/framework/main/classes/resolver/command/html/class_HtmlCommandResolver.php
@@ -15,11 +15,7 @@ use \InvalidArgumentException;
  *
  * @author             Roland Haeder <webmaster@shipsimu.org>
  * @version            0.0.0
-<<<<<<< HEAD:framework/main/classes/resolver/command/html/class_HtmlCommandResolver.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/resolver/command/html/class_HtmlCommandResolver.php
  * @license            GNU GPL 3.0 or any newer version
  * @link               http://www.shipsimu.org
  *

diff --git a/framework/main/classes/resolver/command/image/class_ImageCommandResolver.php b/framework/main/classes/resolver/command/image/class_ImageCommandResolver.php
index 0c9ce924c3960dfa0c5a00a396a0bad4ed792839..9e642c38979840d6229c4569af38c2295c1b05f6 100644 (file)
--- a/framework/main/classes/resolver/command/image/class_ImageCommandResolver.php
+++ b/framework/main/classes/resolver/command/image/class_ImageCommandResolver.php
@@ -14,11 +14,7 @@ use \InvalidArgumentException;
  *
  * @author             Roland Haeder <webmaster@shipsimu.org>
  * @version            0.0.0
-<<<<<<< HEAD:framework/main/classes/resolver/command/image/class_ImageCommandResolver.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/resolver/command/image/class_ImageCommandResolver.php
  * @license            GNU GPL 3.0 or any newer version
  * @link               http://www.shipsimu.org
  *

diff --git a/framework/main/classes/resolver/controller/class_BaseControllerResolver.php b/framework/main/classes/resolver/controller/class_BaseControllerResolver.php
index a38b4ef3a9a58f1c55da188ca0a0cd604ba78ceb..ff10fc88143361f430ed58cd770b1b13093cd70a 100644 (file)
--- a/framework/main/classes/resolver/controller/class_BaseControllerResolver.php
+++ b/framework/main/classes/resolver/controller/class_BaseControllerResolver.php
@@ -6,7 +6,7 @@ namespace Org\Mxchange\CoreFramework\Resolver\Controller;
 use Org\Mxchange\CoreFramework\Controller\DefaultControllerException;
 use Org\Mxchange\CoreFramework\Controller\Controller;
 use Org\Mxchange\CoreFramework\Factory\ObjectFactory;
-use Org\Mxchange\CoreFramework\Registry\Registry;
+use Org\Mxchange\CoreFramework\Registry\GenericRegistry;
 use Org\Mxchange\CoreFramework\Resolver\BaseResolver;
 use Org\Mxchange\CoreFramework\Resolver\Controller\ControllerResolver;
 
@@ -18,11 +18,7 @@ use \InvalidArgumentException;
  *
  * @author             Roland Haeder <webmaster@shipsimu.org>
  * @version            0.0.0
-<<<<<<< HEAD:framework/main/classes/resolver/controller/class_BaseControllerResolver.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/resolver/controller/class_BaseControllerResolver.php
  * @license            GNU GPL 3.0 or any newer version
  * @link               http://www.shipsimu.org
  *

diff --git a/framework/main/classes/resolver/controller/console/class_ConsoleControllerResolver.php b/framework/main/classes/resolver/controller/console/class_ConsoleControllerResolver.php
index d9b6b6472549316e53c17c64753f2862f13d987b..729295919b74d2c864ebeb07824b16bffce126da 100644 (file)
--- a/framework/main/classes/resolver/controller/console/class_ConsoleControllerResolver.php
+++ b/framework/main/classes/resolver/controller/console/class_ConsoleControllerResolver.php
@@ -16,11 +16,7 @@ use \InvalidArgumentException;
  *
  * @author             Roland Haeder <webmaster@shipsimu.org>
  * @version            0.0.0
-<<<<<<< HEAD:framework/main/classes/resolver/controller/console/class_ConsoleControllerResolver.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/resolver/controller/console/class_ConsoleControllerResolver.php
  * @license            GNU GPL 3.0 or any newer version
  * @link               http://www.shipsimu.org
  *

diff --git a/framework/main/classes/resolver/controller/html/class_HtmlControllerResolver.php b/framework/main/classes/resolver/controller/html/class_HtmlControllerResolver.php
index 3a79138c35eccab595f9bdba5af6bf7a1060d2a1..cbc46d0b961d29c8e1779dab6f166ba4ab733a52 100644 (file)
--- a/framework/main/classes/resolver/controller/html/class_HtmlControllerResolver.php
+++ b/framework/main/classes/resolver/controller/html/class_HtmlControllerResolver.php
@@ -16,11 +16,7 @@ use \InvalidArgumentException;
  *
  * @author             Roland Haeder <webmaster@shipsimu.org>
  * @version            0.0.0
-<<<<<<< HEAD:framework/main/classes/resolver/controller/html/class_HtmlControllerResolver.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/resolver/controller/html/class_HtmlControllerResolver.php
  * @license            GNU GPL 3.0 or any newer version
  * @link               http://www.shipsimu.org
  *

diff --git a/framework/main/classes/resolver/controller/image/class_ImageControllerResolver.php b/framework/main/classes/resolver/controller/image/class_ImageControllerResolver.php
index e8c970156df36770c58f30adcf48de3d70035f76..02024241224bf99dfc97c9dcbd3a37f996f1bade 100644 (file)
--- a/framework/main/classes/resolver/controller/image/class_ImageControllerResolver.php
+++ b/framework/main/classes/resolver/controller/image/class_ImageControllerResolver.php
@@ -16,11 +16,7 @@ use \InvalidArgumentException;
  *
  * @author             Roland Haeder <webmaster@shipsimu.org>
  * @version            0.0.0
-<<<<<<< HEAD:framework/main/classes/resolver/controller/image/class_ImageControllerResolver.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/resolver/controller/image/class_ImageControllerResolver.php
  * @license            GNU GPL 3.0 or any newer version
  * @link               http://www.shipsimu.org
  *

diff --git a/framework/main/classes/response/class_BaseResponse.php b/framework/main/classes/response/class_BaseResponse.php
index 4092a010c2772f54ab27542629616233f9b968fc..0c2c8a17e669f0d6028a69b7efcd46e104d3ee84 100644 (file)
--- a/framework/main/classes/response/class_BaseResponse.php
+++ b/framework/main/classes/response/class_BaseResponse.php
@@ -4,18 +4,14 @@ namespace Org\Mxchange\CoreFramework\Response;
 
 // Import framework stuff
 use Org\Mxchange\CoreFramework\Object\BaseFrameworkSystem;
-use Org\Mxchange\CoreFramework\Registry\Registry;
+use Org\Mxchange\CoreFramework\Registry\GenericRegistry;
 
 /**
  * A generic request class
  *
  * @author             Roland Haeder <webmaster@shipsimu.org>
  * @version            0.0.0
-<<<<<<< HEAD:framework/main/classes/response/class_BaseResponse.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/response/class_BaseResponse.php
  * @license            GNU GPL 3.0 or any newer version
  * @link               http://www.shipsimu.org
  *
@@ -156,7 +152,7 @@ abstract class BaseResponse extends BaseFrameworkSystem {
         */
        public final function addFatalMessage ($messageId) {
                // Get application instance
-               $applicationInstance = Registry::getRegistry()->getInstance('app');
+               $applicationInstance = GenericRegistry::getRegistry()->getInstance('app');
 
                // Adds the resolved message id to the fatal message list
                $this->addFatalMessagePlain($applicationInstance()->getLanguageInstance()->getMessage($messageId));
@@ -184,7 +180,7 @@ abstract class BaseResponse extends BaseFrameworkSystem {
         */
        public function flushBuffer ($force = false) {
                // Get application instance
-               $applicationInstance = Registry::getRegistry()->getInstance('app');
+               $applicationInstance = GenericRegistry::getRegistry()->getInstance('app');
 
                // Headers already sent?
                if ((headers_sent()) && ($force === false)) {
@@ -247,7 +243,7 @@ abstract class BaseResponse extends BaseFrameworkSystem {
         */
        public function determineDefaultCommand () {
                // Get application instance
-               $applicationInstance = Registry::getRegistry()->getInstance('app');
+               $applicationInstance = GenericRegistry::getRegistry()->getInstance('app');
 
                // Generate config key
                $configKey = sprintf('default_%s_%s_command',

diff --git a/framework/main/classes/response/console/class_ConsoleResponse.php b/framework/main/classes/response/console/class_ConsoleResponse.php
index 321c6ff6505a5b76144ec09c390c9fbc92d71689..d98de4bedf25751703a13c7d7df1b08bc9638a71 100644 (file)
--- a/framework/main/classes/response/console/class_ConsoleResponse.php
+++ b/framework/main/classes/response/console/class_ConsoleResponse.php
@@ -10,11 +10,7 @@ use Org\Mxchange\CoreFramework\Response\Responseable;
  *
  * @author             Roland Haeder <webmaster@shipsimu.org>
  * @version            0.0.0
-<<<<<<< HEAD:framework/main/classes/response/console/class_ConsoleResponse.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/response/console/class_ConsoleResponse.php
  * @license            GNU GPL 3.0 or any newer version
  * @link               http://www.shipsimu.org
  *

diff --git a/framework/main/classes/response/html/class_HtmlResponse.php b/framework/main/classes/response/html/class_HtmlResponse.php
index ed0504930fd68177a2216b4ea5b0a47a0a373387..bd3f450ed3228c267a66262cd00eb4b16665841b 100644 (file)
--- a/framework/main/classes/response/html/class_HtmlResponse.php
+++ b/framework/main/classes/response/html/class_HtmlResponse.php
@@ -3,7 +3,7 @@
 namespace Org\Mxchange\CoreFramework\Response;
 
 // Import framework stuff
-use Org\Mxchange\CoreFramework\Registry\Registry;
+use Org\Mxchange\CoreFramework\Registry\GenericRegistry;
 use Org\Mxchange\CoreFramework\Response\Responseable;
 
 /**
@@ -11,11 +11,7 @@ use Org\Mxchange\CoreFramework\Response\Responseable;
  *
  * @author             Roland Haeder <webmaster@shipsimu.org>
  * @version            0.0.0
-<<<<<<< HEAD:framework/main/classes/response/html/class_HtmlResponse.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/response/html/class_HtmlResponse.php
  * @license            GNU GPL 3.0 or any newer version
  * @link               http://www.shipsimu.org
  *
@@ -135,7 +131,7 @@ class HtmlResponse extends BaseResponse implements Responseable {
         */
        public function redirectToConfiguredUrl ($configEntry) {
                // Get application instance
-               $applicationInstance = Registry::getRegistry()->getInstance('app');
+               $applicationInstance = GenericRegistry::getRegistry()->getInstance('app');
 
                // Is the header not yet sent?
                if (headers_sent()) {

diff --git a/framework/main/classes/response/image/class_ImageResponse.php b/framework/main/classes/response/image/class_ImageResponse.php
index 8594ca4f6ae605b8045862424298d0a44800daa2..13101d9e0faf9f926af30d90518f4292663e5a60 100644 (file)
--- a/framework/main/classes/response/image/class_ImageResponse.php
+++ b/framework/main/classes/response/image/class_ImageResponse.php
@@ -3,7 +3,7 @@
 namespace Org\Mxchange\CoreFramework\Response;
 
 // Import framework stuff
-use Org\Mxchange\CoreFramework\Registry\Registry;
+use Org\Mxchange\CoreFramework\Registry\GenericRegistry;
 use Org\Mxchange\CoreFramework\Response\Responseable;
 
 /**
@@ -11,11 +11,7 @@ use Org\Mxchange\CoreFramework\Response\Responseable;
  *
  * @author             Roland Haeder <webmaster@shipsimu.org>
  * @version            0.0.0
-<<<<<<< HEAD:framework/main/classes/response/image/class_ImageResponse.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/response/image/class_ImageResponse.php
  * @license            GNU GPL 3.0 or any newer version
  * @link               http://www.shipsimu.org
  *
@@ -145,7 +141,7 @@ class ImageResponse extends BaseResponse implements Responseable {
         */
        public function redirectToConfiguredUrl ($configEntry) {
                // Get application instance
-               $applicationInstance = Registry::getRegistry()->getInstance('app');
+               $applicationInstance = GenericRegistry::getRegistry()->getInstance('app');
 
                // Is the header not yet sent?
                if (headers_sent()) {

diff --git a/framework/main/classes/rng/class_RandomNumberGenerator.php b/framework/main/classes/rng/class_RandomNumberGenerator.php
index c2e04ae25af328e88941b2b16f7d2fc4a2b59b40..e1a34ea8849b63cf2914f0dec618aea6c15284ca 100644 (file)
--- a/framework/main/classes/rng/class_RandomNumberGenerator.php
+++ b/framework/main/classes/rng/class_RandomNumberGenerator.php
@@ -12,11 +12,7 @@ use Org\Mxchange\CoreFramework\Generic\FrameworkInterface;
  *
  * @author             Roland Haeder <webmaster@shipsimu.org>
  * @version            0.0.0
-<<<<<<< HEAD:framework/main/classes/rng/class_RandomNumberGenerator.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/rng/class_RandomNumberGenerator.php
  * @license            GNU GPL 3.0 or any newer version
  * @link               http://www.shipsimu.org
  *

diff --git a/framework/main/classes/stacker/class_ b/framework/main/classes/stacker/class_
index 629bcd4148d62f1db1781dd0433e68d65f4a301a..c3c188ed2f2c8865658a28735ebf6f61817ff99d 100644 (file)
--- a/framework/main/classes/stacker/class_
+++ b/framework/main/classes/stacker/class_
@@ -11,11 +11,7 @@ use Org\Mxchange\CoreFramework\Stacker\Stackable;
  *
  * @author             Roland Haeder <webmaster@ship-simu.org>
  * @version            0.0.0
-<<<<<<< HEAD:framework/main/classes/stacker/class_
  * @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/stacker/class_
  * @license            GNU GPL 3.0 or any newer version
  * @link               http://www.ship-simu.org
  *

diff --git a/framework/main/classes/stacker/class_BaseStacker.php b/framework/main/classes/stacker/class_BaseStacker.php
index 602de195cf37293d61b8b57758dc97eeefefb5a9..d6d627ca19131d7eedb1b565c6853770fb19e787 100644 (file)
--- a/framework/main/classes/stacker/class_BaseStacker.php
+++ b/framework/main/classes/stacker/class_BaseStacker.php
@@ -10,11 +10,7 @@ use Org\Mxchange\CoreFramework\Object\BaseFrameworkSystem;
  *
  * @author             Roland Haeder <webmaster@shipsimu.org>
  * @version            0.0.0
-<<<<<<< HEAD:framework/main/classes/stacker/class_BaseStacker.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/stacker/class_BaseStacker.php
  * @license            GNU GPL 3.0 or any newer version
  * @link               http://www.shipsimu.org
  *

diff --git a/framework/main/classes/stacker/fifo/class_FiFoStacker.php b/framework/main/classes/stacker/fifo/class_FiFoStacker.php
index 689f210375748cea95f98813ec50b391ca010e95..6e73709eac79431d7411514aeee2ba438fddc76e 100644 (file)
--- a/framework/main/classes/stacker/fifo/class_FiFoStacker.php
+++ b/framework/main/classes/stacker/fifo/class_FiFoStacker.php
@@ -7,11 +7,7 @@ namespace Org\Mxchange\CoreFramework\Stacker;
  *
  * @author             Roland Haeder <webmaster@shipsimu.org>
  * @version            0.0.0
-<<<<<<< HEAD:framework/main/classes/stacker/fifo/class_FiFoStacker.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/stacker/fifo/class_FiFoStacker.php
  * @license            GNU GPL 3.0 or any newer version
  * @link               http://www.shipsimu.org
  *

diff --git a/framework/main/classes/stacker/file/class_ b/framework/main/classes/stacker/file/class_
index b3a3934a296b64453879dd106e456f45f9b78d9c..952279a2827b85105b6700f13ec22e643887dcb4 100644 (file)
--- a/framework/main/classes/stacker/file/class_
+++ b/framework/main/classes/stacker/file/class_
@@ -4,11 +4,7 @@
  *
  * @author             Roland Haeder <webmaster@ship-simu.org>
  * @version            0.0.0
-<<<<<<< HEAD:framework/main/classes/stacker/file/class_
  * @copyright  Copyright (c) 2017 Core Developer Team
-=======
- * @copyright  Copyright (c) 2016 Core Developer Team
->>>>>>> Some updates::inc/main/classes/stacker/file/class_
  * @license            GNU GPL 3.0 or any newer version
  * @link               http://www.ship-simu.org
  *

diff --git a/framework/main/classes/stacker/file/class_BaseFileStack.php b/framework/main/classes/stacker/file/class_BaseFileStack.php
index 8bf35ac9aab88d04dcf03d01b8cddd5c1fb65701..fbad6cd4107e1d937f34629cd0ed4a655df5af0f 100644 (file)
--- a/framework/main/classes/stacker/file/class_BaseFileStack.php
+++ b/framework/main/classes/stacker/file/class_BaseFileStack.php
@@ -18,11 +18,7 @@ use \SplFileInfo;
  *
  * @author             Roland Haeder <webmaster@ship-simu.org>
  * @version            0.0.0
-<<<<<<< HEAD:framework/main/classes/stacker/file/class_BaseFileStack.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/stacker/file/class_BaseFileStack.php
  * @license            GNU GPL 3.0 or any newer version
  * @link               http://www.ship-simu.org
  *

diff --git a/framework/main/classes/stacker/file/fifo/class_FiFoFileStack.php b/framework/main/classes/stacker/file/fifo/class_FiFoFileStack.php
index d44ba9f6dd2c7c32fc1daa616628ef87c0080d16..9994e38cb3ed071f05f68af972d75c9c3051c73d 100644 (file)
--- a/framework/main/classes/stacker/file/fifo/class_FiFoFileStack.php
+++ b/framework/main/classes/stacker/file/fifo/class_FiFoFileStack.php
@@ -16,11 +16,7 @@ use \SplFileInfo;
  *
  * @author             Roland Haeder <webmaster@ship-simu.org>
  * @version            0.0.0
-<<<<<<< HEAD:framework/main/classes/stacker/file/fifo/class_FiFoFileStack.php
  * @copyright  Copyright (c) 2017 Core Developer Team
-=======
- * @copyright  Copyright (c) 2016 Core Developer Team
->>>>>>> Some updates::inc/main/classes/stacker/file/fifo/class_FiFoFileStack.php
  * @license            GNU GPL 3.0 or any newer version
  * @link               http://www.ship-simu.org
  *

diff --git a/framework/main/classes/stacker/filo/class_FiLoStacker.php b/framework/main/classes/stacker/filo/class_FiLoStacker.php
index 43e84b84459b6365f7bf54f5716007ed5ca6021f..61caf361c131e32b8eb3b1d8902ab22b07bd3e8a 100644 (file)
--- a/framework/main/classes/stacker/filo/class_FiLoStacker.php
+++ b/framework/main/classes/stacker/filo/class_FiLoStacker.php
@@ -7,11 +7,7 @@ namespace Org\Mxchange\CoreFramework\Stacker;
  *
  * @author             Roland Haeder <webmaster@shipsimu.org>
  * @version            0.0.0
-<<<<<<< HEAD:framework/main/classes/stacker/filo/class_FiLoStacker.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/stacker/filo/class_FiLoStacker.php
  * @license            GNU GPL 3.0 or any newer version
  * @link               http://www.shipsimu.org
  *

diff --git a/framework/main/classes/states/class_ b/framework/main/classes/states/class_
index b81eaaf996390bf1c76cdbfe1f7664e4f5190dff..f211a130d86630c83af1111b4782ddbf5498ea01 100644 (file)
--- a/framework/main/classes/states/class_
+++ b/framework/main/classes/states/class_
@@ -4,11 +4,7 @@
  *
  * @author             Roland Haeder <webmaster@ship-simu.org>
  * @version            0.0.0
-<<<<<<< HEAD:framework/main/classes/states/class_
  * @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/states/class_
  * @license            GNU GPL 3.0 or any newer version
  * @link               http://www.ship-simu.org
  *

diff --git a/framework/main/classes/states/class_BaseState.php b/framework/main/classes/states/class_BaseState.php
index 5c7945dbf94a469b89d5e29dd6737a3e6f471cd4..820f31c385e2d6018512b91c1ac258935cf7388f 100644 (file)
--- a/framework/main/classes/states/class_BaseState.php
+++ b/framework/main/classes/states/class_BaseState.php
@@ -13,11 +13,7 @@ use Org\Mxchange\CoreFramework\State\Stateable;
  *
  * @author             Roland Haeder <webmaster@shipsimu.org>
  * @version            0.0.0
-<<<<<<< HEAD:framework/main/classes/states/class_BaseState.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/states/class_BaseState.php
  * @license            GNU GPL 3.0 or any newer version
  * @link               http://www.shipsimu.org
  *

diff --git a/framework/main/classes/streams/class_BaseStream.php b/framework/main/classes/streams/class_BaseStream.php
index 7e21392d2a2543378011acd30d09d3dc53f0ff5a..137016ae71ad255e5f0ca5a595b8b89c5b2d3022 100644 (file)
--- a/framework/main/classes/streams/class_BaseStream.php
+++ b/framework/main/classes/streams/class_BaseStream.php
@@ -10,11 +10,7 @@ use Org\Mxchange\CoreFramework\Object\BaseFrameworkSystem;
  *
  * @author             Roland Haeder <webmaster@shipsimu.org>
  * @version            0.0.0
-<<<<<<< HEAD:framework/main/classes/streams/class_BaseStream.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/streams/class_BaseStream.php
  * @license            GNU GPL 3.0 or any newer version
  * @link               http://www.shipsimu.org
  *

diff --git a/framework/main/classes/streams/crypto/class_McryptStream.php b/framework/main/classes/streams/crypto/class_McryptStream.php
index f56018f4a76cff0ac2f61bc7a901f708d0cbf862..0c2fd3140aef9b2c51d3d7dcaf330f57409937bb 100644 (file)
--- a/framework/main/classes/streams/crypto/class_McryptStream.php
+++ b/framework/main/classes/streams/crypto/class_McryptStream.php
@@ -12,11 +12,7 @@ use Org\Mxchange\CoreFramework\Stream\BaseStream;
  *
  * @author             Roland Haeder <webmaster@shipsimu.org>
  * @version            0.0.0
-<<<<<<< HEAD:framework/main/classes/streams/crypto/class_McryptStream.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/streams/crypto/class_McryptStream.php
  * @license            GNU GPL 3.0 or any newer version
  * @link               http://www.shipsimu.org
  * @todo               mcrypt will become deprecated, rewrite to OpenSSL

diff --git a/framework/main/classes/tasks/class_ b/framework/main/classes/tasks/class_
index fe6ac768bcfae324b074254cdd89d140bda40c0d..41a5bbcda6126f8afd6357ffaa42227c9a4c8cbb 100644 (file)
--- a/framework/main/classes/tasks/class_
+++ b/framework/main/classes/tasks/class_
@@ -13,11 +13,7 @@ use Org\Mxchange\CoreFramework\Visitor\Visitor;
  *
  * @author             Roland Haeder <webmaster@ship-simu.org>
  * @version            0.0.0
-<<<<<<< HEAD:framework/main/classes/tasks/class_
  * @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/tasks/class_
  * @license            GNU GPL 3.0 or any newer version
  * @link               http://www.ship-simu.org
  *

diff --git a/framework/main/classes/tasks/class_BaseTask.php b/framework/main/classes/tasks/class_BaseTask.php
index d948a4d5b86700e83046c28d6f946c574d788d0b..4f53883cfea3bc55ff57e13b5cde159655e463ad 100644 (file)
--- a/framework/main/classes/tasks/class_BaseTask.php
+++ b/framework/main/classes/tasks/class_BaseTask.php
@@ -10,11 +10,7 @@ use Org\Mxchange\CoreFramework\Object\BaseFrameworkSystem;
  *
  * @author             Roland Haeder <webmaster@shipsimu.org>
  * @version            0.0.0
-<<<<<<< HEAD:framework/main/classes/tasks/class_BaseTask.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/tasks/class_BaseTask.php
  * @license            GNU GPL 3.0 or any newer version
  * @link               http://www.shipsimu.org
  *

diff --git a/framework/main/classes/tasks/idle/class_IdleLoopTask.php b/framework/main/classes/tasks/idle/class_IdleLoopTask.php
index 4b149324a04dac8a30793334273b3fc6b855b685..7652b5888a301c6436291533f8e90e3dda494137 100644 (file)
--- a/framework/main/classes/tasks/idle/class_IdleLoopTask.php
+++ b/framework/main/classes/tasks/idle/class_IdleLoopTask.php
@@ -13,11 +13,7 @@ use Org\Mxchange\CoreFramework\Visitor\Visitor;
  *
  * @author             Roland Haeder <webmaster@shipsimu.org>
  * @version            0.0.0
-<<<<<<< HEAD:framework/main/classes/tasks/idle/class_IdleLoopTask.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/tasks/idle/class_IdleLoopTask.php
  * @license            GNU GPL 3.0 or any newer version
  * @link               http://www.shipsimu.org
  *

diff --git a/framework/main/classes/template/class_ b/framework/main/classes/template/class_
index 5e16c25145ff8169f7d1985d1e93ad71d488e456..fbea34b6f3ce938f6f3c663adb975a7a1386b278 100644 (file)
--- a/framework/main/classes/template/class_
+++ b/framework/main/classes/template/class_
@@ -10,11 +10,7 @@ use Org\Mxchange\CoreFramework\Template\Engine\BaseTemplateEngine;
  *
  * @author             Roland Haeder <webmaster@ship-simu.org>
  * @version            0.0.0
-<<<<<<< HEAD:framework/main/classes/template/class_
  * @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/template/class_
  * @license            GNU GPL 3.0 or any newer version
  * @link               http://www.ship-simu.org
  *

diff --git a/framework/main/classes/template/class_BaseTemplateEngine.php b/framework/main/classes/template/class_BaseTemplateEngine.php
index 3bbeb010a913d7d6405fd92b70c28116df9e1e7d..01ff9a92ede901e7b3925676badebae3a48def26 100644 (file)
--- a/framework/main/classes/template/class_BaseTemplateEngine.php
+++ b/framework/main/classes/template/class_BaseTemplateEngine.php
@@ -20,11 +20,7 @@ use \SplFileInfo;
  *
  * @author             Roland Haeder <webmaster@shipsimu.org>
  * @version            0.0.0
-<<<<<<< HEAD:framework/main/classes/template/class_BaseTemplateEngine.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/template/class_BaseTemplateEngine.php
  * @license            GNU GPL 3.0 or any newer version
  * @link               http://www.shipsimu.org
  *

diff --git a/framework/main/classes/template/console/class_ConsoleTemplateEngine.php b/framework/main/classes/template/console/class_ConsoleTemplateEngine.php
index 4367807f434b5d2a62bf682f3cf13babd6cf4faa..7ee9055434f020ac3c6db7b05c5c3eec1d1e38f3 100644 (file)
--- a/framework/main/classes/template/console/class_ConsoleTemplateEngine.php
+++ b/framework/main/classes/template/console/class_ConsoleTemplateEngine.php
@@ -4,7 +4,7 @@ namespace Org\Mxchange\CoreFramework\Template\Engine;
 
 // Import framework stuff
 use Org\Mxchange\CoreFramework\Filesystem\InvalidDirectoryException;
-use Org\Mxchange\CoreFramework\Registry\Registry;
+use Org\Mxchange\CoreFramework\Registry\GenericRegistry;
 use Org\Mxchange\CoreFramework\Template\CompileableTemplate;
 use Org\Mxchange\CoreFramework\Template\Engine\BaseTemplateEngine;
 
@@ -16,11 +16,7 @@ use \UnexpectedValueException;
  *
  * @author             Roland Haeder <webmaster@shipsimu.org>
  * @version            0.0.0
-<<<<<<< HEAD:framework/main/classes/template/console/class_ConsoleTemplateEngine.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/template/console/class_ConsoleTemplateEngine.php
  * @license            GNU GPL 3.0 or any newer version
  * @link               http://www.shipsimu.org
  * @todo               This template engine does not make use of setTemplateType()
@@ -64,7 +60,7 @@ class ConsoleTemplateEngine extends BaseTemplateEngine implements CompileableTem
                $templateInstance = new ConsoleTemplateEngine();
 
                // Get the application instance from registry
-               $applicationInstance = Registry::getRegistry()->getInstance('app');
+               $applicationInstance = GenericRegistry::getRegistry()->getInstance('app');
 
                // Determine base path
                $templateBasePath = $templateInstance->getConfigInstance()->getConfigEntry('application_base_path') . $applicationInstance->getAppShortName(). '/';

diff --git a/framework/main/classes/template/html/class_HtmlTemplateEngine.php b/framework/main/classes/template/html/class_HtmlTemplateEngine.php
index 706b4a2fc34e33a0023b23a64a77347320f255bd..9d1bb119ccd9ec0cfe22fe9b1e7b5da2ca3ae96c 100644 (file)
--- a/framework/main/classes/template/html/class_HtmlTemplateEngine.php
+++ b/framework/main/classes/template/html/class_HtmlTemplateEngine.php
@@ -4,7 +4,7 @@ namespace Org\Mxchange\CoreFramework\Template\Engine;
 
 // Import framework stuff
 use Org\Mxchange\CoreFramework\Filesystem\InvalidDirectoryException;
-use Org\Mxchange\CoreFramework\Registry\Registry;
+use Org\Mxchange\CoreFramework\Registry\GenericRegistry;
 use Org\Mxchange\CoreFramework\Template\CompileableTemplate;
 use Org\Mxchange\CoreFramework\Template\Engine\BaseTemplateEngine;
 
@@ -17,11 +17,7 @@ use \UnexpectedValueException;
  *
  * @author             Roland Haeder <webmaster@shipsimu.org>
  * @version            0.0.0
-<<<<<<< HEAD:framework/main/classes/template/html/class_HtmlTemplateEngine.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/template/html/class_HtmlTemplateEngine.php
  * @license            GNU GPL 3.0 or any newer version
  * @link               http://www.shipsimu.org
  *
@@ -64,7 +60,7 @@ class HtmlTemplateEngine extends BaseTemplateEngine implements CompileableTempla
                $templateInstance = new HtmlTemplateEngine();
 
                // Get the application instance from registry
-               $applicationInstance = Registry::getRegistry()->getInstance('app');
+               $applicationInstance = GenericRegistry::getRegistry()->getInstance('app');
 
                // Determine base path
                $templateBasePath = $templateInstance->getConfigInstance()->getConfigEntry('application_base_path') . $applicationInstance->getAppShortName(). '/';

diff --git a/framework/main/classes/template/image/class_ImageTemplateEngine.php b/framework/main/classes/template/image/class_ImageTemplateEngine.php
index 5aa7e95d51459a461cda922ededa8f62a9687e9b..608038fed9b676b3f06158cc92e3289518b2ef72 100644 (file)
--- a/framework/main/classes/template/image/class_ImageTemplateEngine.php
+++ b/framework/main/classes/template/image/class_ImageTemplateEngine.php
@@ -6,7 +6,7 @@ namespace Org\Mxchange\CoreFramework\Template\Engine;
 use Org\Mxchange\CoreFramework\Factory\ObjectFactory;
 use Org\Mxchange\CoreFramework\Filesystem\InvalidDirectoryException;
 use Org\Mxchange\CoreFramework\Parser\Xml\XmlParser;
-use Org\Mxchange\CoreFramework\Registry\Registry;
+use Org\Mxchange\CoreFramework\Registry\GenericRegistry;
 use Org\Mxchange\CoreFramework\Response\Responseable;
 use Org\Mxchange\CoreFramework\Template\CompileableTemplate;
 use Org\Mxchange\CoreFramework\Template\Engine\BaseTemplateEngine;
@@ -20,11 +20,7 @@ use \UnexpectedValueException;
  *
  * @author             Roland Haeder <webmaster@shipsimu.org>
  * @version            0.0.0
-<<<<<<< HEAD:framework/main/classes/template/image/class_ImageTemplateEngine.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/template/image/class_ImageTemplateEngine.php
  * @license            GNU GPL 3.0 or any newer version
  * @link               http://www.shipsimu.org
  *
@@ -101,7 +97,7 @@ class ImageTemplateEngine extends BaseTemplateEngine implements CompileableTempl
                $templateInstance = new ImageTemplateEngine();
 
                // Get the application instance from registry
-               $applicationInstance = Registry::getRegistry()->getInstance('app');
+               $applicationInstance = GenericRegistry::getRegistry()->getInstance('app');
 
                // Determine base path
                $templateBasePath = $templateInstance->getConfigInstance()->getConfigEntry('application_base_path') . $applicationInstance->getAppShortName(). '/';

diff --git a/framework/main/classes/template/mail/class_MailTemplateEngine.php b/framework/main/classes/template/mail/class_MailTemplateEngine.php
index a1cef5ccf0bf87b654577b2a3538157ab5375b9e..6973d80ece8c5f67ca3a70cff2603c9c3b3923da 100644 (file)
--- a/framework/main/classes/template/mail/class_MailTemplateEngine.php
+++ b/framework/main/classes/template/mail/class_MailTemplateEngine.php
@@ -6,7 +6,7 @@ namespace Org\Mxchange\CoreFramework\Template\Engine;
 use Org\Mxchange\CoreFramework\Filesystem\InvalidDirectoryException;
 use Org\Mxchange\CoreFramework\Mailer\DeliverableMail;
 use Org\Mxchange\CoreFramework\Parser\Xml\XmlParser;
-use Org\Mxchange\CoreFramework\Registry\Registry;
+use Org\Mxchange\CoreFramework\Registry\GenericRegistry;
 use Org\Mxchange\CoreFramework\Response\Responseable;
 use Org\Mxchange\CoreFramework\Template\CompileableTemplate;
 use Org\Mxchange\CoreFramework\Template\Engine\BaseTemplateEngine;
@@ -19,11 +19,7 @@ use \UnexpectedValueException;
  *
  * @author             Roland Haeder <webmaster@shipsimu.org>
  * @version            0.0.0
-<<<<<<< HEAD:framework/main/classes/template/mail/class_MailTemplateEngine.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/template/mail/class_MailTemplateEngine.php
  * @license            GNU GPL 3.0 or any newer version
  * @link               http://www.shipsimu.org
  * @todo               This template engine does not make use of setTemplateType()
@@ -94,7 +90,7 @@ class MailTemplateEngine extends BaseTemplateEngine implements CompileableTempla
                $templateInstance = new MailTemplateEngine();
 
                // Get the application instance from registry
-               $applicationInstance = Registry::getRegistry()->getInstance('app');
+               $applicationInstance = GenericRegistry::getRegistry()->getInstance('app');
 
                // Determine base path
                $templateBasePath = $templateInstance->getConfigInstance()->getConfigEntry('application_base_path') . $applicationInstance->getAppShortName(). '/';

diff --git a/framework/main/classes/template/menu/class_MenuTemplateEngine.php b/framework/main/classes/template/menu/class_MenuTemplateEngine.php
index a5baa2831ca5a0b0aea7cd67fb1e1014bf904c75..f5cace2505519c97dd9b78f3860a52ab9044657d 100644 (file)
--- a/framework/main/classes/template/menu/class_MenuTemplateEngine.php
+++ b/framework/main/classes/template/menu/class_MenuTemplateEngine.php
@@ -6,7 +6,7 @@ namespace Org\Mxchange\CoreFramework\Template\Engine;
 use Org\Mxchange\CoreFramework\Factory\ObjectFactory;
 use Org\Mxchange\CoreFramework\Filesystem\InvalidDirectoryException;
 use Org\Mxchange\CoreFramework\Parser\Xml\XmlParser;
-use Org\Mxchange\CoreFramework\Registry\Registry;
+use Org\Mxchange\CoreFramework\Registry\GenericRegistry;
 use Org\Mxchange\CoreFramework\Template\CompileableTemplate;
 use Org\Mxchange\CoreFramework\Template\Engine\BaseTemplateEngine;
 
@@ -19,11 +19,7 @@ use \UnexpectedValueException;
  *
  * @author             Roland Haeder <webmaster@shipsimu.org>
  * @version            0.0.0
-<<<<<<< HEAD:framework/main/classes/template/menu/class_MenuTemplateEngine.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/template/menu/class_MenuTemplateEngine.php
  * @license            GNU GPL 3.0 or any newer version
  * @link               http://www.shipsimu.org
  *
@@ -154,7 +150,7 @@ class MenuTemplateEngine extends BaseTemplateEngine implements CompileableTempla
                $templateInstance = new MenuTemplateEngine();
 
                // Get the application instance from registry
-               $applicationInstance = Registry::getRegistry()->getInstance('app');
+               $applicationInstance = GenericRegistry::getRegistry()->getInstance('app');
 
                // Determine base path
                $templateBasePath = $templateInstance->getConfigInstance()->getConfigEntry('application_base_path') . $applicationInstance->getAppShortName(). '/';
@@ -876,7 +872,7 @@ class MenuTemplateEngine extends BaseTemplateEngine implements CompileableTempla
         */
        public function getMenuCacheFile () {
                // Get the application instance from registry
-               $applicationInstance = Registry::getRegistry()->getInstance('app');
+               $applicationInstance = GenericRegistry::getRegistry()->getInstance('app');
 
                // Get the file instance ready
                $fileInstance = new SplFileInfo(sprintf('%s%smenus/_cache/%s.%s',

diff --git a/framework/main/classes/tools/console/class_ConsoleTools.php b/framework/main/classes/tools/console/class_ConsoleTools.php
index fbf17137972b3644132cdcad5eadfdb69dbf5ccb..feafde705c0702c1ee0375fd07b0189fc29b29cc 100644 (file)
--- a/framework/main/classes/tools/console/class_ConsoleTools.php
+++ b/framework/main/classes/tools/console/class_ConsoleTools.php
@@ -18,11 +18,7 @@ use \SplFileInfo;
  *
  * @author             Roland Haeder <webmaster@shipsimu.org>
  * @version            0.0.0
-<<<<<<< HEAD:framework/main/classes/tools/console/class_ConsoleTools.php
  * @copyright  Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2017 Hub Developer Team
-=======
- * @copyright  Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2016 Core Developer Team
->>>>>>> Some updates::inc/main/classes/console/class_ConsoleTools.php
  * @license            GNU GPL 3.0 or any newer version
  * @link               http://www.shipsimu.org
  *

diff --git a/framework/main/classes/user/class_BaseUser.php b/framework/main/classes/user/class_BaseUser.php
index 393ebee06bb2e4d430c18237b84e43242c7d4729..d4e1d511676747462aa428cf66558f96571908ec 100644 (file)
--- a/framework/main/classes/user/class_BaseUser.php
+++ b/framework/main/classes/user/class_BaseUser.php
@@ -15,11 +15,7 @@ use Org\Mxchange\CoreFramework\Result\Search\SearchableResult;
  *
  * @author             Roland Haeder <webmaster@shipsimu.org>
  * @version            0.0.0
-<<<<<<< HEAD:framework/main/classes/user/class_BaseUser.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/user/class_BaseUser.php
  * @license            GNU GPL 3.0 or any newer version
  * @link               http://www.shipsimu.org
  *

diff --git a/framework/main/classes/user/guest/class_Guest.php b/framework/main/classes/user/guest/class_Guest.php
index 94e45ab26e2614472ee3874260fe737ce53e7148..60192e00a72b5a76ab02f0cd6146567659cc4d82 100644 (file)
--- a/framework/main/classes/user/guest/class_Guest.php
+++ b/framework/main/classes/user/guest/class_Guest.php
@@ -13,11 +13,7 @@ use Org\Mxchange\CoreFramework\User\BaseUser;
  *
  * @author             Roland Haeder <webmaster@shipsimu.org>
  * @version            0.0.0
-<<<<<<< HEAD:framework/main/classes/user/guest/class_Guest.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/user/guest/class_Guest.php
  * @license            GNU GPL 3.0 or any newer version
  * @link               http://www.shipsimu.org
  *

diff --git a/framework/main/classes/user/member/class_Member.php b/framework/main/classes/user/member/class_Member.php
index 122448fcf410e8ad49d324a1676639d01f62f663..f06d1c306d0406d9547fb53bc7707d9a5731ec76 100644 (file)
--- a/framework/main/classes/user/member/class_Member.php
+++ b/framework/main/classes/user/member/class_Member.php
@@ -14,11 +14,7 @@ use Org\Mxchange\CoreFramework\User\BaseUser;
  *
  * @author             Roland Haeder <webmaster@shipsimu.org>
  * @version            0.0.0
-<<<<<<< HEAD:framework/main/classes/user/member/class_Member.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/user/member/class_Member.php
  * @license            GNU GPL 3.0 or any newer version
  * @link               http://www.shipsimu.org
  *

diff --git a/framework/main/classes/visitor/class_ b/framework/main/classes/visitor/class_
index 11ff3fd8e6618f6a3eeeef72ac2f839f787d7d2e..17f2a5f3417c20424ce2bdf8fefe1c1fb52959c8 100644 (file)
--- a/framework/main/classes/visitor/class_
+++ b/framework/main/classes/visitor/class_
@@ -10,11 +10,7 @@ use Org\Mxchange\CoreFramework\Visitor\BaseVisitor;
  *
  * @author             Roland Haeder <webmaster@ship-simu.org>
  * @version            0.0.0
-<<<<<<< HEAD:framework/main/classes/visitor/class_
  * @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/visitor/class_
  * @license            GNU GPL 3.0 or any newer version
  * @link               http://www.ship-simu.org
  *

diff --git a/framework/main/classes/visitor/class_BaseVisitor.php b/framework/main/classes/visitor/class_BaseVisitor.php
index 51af653e5efbf5b9031371eb3137b678bb80fd89..19ab92217adf6e3ede75fdef11c8901b53ef2784 100644 (file)
--- a/framework/main/classes/visitor/class_BaseVisitor.php
+++ b/framework/main/classes/visitor/class_BaseVisitor.php
@@ -10,11 +10,7 @@ use Org\Mxchange\CoreFramework\Object\BaseFrameworkSystem;
  *
  * @author             Roland Haeder <webmaster@shipsimu.org>
  * @version            0.0.0
-<<<<<<< HEAD:framework/main/classes/visitor/class_BaseVisitor.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/visitor/class_BaseVisitor.php
  * @license            GNU GPL 3.0 or any newer version
  * @link               http://www.shipsimu.org
  *

diff --git a/framework/main/exceptions/actions/class_InvalidActionException.php b/framework/main/exceptions/actions/class_InvalidActionException.php
index 013794abbe6ffc218e26e885b1a446fc02fa8dc7..8b709c6f7a348bf687f256f2f3f794846921aad3 100644 (file)
--- a/framework/main/exceptions/actions/class_InvalidActionException.php
+++ b/framework/main/exceptions/actions/class_InvalidActionException.php
@@ -10,11 +10,7 @@ use Org\Mxchange\CoreFramework\Generic\FrameworkException;
  *
  * @author             Roland Haeder <webmaster@shipsimu.org>
  * @version            0.0.0
-<<<<<<< HEAD:framework/main/exceptions/actions/class_InvalidActionException.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/exceptions/actions/class_InvalidActionException.php
  * @license            GNU GPL 3.0 or any newer version
  * @link               http://www.shipsimu.org
  *

diff --git a/framework/main/exceptions/auth/class_UserAuthorizationException.php b/framework/main/exceptions/auth/class_UserAuthorizationException.php
index d707ca127129b39376e1726caffb9493e5105a11..0d4495b16f48dba3e12ed4678d69bebf099d6eae 100644 (file)
--- a/framework/main/exceptions/auth/class_UserAuthorizationException.php
+++ b/framework/main/exceptions/auth/class_UserAuthorizationException.php
@@ -11,11 +11,7 @@ use Org\Mxchange\CoreFramework\Generic\FrameworkException;
  *
  * @author             Roland Haeder <webmaster@shipsimu.org>
  * @version            0.0.0
-<<<<<<< HEAD:framework/main/exceptions/auth/class_UserAuthorizationException.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/exceptions/auth/class_UserAuthorizationException.php
  * @license            GNU GPL 3.0 or any newer version
  * @link               http://www.shipsimu.org
  *

diff --git a/framework/main/exceptions/base64/class_Base64EncodingBadException.php b/framework/main/exceptions/base64/class_Base64EncodingBadException.php
index 77fe03be0e67036569cb87a6728d74047a141908..2fa669aecd7f8dc92e8bd84293356de90d542f31 100644 (file)
--- a/framework/main/exceptions/base64/class_Base64EncodingBadException.php
+++ b/framework/main/exceptions/base64/class_Base64EncodingBadException.php
@@ -11,11 +11,7 @@ use Org\Mxchange\CoreFramework\Generic\FrameworkException;
  *
  * @author             Roland Haeder <webmaster@shipsimu.org>
  * @version            0.0.0
-<<<<<<< HEAD:framework/main/exceptions/base64/class_Base64EncodingBadException.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/exceptions/base64/class_Base64EncodingBadException.php
  * @license            GNU GPL 3.0 or any newer version
  * @link               http://www.shipsimu.org
  * @deprecated Don't use this anymore

diff --git a/framework/main/exceptions/base64/class_Base64EncodingModuloException.php b/framework/main/exceptions/base64/class_Base64EncodingModuloException.php
index ea6b81612c37376bb8e6dbfebfd543ade7ed8252..433d9272df4308e6fa52e9fc6810fefec607544f 100644 (file)
--- a/framework/main/exceptions/base64/class_Base64EncodingModuloException.php
+++ b/framework/main/exceptions/base64/class_Base64EncodingModuloException.php
@@ -10,11 +10,7 @@ use Org\Mxchange\CoreFramework\Generic\FrameworkException;
  *
  * @author             Roland Haeder <webmaster@shipsimu.org>
  * @version            0.0.0
-<<<<<<< HEAD:framework/main/exceptions/base64/class_Base64EncodingModuloException.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/exceptions/base64/class_Base64EncodingModuloException.php
  * @license            GNU GPL 3.0 or any newer version
  * @link               http://www.shipsimu.org
  * @deprecated Don't use this anymore

diff --git a/framework/main/exceptions/class_ b/framework/main/exceptions/class_
index a6a81f4fd3efb467de9202627e34ccd85978d90c..2af02c8d0f533a48d290eedb26a2a3d5ef54eb08 100644 (file)
--- a/framework/main/exceptions/class_
+++ b/framework/main/exceptions/class_
@@ -4,11 +4,7 @@
  *
  * @author             Roland Haeder <webmaster@ship-simu.org>
  * @version            0.0.0
-<<<<<<< HEAD:framework/main/exceptions/class_
  * @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/exceptions/class_
  * @license            GNU GPL 3.0 or any newer version
  * @link               http://www.ship-simu.org
  *

diff --git a/framework/main/exceptions/class_FrameworkException.php b/framework/main/exceptions/class_FrameworkException.php
index c75ed900d20905a4920d1113268cc9fbfcc2e3cc..e1dedd97025987948db99be489afe313b926a470 100644 (file)
--- a/framework/main/exceptions/class_FrameworkException.php
+++ b/framework/main/exceptions/class_FrameworkException.php
@@ -12,11 +12,7 @@ use \ReflectionException;
  *
  * @author             Roland Haeder <webmaster@shipsimu.org>
  * @version            0.0.0
-<<<<<<< HEAD:framework/main/exceptions/class_FrameworkException.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/exceptions/class_FrameworkException.php
  * @license            GNU GPL 3.0 or any newer version
  * @link               http://www.shipsimu.org
  *

diff --git a/framework/main/exceptions/compressor/class_MismatchingCompressorsException.php b/framework/main/exceptions/compressor/class_MismatchingCompressorsException.php
index bca572be74984763fefb8d2a3b81deec928d524e..6a66dbe537b94b5b4b005e5403c0f7471c7f397c 100644 (file)
--- a/framework/main/exceptions/compressor/class_MismatchingCompressorsException.php
+++ b/framework/main/exceptions/compressor/class_MismatchingCompressorsException.php
@@ -10,11 +10,7 @@ use Org\Mxchange\CoreFramework\Generic\FrameworkException;
  *
  * @author             Roland Haeder <webmaster@shipsimu.org>
  * @version            0.0.0
-<<<<<<< HEAD:framework/main/exceptions/compressor/class_MismatchingCompressorsException.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/exceptions/compressor/class_MismatchingCompressorsException.php
  * @license            GNU GPL 3.0 or any newer version
  * @link               http://www.shipsimu.org
  * @todo               Rename to CompressorMismatchException

diff --git a/framework/main/exceptions/config/class_ConfigValueTypeUnsupportedException.php b/framework/main/exceptions/config/class_ConfigValueTypeUnsupportedException.php
index 6ac3ecc708bf130331e046f24a68114928a0273d..d4b5002a9ec56ac34b4cfe4cdfff172aea58b778 100644 (file)
--- a/framework/main/exceptions/config/class_ConfigValueTypeUnsupportedException.php
+++ b/framework/main/exceptions/config/class_ConfigValueTypeUnsupportedException.php
@@ -12,11 +12,7 @@ use Org\Mxchange\CoreFramework\Generic\FrameworkException;
  *
  * @author             Roland Haeder <webmaster@ship-simu.org>
  * @version            0.0.0
-<<<<<<< HEAD:framework/main/exceptions/config/class_ConfigValueTypeUnsupportedException.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/exceptions/config/class_ConfigValueTypeUnsupportedException.php
  * @license            GNU GPL 3.0 or any newer version
  * @link               http://www.ship-simu.org
  * @todo               These are invalid argument exceptions

diff --git a/framework/main/exceptions/config/class_NoConfigEntryException.php b/framework/main/exceptions/config/class_NoConfigEntryException.php
index a662fc5d30a2708c24bf069a4f52283e93838c67..5c24a5b882938ba7134b290986591db1d40b7a2d 100644 (file)
--- a/framework/main/exceptions/config/class_NoConfigEntryException.php
+++ b/framework/main/exceptions/config/class_NoConfigEntryException.php
@@ -10,11 +10,7 @@ use Org\Mxchange\CoreFramework\Generic\FrameworkException;
  *
  * @author             Roland Haeder <webmaster@shipsimu.org>
  * @version            0.0.0
-<<<<<<< HEAD:framework/main/exceptions/config/class_NoConfigEntryException.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/exceptions/config/class_NoConfigEntryException.php
  * @license            GNU GPL 3.0 or any newer version
  * @link               http://www.shipsimu.org
  * @todo               Rename this class to NoFoundEntryException

diff --git a/framework/main/exceptions/connection/class_ConnectionAlreadyRegisteredException.php b/framework/main/exceptions/connection/class_ConnectionAlreadyRegisteredException.php
index 30a057335c7d714844cd0b92959fe4acaba23ab4..9a9185a157cc2e4c810e9d0ea246cf412a4501d9 100644 (file)
--- a/framework/main/exceptions/connection/class_ConnectionAlreadyRegisteredException.php
+++ b/framework/main/exceptions/connection/class_ConnectionAlreadyRegisteredException.php
@@ -11,11 +11,7 @@ use Org\Mxchange\CoreFramework\Generic\FrameworkException;
  *
  * @author             Roland Haeder <webmaster@shipsimu.org>
  * @version            0.0.0
-<<<<<<< HEAD:framework/main/exceptions/connection/class_ConnectionAlreadyRegisteredException.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/exceptions/connection/class_ConnectionAlreadyRegisteredException.php
  * @license            GNU GPL 3.0 or any newer version
  * @link               http://www.shipsimu.org
  *

diff --git a/framework/main/exceptions/controller/class_DefaultControllerException.php b/framework/main/exceptions/controller/class_DefaultControllerException.php
index 3163c0b8dc9c350b379cb41265355adda1901459..7a247d30c3a7682b7f0e7d82eefd3f8525198c34 100644 (file)
--- a/framework/main/exceptions/controller/class_DefaultControllerException.php
+++ b/framework/main/exceptions/controller/class_DefaultControllerException.php
@@ -11,11 +11,7 @@ use Org\Mxchange\CoreFramework\Resolver\Controller\ControllerResolver;
  *
  * @author             Roland Haeder <webmaster@shipsimu.org>
  * @version            0.0.0
-<<<<<<< HEAD:framework/main/exceptions/controller/class_DefaultControllerException.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/exceptions/controller/class_DefaultControllerException.php
  * @license            GNU GPL 3.0 or any newer version
  * @link               http://www.shipsimu.org
  *

diff --git a/framework/main/exceptions/controller/class_InvalidControllerException.php b/framework/main/exceptions/controller/class_InvalidControllerException.php
index b9d7f5ea7a4ae8ee3a593240938c5a0975491d9e..aacc2e248da80f68541b4db4218497ad3c2184d5 100644 (file)
--- a/framework/main/exceptions/controller/class_InvalidControllerException.php
+++ b/framework/main/exceptions/controller/class_InvalidControllerException.php
@@ -10,11 +10,7 @@ use Org\Mxchange\CoreFramework\Generic\FrameworkException;
  *
  * @author             Roland Haeder <webmaster@shipsimu.org>
  * @version            0.0.0
-<<<<<<< HEAD:framework/main/exceptions/controller/class_InvalidControllerException.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/exceptions/controller/class_InvalidControllerException.php
  * @license            GNU GPL 3.0 or any newer version
  * @link               http://www.shipsimu.org
  *

diff --git a/framework/main/exceptions/crypto/class_EncryptInvalidLengthException.php b/framework/main/exceptions/crypto/class_EncryptInvalidLengthException.php
index afda6d5e4d93d0734f0bad57f228d72c3cf10bbc..b1d470a116f365515409b6906a629d8cefd24bfb 100644 (file)
--- a/framework/main/exceptions/crypto/class_EncryptInvalidLengthException.php
+++ b/framework/main/exceptions/crypto/class_EncryptInvalidLengthException.php
@@ -11,11 +11,7 @@ use Org\Mxchange\CoreFramework\Generic\FrameworkException;
  *
  * @author             Roland Haeder <webmaster@shipsimu.org>
  * @version            0.0.0
-<<<<<<< HEAD:framework/main/exceptions/crypto/class_EncryptInvalidLengthException.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/exceptions/crypto/class_EncryptInvalidLengthException.php
  * @license            GNU GPL 3.0 or any newer version
  * @link               http://www.shipsimu.org
  * @deprecated Don't use this anymore

diff --git a/framework/main/exceptions/crypto/class_EncryptMissingException.php b/framework/main/exceptions/crypto/class_EncryptMissingException.php
index dc7685ec7b224b608a4c4815e18322db3d2f335a..a6633ed229679e380cc13c844e9f3a0f05d530cb 100644 (file)
--- a/framework/main/exceptions/crypto/class_EncryptMissingException.php
+++ b/framework/main/exceptions/crypto/class_EncryptMissingException.php
@@ -11,11 +11,7 @@ use Org\Mxchange\CoreFramework\Generic\FrameworkException;
  *
  * @author             Roland Haeder <webmaster@shipsimu.org>
  * @version            0.0.0
-<<<<<<< HEAD:framework/main/exceptions/crypto/class_EncryptMissingException.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/exceptions/crypto/class_EncryptMissingException.php
  * @license            GNU GPL 3.0 or any newer version
  * @link               http://www.shipsimu.org
  * @deprecated Don't use this anymore

diff --git a/framework/main/exceptions/database/class_ b/framework/main/exceptions/database/class_
index fc36e2a13d39939bc36c5caa6022f23cbea2dd3e..5098f7bac507eb032d85620804cab94d3983a4aa 100644 (file)
--- a/framework/main/exceptions/database/class_
+++ b/framework/main/exceptions/database/class_
@@ -4,11 +4,7 @@
  *
  * @author             Roland Haeder <webmaster@ship-simu.org>
  * @version            0.0.0
-<<<<<<< HEAD:framework/main/exceptions/database/class_
  * @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/exceptions/database/class_
  * @license            GNU GPL 3.0 or any newer version
  * @link               http://www.ship-simu.org
  * 

diff --git a/framework/main/exceptions/database/class_DatabaseException.php b/framework/main/exceptions/database/class_DatabaseException.php
index 3a493b03b8f9d41436364fbc20880d5f1ba3cb55..ba71bd17f8c0235983b67cff478324e4e2eee27a 100644 (file)
--- a/framework/main/exceptions/database/class_DatabaseException.php
+++ b/framework/main/exceptions/database/class_DatabaseException.php
@@ -10,11 +10,7 @@ use Org\Mxchange\CoreFramework\Generic\FrameworkException;
  *
  * @author             Roland Haeder <webmaster@shipsimu.org>
  * @version            0.0.0
-<<<<<<< HEAD:framework/main/exceptions/database/class_DatabaseException.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/exceptions/database/class_DatabaseException.php
  * @license            GNU GPL 3.0 or any newer version
  * @link               http://www.shipsimu.org
  * 

diff --git a/framework/main/exceptions/database/general/class_SqlException.php b/framework/main/exceptions/database/general/class_SqlException.php
index e43f6deb6c8be2142535135d4f7bfd29f2b840c9..cf385f224d05f3058a7aadf5271ce3c52a8934c3 100644 (file)
--- a/framework/main/exceptions/database/general/class_SqlException.php
+++ b/framework/main/exceptions/database/general/class_SqlException.php
@@ -10,11 +10,7 @@ use Org\Mxchange\CoreFramework\Database\DatabaseException;
  *
  * @author             Roland Haeder <webmaster@shipsimu.org>
  * @version            0.0.0
-<<<<<<< HEAD:framework/main/exceptions/database/general/class_SqlException.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/exceptions/database/general/class_SqlException.php
  * @license            GNU GPL 3.0 or any newer version
  * @link               http://www.shipsimu.org
  * 

diff --git a/framework/main/exceptions/database/local_file/class_SavePathIsNoDirectoryException.php b/framework/main/exceptions/database/local_file/class_SavePathIsNoDirectoryException.php
index f55a9604a616db8eecde1bb02667c6142340c891..290f83a8faf3c0fb918e2a9d88580291de592ddb 100644 (file)
--- a/framework/main/exceptions/database/local_file/class_SavePathIsNoDirectoryException.php
+++ b/framework/main/exceptions/database/local_file/class_SavePathIsNoDirectoryException.php
@@ -10,11 +10,7 @@ use Org\Mxchange\CoreFramework\Database\DatabaseException;
  *
  * @author             Roland Haeder <webmaster@shipsimu.org>
  * @version            0.0.0
-<<<<<<< HEAD:framework/main/exceptions/database/local_file/class_SavePathIsNoDirectoryException.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/exceptions/database/local_file/class_SavePathIsNoDirectoryException.php
  * @license            GNU GPL 3.0 or any newer version
  * @link               http://www.shipsimu.org
  * @deprecated Don't use this

diff --git a/framework/main/exceptions/database/local_file/class_SavePathReadProtectedException.php b/framework/main/exceptions/database/local_file/class_SavePathReadProtectedException.php
index 2509edba0eeb26cc46523bd4754ce9df1d15e961..9bb346056d751013c48740c5dfd3c17527fbcbc4 100644 (file)
--- a/framework/main/exceptions/database/local_file/class_SavePathReadProtectedException.php
+++ b/framework/main/exceptions/database/local_file/class_SavePathReadProtectedException.php
@@ -10,11 +10,7 @@ use Org\Mxchange\CoreFramework\Database\DatabaseException;
  *
  * @author             Roland Haeder <webmaster@shipsimu.org>
  * @version            0.0.0
-<<<<<<< HEAD:framework/main/exceptions/database/local_file/class_SavePathReadProtectedException.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/exceptions/database/local_file/class_SavePathReadProtectedException.php
  * @license            GNU GPL 3.0 or any newer version
  * @link               http://www.shipsimu.org
  * @deprecated Please don't use this

diff --git a/framework/main/exceptions/database/local_file/class_SavePathWriteProtectedException.php b/framework/main/exceptions/database/local_file/class_SavePathWriteProtectedException.php
index ad5e55f515a0ba76d7382a5484bfbf5f6fcf7ac8..439b33529f98477e567f6e847e45eb85d8635548 100644 (file)
--- a/framework/main/exceptions/database/local_file/class_SavePathWriteProtectedException.php
+++ b/framework/main/exceptions/database/local_file/class_SavePathWriteProtectedException.php
@@ -10,11 +10,7 @@ use Org\Mxchange\CoreFramework\Database\DatabaseException;
  *
  * @author             Roland Haeder <webmaster@shipsimu.org>
  * @version            0.0.0
-<<<<<<< HEAD:framework/main/exceptions/database/local_file/class_SavePathWriteProtectedException.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/exceptions/database/local_file/class_SavePathWriteProtectedException.php
  * @license            GNU GPL 3.0 or any newer version
  * @link               http://www.shipsimu.org
  * @deprecated Please don't use this

diff --git a/framework/main/exceptions/dns/class_UnknownHostnameException.php b/framework/main/exceptions/dns/class_UnknownHostnameException.php
index e999d30ebab3fbf6180520a3d88912cca5f1d17c..c96712e1dbc979964de70b022f595316d4216865 100644 (file)
--- a/framework/main/exceptions/dns/class_UnknownHostnameException.php
+++ b/framework/main/exceptions/dns/class_UnknownHostnameException.php
@@ -10,11 +10,7 @@ use Org\Mxchange\CoreFramework\Generic\FrameworkException;
  *
  * @author             Roland Haeder <webmaster@shipsimu.org>
  * @version            0.0.0
-<<<<<<< HEAD:framework/main/exceptions/dns/class_UnknownHostnameException.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/exceptions/main/class_EmptyVariableException.php
  * @license            GNU GPL 3.0 or any newer version
  * @link               http://www.shipsimu.org
  *

diff --git a/framework/main/exceptions/feature/class_FeatureMethodNotCallableException.php b/framework/main/exceptions/feature/class_FeatureMethodNotCallableException.php
index 389579c5afb28c1e922bf92c363cff6c2adf813a..c686e8b087a4ad2a4b988b6b46c929f7ae6245b4 100644 (file)
--- a/framework/main/exceptions/feature/class_FeatureMethodNotCallableException.php
+++ b/framework/main/exceptions/feature/class_FeatureMethodNotCallableException.php
@@ -10,11 +10,7 @@ use Org\Mxchange\CoreFramework\Generic\FrameworkException;
  *
  * @author             Roland Haeder <webmaster@ship-simu.org>
  * @version            0.0.0
-<<<<<<< HEAD:framework/main/exceptions/feature/class_FeatureMethodNotCallableException.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/exceptions/feature/class_FeatureMethodNotCallableException.php
  * @license            GNU GPL 3.0 or any newer version
  * @link               http://www.ship-simu.org
  *

diff --git a/framework/main/exceptions/file_directory/class_DirPointerNotOpenedException.php b/framework/main/exceptions/file_directory/class_DirPointerNotOpenedException.php
index afba88f33f32bc3f05e8b5b26021f49866b29bb9..3a6339d5c85c0c76a8b78a56e4140ff17d7bae78 100644 (file)
--- a/framework/main/exceptions/file_directory/class_DirPointerNotOpenedException.php
+++ b/framework/main/exceptions/file_directory/class_DirPointerNotOpenedException.php
@@ -10,11 +10,7 @@ use Org\Mxchange\CoreFramework\Generic\FrameworkException;
  *
  * @author             Roland Haeder <webmaster@shipsimu.org>
  * @version            0.0.0
-<<<<<<< HEAD:framework/main/exceptions/file_directory/class_DirPointerNotOpenedException.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/exceptions/file_directory/class_DirPointerNotOpenedException.php
  * @license            GNU GPL 3.0 or any newer version
  * @link               http://www.shipsimu.org
  * 

diff --git a/framework/main/exceptions/file_directory/class_FileIoException.php b/framework/main/exceptions/file_directory/class_FileIoException.php
index 535e5230fcadde5f620476dc353f4b7d05301f80..e1649d038dc894d3340e456789b32a9a452dcc41 100644 (file)
--- a/framework/main/exceptions/file_directory/class_FileIoException.php
+++ b/framework/main/exceptions/file_directory/class_FileIoException.php
@@ -14,11 +14,7 @@ use \SplFileInfo;
  *
  * @author             Roland Haeder <webmaster@shipsimu.org>
  * @version            0.0.0
-<<<<<<< HEAD:framework/main/exceptions/file_directory/class_FileIoException.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/exceptions/file_directory/class_FileIoException.php
  * @license            GNU GPL 3.0 or any newer version
  * @link               http://www.shipsimu.org
  * 

diff --git a/framework/main/exceptions/file_directory/class_FileNotFoundException.php b/framework/main/exceptions/file_directory/class_FileNotFoundException.php
index b05965c659b13cd68aabb53711c6b0827db5eb04..5285157dc2c109b1ff756c783bd2d4d418f91b13 100644 (file)
--- a/framework/main/exceptions/file_directory/class_FileNotFoundException.php
+++ b/framework/main/exceptions/file_directory/class_FileNotFoundException.php
@@ -13,11 +13,7 @@ use \SplFileInfo;
  *
  * @author             Roland Haeder <webmaster@shipsimu.org>
  * @version            0.0.0
-<<<<<<< HEAD:framework/main/exceptions/file_directory/class_FileNotFoundException.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/exceptions/file_directory/class_FileNotFoundException.php
  * @license            GNU GPL 3.0 or any newer version
  * @link               http://www.shipsimu.org
  * 

diff --git a/framework/main/exceptions/file_directory/class_FileReadProtectedException.php b/framework/main/exceptions/file_directory/class_FileReadProtectedException.php
index b1634fb8647855fb1b7dae3b00443abab01beaa1..d791c3ed71e41671d5e54906445975d7cb7f33b6 100644 (file)
--- a/framework/main/exceptions/file_directory/class_FileReadProtectedException.php
+++ b/framework/main/exceptions/file_directory/class_FileReadProtectedException.php
@@ -13,11 +13,7 @@ use \SplFileInfo;
  *
  * @author             Roland Haeder <webmaster@shipsimu.org>
  * @version            0.0.0
-<<<<<<< HEAD:framework/main/exceptions/file_directory/class_FileReadProtectedException.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/exceptions/file_directory/class_FileReadProtectedException.php
  * @license            GNU GPL 3.0 or any newer version
  * @link               http://www.shipsimu.org
  * 

diff --git a/framework/main/exceptions/file_directory/class_FileWriteProtectedException.php b/framework/main/exceptions/file_directory/class_FileWriteProtectedException.php
index ad7990535abf256604b6a224a71f1edf210b15d7..3961d559c33e305a7f4e285ec6ede04320ca51c5 100644 (file)
--- a/framework/main/exceptions/file_directory/class_FileWriteProtectedException.php
+++ b/framework/main/exceptions/file_directory/class_FileWriteProtectedException.php
@@ -13,11 +13,7 @@ use \SplFileInfo;
  *
  * @author             Roland Haeder <webmaster@shipsimu.org>
  * @version            0.0.0
-<<<<<<< HEAD:framework/main/exceptions/file_directory/class_FileWriteProtectedException.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/exceptions/file_directory/class_FileWriteProtectedException.php
  * @license            GNU GPL 3.0 or any newer version
  * @link               http://www.shipsimu.org
  *

diff --git a/framework/main/exceptions/file_directory/class_InvalidDataLengthException.php b/framework/main/exceptions/file_directory/class_InvalidDataLengthException.php
index a3058c353898c4ae4b7e0ea9332ed628bc9fd210..826f1ea262e1b2a26bb2a4a2004cd0de52a1a4fa 100644 (file)
--- a/framework/main/exceptions/file_directory/class_InvalidDataLengthException.php
+++ b/framework/main/exceptions/file_directory/class_InvalidDataLengthException.php
@@ -10,11 +10,7 @@ use Org\Mxchange\CoreFramework\Generic\FrameworkException;
  *
  * @author             Roland Haeder <webmaster@shipsimu.org>
  * @version            0.0.0
-<<<<<<< HEAD:framework/main/exceptions/file_directory/class_InvalidDataLengthException.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/exceptions/file_directory/class_InvalidDataLengthException.php
  * @license            GNU GPL 3.0 or any newer version
  * @link               http://www.shipsimu.org
  * @deprecated Don't use this anymore

diff --git a/framework/main/exceptions/file_directory/class_InvalidMD5ChecksumException.php b/framework/main/exceptions/file_directory/class_InvalidMD5ChecksumException.php
index 42143609152fead4f2d43ecdb8689f73fd2761e9..cb72311b0c72c1a57676e86716ec6d7cf415bc10 100644 (file)
--- a/framework/main/exceptions/file_directory/class_InvalidMD5ChecksumException.php
+++ b/framework/main/exceptions/file_directory/class_InvalidMD5ChecksumException.php
@@ -10,11 +10,7 @@ use Org\Mxchange\CoreFramework\Generic\FrameworkException;
  *
  * @author             Roland Haeder <webmaster@shipsimu.org>
  * @version            0.0.0
-<<<<<<< HEAD:framework/main/exceptions/file_directory/class_InvalidMD5ChecksumException.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/exceptions/file_directory/class_InvalidMD5ChecksumException.php
  * @license            GNU GPL 3.0 or any newer version
  * @link               http://www.shipsimu.org
  * @deprecated Don't use this anymore

diff --git a/framework/main/exceptions/file_directory/class_InvalidResourceException.php b/framework/main/exceptions/file_directory/class_InvalidResourceException.php
index ea616c11a0ee1ff72af3c69baf689a2c27262cc4..0e50681d30ba646cb97a1ce7a46a76331610b79c 100644 (file)
--- a/framework/main/exceptions/file_directory/class_InvalidResourceException.php
+++ b/framework/main/exceptions/file_directory/class_InvalidResourceException.php
@@ -11,11 +11,7 @@ use Org\Mxchange\CoreFramework\Generic\FrameworkInterface;
  *
  * @author             Roland Haeder <webmaster@shipsimu.org>
  * @version            0.0.0
-<<<<<<< HEAD:framework/main/exceptions/file_directory/class_InvalidResourceException.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/exceptions/file_directory/class_InvalidResourceException.php
  * @license            GNU GPL 3.0 or any newer version
  * @link               http://www.shipsimu.org
  * 

diff --git a/framework/main/exceptions/file_directory/class_PathIsNoDirectoryException.php b/framework/main/exceptions/file_directory/class_PathIsNoDirectoryException.php
index a969b3e34123dbb04625eed3aab2d3f893559221..b26387e4612b50a184ebf876c8578f12ef541730 100644 (file)
--- a/framework/main/exceptions/file_directory/class_PathIsNoDirectoryException.php
+++ b/framework/main/exceptions/file_directory/class_PathIsNoDirectoryException.php
@@ -10,11 +10,7 @@ use Org\Mxchange\CoreFramework\Generic\FrameworkException;
  *
  * @author             Roland Haeder <webmaster@shipsimu.org>
  * @version            0.0.0
-<<<<<<< HEAD:framework/main/exceptions/file_directory/class_PathIsNoDirectoryException.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/exceptions/file_directory/class_PathIsNoDirectoryException.php
  * @license            GNU GPL 3.0 or any newer version
  * @link               http://www.shipsimu.org
  * @deprecated Don't use this anymore

diff --git a/framework/main/exceptions/file_directory/class_PathReadProtectedException.php b/framework/main/exceptions/file_directory/class_PathReadProtectedException.php
index 0a50d077a17f4d601218f5c3413f785c37e346f4..b15a5fc364f02e790ec9491aedee5ad7e1c08ef7 100644 (file)
--- a/framework/main/exceptions/file_directory/class_PathReadProtectedException.php
+++ b/framework/main/exceptions/file_directory/class_PathReadProtectedException.php
@@ -10,11 +10,7 @@ use Org\Mxchange\CoreFramework\Generic\FrameworkException;
  *
  * @author             Roland Haeder <webmaster@shipsimu.org>
  * @version            0.0.0
-<<<<<<< HEAD:framework/main/exceptions/file_directory/class_PathReadProtectedException.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/exceptions/file_directory/class_PathReadProtectedException.php
  * @license            GNU GPL 3.0 or any newer version
  * @link               http://www.shipsimu.org
  * @deprecated Don't use this anymore

diff --git a/framework/main/exceptions/file_directory/class_PathWriteProtectedException.php b/framework/main/exceptions/file_directory/class_PathWriteProtectedException.php
index 8366a53a3bf7cb470fd02fea86ad6d2985829638..4e04017fc2bbde7826239afbdae2c66ef97cf2ad 100644 (file)
--- a/framework/main/exceptions/file_directory/class_PathWriteProtectedException.php
+++ b/framework/main/exceptions/file_directory/class_PathWriteProtectedException.php
@@ -14,11 +14,7 @@ use \SplFileInfo;
  *
  * @author             Roland Haeder <webmaster@shipsimu.org>
  * @version            0.0.0
-<<<<<<< HEAD:framework/main/exceptions/file_directory/class_PathWriteProtectedException.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/exceptions/file_directory/class_PathWriteProtectedException.php
  * @license            GNU GPL 3.0 or any newer version
  * @link               http://www.shipsimu.org
  * 

diff --git a/framework/main/exceptions/filter/class_FilterChainException.php b/framework/main/exceptions/filter/class_FilterChainException.php
index bd335527c15faa45700a19fb36c6cb010a81326f..f36495d33b41b9d60c8d2fd28e8a2f9ed8019d19 100644 (file)
--- a/framework/main/exceptions/filter/class_FilterChainException.php
+++ b/framework/main/exceptions/filter/class_FilterChainException.php
@@ -11,11 +11,7 @@ use Org\Mxchange\CoreFramework\Generic\FrameworkException;
  *
  * @author             Roland Haeder <webmaster@shipsimu.org>
  * @version            0.0.0
-<<<<<<< HEAD:framework/main/exceptions/filter/class_FilterChainException.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/exceptions/filter/class_FilterChainException.php
  * @license            GNU GPL 3.0 or any newer version
  * @link               http://www.shipsimu.org
  *

diff --git a/framework/main/exceptions/filter/class_InvalidFilterChainException.php b/framework/main/exceptions/filter/class_InvalidFilterChainException.php
index 87d7dcfe68ecf984c3c5fecb37247c2e8662ab67..b117c960cd957c99c3545d5c96e331726a95f065 100644 (file)
--- a/framework/main/exceptions/filter/class_InvalidFilterChainException.php
+++ b/framework/main/exceptions/filter/class_InvalidFilterChainException.php
@@ -10,11 +10,7 @@ use Org\Mxchange\CoreFramework\Generic\FrameworkException;
  *
  * @author             Roland Haeder <webmaster@shipsimu.org>
  * @version            0.0.0
-<<<<<<< HEAD:framework/main/exceptions/filter/class_InvalidFilterChainException.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/exceptions/filter/class_InvalidFilterChainException.php
  * @license            GNU GPL 3.0 or any newer version
  * @link               http://www.shipsimu.org
  * @deprecated Don't use this anymore

diff --git a/framework/main/exceptions/helper/class_FormClosedException.php b/framework/main/exceptions/helper/class_FormClosedException.php
index 396ee34dbffad5deacd48b841193b54fcf7a7b17..be2d4b8d8697bdafe045a77b7a7a973bf350a1ff 100644 (file)
--- a/framework/main/exceptions/helper/class_FormClosedException.php
+++ b/framework/main/exceptions/helper/class_FormClosedException.php
@@ -11,11 +11,7 @@ use Org\Mxchange\CoreFramework\Generic\FrameworkException;
  *
  * @author             Roland Haeder <webmaster@shipsimu.org>
  * @version            0.0.0
-<<<<<<< HEAD:framework/main/exceptions/helper/class_FormClosedException.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/exceptions/helper/class_FormClosedException.php
  * @license            GNU GPL 3.0 or any newer version
  * @link               http://www.shipsimu.org
  * @deprecated Don't use this anymore

diff --git a/framework/main/exceptions/helper/class_FormGroupClosedException.php b/framework/main/exceptions/helper/class_FormGroupClosedException.php
index 3c3dc740c28f96ca7fd6af354162e66d8f09e059..f45c8f1e592b9766446048ad41812d82a82b1a57 100644 (file)
--- a/framework/main/exceptions/helper/class_FormGroupClosedException.php
+++ b/framework/main/exceptions/helper/class_FormGroupClosedException.php
@@ -10,11 +10,7 @@ use Org\Mxchange\CoreFramework\Generic\FrameworkException;
  *
  * @author             Roland Haeder <webmaster@shipsimu.org>
  * @version            0.0.0
-<<<<<<< HEAD:framework/main/exceptions/helper/class_FormGroupClosedException.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/exceptions/helper/class_FormGroupClosedException.php
  * @license            GNU GPL 3.0 or any newer version
  * @link               http://www.shipsimu.org
  * @deprecated Don't use this anymore

diff --git a/framework/main/exceptions/helper/class_FormOpenedException.php b/framework/main/exceptions/helper/class_FormOpenedException.php
index 6401ec2c29a9f939c241a7afd665c37d00da8528..7e172479b2adb10cd6f45eea0e75f520cb3e6bb2 100644 (file)
--- a/framework/main/exceptions/helper/class_FormOpenedException.php
+++ b/framework/main/exceptions/helper/class_FormOpenedException.php
@@ -12,11 +12,7 @@ use Org\Mxchange\CoreFramework\Helper\BaseHelper;
  *
  * @author             Roland Haeder <webmaster@shipsimu.org>
  * @version            0.0.0
-<<<<<<< HEAD:framework/main/exceptions/helper/class_FormOpenedException.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/exceptions/helper/class_FormOpenedException.php
  * @license            GNU GPL 3.0 or any newer version
  * @link               http://www.shipsimu.org
  * @deprecated Don't use this anymore

diff --git a/framework/main/exceptions/helper/class_HelperGroupAlreadyCreatedException.php b/framework/main/exceptions/helper/class_HelperGroupAlreadyCreatedException.php
index 6e5a1c69253320e617a4d80c11a82383ed09084d..2c35f5e08149a25e5bfac47f1baaf088a773ecad 100644 (file)
--- a/framework/main/exceptions/helper/class_HelperGroupAlreadyCreatedException.php
+++ b/framework/main/exceptions/helper/class_HelperGroupAlreadyCreatedException.php
@@ -10,11 +10,7 @@ use Org\Mxchange\CoreFramework\Generic\FrameworkException;
  *
  * @author             Roland Haeder <webmaster@shipsimu.org>
  * @version            0.0.0
-<<<<<<< HEAD:framework/main/exceptions/helper/class_HelperGroupAlreadyCreatedException.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/exceptions/helper/class_HelperGroupAlreadyCreatedException.php
  * @license            GNU GPL 3.0 or any newer version
  * @link               http://www.shipsimu.org
  * @deprecated Don't use this anymore

diff --git a/framework/main/exceptions/helper/class_HelperNoPreviousOpenedSubGroupException.php b/framework/main/exceptions/helper/class_HelperNoPreviousOpenedSubGroupException.php
index d401eb4c5df605b33905a8e4f46a5deac14f665e..6da141e504fbb927c6a4e3f23aa1e07c098fdafb 100644 (file)
--- a/framework/main/exceptions/helper/class_HelperNoPreviousOpenedSubGroupException.php
+++ b/framework/main/exceptions/helper/class_HelperNoPreviousOpenedSubGroupException.php
@@ -10,11 +10,7 @@ use Org\Mxchange\CoreFramework\Generic\FrameworkException;
  *
  * @author             Roland Haeder <webmaster@shipsimu.org>
  * @version            0.0.0
-<<<<<<< HEAD:framework/main/exceptions/helper/class_HelperNoPreviousOpenedSubGroupException.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/exceptions/helper/class_HelperNoPreviousOpenedSubGroupException.php
  * @license            GNU GPL 3.0 or any newer version
  * @link               http://www.shipsimu.org
  * @deprecated Don't use this anymore

diff --git a/framework/main/exceptions/helper/class_HelperSubGroupAlreadyCreatedException.php b/framework/main/exceptions/helper/class_HelperSubGroupAlreadyCreatedException.php
index d44f36026edf053ff21879d8235c1429ffbc79e4..c00875c9994c875e57cda9145cc99f313a9d845f 100644 (file)
--- a/framework/main/exceptions/helper/class_HelperSubGroupAlreadyCreatedException.php
+++ b/framework/main/exceptions/helper/class_HelperSubGroupAlreadyCreatedException.php
@@ -10,11 +10,7 @@ use Org\Mxchange\CoreFramework\Generic\FrameworkException;
  *
  * @author             Roland Haeder <webmaster@shipsimu.org>
  * @version            0.0.0
-<<<<<<< HEAD:framework/main/exceptions/helper/class_HelperSubGroupAlreadyCreatedException.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/exceptions/helper/class_HelperSubGroupAlreadyCreatedException.php
  * @license            GNU GPL 3.0 or any newer version
  * @link               http://www.shipsimu.org
  * @deprecated Don't use this anymore

diff --git a/framework/main/exceptions/helper/class_InvalidFormNameException.php b/framework/main/exceptions/helper/class_InvalidFormNameException.php
index c58711d3e33112a3b05f0b10ed439e03bcb196e6..596633738edadf4003a8209f4131d9b925a627d8 100644 (file)
--- a/framework/main/exceptions/helper/class_InvalidFormNameException.php
+++ b/framework/main/exceptions/helper/class_InvalidFormNameException.php
@@ -11,11 +11,7 @@ use Org\Mxchange\CoreFramework\Helper\BaseHelper;
  *
  * @author             Roland Haeder <webmaster@shipsimu.org>
  * @version            0.0.0
-<<<<<<< HEAD:framework/main/exceptions/helper/class_InvalidFormNameException.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/exceptions/helper/class_InvalidFormNameException.php
  * @license            GNU GPL 3.0 or any newer version
  * @link               http://www.shipsimu.org
  * @deprecated Don't use this anymore

diff --git a/framework/main/exceptions/helper/class_NoGroupOpenedException.php b/framework/main/exceptions/helper/class_NoGroupOpenedException.php
index 9aa5b8b07cd329d933015c57f96595aa1f525cb2..fd28e2ac6626c819bccad2c5c798c51e999b3f7e 100644 (file)
--- a/framework/main/exceptions/helper/class_NoGroupOpenedException.php
+++ b/framework/main/exceptions/helper/class_NoGroupOpenedException.php
@@ -10,11 +10,7 @@ use Org\Mxchange\CoreFramework\Generic\FrameworkException;
  *
  * @author             Roland Haeder <webmaster@shipsimu.org>
  * @version            0.0.0
-<<<<<<< HEAD:framework/main/exceptions/helper/class_NoGroupOpenedException.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/exceptions/helper/class_NoGroupOpenedException.php
  * @license            GNU GPL 3.0 or any newer version
  * @link               http://www.shipsimu.org
  * @deprecated Don't use this anymore

diff --git a/framework/main/exceptions/helper/class_UserInstanceMissingException.php b/framework/main/exceptions/helper/class_UserInstanceMissingException.php
index aa046bef67200a2c8451de99b35c53ecd00e82ab..d6e342909de8291a78814746c24ad61b6b819666 100644 (file)
--- a/framework/main/exceptions/helper/class_UserInstanceMissingException.php
+++ b/framework/main/exceptions/helper/class_UserInstanceMissingException.php
@@ -10,11 +10,7 @@ use Org\Mxchange\CoreFramework\Generic\FrameworkException;
  *
  * @author             Roland Haeder <webmaster@shipsimu.org>
  * @version            0.0.0
-<<<<<<< HEAD:framework/main/exceptions/helper/class_UserInstanceMissingException.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/exceptions/helper/class_UserInstanceMissingException.php
  * @license            GNU GPL 3.0 or any newer version
  * @link               http://www.shipsimu.org
  * @deprecated Don't use this anymore

diff --git a/framework/main/exceptions/language/class_InvalidLanguagePathStringException.php b/framework/main/exceptions/language/class_InvalidLanguagePathStringException.php
index 69e17809939ed40c55963ec7122af9e20684641a..edaef0d9080bdc3d07f132769bf5dee294b089bf 100644 (file)
--- a/framework/main/exceptions/language/class_InvalidLanguagePathStringException.php
+++ b/framework/main/exceptions/language/class_InvalidLanguagePathStringException.php
@@ -10,11 +10,7 @@ use Org\Mxchange\CoreFramework\Generic\FrameworkException;
  *
  * @author             Roland Haeder <webmaster@shipsimu.org>
  * @version            0.0.0
-<<<<<<< HEAD:framework/main/exceptions/language/class_InvalidLanguagePathStringException.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/exceptions/language/class_InvalidLanguagePathStringException.php
  * @license            GNU GPL 3.0 or any newer version
  * @link               http://www.shipsimu.org
  * @deprecated Don't use this anymore

diff --git a/framework/main/exceptions/language/class_LanguagePathIsNoDirectoryException.php b/framework/main/exceptions/language/class_LanguagePathIsNoDirectoryException.php
index 19213d732008550558e289a06eeb9d028959f62e..59aefe4bae125273fcdc2bf064a484a3efddc624 100644 (file)
--- a/framework/main/exceptions/language/class_LanguagePathIsNoDirectoryException.php
+++ b/framework/main/exceptions/language/class_LanguagePathIsNoDirectoryException.php
@@ -10,11 +10,7 @@ use Org\Mxchange\CoreFramework\Generic\FrameworkException;
  *
  * @author             Roland Haeder <webmaster@shipsimu.org>
  * @version            0.0.0
-<<<<<<< HEAD:framework/main/exceptions/language/class_LanguagePathIsNoDirectoryException.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/exceptions/language/class_LanguagePathIsNoDirectoryException.php
  * @license            GNU GPL 3.0 or any newer version
  * @link               http://www.shipsimu.org
  * @todo               Don't use this anymore

diff --git a/framework/main/exceptions/language/class_LanguagePathReadProtectedException.php b/framework/main/exceptions/language/class_LanguagePathReadProtectedException.php
index 39759a007107a7d3e5bda5ab7e652816653e495e..cfaaa946e715d628f80aaf2b63c6fc9a5b10fa7b 100644 (file)
--- a/framework/main/exceptions/language/class_LanguagePathReadProtectedException.php
+++ b/framework/main/exceptions/language/class_LanguagePathReadProtectedException.php
@@ -10,11 +10,7 @@ use Org\Mxchange\CoreFramework\Generic\FrameworkException;
  *
  * @author             Roland Haeder <webmaster@shipsimu.org>
  * @version            0.0.0
-<<<<<<< HEAD:framework/main/exceptions/language/class_LanguagePathReadProtectedException.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/exceptions/language/class_LanguagePathReadProtectedException.php
  * @license            GNU GPL 3.0 or any newer version
  * @link               http://www.shipsimu.org
  * @deprecated Don't use this anymore

diff --git a/framework/main/exceptions/main/class_AssertionException.php b/framework/main/exceptions/main/class_AssertionException.php
index dc337c4ff3430760ca9344198d08db0566e0b9c0..933c52abbcd29666c5da2a78ea060abf65926d8d 100644 (file)
--- a/framework/main/exceptions/main/class_AssertionException.php
+++ b/framework/main/exceptions/main/class_AssertionException.php
@@ -10,11 +10,7 @@ use Org\Mxchange\CoreFramework\Generic\FrameworkException;
  *
  * @author             Roland Haeder <webmaster@shipsimu.org>
  * @version            0.0.0
-<<<<<<< HEAD:framework/main/exceptions/main/class_AssertionException.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/exceptions/main/class_AssertionException.php
  * @license            GNU GPL 3.0 or any newer version
  * @link               http://www.shipsimu.org
  *

diff --git a/framework/main/exceptions/main/class_ClassMismatchException.php b/framework/main/exceptions/main/class_ClassMismatchException.php
index e24f0f2c73411dbdd33d54e197f954b90da2a73b..e69f46214d502e3c47f19bb01dbbc4430a8ba8d1 100644 (file)
--- a/framework/main/exceptions/main/class_ClassMismatchException.php
+++ b/framework/main/exceptions/main/class_ClassMismatchException.php
@@ -10,11 +10,7 @@ use Org\Mxchange\CoreFramework\Generic\FrameworkException;
  *
  * @author             Roland Haeder <webmaster@shipsimu.org>
  * @version            0.0.0
-<<<<<<< HEAD:framework/main/exceptions/main/class_ClassMismatchException.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/exceptions/main/class_ClassMismatchException.php
  * @license            GNU GPL 3.0 or any newer version
  * @link               http://www.shipsimu.org
  * 

diff --git a/framework/main/exceptions/main/class_DimNotFoundInArrayException.php b/framework/main/exceptions/main/class_DimNotFoundInArrayException.php
index 2d172421339eb0feefe1ff71dc14a38183b1458c..2be4f6f37777030d31b8db6e3697cfaa4aa6dd5b 100644 (file)
--- a/framework/main/exceptions/main/class_DimNotFoundInArrayException.php
+++ b/framework/main/exceptions/main/class_DimNotFoundInArrayException.php
@@ -11,11 +11,7 @@ use Org\Mxchange\CoreFramework\Generic\FrameworkInterface;
  *
  * @author             Roland Haeder <webmaster@shipsimu.org>
  * @version            0.0.0
-<<<<<<< HEAD:framework/main/exceptions/main/class_DimNotFoundInArrayException.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/exceptions/main/class_DimNotFoundInArrayException.php
  * @license            GNU GPL 3.0 or any newer version
  * @link               http://www.shipsimu.org
  * @deprecated Please don't use this anymore

diff --git a/framework/main/exceptions/main/class_FatalErrorException.php b/framework/main/exceptions/main/class_FatalErrorException.php
index b2ae4873bbaa9b7595c5cb9bad623d17ccb25ca5..7b139844306ab02f1a55759cce1d4dbe9523d6c8 100644 (file)
--- a/framework/main/exceptions/main/class_FatalErrorException.php
+++ b/framework/main/exceptions/main/class_FatalErrorException.php
@@ -10,11 +10,7 @@ use Org\Mxchange\CoreFramework\Generic\FrameworkException;
  *
  * @author             Roland Haeder <webmaster@shipsimu.org>
  * @version            0.0.0
-<<<<<<< HEAD:framework/main/exceptions/main/class_FatalErrorException.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/exceptions/main/class_FatalErrorException.php
  * @license            GNU GPL 3.0 or any newer version
  * @link               http://www.shipsimu.org
  *

diff --git a/framework/main/exceptions/main/class_IndexOutOfBoundsException.php b/framework/main/exceptions/main/class_IndexOutOfBoundsException.php
index a72ae8935540711279e30d9d462881a4edea17a8..374752835de3ddc0134da19c1834d9a5e44f2992 100644 (file)
--- a/framework/main/exceptions/main/class_IndexOutOfBoundsException.php
+++ b/framework/main/exceptions/main/class_IndexOutOfBoundsException.php
@@ -10,11 +10,7 @@ use Org\Mxchange\CoreFramework\Generic\FrameworkException;
  *
  * @author             Roland Haeder <webmaster@shipsimu.org>
  * @version            0.0.0
-<<<<<<< HEAD:framework/main/exceptions/main/class_IndexOutOfBoundsException.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/exceptions/main/class_IndexOutOfBoundsException.php
  * @license            GNU GPL 3.0 or any newer version
  * @link               http://www.shipsimu.org
  *

diff --git a/framework/main/exceptions/main/class_InvalidArrayCountException.php b/framework/main/exceptions/main/class_InvalidArrayCountException.php
index 8d630f0f3ae982fb3d897bbc2dfeca3f41c2e62a..1ec609cf1f7f71a39703d8b8e0558c2d3f4c8f57 100644 (file)
--- a/framework/main/exceptions/main/class_InvalidArrayCountException.php
+++ b/framework/main/exceptions/main/class_InvalidArrayCountException.php
@@ -10,11 +10,7 @@ use Org\Mxchange\CoreFramework\Generic\FrameworkException;
  *
  * @author             Roland Haeder <webmaster@shipsimu.org>
  * @version            0.0.0
-<<<<<<< HEAD:framework/main/exceptions/main/class_InvalidArrayCountException.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/exceptions/main/class_InvalidArrayCountException.php
  * @license            GNU GPL 3.0 or any newer version
  * @link               http://www.shipsimu.org
  * @deprecated Don't use this anymore

diff --git a/framework/main/exceptions/main/class_InvalidCommandException.php b/framework/main/exceptions/main/class_InvalidCommandException.php
index 965e3609064e42e869b13132ca8537bbe57e83d0..ca84cd071dd5600d1a9236eeb899c6d6c0284cb8 100644 (file)
--- a/framework/main/exceptions/main/class_InvalidCommandException.php
+++ b/framework/main/exceptions/main/class_InvalidCommandException.php
@@ -10,11 +10,7 @@ use Org\Mxchange\CoreFramework\Generic\FrameworkException;
  *
  * @author             Roland Haeder <webmaster@shipsimu.org>
  * @version            0.0.0
-<<<<<<< HEAD:framework/main/exceptions/main/class_InvalidCommandException.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/exceptions/main/class_InvalidCommandException.php
  * @license            GNU GPL 3.0 or any newer version
  * @link               http://www.shipsimu.org
  *

diff --git a/framework/main/exceptions/main/class_InvalidInterfaceException.php b/framework/main/exceptions/main/class_InvalidInterfaceException.php
index 34c73996888096b82dd64c2efdc4e74c90ffa6b1..dc38900e76a5e7746c4e2c33a40a500531bf3946 100644 (file)
--- a/framework/main/exceptions/main/class_InvalidInterfaceException.php
+++ b/framework/main/exceptions/main/class_InvalidInterfaceException.php
@@ -10,11 +10,7 @@ use Org\Mxchange\CoreFramework\Generic\FrameworkException;
  *
  * @author             Roland Haeder <webmaster@shipsimu.org>
  * @version            0.0.0
-<<<<<<< HEAD:framework/main/exceptions/main/class_InvalidInterfaceException.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/exceptions/main/class_InvalidInterfaceException.php
  * @license            GNU GPL 3.0 or any newer version
  * @link               http://www.shipsimu.org
  * 

diff --git a/framework/main/exceptions/main/class_InvalidObjectException.php b/framework/main/exceptions/main/class_InvalidObjectException.php
index cec325b1f018a8d90b124bc07cecd5d4d32bdf72..0f28af78f14583ea50cc739b30ed6e66a6f2f680 100644 (file)
--- a/framework/main/exceptions/main/class_InvalidObjectException.php
+++ b/framework/main/exceptions/main/class_InvalidObjectException.php
@@ -11,11 +11,7 @@ use Org\Mxchange\CoreFramework\Generic\FrameworkInterface;
  *
  * @author             Roland Haeder <webmaster@shipsimu.org>
  * @version            0.0.0
-<<<<<<< HEAD:framework/main/exceptions/main/class_InvalidObjectException.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/exceptions/main/class_InvalidObjectException.php
  * @license            GNU GPL 3.0 or any newer version
  * @link               http://www.shipsimu.org
  * @deprecated Don't use this anymore

diff --git a/framework/main/exceptions/main/class_MissingArrayElementsException.php b/framework/main/exceptions/main/class_MissingArrayElementsException.php
index 93af76c2236b0d47a8b1ceb5c182ec0d8d0af9d3..a7b250fd7ca227f2826637db63ff6f0f8515bb2e 100644 (file)
--- a/framework/main/exceptions/main/class_MissingArrayElementsException.php
+++ b/framework/main/exceptions/main/class_MissingArrayElementsException.php
@@ -10,11 +10,7 @@ use Org\Mxchange\CoreFramework\Generic\FrameworkException;
  *
  * @author             Roland Haeder <webmaster@shipsimu.org>
  * @version            0.0.0
-<<<<<<< HEAD:framework/main/exceptions/main/class_MissingArrayElementsException.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/exceptions/main/class_MissingArrayElementsException.php
  * @license            GNU GPL 3.0 or any newer version
  * @link               http://www.shipsimu.org
  * 

diff --git a/framework/main/exceptions/main/class_MissingDecimalsThousandsSeparatorException.php b/framework/main/exceptions/main/class_MissingDecimalsThousandsSeparatorException.php
index 915040454a485e3cd416012658c04b4b1c3944dd..74344cb4ff2ad4b5b1c7aac079e376ad1a07506f 100644 (file)
--- a/framework/main/exceptions/main/class_MissingDecimalsThousandsSeparatorException.php
+++ b/framework/main/exceptions/main/class_MissingDecimalsThousandsSeparatorException.php
@@ -10,11 +10,7 @@ use Org\Mxchange\CoreFramework\Generic\FrameworkException;
  *
  * @author             Roland Haeder <webmaster@shipsimu.org>
  * @version            0.0.0
-<<<<<<< HEAD:framework/main/exceptions/main/class_MissingDecimalsThousandsSeparatorException.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/exceptions/main/class_MissingDecimalsThousandsSeparatorException.php
  * @license            GNU GPL 3.0 or any newer version
  * @link               http://www.shipsimu.org
  * @deprecated Don't use this anymore

diff --git a/framework/main/exceptions/main/class_NoClassException.php b/framework/main/exceptions/main/class_NoClassException.php
index c47806e1fc15d1e4f3445525499ee25515254b63..61f275dcc1eade921213e47b9f8cef24ee5f9a8e 100644 (file)
--- a/framework/main/exceptions/main/class_NoClassException.php
+++ b/framework/main/exceptions/main/class_NoClassException.php
@@ -10,11 +10,7 @@ use Org\Mxchange\CoreFramework\Generic\FrameworkException;
  *
  * @author             Roland Haeder <webmaster@shipsimu.org>
  * @version            0.0.0
-<<<<<<< HEAD:framework/main/exceptions/main/class_NoClassException.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/exceptions/main/class_NoClassException.php
  * @license            GNU GPL 3.0 or any newer version
  * @link               http://www.shipsimu.org
  *

diff --git a/framework/main/exceptions/main/class_NullPointerException.php b/framework/main/exceptions/main/class_NullPointerException.php
index 9f4b0fc5a0c1f12468bc8da4bd91a6c3923c5db8..62b1e3417ebc1b27f3a36257db5a19d65d912157 100644 (file)
--- a/framework/main/exceptions/main/class_NullPointerException.php
+++ b/framework/main/exceptions/main/class_NullPointerException.php
@@ -11,11 +11,7 @@ use Org\Mxchange\CoreFramework\Generic\FrameworkInterface;
  *
  * @author             Roland Haeder <webmaster@shipsimu.org>
  * @version            0.0.0
-<<<<<<< HEAD:framework/main/exceptions/main/class_NullPointerException.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/exceptions/main/class_NullPointerException.php
  * @license            GNU GPL 3.0 or any newer version
  * @link               http://www.shipsimu.org
  * 

diff --git a/framework/main/exceptions/main/class_ResponseHeadersAlreadySentException.php b/framework/main/exceptions/main/class_ResponseHeadersAlreadySentException.php
index 54e80d92c5af926c806bd71d099bdbf01b4814dd..b0dfeb53cb36fd0b3f4d6ffef96f6dae473da555 100644 (file)
--- a/framework/main/exceptions/main/class_ResponseHeadersAlreadySentException.php
+++ b/framework/main/exceptions/main/class_ResponseHeadersAlreadySentException.php
@@ -11,11 +11,7 @@ use Org\Mxchange\CoreFramework\Generic\FrameworkInterface;
  *
  * @author             Roland Haeder <webmaster@shipsimu.org>
  * @version            0.0.0
-<<<<<<< HEAD:framework/main/exceptions/main/class_ResponseHeadersAlreadySentException.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/exceptions/main/class_ResponseHeadersAlreadySentException.php
  * @license            GNU GPL 3.0 or any newer version
  * @link               http://www.shipsimu.org
  * 

diff --git a/framework/main/exceptions/main/class_UnsupportedOperationException.php b/framework/main/exceptions/main/class_UnsupportedOperationException.php
index 02490bdc4056712271c71bcff4110735ef83f0b7..a27c076e245d35cf870296a5634e925b98c61c25 100644 (file)
--- a/framework/main/exceptions/main/class_UnsupportedOperationException.php
+++ b/framework/main/exceptions/main/class_UnsupportedOperationException.php
@@ -12,11 +12,7 @@ use Org\Mxchange\CoreFramework\Generic\FrameworkInterface;
  *
  * @author             Roland Haeder <webmaster@shipsimu.org>
  * @version            0.0.0
-<<<<<<< HEAD:framework/main/exceptions/main/class_UnsupportedOperationException.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/exceptions/main/class_UnsupportedOperationException.php
  * @license            GNU GPL 3.0 or any newer version
  * @link               http://www.shipsimu.org
  *

diff --git a/framework/main/exceptions/main/class_VariableIsNotSetException.php b/framework/main/exceptions/main/class_VariableIsNotSetException.php
index f0ad6db1026944a18823daed89914ce13063a4e8..9573a843d0c45ade779ce4a5b14b0ad908b05fa0 100644 (file)
--- a/framework/main/exceptions/main/class_VariableIsNotSetException.php
+++ b/framework/main/exceptions/main/class_VariableIsNotSetException.php
@@ -10,11 +10,7 @@ use Org\Mxchange\CoreFramework\Generic\FrameworkException;
  *
  * @author             Roland Haeder <webmaster@shipsimu.org>
  * @version            0.0.0
-<<<<<<< HEAD:framework/main/exceptions/main/class_VariableIsNotSetException.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/exceptions/main/class_VariableIsNotSetException.php
  * @license            GNU GPL 3.0 or any newer version
  * @link               http://www.shipsimu.org
  * @deprecated Don't use this anymore

diff --git a/framework/main/exceptions/result/class_InvalidDatabaseResultException.php b/framework/main/exceptions/result/class_InvalidDatabaseResultException.php
index fccf81994b543f62160c904ddf4796edd1066fa4..3901ef8fed18bf74a274c70105da5e4f2abb8563 100644 (file)
--- a/framework/main/exceptions/result/class_InvalidDatabaseResultException.php
+++ b/framework/main/exceptions/result/class_InvalidDatabaseResultException.php
@@ -10,11 +10,7 @@ use Org\Mxchange\CoreFramework\Generic\FrameworkException;
  *
  * @author             Roland Haeder <webmaster@shipsimu.org>
  * @version            0.0.0
-<<<<<<< HEAD:framework/main/exceptions/result/class_InvalidDatabaseResultException.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/exceptions/result/class_InvalidDatabaseResultException.php
  * @license            GNU GPL 3.0 or any newer version
  * @link               http://www.shipsimu.org
  *

diff --git a/framework/main/exceptions/result/class_ResultUpdateException.php b/framework/main/exceptions/result/class_ResultUpdateException.php
index b46b2887f0d4be46f0a16a008e40c8d2f9e64b81..d0e492f186d5dfff5a6b19162ffe248ff7ddb4dd 100644 (file)
--- a/framework/main/exceptions/result/class_ResultUpdateException.php
+++ b/framework/main/exceptions/result/class_ResultUpdateException.php
@@ -11,11 +11,7 @@ use Org\Mxchange\CoreFramework\Result\Update\UpdateableResult;
  *
  * @author             Roland Haeder <webmaster@shipsimu.org>
  * @version            0.0.0
-<<<<<<< HEAD:framework/main/exceptions/result/class_ResultUpdateException.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/exceptions/result/class_ResultUpdateException.php
  * @license            GNU GPL 3.0 or any newer version
  * @link               http://www.shipsimu.org
  *

diff --git a/framework/main/exceptions/socket/class_AbstractSocketException.php b/framework/main/exceptions/socket/class_AbstractSocketException.php
index da3b11175dd44dfcce5174387c739e5329729ca1..ff3d610cd5c3453da8982f7e0ca2faa9254e9883 100644 (file)
--- a/framework/main/exceptions/socket/class_AbstractSocketException.php
+++ b/framework/main/exceptions/socket/class_AbstractSocketException.php
@@ -11,11 +11,7 @@ use Org\Mxchange\CoreFramework\Generic\FrameworkException;
  *
  * @author             Roland Haeder <webmaster@shipsimu.org>
  * @version            0.0.0
-<<<<<<< HEAD:framework/main/exceptions/socket/class_AbstractSocketException.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/exceptions/socket/class_AbstractSocketException.php
  * @license            GNU GPL 3.0 or any newer version
  * @link               http://www.shipsimu.org
  *

diff --git a/framework/main/exceptions/socket/class_InvalidServerSocketException.php b/framework/main/exceptions/socket/class_InvalidServerSocketException.php
index 286e89c77fc6368e184b92c12e28669f8c87b1b3..d28e5d10e74f8cb9c43aa6834396254cfdf28981 100644 (file)
--- a/framework/main/exceptions/socket/class_InvalidServerSocketException.php
+++ b/framework/main/exceptions/socket/class_InvalidServerSocketException.php
@@ -7,11 +7,7 @@ namespace Org\Mxchange\CoreFramework\Socket;
  *
  * @author             Roland Haeder <webmaster@shipsimu.org>
  * @version            0.0.0
-<<<<<<< HEAD:framework/main/exceptions/socket/class_InvalidServerSocketException.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/exceptions/socket/class_InvalidServerSocketException.php
  * @license            GNU GPL 3.0 or any newer version
  * @link               http://www.shipsimu.org
  *

diff --git a/framework/main/exceptions/socket/class_InvalidSocketException.php b/framework/main/exceptions/socket/class_InvalidSocketException.php
index 65212e0d2a996d4fc6e3b6a247130416dcac25fc..c663ea3a09180809681d91a2ebe48bbb82c416c1 100644 (file)
--- a/framework/main/exceptions/socket/class_InvalidSocketException.php
+++ b/framework/main/exceptions/socket/class_InvalidSocketException.php
@@ -8,11 +8,7 @@ namespace Org\Mxchange\CoreFramework\Socket;
  *
  * @author             Roland Haeder <webmaster@shipsimu.org>
  * @version            0.0.0
-<<<<<<< HEAD:framework/main/exceptions/socket/class_InvalidSocketException.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/exceptions/socket/class_InvalidSocketException.php
  * @license            GNU GPL 3.0 or any newer version
  * @link               http://www.shipsimu.org
  *

diff --git a/framework/main/exceptions/socket/class_NoSocketErrorDetectedException.php b/framework/main/exceptions/socket/class_NoSocketErrorDetectedException.php
index ae9fab9594528c1e7b2bcce42603090a868e7f5e..b086bcf4b74f0834e6b16bfcb351b629664255d6 100644 (file)
--- a/framework/main/exceptions/socket/class_NoSocketErrorDetectedException.php
+++ b/framework/main/exceptions/socket/class_NoSocketErrorDetectedException.php
@@ -9,11 +9,7 @@ namespace Org\Mxchange\CoreFramework\Socket;
  *
  * @author             Roland Haeder <webmaster@shipsimu.org>
  * @version            0.0.0
-<<<<<<< HEAD:framework/main/exceptions/socket/class_NoSocketErrorDetectedException.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/exceptions/socket/class_NoSocketErrorDetectedException.php
  * @license            GNU GPL 3.0 or any newer version
  * @link               http://www.shipsimu.org
  * @todo               Those are logic exceptions and should be rewritten

diff --git a/framework/main/exceptions/socket/class_SocketAlreadyRegisteredException.php b/framework/main/exceptions/socket/class_SocketAlreadyRegisteredException.php
index d6308eb89aef07d2c41912884f03ddb62e5fbfa2..0612f581d1a5d5c60b706af4810abb91e0d72c10 100644 (file)
--- a/framework/main/exceptions/socket/class_SocketAlreadyRegisteredException.php
+++ b/framework/main/exceptions/socket/class_SocketAlreadyRegisteredException.php
@@ -8,11 +8,7 @@ namespace Org\Mxchange\CoreFramework\Socket;
  *
  * @author             Roland Haeder <webmaster@shipsimu.org>
  * @version            0.0.0
-<<<<<<< HEAD:framework/main/exceptions/socket/class_SocketAlreadyRegisteredException.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/exceptions/socket/class_SocketAlreadyRegisteredException.php
  * @license            GNU GPL 3.0 or any newer version
  * @link               http://www.shipsimu.org
  *

diff --git a/framework/main/exceptions/socket/class_SocketBindingException.php b/framework/main/exceptions/socket/class_SocketBindingException.php
index 6383dfa5f99292935e4f283028e7a61c4b145eb4..d1cd271dcfbdd57c4b0a24070d7822a2e4920be1 100644 (file)
--- a/framework/main/exceptions/socket/class_SocketBindingException.php
+++ b/framework/main/exceptions/socket/class_SocketBindingException.php
@@ -6,11 +6,7 @@ namespace Org\Mxchange\CoreFramework\Socket;
  *
  * @author             Roland Haeder <webmaster@shipsimu.org>
  * @version            0.0.0
-<<<<<<< HEAD:framework/main/exceptions/socket/class_SocketBindingException.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/exceptions/socket/class_SocketBindingException.php
  * @license            GNU GPL 3.0 or any newer version
  * @link               http://www.shipsimu.org
  *

diff --git a/framework/main/exceptions/socket/class_SocketConnectionException.php b/framework/main/exceptions/socket/class_SocketConnectionException.php
index 9b10453d123815ad833a869ffb9b4aab031f7032..96ead0cb05192f08e2893fe9904df41e124a07c3 100644 (file)
--- a/framework/main/exceptions/socket/class_SocketConnectionException.php
+++ b/framework/main/exceptions/socket/class_SocketConnectionException.php
@@ -9,11 +9,7 @@ namespace Org\Mxchange\CoreFramework\Socket;
  *
  * @author             Roland Haeder <webmaster@shipsimu.org>
  * @version            0.0.0
-<<<<<<< HEAD:framework/main/exceptions/socket/class_SocketConnectionException.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/exceptions/socket/class_SocketConnectionException.php
  * @license            GNU GPL 3.0 or any newer version
  * @link               http://www.shipsimu.org
  *

diff --git a/framework/main/exceptions/socket/class_SocketCreationException.php b/framework/main/exceptions/socket/class_SocketCreationException.php
index af37c613da9d4236b9f193b34d73ab5baad96dda..5735bf2ff481d480208cca29903a7b20cb960a1f 100644 (file)
--- a/framework/main/exceptions/socket/class_SocketCreationException.php
+++ b/framework/main/exceptions/socket/class_SocketCreationException.php
@@ -9,11 +9,7 @@ namespace Org\Mxchange\CoreFramework\Socket;
  *
  * @author             Roland Haeder <webmaster@shipsimu.org>
  * @version            0.0.0
-<<<<<<< HEAD:framework/main/exceptions/socket/class_SocketCreationException.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/exceptions/socket/class_SocketCreationException.php
  * @license            GNU GPL 3.0 or any newer version
  * @link               http://www.shipsimu.org
  *

diff --git a/framework/main/exceptions/socket/class_SocketOptionException.php b/framework/main/exceptions/socket/class_SocketOptionException.php
index b701c4e976a2009bed8de32f9a250670dbb84889..54cd20dfbe1acbc7f78b84be6ff99d61306ee887 100644 (file)
--- a/framework/main/exceptions/socket/class_SocketOptionException.php
+++ b/framework/main/exceptions/socket/class_SocketOptionException.php
@@ -9,11 +9,7 @@ namespace Org\Mxchange\CoreFramework\Socket;
  *
  * @author             Roland Haeder <webmaster@shipsimu.org>
  * @version            0.0.0
-<<<<<<< HEAD:framework/main/exceptions/socket/class_SocketOptionException.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/exceptions/socket/class_SocketOptionException.php
  * @license            GNU GPL 3.0 or any newer version
  * @link               http://www.shipsimu.org
  *

diff --git a/framework/main/exceptions/socket/class_UnsupportedSocketErrorHandlerException.php b/framework/main/exceptions/socket/class_UnsupportedSocketErrorHandlerException.php
index 64d60363d10e157a583610e3bf356e67e53b4214..0c9e7948157b1c6ac68c69ee7c4f3c016d002d84 100644 (file)
--- a/framework/main/exceptions/socket/class_UnsupportedSocketErrorHandlerException.php
+++ b/framework/main/exceptions/socket/class_UnsupportedSocketErrorHandlerException.php
@@ -8,11 +8,7 @@ namespace Org\Mxchange\CoreFramework\Socket;
  *
  * @author             Roland Haeder <webmaster@shipsimu.org>
  * @version            0.0.0
-<<<<<<< HEAD:framework/main/exceptions/socket/class_UnsupportedSocketErrorHandlerException.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/exceptions/socket/class_UnsupportedSocketErrorHandlerException.php
  * @license            GNU GPL 3.0 or any newer version
  * @link               http://www.shipsimu.org
  *

diff --git a/framework/main/exceptions/stacker/class_AlreadyInitializedStackerException.php b/framework/main/exceptions/stacker/class_AlreadyInitializedStackerException.php
index 1edb630cb312cf51bca801e2a69fe734816b571f..d98ddbe2824c5d405d06bc386358e2beab950998 100644 (file)
--- a/framework/main/exceptions/stacker/class_AlreadyInitializedStackerException.php
+++ b/framework/main/exceptions/stacker/class_AlreadyInitializedStackerException.php
@@ -10,11 +10,7 @@ use Org\Mxchange\CoreFramework\Generic\FrameworkException;
  *
  * @author             Roland Haeder <webmaster@shipsimu.org>
  * @version            0.0.0
-<<<<<<< HEAD:framework/main/exceptions/stacker/class_AlreadyInitializedStackerException.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/exceptions/stacker/class_AlreadyInitializedStackerException.php
  * @license            GNU GPL 3.0 or any newer version
  * @link               http://www.shipsimu.org
  *

diff --git a/framework/main/exceptions/stacker/class_EmptyStackerException.php b/framework/main/exceptions/stacker/class_EmptyStackerException.php
index b1b6e952f84b06e67127f7fdf5c65fb81ccfd1ec..91b53f47728b2ec00c91da9985392c6febc500d2 100644 (file)
--- a/framework/main/exceptions/stacker/class_EmptyStackerException.php
+++ b/framework/main/exceptions/stacker/class_EmptyStackerException.php
@@ -10,11 +10,7 @@ use Org\Mxchange\CoreFramework\Generic\FrameworkException;
  *
  * @author             Roland Haeder <webmaster@shipsimu.org>
  * @version            0.0.0
-<<<<<<< HEAD:framework/main/exceptions/stacker/class_EmptyStackerException.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/exceptions/stacker/class_EmptyStackerException.php
  * @license            GNU GPL 3.0 or any newer version
  * @link               http://www.shipsimu.org
  * @deprecated Don't use this anymore

diff --git a/framework/main/exceptions/stacker/class_FullStackerException.php b/framework/main/exceptions/stacker/class_FullStackerException.php
index 00447302c8d3c9cd4e48ec18fb003cdb0d7e2951..1388995b92a8647f47d2b9d34864e953180bba41 100644 (file)
--- a/framework/main/exceptions/stacker/class_FullStackerException.php
+++ b/framework/main/exceptions/stacker/class_FullStackerException.php
@@ -10,11 +10,7 @@ use Org\Mxchange\CoreFramework\Generic\FrameworkException;
  *
  * @author             Roland Haeder <webmaster@shipsimu.org>
  * @version            0.0.0
-<<<<<<< HEAD:framework/main/exceptions/stacker/class_FullStackerException.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/exceptions/stacker/class_FullStackerException.php
  * @license            GNU GPL 3.0 or any newer version
  * @link               http://www.shipsimu.org
  *

diff --git a/framework/main/exceptions/stacker/class_NoStackerException.php b/framework/main/exceptions/stacker/class_NoStackerException.php
index 3863331372a63f6e53e20edf79ebdcb5f36bdc00..166edaed66d788c9292b0c28050732e50362fcb0 100644 (file)
--- a/framework/main/exceptions/stacker/class_NoStackerException.php
+++ b/framework/main/exceptions/stacker/class_NoStackerException.php
@@ -10,11 +10,7 @@ use Org\Mxchange\CoreFramework\Generic\FrameworkException;
  *
  * @author             Roland Haeder <webmaster@shipsimu.org>
  * @version            0.0.0
-<<<<<<< HEAD:framework/main/exceptions/stacker/class_NoStackerException.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/exceptions/stacker/class_NoStackerException.php
  * @license            GNU GPL 3.0 or any newer version
  * @link               http://www.shipsimu.org
  *

diff --git a/framework/main/exceptions/state/class_InvalidStateInstanceException.php b/framework/main/exceptions/state/class_InvalidStateInstanceException.php
index 69b701ffd4359477033c3e51a947f2b711c9480c..f529843b3901359935d7a1c84c87724793a9a483 100644 (file)
--- a/framework/main/exceptions/state/class_InvalidStateInstanceException.php
+++ b/framework/main/exceptions/state/class_InvalidStateInstanceException.php
@@ -10,11 +10,7 @@ use Org\Mxchange\CoreFramework\Generic\FrameworkException;
  *
  * @author             Roland Haeder <webmaster@shipsimu.org>
  * @version            0.0.0
-<<<<<<< HEAD:framework/main/exceptions/state/class_InvalidStateInstanceException.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/exceptions/state/class_InvalidStateInstanceException.php
  * @license            GNU GPL 3.0 or any newer version
  * @link               http://www.shipsimu.org
  *

diff --git a/framework/main/exceptions/state/class_UnexpectedStateException.php b/framework/main/exceptions/state/class_UnexpectedStateException.php
index d64b5bdad77df294d602937ff9f946e960ec42f8..b2af8ba95a8d5d28b1ba0e591e7beeec06b69bef 100644 (file)
--- a/framework/main/exceptions/state/class_UnexpectedStateException.php
+++ b/framework/main/exceptions/state/class_UnexpectedStateException.php
@@ -11,11 +11,7 @@ use Org\Mxchange\CoreFramework\State\Stateable;
  *
  * @author             Roland Haeder <webmaster@shipsimu.org>
  * @version            0.0.0
-<<<<<<< HEAD:framework/main/exceptions/state/class_UnexpectedStateException.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/exceptions/state/class_UnexpectedStateException.php
  * @license            GNU GPL 3.0 or any newer version
  * @link               http://www.shipsimu.org
  *

diff --git a/framework/main/exceptions/state/class_UnresolveableStateException.php b/framework/main/exceptions/state/class_UnresolveableStateException.php
index 62fa1374ff88654a3da79307f7e3abababe30511..36b3c0a393ac6c78e4eebf8d9c91a6f6285cc41e 100644 (file)
--- a/framework/main/exceptions/state/class_UnresolveableStateException.php
+++ b/framework/main/exceptions/state/class_UnresolveableStateException.php
@@ -10,11 +10,7 @@ use Org\Mxchange\CoreFramework\Generic\FrameworkException;
  *
  * @author             Roland Haeder <webmaster@shipsimu.org>
  * @version            0.0.0
-<<<<<<< HEAD:framework/main/exceptions/state/class_UnresolveableStateException.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/exceptions/state/class_UnresolveableStateException.php
  * @license            GNU GPL 3.0 or any newer version
  * @link               http://www.shipsimu.org
  *

diff --git a/framework/main/exceptions/template/class_BasePathReadProtectedException.php b/framework/main/exceptions/template/class_BasePathReadProtectedException.php
index bce750ff58f23fa41d8fa09e865d99b0cbfd97a9..3fb79123fa22b70abe2a751475f89a6577856838 100644 (file)
--- a/framework/main/exceptions/template/class_BasePathReadProtectedException.php
+++ b/framework/main/exceptions/template/class_BasePathReadProtectedException.php
@@ -10,11 +10,7 @@ use Org\Mxchange\CoreFramework\Generic\FrameworkException;
  *
  * @author             Roland Haeder <webmaster@shipsimu.org>
  * @version            0.0.0
-<<<<<<< HEAD:framework/main/exceptions/template/class_BasePathReadProtectedException.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/exceptions/template/class_BasePathReadProtectedException.php
  * @license            GNU GPL 3.0 or any newer version
  * @link               http://www.shipsimu.org
  * @deprecated Don't use this anymore

diff --git a/framework/main/exceptions/template/class_InvalidDirectoryException.php b/framework/main/exceptions/template/class_InvalidDirectoryException.php
index 515d64f6697d073fc9e9f6a911bcc44831cc5d08..a8931b4e84475637ad37af3035f04c8c59281202 100644 (file)
--- a/framework/main/exceptions/template/class_InvalidDirectoryException.php
+++ b/framework/main/exceptions/template/class_InvalidDirectoryException.php
@@ -10,11 +10,7 @@ use Org\Mxchange\CoreFramework\Generic\FrameworkException;
  *
  * @author             Roland Haeder <webmaster@shipsimu.org>
  * @version            0.0.0
-<<<<<<< HEAD:framework/main/exceptions/template/class_InvalidDirectoryException.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/exceptions/template/class_BasePathIsNoDirectoryException.php
  * @license            GNU GPL 3.0 or any newer version
  * @link               http://www.shipsimu.org
  * 

diff --git a/framework/main/exceptions/template/class_NoVariableException.php b/framework/main/exceptions/template/class_NoVariableException.php
index 2d3bdb3beb56f664ee0d29a4cf4dee366db48bf0..671ee88a984e5b9141094a4e3a14f6ca97f46080 100644 (file)
--- a/framework/main/exceptions/template/class_NoVariableException.php
+++ b/framework/main/exceptions/template/class_NoVariableException.php
@@ -10,11 +10,7 @@ use Org\Mxchange\CoreFramework\Generic\FrameworkException;
  *
  * @author             Roland Haeder <webmaster@shipsimu.org>
  * @version            0.0.0
-<<<<<<< HEAD:framework/main/exceptions/template/class_NoVariableException.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/exceptions/template/class_NoVariableException.php
  * @license            GNU GPL 3.0 or any newer version
  * @link               http://www.shipsimu.org
  * @deprecated Don't use this anymore

diff --git a/framework/main/exceptions/template/class_UnexpectedTemplateTypeException.php b/framework/main/exceptions/template/class_UnexpectedTemplateTypeException.php
index 2572bea881c866e0ad6d98ddae6769b65dc650fc..c0c558cba62b62adbaa5e12bbc8fb692ed06e87b 100644 (file)
--- a/framework/main/exceptions/template/class_UnexpectedTemplateTypeException.php
+++ b/framework/main/exceptions/template/class_UnexpectedTemplateTypeException.php
@@ -10,11 +10,7 @@ use Org\Mxchange\CoreFramework\Generic\FrameworkException;
  *
  * @author             Roland Haeder <webmaster@shipsimu.org>
  * @version            0.0.0
-<<<<<<< HEAD:framework/main/exceptions/template/class_UnexpectedTemplateTypeException.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/exceptions/template/class_UnexpectedTemplateTypeException.php
  * @license            GNU GPL 3.0 or any newer version
  * @link               http://www.shipsimu.org
  * @deprecated Don't use this anymore

diff --git a/framework/main/exceptions/template/class_UnsupportedTemplateEngineException.php b/framework/main/exceptions/template/class_UnsupportedTemplateEngineException.php
index b1fbe423aa7884cbb5157e11ebc2f98b4d25cbae..cfc405536b7bfcff35b4a16bd89b9168cd6f2720 100644 (file)
--- a/framework/main/exceptions/template/class_UnsupportedTemplateEngineException.php
+++ b/framework/main/exceptions/template/class_UnsupportedTemplateEngineException.php
@@ -11,11 +11,7 @@ use Org\Mxchange\CoreFramework\Generic\FrameworkInterface;
  *
  * @author             Roland Haeder <webmaster@shipsimu.org>
  * @version            0.0.0
-<<<<<<< HEAD:framework/main/exceptions/template/class_UnsupportedTemplateEngineException.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/exceptions/template/class_UnsupportedTemplateEngineException.php
  * @license            GNU GPL 3.0 or any newer version
  * @link               http://www.shipsimu.org
  *

diff --git a/framework/main/exceptions/user/class_AccountPasswordMismatchException.php b/framework/main/exceptions/user/class_AccountPasswordMismatchException.php
index 65b3a9e8802edeac280677ffe3c63315fbe13ec7..73ac7bd90bb7498d02556e2011562412168f3b4f 100644 (file)
--- a/framework/main/exceptions/user/class_AccountPasswordMismatchException.php
+++ b/framework/main/exceptions/user/class_AccountPasswordMismatchException.php
@@ -11,11 +11,7 @@ use Org\Mxchange\CoreFramework\Generic\FrameworkException;
  *
  * @author             Roland Haeder <webmaster@shipsimu.org>
  * @version            0.0.0
-<<<<<<< HEAD:framework/main/exceptions/user/class_AccountPasswordMismatchException.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/exceptions/user/class_AccountPasswordMismatchException.php
  * @license            GNU GPL 3.0 or any newer version
  * @link               http://www.shipsimu.org
  *

diff --git a/framework/main/exceptions/user/class_UnexpectedGuestAccountException.php b/framework/main/exceptions/user/class_UnexpectedGuestAccountException.php
index bd6f3c2846e686674ae1a2faa43329848415e4b4..2525610aebe37067268f4a551b962786698d2f31 100644 (file)
--- a/framework/main/exceptions/user/class_UnexpectedGuestAccountException.php
+++ b/framework/main/exceptions/user/class_UnexpectedGuestAccountException.php
@@ -10,11 +10,7 @@ use Org\Mxchange\CoreFramework\Generic\FrameworkException;
  *
  * @author             Roland Haeder <webmaster@shipsimu.org>
  * @version            0.0.0
-<<<<<<< HEAD:framework/main/exceptions/user/class_UnexpectedGuestAccountException.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/exceptions/user/class_UnexpectedGuestAccountException.php
  * @license            GNU GPL 3.0 or any newer version
  * @link               http://www.shipsimu.org
  *

diff --git a/framework/main/exceptions/user/class_UserEmailMissingException.php b/framework/main/exceptions/user/class_UserEmailMissingException.php
index 803091887c54f50d02a4425c82cb7913e20ad610..38c4cfae873c0b46d8d2a2a32c7111f8718d7c6e 100644 (file)
--- a/framework/main/exceptions/user/class_UserEmailMissingException.php
+++ b/framework/main/exceptions/user/class_UserEmailMissingException.php
@@ -10,11 +10,7 @@ use Org\Mxchange\CoreFramework\Generic\FrameworkException;
  *
  * @author             Roland Haeder <webmaster@shipsimu.org>
  * @version            0.0.0
-<<<<<<< HEAD:framework/main/exceptions/user/class_UserEmailMissingException.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/exceptions/user/class_UserEmailMissingException.php
  * @license            GNU GPL 3.0 or any newer version
  * @link               http://www.shipsimu.org
  *

diff --git a/framework/main/exceptions/user/class_UserNoGuestException.php b/framework/main/exceptions/user/class_UserNoGuestException.php
index 51e2ec01a21f1028833f9d8796fc56c36633a931..aa7198900137f1b7025a5c6c049dc1680812692b 100644 (file)
--- a/framework/main/exceptions/user/class_UserNoGuestException.php
+++ b/framework/main/exceptions/user/class_UserNoGuestException.php
@@ -11,11 +11,7 @@ use Org\Mxchange\CoreFramework\Generic\FrameworkException;
  *
  * @author             Roland Haeder <webmaster@shipsimu.org>
  * @version            0.0.0
-<<<<<<< HEAD:framework/main/exceptions/user/class_UserNoGuestException.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/exceptions/user/class_UserNoGuestException.php
  * @license            GNU GPL 3.0 or any newer version
  * @link               http://www.shipsimu.org
  * @todo               Better rename this

diff --git a/framework/main/exceptions/user/class_UserPasswordMismatchException.php b/framework/main/exceptions/user/class_UserPasswordMismatchException.php
index bfb6934a88d3759e22872856b584bb1d3b76e752..c039a3b4abe2d21d5fc54b79a878f27f9feab7fd 100644 (file)
--- a/framework/main/exceptions/user/class_UserPasswordMismatchException.php
+++ b/framework/main/exceptions/user/class_UserPasswordMismatchException.php
@@ -10,11 +10,7 @@ use Org\Mxchange\CoreFramework\Generic\FrameworkException;
  *
  * @author             Roland Haeder <webmaster@shipsimu.org>
  * @version            0.0.0
-<<<<<<< HEAD:framework/main/exceptions/user/class_UserPasswordMismatchException.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/exceptions/user/class_UserPasswordMismatchException.php
  * @license            GNU GPL 3.0 or any newer version
  * @link               http://www.shipsimu.org
  *

diff --git a/framework/main/exceptions/user/class_UsernameMissingException.php b/framework/main/exceptions/user/class_UsernameMissingException.php
index f557c71f7262fc01d70c12a7c749307918faf4a0..ff0725a98bed30980e83e20e0bef42d7c228b87f 100644 (file)
--- a/framework/main/exceptions/user/class_UsernameMissingException.php
+++ b/framework/main/exceptions/user/class_UsernameMissingException.php
@@ -10,11 +10,7 @@ use Org\Mxchange\CoreFramework\Generic\FrameworkException;
  *
  * @author             Roland Haeder <webmaster@shipsimu.org>
  * @version            0.0.0
-<<<<<<< HEAD:framework/main/exceptions/user/class_UsernameMissingException.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/exceptions/user/class_UsernameMissingException.php
  * @license            GNU GPL 3.0 or any newer version
  * @link               http://www.shipsimu.org
  *

diff --git a/framework/main/exceptions/xml/class_InvalidXmlNodeException.php b/framework/main/exceptions/xml/class_InvalidXmlNodeException.php
index e1c11aa5fd34fc006be512799863a70ee2998495..fc658552454f07af5ec049effd66218dd7d801ec 100644 (file)
--- a/framework/main/exceptions/xml/class_InvalidXmlNodeException.php
+++ b/framework/main/exceptions/xml/class_InvalidXmlNodeException.php
@@ -10,11 +10,7 @@ use Org\Mxchange\CoreFramework\Generic\FrameworkException;
  *
  * @author             Roland Haeder <webmaster@shipsimu.org>
  * @version            0.0.0
-<<<<<<< HEAD:framework/main/exceptions/xml/class_InvalidXmlNodeException.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/exceptions/xml/class_InvalidXmlNodeException.php
  * @license            GNU GPL 3.0 or any newer version
  * @link               http://www.shipsimu.org
  *

diff --git a/framework/main/exceptions/xml/class_XmlNodeMismatchException.php b/framework/main/exceptions/xml/class_XmlNodeMismatchException.php
index db2e749bf410e02ba566db000b6d0851f1a9907c..00667c11ab2fdfbe796eeecd7938157e7772e8fc 100644 (file)
--- a/framework/main/exceptions/xml/class_XmlNodeMismatchException.php
+++ b/framework/main/exceptions/xml/class_XmlNodeMismatchException.php
@@ -10,11 +10,7 @@ use Org\Mxchange\CoreFramework\Generic\FrameworkException;
  *
  * @author             Roland Haeder <webmaster@shipsimu.org>
  * @version            0.0.0
-<<<<<<< HEAD:framework/main/exceptions/xml/class_XmlNodeMismatchException.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/exceptions/xml/class_XmlNodeMismatchException.php
  * @license            GNU GPL 3.0 or any newer version
  * @link               http://www.shipsimu.org
  *

diff --git a/framework/main/exceptions/xml/class_XmlParserException.php b/framework/main/exceptions/xml/class_XmlParserException.php
index a6d86852d0bb622fe009981d385452882f6bd95c..fb5cf58424ae39d1d1ef3afbe61b6a028b74f932 100644 (file)
--- a/framework/main/exceptions/xml/class_XmlParserException.php
+++ b/framework/main/exceptions/xml/class_XmlParserException.php
@@ -10,11 +10,7 @@ use Org\Mxchange\CoreFramework\Generic\FrameworkException;
  *
  * @author             Roland Haeder <webmaster@shipsimu.org>
  * @version            0.0.0
-<<<<<<< HEAD:framework/main/exceptions/xml/class_XmlParserException.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/exceptions/xml/class_XmlParserException.php
  * @license            GNU GPL 3.0 or any newer version
  * @link               http://www.shipsimu.org
  *

diff --git a/framework/main/interfaces/actions/class_PerformableAction.php b/framework/main/interfaces/actions/class_PerformableAction.php
index 9a99d9e0e23a7d9e9ca17154be7457b522954d22..d60b094bb3e03750468af7359d0272f371e51ac5 100644 (file)
--- a/framework/main/interfaces/actions/class_PerformableAction.php
+++ b/framework/main/interfaces/actions/class_PerformableAction.php
@@ -12,11 +12,7 @@ use Org\Mxchange\CoreFramework\Response\Responseable;
  *
  * @author             Roland Haeder <webmaster@shipsimu.org>
  * @version            0.0.0
-<<<<<<< HEAD:framework/main/interfaces/actions/class_PerformableAction.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/actions/class_PerformableAction.php
  * @license            GNU GPL 3.0 or any newer version
  * @link               http://www.shipsimu.org
  *

diff --git a/framework/main/interfaces/actions/commands/class_Commandable.php b/framework/main/interfaces/actions/commands/class_Commandable.php
index b1b099e0a8b90a3bba3b2c035104e392cb388514..d4c60e2dc117e3af860b7eeaaff8888b8a809aac 100644 (file)
--- a/framework/main/interfaces/actions/commands/class_Commandable.php
+++ b/framework/main/interfaces/actions/commands/class_Commandable.php
@@ -12,11 +12,7 @@ use Org\Mxchange\CoreFramework\Request\Requestable;
  *
  * @author             Roland Haeder <webmaster@shipsimu.org>
  * @version            0.0.0
-<<<<<<< HEAD:framework/main/interfaces/actions/commands/class_Commandable.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/actions/commands/class_Commandable.php
  * @license            GNU GPL 3.0 or any newer version
  * @link               http://www.shipsimu.org
  *

diff --git a/framework/main/interfaces/application/class_ManageableApplication.php b/framework/main/interfaces/application/class_ManageableApplication.php
index 1f6dcb56c0ac0652da0b8bab9d3366f0c58dcc90..bf409cba03938f754c0ea35e8f42bc014dc169ec 100644 (file)
--- a/framework/main/interfaces/application/class_ManageableApplication.php
+++ b/framework/main/interfaces/application/class_ManageableApplication.php
@@ -16,11 +16,7 @@ use Org\Mxchange\CoreFramework\Template\CompileableTemplate;
  *
  * @author             Roland Haeder <webmaster@shipsimu.org>
  * @version            0.0.0
-<<<<<<< HEAD:framework/main/interfaces/application/class_ManageableApplication.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/application/class_ManageableApplication.php
  * @license            GNU GPL 3.0 or any newer version
  * @link               http://www.shipsimu.org
  *

diff --git a/framework/main/interfaces/auth/class_Authorizeable.php b/framework/main/interfaces/auth/class_Authorizeable.php
index 8e192acd3c4ca0f7653a3b3bd6c6df54b003110c..4f00465ebdf0e8c05bc9083bfd31337704940676 100644 (file)
--- a/framework/main/interfaces/auth/class_Authorizeable.php
+++ b/framework/main/interfaces/auth/class_Authorizeable.php
@@ -10,10 +10,7 @@ use Org\Mxchange\CoreFramework\Generic\FrameworkInterface;
  *
  * @author             Roland Haeder <webmaster@shipsimu.org>
  * @version            0.0.0
-<<<<<<< HEAD:framework/main/interfaces/auth/class_Authorizeable.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/auth/class_Authorizeable.php
  * @license            GNU GPL 3.0 or any newer version
  * @link               http://www.shipsimu.org

diff --git a/framework/main/interfaces/block/calculatable/class_CalculatableBlock.php b/framework/main/interfaces/block/calculatable/class_CalculatableBlock.php
index 5820c38d13407bf05b131ce73045b7b3b4328b01..b6f076aeb6d7451463af797a33f35a78fb6014ab 100644 (file)
--- a/framework/main/interfaces/block/calculatable/class_CalculatableBlock.php
+++ b/framework/main/interfaces/block/calculatable/class_CalculatableBlock.php
@@ -10,11 +10,7 @@ use Org\Mxchange\CoreFramework\Filesystem\Block;
  *
  * @author             Roland Haeder <webmaster@ship-simu.org>
  * @version            0.0.0
-<<<<<<< HEAD:framework/main/interfaces/block/calculatable/class_CalculatableBlock.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/block/calculatable/class_CalculatableBlock.php
  * @license            GNU GPL 3.0 or any newer version
  * @link               http://www.ship-simu.org
  *

diff --git a/framework/main/interfaces/block/class_Block.php b/framework/main/interfaces/block/class_Block.php
index b7f88f845d6d89aad85e2baac16bc894fab247f5..5815f2de150a8134de8ec475b7aecbab7beed36d 100644 (file)
--- a/framework/main/interfaces/block/class_Block.php
+++ b/framework/main/interfaces/block/class_Block.php
@@ -10,11 +10,7 @@ use Org\Mxchange\CoreFramework\Generic\FrameworkInterface;
  *
  * @author             Roland Haeder <webmaster@ship-simu.org>
  * @version            0.0.0
-<<<<<<< HEAD:framework/main/interfaces/block/class_Block.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/block/class_Block.php
  * @license            GNU GPL 3.0 or any newer version
  * @link               http://www.ship-simu.org
  *

diff --git a/framework/main/interfaces/cache/class_Cacheable.php b/framework/main/interfaces/cache/class_Cacheable.php
index d3cc0623ffba4534aee0c481e0ba3c3911d94212..2ea48a4766198c9e5ade3b5d3e62c73d92f402e6 100644 (file)
--- a/framework/main/interfaces/cache/class_Cacheable.php
+++ b/framework/main/interfaces/cache/class_Cacheable.php
@@ -10,11 +10,7 @@ use Org\Mxchange\CoreFramework\Generic\FrameworkInterface;
  *
  * @author             Roland Haeder <webmaster@shipsimu.org>
  * @version            0.0.0
-<<<<<<< HEAD:framework/main/interfaces/cache/class_Cacheable.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/cache/class_Cacheable.php
  * @license            GNU GPL 3.0 or any newer version
  * @link               http://www.shipsimu.org
  *

diff --git a/framework/main/interfaces/captcha/class_SolveableCaptcha.php b/framework/main/interfaces/captcha/class_SolveableCaptcha.php
index bb087f12f0b3d31e10a395a017fc561e6a1f9567..5545289cb2a1839929827a5eaead7f01942e5a7e 100644 (file)
--- a/framework/main/interfaces/captcha/class_SolveableCaptcha.php
+++ b/framework/main/interfaces/captcha/class_SolveableCaptcha.php
@@ -11,11 +11,7 @@ use Org\Mxchange\CoreFramework\Helper\Helper;
  *
  * @author             Roland Haeder <webmaster@shipsimu.org>
  * @version            0.0.0
-<<<<<<< HEAD:framework/main/interfaces/captcha/class_SolveableCaptcha.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/captcha/class_SolveableCaptcha.php
  * @license            GNU GPL 3.0 or any newer version
  * @link               http://www.shipsimu.org
  *

diff --git a/framework/main/interfaces/class_ b/framework/main/interfaces/class_
index 725dee1c6bec7e3fe3f1127400005d89717aa9fa..b7c59130b670dd726c7e26885cb0148bfb8c6dd8 100644 (file)
--- a/framework/main/interfaces/class_
+++ b/framework/main/interfaces/class_
@@ -10,11 +10,7 @@ use Org\Mxchange\CoreFramework\Generic\FrameworkInterface;
  *
  * @author             Roland Haeder <webmaster@ship-simu.org>
  * @version            0.0.0
-<<<<<<< HEAD:framework/main/interfaces/class_
  * @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/class_
  * @license            GNU GPL 3.0 or any newer version
  * @link               http://www.ship-simu.org
  *

diff --git a/framework/main/interfaces/class_FrameworkInterface.php b/framework/main/interfaces/class_FrameworkInterface.php
index f1d3725f5ff253651b7c3789a14a486d5a4fdc7d..d40ffb35a47bc917550a72db16d118c2bf49ff2c 100644 (file)
--- a/framework/main/interfaces/class_FrameworkInterface.php
+++ b/framework/main/interfaces/class_FrameworkInterface.php
@@ -8,11 +8,7 @@ namespace Org\Mxchange\CoreFramework\Generic;
  *
  * @author             Roland Haeder <webmaster@shipsimu.org>
  * @version            0.0.0
-<<<<<<< HEAD:framework/main/interfaces/class_FrameworkInterface.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/class_FrameworkInterface.php
  * @license            GNU GPL 3.0 or any newer version
  * @link               http://www.shipsimu.org
  * @todo               Find a better name for this interface

diff --git a/framework/main/interfaces/client/class_Client.php b/framework/main/interfaces/client/class_Client.php
index 697aa0bd74914b1174da88e018791dfab0ad01cf..56626d6fc7e5f1cd5000e9c868cf182015e75958 100644 (file)
--- a/framework/main/interfaces/client/class_Client.php
+++ b/framework/main/interfaces/client/class_Client.php
@@ -10,11 +10,7 @@ use Org\Mxchange\CoreFramework\Generic\FrameworkInterface;
  *
  * @author             Roland Haeder <webmaster@ship-simu.org>
  * @version            0.0.0
-<<<<<<< HEAD:framework/main/interfaces/client/class_Client.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/client/class_Client.php
  * @license            GNU GPL 3.0 or any newer version
  * @link               http://www.ship-simu.org
  *

diff --git a/framework/main/interfaces/compressor/class_Compressor.php b/framework/main/interfaces/compressor/class_Compressor.php
index cae3105e5297b9166ff4b9d9d1bfe9c877a6b96c..1f9270ad5683debe5faa6b702d162877fa10c216 100644 (file)
--- a/framework/main/interfaces/compressor/class_Compressor.php
+++ b/framework/main/interfaces/compressor/class_Compressor.php
@@ -10,11 +10,7 @@ use Org\Mxchange\CoreFramework\Generic\FrameworkInterface;
  *
  * @author             Roland Haeder <webmaster@shipsimu.org>
  * @version            0.0.0
-<<<<<<< HEAD:framework/main/interfaces/compressor/class_Compressor.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/compressor/class_Compressor.php
  * @license            GNU GPL 3.0 or any newer version
  * @link               http://www.shipsimu.org
  *

diff --git a/framework/main/interfaces/controller/class_Controller.php b/framework/main/interfaces/controller/class_Controller.php
index 8c5c947939b3643412ef252a26832a4d322a12a4..30239686c68cb7298812d14b68ba2c156ab21e99 100644 (file)
--- a/framework/main/interfaces/controller/class_Controller.php
+++ b/framework/main/interfaces/controller/class_Controller.php
@@ -12,11 +12,7 @@ use Org\Mxchange\CoreFramework\Response\Responseable;
  *
  * @author             Roland Haeder <webmaster@shipsimu.org>
  * @version            0.0.0
-<<<<<<< HEAD:framework/main/interfaces/controller/class_Controller.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/controller/class_Controller.php
  * @license            GNU GPL 3.0 or any newer version
  * @link               http://www.shipsimu.org
  *

diff --git a/framework/main/interfaces/criteria/class_Criteria.php b/framework/main/interfaces/criteria/class_Criteria.php
index f3bcf61a1978512c12a1eb576b7e53919c33557d..ae646cd4ca6369a25b719d01a4782292ac8c82f6 100644 (file)
--- a/framework/main/interfaces/criteria/class_Criteria.php
+++ b/framework/main/interfaces/criteria/class_Criteria.php
@@ -10,11 +10,7 @@ use Org\Mxchange\CoreFramework\Generic\FrameworkInterface;
  *
  * @author             Roland Haeder <webmaster@shipsimu.org>
  * @version            0.0.0
-<<<<<<< HEAD:framework/main/interfaces/criteria/class_Criteria.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/criteria/class_Criteria.php
  * @license            GNU GPL 3.0 or any newer version
  * @link               http://www.shipsimu.org
  *

diff --git a/framework/main/interfaces/criteria/extended/class_AddableCriteria.php b/framework/main/interfaces/criteria/extended/class_AddableCriteria.php
index d057ceabf2c4d8337bac3ae21f0c7a036ae6460c..df52c7e1fb1047842d0ebde1b6dfbc649dc5f1d2 100644 (file)
--- a/framework/main/interfaces/criteria/extended/class_AddableCriteria.php
+++ b/framework/main/interfaces/criteria/extended/class_AddableCriteria.php
@@ -11,11 +11,7 @@ use Org\Mxchange\CoreFramework\Generic\FrameworkInterface;
  *
  * @author             Roland Haeder <webmaster@shipsimu.org>
  * @version            0.0.0
-<<<<<<< HEAD:framework/main/interfaces/criteria/extended/class_AddableCriteria.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/criteria/extended/class_AddableCriteria.php
  * @license            GNU GPL 3.0 or any newer version
  * @link               http://www.shipsimu.org
  *

diff --git a/framework/main/interfaces/criteria/extended/class_LocalSearchCriteria.php b/framework/main/interfaces/criteria/extended/class_LocalSearchCriteria.php
index cc0b0747490ce16f1e6d90caed8607be270fc714..10ee38adf29a12c6175c96782bfb74b8938ff562 100644 (file)
--- a/framework/main/interfaces/criteria/extended/class_LocalSearchCriteria.php
+++ b/framework/main/interfaces/criteria/extended/class_LocalSearchCriteria.php
@@ -10,11 +10,7 @@ use Org\Mxchange\CoreFramework\Criteria\Criteria;
  *
  * @author             Roland Haeder <webmaster@shipsimu.org>
  * @version            0.0.0
-<<<<<<< HEAD:framework/main/interfaces/criteria/extended/class_LocalSearchCriteria.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/criteria/extended/class_LocalSearchCriteria.php
  * @license            GNU GPL 3.0 or any newer version
  * @link               http://www.shipsimu.org
  *

diff --git a/framework/main/interfaces/criteria/extended/class_LocalUpdateCriteria.php b/framework/main/interfaces/criteria/extended/class_LocalUpdateCriteria.php
index 2657e2a88a2747db6742b597d7428def28a6740c..f851ad8377cb393891071d18875f27f708647c14 100644 (file)
--- a/framework/main/interfaces/criteria/extended/class_LocalUpdateCriteria.php
+++ b/framework/main/interfaces/criteria/extended/class_LocalUpdateCriteria.php
@@ -10,11 +10,7 @@ use Org\Mxchange\CoreFramework\Criteria\Criteria;
  *
  * @author             Roland Haeder <webmaster@shipsimu.org>
  * @version            0.0.0
-<<<<<<< HEAD:framework/main/interfaces/criteria/extended/class_LocalUpdateCriteria.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/criteria/extended/class_LocalUpdateCriteria.php
  * @license            GNU GPL 3.0 or any newer version
  * @link               http://www.shipsimu.org
  *

diff --git a/framework/main/interfaces/criteria/extended/class_StoreableCriteria.php b/framework/main/interfaces/criteria/extended/class_StoreableCriteria.php
index ebc067b78fa1a1bd5cc59857f3a6068e321b8066..f183a6add8f9ef0276ee746b3746bdc090180afe 100644 (file)
--- a/framework/main/interfaces/criteria/extended/class_StoreableCriteria.php
+++ b/framework/main/interfaces/criteria/extended/class_StoreableCriteria.php
@@ -10,11 +10,7 @@ use Org\Mxchange\CoreFramework\Criteria\Criteria;
  *
  * @author             Roland Haeder <webmaster@shipsimu.org>
  * @version            0.0.0
-<<<<<<< HEAD:framework/main/interfaces/criteria/extended/class_StoreableCriteria.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/criteria/extended/class_StoreableCriteria.php
  * @license            GNU GPL 3.0 or any newer version
  * @link               http://www.shipsimu.org
  *

diff --git a/framework/main/interfaces/crypto/class_Cryptable.php b/framework/main/interfaces/crypto/class_Cryptable.php
index 54e6ce4c16ed09bd068628ffc533a56039b2663a..890b0d32f07a61112518bd9506d123392d31a4ab 100644 (file)
--- a/framework/main/interfaces/crypto/class_Cryptable.php
+++ b/framework/main/interfaces/crypto/class_Cryptable.php
@@ -10,11 +10,7 @@ use Org\Mxchange\CoreFramework\Generic\FrameworkInterface;
  *
  * @author             Roland Haeder <webmaster@shipsimu.org>
  * @version            0.0.0
-<<<<<<< HEAD:framework/main/interfaces/crypto/class_Cryptable.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/crypto/class_Cryptable.php
  * @license            GNU GPL 3.0 or any newer version
  * @link               http://www.shipsimu.org
  *

diff --git a/framework/main/interfaces/database/backend/class_DatabaseBackend.php b/framework/main/interfaces/database/backend/class_DatabaseBackend.php
index a354bb1527638fc2f5f0eec958c197c953c83ebd..13f2c61cba412ce95a350b0e8566dd4ee9b01d6d 100644 (file)
--- a/framework/main/interfaces/database/backend/class_DatabaseBackend.php
+++ b/framework/main/interfaces/database/backend/class_DatabaseBackend.php
@@ -16,11 +16,7 @@ use Org\Mxchange\CoreFramework\Database\FrameworkDatabase;
  *
  * @author             Roland Haeder <webmaster@shipsimu.org>
  * @version            0.0.0
-<<<<<<< HEAD:framework/main/interfaces/database/backend/class_DatabaseBackend.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/database/backend/class_DatabaseBackend.php
  * @license            GNU GPL 3.0 or any newer version
  * @link               http://www.shipsimu.org
  *

diff --git a/framework/main/interfaces/database/class_DatabaseWrapper.php b/framework/main/interfaces/database/class_DatabaseWrapper.php
index 401e85fd658db648f5d7567aa313a7e7a2b99cc1..e314256b3b2736e80c1738a66c1e96f8029d7209 100644 (file)
--- a/framework/main/interfaces/database/class_DatabaseWrapper.php
+++ b/framework/main/interfaces/database/class_DatabaseWrapper.php
@@ -11,11 +11,7 @@ use Org\Mxchange\CoreFramework\Generic\FrameworkInterface;
  *
  * @author             Roland Haeder <webmaster@shipsimu.org>
  * @version            0.0.0
-<<<<<<< HEAD:framework/main/interfaces/database/class_DatabaseWrapper.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/database/class_DatabaseWrapper.php
  * @license            GNU GPL 3.0 or any newer version
  * @link               http://www.shipsimu.org
  *

diff --git a/framework/main/interfaces/database/class_FrameworkDatabase.php b/framework/main/interfaces/database/class_FrameworkDatabase.php
index 032dd820fcace840ab973d0918522dec3d403f7a..dcf2e2449bef42e570977b7db2f014e09ee66f01 100644 (file)
--- a/framework/main/interfaces/database/class_FrameworkDatabase.php
+++ b/framework/main/interfaces/database/class_FrameworkDatabase.php
@@ -10,11 +10,7 @@ use Org\Mxchange\CoreFramework\Generic\FrameworkInterface;
  *
  * @author             Roland Haeder <webmaster@shipsimu.org>
  * @version            0.0.0
-<<<<<<< HEAD:framework/main/interfaces/database/class_FrameworkDatabase.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/database/class_FrameworkDatabase.php
  * @license            GNU GPL 3.0 or any newer version
  * @link               http://www.shipsimu.org
  *

diff --git a/framework/main/interfaces/database/class_Updateable.php b/framework/main/interfaces/database/class_Updateable.php
index 73c093c02f78a79c334ecccfcc351509df5abee0..6fd4c1bb36db7eaf14753a8d8cba4e351f7f6aa0 100644 (file)
--- a/framework/main/interfaces/database/class_Updateable.php
+++ b/framework/main/interfaces/database/class_Updateable.php
@@ -10,11 +10,7 @@ use Org\Mxchange\CoreFramework\Generic\FrameworkInterface;
  *
  * @author             Roland Haeder <webmaster@shipsimu.org>
  * @version            0.0.0
-<<<<<<< HEAD:framework/main/interfaces/database/class_Updateable.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/database/class_Updateable.php
  * @license            GNU GPL 3.0 or any newer version
  * @link               http://www.shipsimu.org
  *

diff --git a/framework/main/interfaces/database/middleware/class_DatabaseConnector.php b/framework/main/interfaces/database/middleware/class_DatabaseConnector.php
index bcc43a3b429e51ce56278d95f6d63a6fd245ebfc..21ca43ff43db90af3fa941989c5a93cdfdda525d 100644 (file)
--- a/framework/main/interfaces/database/middleware/class_DatabaseConnector.php
+++ b/framework/main/interfaces/database/middleware/class_DatabaseConnector.php
@@ -13,11 +13,7 @@ use Org\Mxchange\CoreFramework\Database\FrameworkDatabase;
  *
  * @author             Roland Haeder <webmaster@shipsimu.org>
  * @version            0.0.0
-<<<<<<< HEAD:framework/main/interfaces/database/middleware/class_DatabaseConnector.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/database/middleware/class_DatabaseConnector.php
  * @license            GNU GPL 3.0 or any newer version
  * @link               http://www.shipsimu.org
  *

diff --git a/framework/main/interfaces/database/wrapper/class_BookablePointsWrapper.php b/framework/main/interfaces/database/wrapper/class_BookablePointsWrapper.php
index 223eab792991734edf865e02ee2a02ac568b5bee..e57a745995e77ac77d5ca3f7281e23c88e55e489 100644 (file)
--- a/framework/main/interfaces/database/wrapper/class_BookablePointsWrapper.php
+++ b/framework/main/interfaces/database/wrapper/class_BookablePointsWrapper.php
@@ -11,11 +11,7 @@ use Org\Mxchange\CoreFramework\Result\Update\UpdateableResult;
  *
  * @author             Roland Haeder <webmaster@shipsimu.org>
  * @version            0.0.0
-<<<<<<< HEAD:framework/main/interfaces/database/wrapper/class_BookablePointsWrapper.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/database/wrapper/class_BookablePointsWrapper.php
  * @license            GNU GPL 3.0 or any newer version
  * @link               http://www.shipsimu.org
  *

diff --git a/framework/main/interfaces/database/wrapper/class_ManageableAccountWrapper.php b/framework/main/interfaces/database/wrapper/class_ManageableAccountWrapper.php
index b39347ab949741943228a032f891a425b1a1757e..7c90ca6d469dc09a040f6182486c5e215d7509d0 100644 (file)
--- a/framework/main/interfaces/database/wrapper/class_ManageableAccountWrapper.php
+++ b/framework/main/interfaces/database/wrapper/class_ManageableAccountWrapper.php
@@ -12,11 +12,7 @@ use Org\Mxchange\CoreFramework\Result\Update\UpdateableResult;
  *
  * @author             Roland Haeder <webmaster@shipsimu.org>
  * @version            0.0.0
-<<<<<<< HEAD:framework/main/interfaces/database/wrapper/class_ManageableAccountWrapper.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/database/wrapper/class_ManageableAccountWrapper.php
  * @license            GNU GPL 3.0 or any newer version
  * @link               http://www.shipsimu.org
  *

diff --git a/framework/main/interfaces/debug/class_Debugger.php b/framework/main/interfaces/debug/class_Debugger.php
index ab90dff428cd7def282aa44ee8a00500eaad8c7c..4ce86a659777647ad0e073840e31212afa7b9542 100644 (file)
--- a/framework/main/interfaces/debug/class_Debugger.php
+++ b/framework/main/interfaces/debug/class_Debugger.php
@@ -10,11 +10,7 @@ use Org\Mxchange\CoreFramework\Generic\FrameworkInterface;
  *
  * @author             Roland Haeder <webmaster@shipsimu.org>
  * @version            0.0.0
-<<<<<<< HEAD:framework/main/interfaces/debug/class_Debugger.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/debug/class_Debugger.php
  * @license            GNU GPL 3.0 or any newer version
  * @link               http://www.shipsimu.org
  *

diff --git a/framework/main/interfaces/discovery/class_Discoverable.php b/framework/main/interfaces/discovery/class_Discoverable.php
index 88e8a4fd182fc8ed0243057dfe41579aac85726e..06fe8796e1184c5bbc298e4b57dafdc17cefa6b5 100644 (file)
--- a/framework/main/interfaces/discovery/class_Discoverable.php
+++ b/framework/main/interfaces/discovery/class_Discoverable.php
@@ -12,11 +12,7 @@ use Org\Mxchange\CoreFramework\Request\Requestable;
  *
  * @author             Roland Haeder <webmaster@shipsimu.org>
  * @version            0.0.0
-<<<<<<< HEAD:framework/main/interfaces/discovery/class_Discoverable.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/discovery/class_Discoverable.php
  * @license            GNU GPL 3.0 or any newer version
  * @link               http://www.shipsimu.org
  *

diff --git a/framework/main/interfaces/feature/class_Feature.php b/framework/main/interfaces/feature/class_Feature.php
index 35a6e7ed121a5a9aecd01bc272841fb60ac2fafb..42acc3632f210b00e1e95d429ac43ecde91bde35 100644 (file)
--- a/framework/main/interfaces/feature/class_Feature.php
+++ b/framework/main/interfaces/feature/class_Feature.php
@@ -10,11 +10,7 @@ use Org\Mxchange\CoreFramework\Generic\FrameworkInterface;
  *
  * @author             Roland Haeder <webmaster@ship-simu.org>
  * @version            0.0.0
-<<<<<<< HEAD:framework/main/interfaces/feature/class_Feature.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/feature/class_Feature.php
  * @license            GNU GPL 3.0 or any newer version
  * @link               http://www.ship-simu.org
  *

diff --git a/framework/main/interfaces/filesystem/class_Filesystem.php b/framework/main/interfaces/filesystem/class_Filesystem.php
index 72d61d5b3b312a972dbadd147039d43f5988ddc2..2a8ed8060f9e3f6bbbed138d9207a400a9136181 100644 (file)
--- a/framework/main/interfaces/filesystem/class_Filesystem.php
+++ b/framework/main/interfaces/filesystem/class_Filesystem.php
@@ -10,11 +10,7 @@ use Org\Mxchange\CoreFramework\Generic\FrameworkInterface;
  *
  * @author             Roland Haeder <webmaster@ship-simu.org>
  * @version            0.0.0
-<<<<<<< HEAD:framework/main/interfaces/filesystem/class_Filesystem.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/filesystem/class_Filesystem.php
  * @license            GNU GPL 3.0 or any newer version
  * @link               http://www.ship-simu.org
  *

diff --git a/framework/main/interfaces/filter/class_Filterable.php b/framework/main/interfaces/filter/class_Filterable.php
index 6954bd7d83b5cac319e9e267ac2bf69bb916d1a7..81927529ae8cea5820722e9b52a085400e5e9afa 100644 (file)
--- a/framework/main/interfaces/filter/class_Filterable.php
+++ b/framework/main/interfaces/filter/class_Filterable.php
@@ -12,11 +12,7 @@ use Org\Mxchange\CoreFramework\Response\Responseable;
  *
  * @author             Roland Haeder <webmaster@shipsimu.org>
  * @version            0.0.0
-<<<<<<< HEAD:framework/main/interfaces/filter/class_Filterable.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/filter/class_Filterable.php
  * @license            GNU GPL 3.0 or any newer version
  * @link               http://www.shipsimu.org
  *

diff --git a/framework/main/interfaces/handler/class_Handleable.php b/framework/main/interfaces/handler/class_Handleable.php
index e334c4fac2af4221a3eba505bfd51c1bbcccb4ac..da13e865518c38084d9affd5204d451bf508e3c5 100644 (file)
--- a/framework/main/interfaces/handler/class_Handleable.php
+++ b/framework/main/interfaces/handler/class_Handleable.php
@@ -10,11 +10,7 @@ use Org\Mxchange\CoreFramework\Generic\FrameworkInterface;
  *
  * @author             Roland Haeder <webmaster@shipsimu.org>
  * @version            0.0.0
-<<<<<<< HEAD:framework/main/interfaces/handler/class_Handleable.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/handler/class_Handleable.php
  * @license            GNU GPL 3.0 or any newer version
  * @link               http://www.shipsimu.org
  *

diff --git a/framework/main/interfaces/handler/class_HandleableDataSet.php b/framework/main/interfaces/handler/class_HandleableDataSet.php
index ade59e735f009249867162d1e07e4a5f30f68d35..b2fea4f4117e2e13ad70719722b800e6ca22c3aa 100644 (file)
--- a/framework/main/interfaces/handler/class_HandleableDataSet.php
+++ b/framework/main/interfaces/handler/class_HandleableDataSet.php
@@ -11,11 +11,7 @@ use Org\Mxchange\CoreFramework\Handler\Handleable;
  *
  * @author             Roland Haeder <webmaster@shipsimu.org>
  * @version            0.0.0
-<<<<<<< HEAD:framework/main/interfaces/handler/class_HandleableDataSet.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/handler/class_HandleableDataSet.php
  * @license            GNU GPL 3.0 or any newer version
  * @link               http://www.shipsimu.org
  *

diff --git a/framework/main/interfaces/handler/task/class_HandleableTask.php b/framework/main/interfaces/handler/task/class_HandleableTask.php
index b19e5f30ca74f23e64aec288158ca9c272a65f9e..db0c8a02ef6914a452b69df5c8baeed12bcbbd30 100644 (file)
--- a/framework/main/interfaces/handler/task/class_HandleableTask.php
+++ b/framework/main/interfaces/handler/task/class_HandleableTask.php
@@ -12,11 +12,7 @@ use Org\Mxchange\CoreFramework\Visitor\Visitable;
  *
  * @author             Roland Haeder <webmaster@shipsimu.org>
  * @version            0.0.0
-<<<<<<< HEAD:framework/main/interfaces/handler/task/class_HandleableTask.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/handler/task/class_HandleableTask.php
  * @license            GNU GPL 3.0 or any newer version
  * @link               http://www.shipsimu.org
  * @todo               HandleableDataSet looks strange here

diff --git a/framework/main/interfaces/helper/class_Helper.php b/framework/main/interfaces/helper/class_Helper.php
index e6284ad5b5bc966a294418b43f18b8c34603d4e5..dea2550ff4ab4bcf2ea5fc4104ce6dff38a8bb43 100644 (file)
--- a/framework/main/interfaces/helper/class_Helper.php
+++ b/framework/main/interfaces/helper/class_Helper.php
@@ -10,11 +10,7 @@ use Org\Mxchange\CoreFramework\Generic\FrameworkInterface;
  *
  * @author             Roland Haeder <webmaster@shipsimu.org>
  * @version            0.0.0
-<<<<<<< HEAD:framework/main/interfaces/helper/class_Helper.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/helper/class_Helper.php
  * @license            GNU GPL 3.0 or any newer version
  * @link               http://www.shipsimu.org
  *

diff --git a/framework/main/interfaces/helper/login/class_HelpableLogin.php b/framework/main/interfaces/helper/login/class_HelpableLogin.php
index 95345a297dc01628c291208d9669dc149545b46c..c81982b36d687fc46bf841c931d13cc45a13a2c7 100644 (file)
--- a/framework/main/interfaces/helper/login/class_HelpableLogin.php
+++ b/framework/main/interfaces/helper/login/class_HelpableLogin.php
@@ -11,11 +11,7 @@ use Org\Mxchange\CoreFramework\Response\Responseable;
  *
  * @author             Roland Haeder <webmaster@shipsimu.org>
  * @version            0.0.0
-<<<<<<< HEAD:framework/main/interfaces/helper/login/class_HelpableLogin.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/helper/login/class_HelpableLogin.php
  * @license            GNU GPL 3.0 or any newer version
  * @link               http://www.shipsimu.org
  *

diff --git a/framework/main/interfaces/helper/template/class_HelpableTemplate.php b/framework/main/interfaces/helper/template/class_HelpableTemplate.php
index 63848249803768dff632244a1d77a364e63982f6..5122260eed997a4b7d1ba3d646aa679e47994a4a 100644 (file)
--- a/framework/main/interfaces/helper/template/class_HelpableTemplate.php
+++ b/framework/main/interfaces/helper/template/class_HelpableTemplate.php
@@ -10,11 +10,7 @@ use Org\Mxchange\CoreFramework\Helper\Helper;
  *
  * @author             Roland Haeder <webmaster@shipsimu.org>
  * @version            0.0.0
-<<<<<<< HEAD:framework/main/interfaces/helper/template/class_HelpableTemplate.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/helper/template/class_HelpableTemplate.php
  * @license            GNU GPL 3.0 or any newer version
  * @link               http://www.shipsimu.org
  *

diff --git a/framework/main/interfaces/index/class_Indexable b/framework/main/interfaces/index/class_Indexable
index ce6f2fb34e6c96d446828163754f2e96e2c34ffe..68242260822ca5d87d7cfc6f3c4a63bde103d6f8 100644 (file)
--- a/framework/main/interfaces/index/class_Indexable
+++ b/framework/main/interfaces/index/class_Indexable
@@ -10,11 +10,7 @@ use Org\Mxchange\CoreFramework\Index\Indexable;
  *
  * @author             Roland Haeder <webmaster@ship-simu.org>
  * @version            0.0.0
-<<<<<<< HEAD:framework/main/interfaces/index/class_Indexable
  * @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/index/class_Indexable
  * @license            GNU GPL 3.0 or any newer version
  * @link               http://www.ship-simu.org
  *

diff --git a/framework/main/interfaces/index/class_Indexable.php b/framework/main/interfaces/index/class_Indexable.php
index fdf5aa9362b0ff2366e57f7d3bcfe3754946a7ca..c9263284c5fd15421564fa769f1e2caabe6e3a2c 100644 (file)
--- a/framework/main/interfaces/index/class_Indexable.php
+++ b/framework/main/interfaces/index/class_Indexable.php
@@ -10,11 +10,7 @@ use Org\Mxchange\CoreFramework\Generic\FrameworkInterface;
  *
  * @author             Roland Haeder <webmaster@ship-simu.org>
  * @version            0.0.0
-<<<<<<< HEAD:framework/main/interfaces/index/class_Indexable.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/index/class_Indexable.php
  * @license            GNU GPL 3.0 or any newer version
  * @link               http://www.ship-simu.org
  *

diff --git a/framework/main/interfaces/index/stack/class_IndexableStack.php b/framework/main/interfaces/index/stack/class_IndexableStack.php
index b6051190b317949cfa8c1cad8058f652ab6ce12f..6fa47bc3a5c64896d4280fa05e2f8abc39ea26e8 100644 (file)
--- a/framework/main/interfaces/index/stack/class_IndexableStack.php
+++ b/framework/main/interfaces/index/stack/class_IndexableStack.php
@@ -11,11 +11,7 @@ use Org\Mxchange\CoreFramework\Index\Indexable;
  *
  * @author             Roland Haeder <webmaster@ship-simu.org>
  * @version            0.0.0
-<<<<<<< HEAD:framework/main/interfaces/index/stack/class_IndexableStack.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/index/stack/class_IndexableStack.php
  * @license            GNU GPL 3.0 or any newer version
  * @link               http://www.ship-simu.org
  *

diff --git a/framework/main/interfaces/io/class_CloseableFile.php b/framework/main/interfaces/io/class_CloseableFile.php
index 44a02b7ca304f93b505288d9cf92e4f87f9bd1cc..ebfc1c3c9754b02ba00eb2d40be2e9ff428cfa37 100644 (file)
--- a/framework/main/interfaces/io/class_CloseableFile.php
+++ b/framework/main/interfaces/io/class_CloseableFile.php
@@ -11,11 +11,7 @@ use Org\Mxchange\CoreFramework\Generic\FrameworkInterface;
  *
  * @author             Roland Haeder <webmaster@shipsimu.org>
  * @version            0.0.0
-<<<<<<< HEAD:framework/main/interfaces/io/class_CloseableFile.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/io/class_CloseableFile.php
  * @license            GNU GPL 3.0 or any newer version
  * @link               http://www.shipsimu.org
  *

diff --git a/framework/main/interfaces/io/class_FilePointer.php b/framework/main/interfaces/io/class_FilePointer.php
index 29e579f1f7caaa9abafb96b299370ed70ddb6176..124a8b069a29bcaac10167486ab737024251b65f 100644 (file)
--- a/framework/main/interfaces/io/class_FilePointer.php
+++ b/framework/main/interfaces/io/class_FilePointer.php
@@ -10,11 +10,7 @@ use Org\Mxchange\CoreFramework\Generic\FrameworkInterface;
  *
  * @author             Roland Haeder <webmaster@shipsimu.org>
  * @version            0.0.0
-<<<<<<< HEAD:framework/main/interfaces/io/class_FilePointer.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/io/class_FilePointer.php
  * @license            GNU GPL 3.0 or any newer version
  * @link               http://www.shipsimu.org
  *

diff --git a/framework/main/interfaces/io/class_Streamable.php b/framework/main/interfaces/io/class_Streamable.php
index 79d6e7bcb2f73b7fb420221786df48c6f666860d..2dea38dc24e5dcc8f989a6e9b37767a2f2e1fbe2 100644 (file)
--- a/framework/main/interfaces/io/class_Streamable.php
+++ b/framework/main/interfaces/io/class_Streamable.php
@@ -10,11 +10,7 @@ use Org\Mxchange\CoreFramework\Generic\FrameworkInterface;
  *
  * @author             Roland Haeder <webmaster@shipsimu.org>
  * @version            0.0.0
-<<<<<<< HEAD:framework/main/interfaces/io/class_Streamable.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/io/class_Streamable.php
  * @license            GNU GPL 3.0 or any newer version
  * @link               http://www.shipsimu.org
  *

diff --git a/framework/main/interfaces/io/class_StreamableInput.php b/framework/main/interfaces/io/class_StreamableInput.php
index 530acff55f811eb3dbefc4547fe5bfca8e04c898..b3806d638369eb0dfabf0329be8cd4d4e144207a 100644 (file)
--- a/framework/main/interfaces/io/class_StreamableInput.php
+++ b/framework/main/interfaces/io/class_StreamableInput.php
@@ -10,11 +10,7 @@ use Org\Mxchange\CoreFramework\Stream\Streamable;
  *
  * @author             Roland Haeder <webmaster@shipsimu.org>
  * @version            0.0.0
-<<<<<<< HEAD:framework/main/interfaces/io/class_StreamableInput.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/io/class_StreamableInput.php
  * @license            GNU GPL 3.0 or any newer version
  * @link               http://www.shipsimu.org
  *

diff --git a/framework/main/interfaces/io/class_StreamableOutput.php b/framework/main/interfaces/io/class_StreamableOutput.php
index a5efa3addfe98c3e956c7973670bdecc283b5ced..f27d344ad0bd0af379f8af1d8fd23c2e84a0bd67 100644 (file)
--- a/framework/main/interfaces/io/class_StreamableOutput.php
+++ b/framework/main/interfaces/io/class_StreamableOutput.php
@@ -10,11 +10,7 @@ use Org\Mxchange\CoreFramework\Stream\Streamable;
  *
  * @author             Roland Haeder <webmaster@shipsimu.org>
  * @version            0.0.0
-<<<<<<< HEAD:framework/main/interfaces/io/class_StreamableOutput.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/io/class_StreamableOutput.php
  * @license            GNU GPL 3.0 or any newer version
  * @link               http://www.shipsimu.org
  *

diff --git a/framework/main/interfaces/io/directory/class_FrameworkDirectory.php b/framework/main/interfaces/io/directory/class_FrameworkDirectory.php
index 83b2c32d88ae045c0f3b9abaa14ae410f1113eb6..a87ba801f150df614d9cafd7b7e202985028e976 100644 (file)
--- a/framework/main/interfaces/io/directory/class_FrameworkDirectory.php
+++ b/framework/main/interfaces/io/directory/class_FrameworkDirectory.php
@@ -10,11 +10,7 @@ use Org\Mxchange\CoreFramework\Generic\FrameworkInterface;
  *
  * @author             Roland Haeder <webmaster@shipsimu.org>
  * @version            0.0.0
-<<<<<<< HEAD:framework/main/interfaces/io/directory/class_FrameworkDirectory.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/io/directory/class_FrameworkDirectory.php
  * @license            GNU GPL 3.0 or any newer version
  * @link               http://www.shipsimu.org
  *

diff --git a/framework/main/interfaces/io/file/class_FileInputStreamer.php b/framework/main/interfaces/io/file/class_FileInputStreamer.php
index bd5247d89f08b52cb76b98ebe7504292e666905c..c4c75a5b31d598c71e4fe8cb07d05f684b39a415 100644 (file)
--- a/framework/main/interfaces/io/file/class_FileInputStreamer.php
+++ b/framework/main/interfaces/io/file/class_FileInputStreamer.php
@@ -13,11 +13,7 @@ use \SplFileInfo;
  *
  * @author             Roland Haeder <webmaster@shipsimu.org>
  * @version            0.0.0
-<<<<<<< HEAD:framework/main/interfaces/io/file/class_FileInputStreamer.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/io/file/class_FileInputStreamer.php
  * @license            GNU GPL 3.0 or any newer version
  * @link               http://www.shipsimu.org
  *
@@ -35,7 +31,6 @@ use \SplFileInfo;
  * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 interface FileInputStreamer extends StreamableInput {
-
        /**
         * Reads from a local or remote file
         *

diff --git a/framework/main/interfaces/io/file/class_FileOutputStreamer.php b/framework/main/interfaces/io/file/class_FileOutputStreamer.php
index 9bc30c6e5ece33575a1d7caf5e59ed066c920813..8b08e882e76eb30c036d9f9481016a00edcb1d7e 100644 (file)
--- a/framework/main/interfaces/io/file/class_FileOutputStreamer.php
+++ b/framework/main/interfaces/io/file/class_FileOutputStreamer.php
@@ -13,11 +13,7 @@ use \SplFileInfo;
  *
  * @author             Roland Haeder <webmaster@shipsimu.org>
  * @version            0.0.0
-<<<<<<< HEAD:framework/main/interfaces/io/file/class_FileOutputStreamer.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/io/file/class_FileOutputStreamer.php
  * @license            GNU GPL 3.0 or any newer version
  * @link               http://www.shipsimu.org
  *

diff --git a/framework/main/interfaces/io/file/csv/class_CsvInputStreamer.php b/framework/main/interfaces/io/file/csv/class_CsvInputStreamer.php
index 3de7eacd6c2548fe69dd5a3155207df0876049a1..8e9885a92ad9d3c9cc1bbaf52ec1e8c7ea6beaad 100644 (file)
--- a/framework/main/interfaces/io/file/csv/class_CsvInputStreamer.php
+++ b/framework/main/interfaces/io/file/csv/class_CsvInputStreamer.php
@@ -10,11 +10,7 @@ use Org\Mxchange\CoreFramework\Stream\Filesystem\FileInputStreamer;
  *
  * @author             Roland Haeder <webmaster@shipsimu.org>
  * @version            0.0.0
-<<<<<<< HEAD:framework/main/interfaces/io/file/csv/class_CsvInputStreamer.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/io/file/csv/class_CsvInputStreamer.php
  * @license            GNU GPL 3.0 or any newer version
  * @link               http://www.shipsimu.org
  *

diff --git a/framework/main/interfaces/io/file/handler/class_IoHandler.php b/framework/main/interfaces/io/file/handler/class_IoHandler.php
index 8d095b86d2e68d692da7a16cfb2c9840b67ebfb1..b8a5293efbc7fcbf9a5b5f8e1cef862d4309379d 100644 (file)
--- a/framework/main/interfaces/io/file/handler/class_IoHandler.php
+++ b/framework/main/interfaces/io/file/handler/class_IoHandler.php
@@ -15,11 +15,7 @@ use \SplFileInfo;
  *
  * @author             Roland Haeder <webmaster@shipsimu.org>
  * @version            0.0.0
-<<<<<<< HEAD:framework/main/interfaces/io/file/handler/class_IoHandler.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/io/file/handler/class_IoHandler.php
  * @license            GNU GPL 3.0 or any newer version
  * @link               http://www.shipsimu.org
  *
@@ -37,7 +33,6 @@ use \SplFileInfo;
  * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 interface IoHandler extends FileInputStreamer, FileOutputStreamer {
-
        /**
         * Setter for the *real* file input instance
         *

diff --git a/framework/main/interfaces/io/output/class_OutputStreamer.php b/framework/main/interfaces/io/output/class_OutputStreamer.php
index eb968405c2ffd9c5e44469c7ddaac69ba38de1b6..a98d185cb1ab3f6d2a8f96bda0a07b0409b0ae5b 100644 (file)
--- a/framework/main/interfaces/io/output/class_OutputStreamer.php
+++ b/framework/main/interfaces/io/output/class_OutputStreamer.php
@@ -10,11 +10,7 @@ use Org\Mxchange\CoreFramework\Stream\Output\StreamableOutput;
  *
  * @author             Roland Haeder <webmaster@shipsimu.org>
  * @version            0.0.0
-<<<<<<< HEAD:framework/main/interfaces/io/output/class_OutputStreamer.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/io/output/class_OutputStreamer.php
  * @license            GNU GPL 3.0 or any newer version
  * @link               http://www.shipsimu.org
  *

diff --git a/framework/main/interfaces/io/pointer/class_InputPointer.php b/framework/main/interfaces/io/pointer/class_InputPointer.php
index d5d1ed45ed4ad73f9f43f254ae43f0d8d7cbd183..334ed78cb27d71ccb4a251b4c10f3dce074cd4a7 100644 (file)
--- a/framework/main/interfaces/io/pointer/class_InputPointer.php
+++ b/framework/main/interfaces/io/pointer/class_InputPointer.php
@@ -11,11 +11,7 @@ use Org\Mxchange\CoreFramework\Stream\Input\StreamableInput;
  *
  * @author             Roland Haeder <webmaster@shipsimu.org>
  * @version            0.0.0
-<<<<<<< HEAD:framework/main/interfaces/io/pointer/class_InputPointer.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/io/pointer/class_InputPointer.php
  * @license            GNU GPL 3.0 or any newer version
  * @link               http://www.shipsimu.org
  *

diff --git a/framework/main/interfaces/io/pointer/class_OutputPointer.php b/framework/main/interfaces/io/pointer/class_OutputPointer.php
index bda35da8455aeb859d8326381c658465d25cedbc..403e6625b415644450b53778b35a68c69c22c91c 100644 (file)
--- a/framework/main/interfaces/io/pointer/class_OutputPointer.php
+++ b/framework/main/interfaces/io/pointer/class_OutputPointer.php
@@ -11,11 +11,7 @@ use Org\Mxchange\CoreFramework\Stream\Output\StreamableOutput;
  *
  * @author             Roland Haeder <webmaster@shipsimu.org>
  * @version            0.0.0
-<<<<<<< HEAD:framework/main/interfaces/io/pointer/class_OutputPointer.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/io/pointer/class_OutputPointer.php
  * @license            GNU GPL 3.0 or any newer version
  * @link               http://www.shipsimu.org
  *

diff --git a/framework/main/interfaces/io/pointer/io/class_InputOutputPointer.php b/framework/main/interfaces/io/pointer/io/class_InputOutputPointer.php
index ea71870042eda55b73abd3852e8751d2c0804778..4d361616469f9caf4a8035c9767e69437d6f3a43 100644 (file)
--- a/framework/main/interfaces/io/pointer/io/class_InputOutputPointer.php
+++ b/framework/main/interfaces/io/pointer/io/class_InputOutputPointer.php
@@ -11,11 +11,7 @@ use Org\Mxchange\CoreFramework\Filesystem\Pointer\OutputPointer;
  *
  * @author             Roland Haeder <webmaster@shipsimu.org>
  * @version            0.0.0
-<<<<<<< HEAD:framework/main/interfaces/io/pointer/io/class_InputOutputPointer.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/io/pointer/io/class_InputOutputPointer.php
  * @license            GNU GPL 3.0 or any newer version
  * @link               http://www.shipsimu.org
  *

diff --git a/framework/main/interfaces/iterator/file/class_SeekableWritableFileIterator.php b/framework/main/interfaces/iterator/file/class_SeekableWritableFileIterator.php
index ad24331ee319f4e19b2a1b28a40f8bf33ad68e69..d134ff3678255d6bf00fb2cd8151842517b50ad1 100644 (file)
--- a/framework/main/interfaces/iterator/file/class_SeekableWritableFileIterator.php
+++ b/framework/main/interfaces/iterator/file/class_SeekableWritableFileIterator.php
@@ -11,11 +11,7 @@ use \SeekableIterator;
  *
  * @author             Roland Haeder <webmaster@ship-simu.org>
  * @version            0.0.0
-<<<<<<< HEAD:framework/main/interfaces/iterator/file/class_SeekableWritableFileIterator.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/iterator/class_SeekableWritableFileIterator.php
  * @license            GNU GPL 3.0 or any newer version
  * @link               http://www.ship-simu.org
  *

diff --git a/framework/main/interfaces/language/class_ManageableLanguage.php b/framework/main/interfaces/language/class_ManageableLanguage.php
index 8b097d3301da7469e53fde4fa864ba21a0b4178e..faf9fa2516755e5abd81bf8af08abb696c148c47 100644 (file)
--- a/framework/main/interfaces/language/class_ManageableLanguage.php
+++ b/framework/main/interfaces/language/class_ManageableLanguage.php
@@ -10,11 +10,7 @@ use Org\Mxchange\CoreFramework\Generic\FrameworkInterface;
  *
  * @author             Roland Haeder <webmaster@shipsimu.org>
  * @version            0.0.0
-<<<<<<< HEAD:framework/main/interfaces/language/class_ManageableLanguage.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/language/class_ManageableLanguage.php
  * @license            GNU GPL 3.0 or any newer version
  * @link               http://www.shipsimu.org
  *

diff --git a/framework/main/interfaces/lists/class_Listable.php b/framework/main/interfaces/lists/class_Listable.php
index 1df8c4de0e9cd2bea031c5619e95ac34eaa8ec14..16f1bd7afc4abeab14bde3c7104898b47d2dfb59 100644 (file)
--- a/framework/main/interfaces/lists/class_Listable.php
+++ b/framework/main/interfaces/lists/class_Listable.php
@@ -14,11 +14,7 @@ use \IteratorAggregate;
  *
  * @author             Roland Haeder <webmaster@shipsimu.org>
  * @version            0.0.0
-<<<<<<< HEAD:framework/main/interfaces/lists/class_Listable.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/lists/class_Listable.php
  * @license            GNU GPL 3.0 or any newer version
  * @link               http://www.shipsimu.org
  *

diff --git a/framework/main/interfaces/login/class_LoginableUser.php b/framework/main/interfaces/login/class_LoginableUser.php
index c71df7f5eb1ce030ac7f4c17f08385024196fa17..eb1edccdd7f44128fda222b8676784015b352151 100644 (file)
--- a/framework/main/interfaces/login/class_LoginableUser.php
+++ b/framework/main/interfaces/login/class_LoginableUser.php
@@ -12,11 +12,7 @@ use Org\Mxchange\CoreFramework\Response\Responseable;
  *
  * @author             Roland Haeder <webmaster@shipsimu.org>
  * @version            0.0.0
-<<<<<<< HEAD:framework/main/interfaces/login/class_LoginableUser.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/login/class_LoginableUser.php
  * @license            GNU GPL 3.0 or any newer version
  * @link               http://www.shipsimu.org
  *

diff --git a/framework/main/interfaces/mailer/class_DeliverableMail.php b/framework/main/interfaces/mailer/class_DeliverableMail.php
index fe4068188b798431554bbf24b54601fb71a497d4..b0727de221b7a995ee32a7ac7560b655fda34b85 100644 (file)
--- a/framework/main/interfaces/mailer/class_DeliverableMail.php
+++ b/framework/main/interfaces/mailer/class_DeliverableMail.php
@@ -11,11 +11,7 @@ use Org\Mxchange\CoreFramework\Manager\Login\ManageableMember;
  *
  * @author             Roland Haeder <webmaster@shipsimu.org>
  * @version            0.0.0
-<<<<<<< HEAD:framework/main/interfaces/mailer/class_DeliverableMail.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/mailer/class_DeliverableMail.php
  * @license            GNU GPL 3.0 or any newer version
  * @link               http://www.shipsimu.org
  *

diff --git a/framework/main/interfaces/parser/class_Parseable.php b/framework/main/interfaces/parser/class_Parseable.php
index 305ffab230d39651d8868301d878f16b08afc5b9..3f9636ef911129c1e0f7778bea983e755e53df14 100644 (file)
--- a/framework/main/interfaces/parser/class_Parseable.php
+++ b/framework/main/interfaces/parser/class_Parseable.php
@@ -10,11 +10,7 @@ use Org\Mxchange\CoreFramework\Generic\FrameworkInterface;
  *
  * @author             Roland Haeder <webmaster@shipsimu.org>
  * @version            0.0.0
-<<<<<<< HEAD:framework/main/interfaces/parser/class_Parseable.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/parser/class_Parseable.php
  * @license            GNU GPL 3.0 or any newer version
  * @link               http://www.shipsimu.org
  *

diff --git a/framework/main/interfaces/points/class_BookablePoints.php b/framework/main/interfaces/points/class_BookablePoints.php
index bfe36a01e89302c8233e984149f1e243a17d56fd..0ede25567c71ff3e7fc97a701ad3e529c9607ee3 100644 (file)
--- a/framework/main/interfaces/points/class_BookablePoints.php
+++ b/framework/main/interfaces/points/class_BookablePoints.php
@@ -10,11 +10,7 @@ use Org\Mxchange\CoreFramework\Criteria\Add\AddableCriteria;
  *
  * @author             Roland Haeder <webmaster@shipsimu.org>
  * @version            0.0.0
-<<<<<<< HEAD:framework/main/interfaces/points/class_BookablePoints.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/points/class_BookablePoints.php
  * @license            GNU GPL 3.0 or any newer version
  * @link               http://www.shipsimu.org
  *

diff --git a/framework/main/interfaces/reader/class_ReadableNews.php b/framework/main/interfaces/reader/class_ReadableNews.php
index ce1d16e07b9c129a0993ec38aa18dbe64f9cdf3c..c206cff871af68808929739253fa4f018472caf0 100644 (file)
--- a/framework/main/interfaces/reader/class_ReadableNews.php
+++ b/framework/main/interfaces/reader/class_ReadableNews.php
@@ -10,11 +10,7 @@ use Org\Mxchange\CoreFramework\Generic\FrameworkInterface;
  *
  * @author             Roland Haeder <webmaster@shipsimu.org>
  * @version            0.0.0
-<<<<<<< HEAD:framework/main/interfaces/reader/class_ReadableNews.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/reader/class_ReadableNews.php
  * @license            GNU GPL 3.0 or any newer version
  * @link               http://www.shipsimu.org
  *

diff --git a/framework/main/interfaces/registration/class_UserRegister.php b/framework/main/interfaces/registration/class_UserRegister.php
index eda82f6e1b1cad36e256cf4f6727366271b19a8c..9503525e7c357aaa9931db6a005ad9fea7d6aa05 100644 (file)
--- a/framework/main/interfaces/registration/class_UserRegister.php
+++ b/framework/main/interfaces/registration/class_UserRegister.php
@@ -10,11 +10,7 @@ use Org\Mxchange\CoreFramework\Criteria\Add\AddableCriteria;
  *
  * @author             Roland Haeder <webmaster@shipsimu.org>
  * @version            0.0.0
-<<<<<<< HEAD:framework/main/interfaces/registration/class_UserRegister.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/registration/class_UserRegister.php
  * @license            GNU GPL 3.0 or any newer version
  * @link               http://www.shipsimu.org
  *

diff --git a/framework/main/interfaces/registry/class_Register.php b/framework/main/interfaces/registry/class_Register.php
index 4be9dfda7f13990574d6a278c7ca5d84a37a8d1c..177be13947b24bfb9df002237df4af61a681f90c 100644 (file)
--- a/framework/main/interfaces/registry/class_Register.php
+++ b/framework/main/interfaces/registry/class_Register.php
@@ -10,11 +10,7 @@ use Org\Mxchange\CoreFramework\Generic\FrameworkInterface;
  *
  * @author             Roland Haeder <webmaster@shipsimu.org>
  * @version            0.0.0
-<<<<<<< HEAD:framework/main/interfaces/registry/class_Register.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/registry/class_Register.php
  * @license            GNU GPL 3.0 or any newer version
  * @link               http://www.shipsimu.org
  *

diff --git a/framework/main/interfaces/registry/class_Registerable.php b/framework/main/interfaces/registry/class_Registerable.php
index ef42c5aa0dbdd58c9b2c6a71bd271cb6cd262cce..8106d413a15de116165c9193cb8b64f0be9fd299 100644 (file)
--- a/framework/main/interfaces/registry/class_Registerable.php
+++ b/framework/main/interfaces/registry/class_Registerable.php
@@ -10,11 +10,7 @@ use Org\Mxchange\CoreFramework\Generic\FrameworkInterface;
  *
  * @author             Roland Haeder <webmaster@shipsimu.org>
  * @version            0.0.0
-<<<<<<< HEAD:framework/main/interfaces/registry/class_Registerable.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/registry/class_Registerable.php
  * @license            GNU GPL 3.0 or any newer version
  * @link               http://www.shipsimu.org
  *

diff --git a/framework/main/interfaces/request/class_Requestable.php b/framework/main/interfaces/request/class_Requestable.php
index 755a361097c4c247c3e7a50a787281d4e3ce2159..1f33bcc364539143c1bb8219b54ce14e150725af 100644 (file)
--- a/framework/main/interfaces/request/class_Requestable.php
+++ b/framework/main/interfaces/request/class_Requestable.php
@@ -10,11 +10,7 @@ use Org\Mxchange\CoreFramework\Generic\FrameworkInterface;
  *
  * @author             Roland Haeder <webmaster@shipsimu.org>
  * @version            0.0.0
-<<<<<<< HEAD:framework/main/interfaces/request/class_Requestable.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/request/class_Requestable.php
  * @license            GNU GPL 3.0 or any newer version
  * @link               http://www.shipsimu.org
  *

diff --git a/framework/main/interfaces/resolver/actions/class_ActionResolver.php b/framework/main/interfaces/resolver/actions/class_ActionResolver.php
index 3af3fe2273df66ae0160fc5fba5b9e53db078da2..80f06b9cdfbd9802369de90c6986027f3acc87c3 100644 (file)
--- a/framework/main/interfaces/resolver/actions/class_ActionResolver.php
+++ b/framework/main/interfaces/resolver/actions/class_ActionResolver.php
@@ -11,11 +11,7 @@ use Org\Mxchange\CoreFramework\Resolver\Resolver;
  *
  * @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
  *

diff --git a/framework/main/interfaces/resolver/class_Resolver.php b/framework/main/interfaces/resolver/class_Resolver.php
index 2e8135cf72df414df1d697acd235f1ae4f1b8741..711fdc79bcc6180ef5cde6b1551b5250dd8e5385 100644 (file)
--- a/framework/main/interfaces/resolver/class_Resolver.php
+++ b/framework/main/interfaces/resolver/class_Resolver.php
@@ -10,11 +10,7 @@ use Org\Mxchange\CoreFramework\Generic\FrameworkInterface;
  *
  * @author             Roland Haeder <webmaster@shipsimu.org>
  * @version            0.0.0
-<<<<<<< HEAD:framework/main/interfaces/resolver/class_Resolver.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/class_Resolver.php
  * @license            GNU GPL 3.0 or any newer version
  * @link               http://www.shipsimu.org
  *

diff --git a/framework/main/interfaces/resolver/commands/class_CommandResolver.php b/framework/main/interfaces/resolver/commands/class_CommandResolver.php
index 967b50228ba172719d64ed34c81cead40c3f0de4..87f56a60a93260665b5d4b5d9a33c101af5a7de1 100644 (file)
--- a/framework/main/interfaces/resolver/commands/class_CommandResolver.php
+++ b/framework/main/interfaces/resolver/commands/class_CommandResolver.php
@@ -11,11 +11,7 @@ use Org\Mxchange\CoreFramework\Resolver\Resolver;
  *
  * @author             Roland Haeder <webmaster@shipsimu.org>
  * @version            0.0.0
-<<<<<<< HEAD:framework/main/interfaces/resolver/commands/class_CommandResolver.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/commands/class_CommandResolver.php
  * @license            GNU GPL 3.0 or any newer version
  * @link               http://www.shipsimu.org
  *

diff --git a/framework/main/interfaces/resolver/controller/class_ControllerResolver.php b/framework/main/interfaces/resolver/controller/class_ControllerResolver.php
index 99777c04cd81dd98ae9e32fcecc87e460d7a8551..daac133cb69518314e15994142141f42bbafbb45 100644 (file)
--- a/framework/main/interfaces/resolver/controller/class_ControllerResolver.php
+++ b/framework/main/interfaces/resolver/controller/class_ControllerResolver.php
@@ -11,11 +11,7 @@ use Org\Mxchange\CoreFramework\Resolver\Resolver;
  *
  * @author             Roland Haeder <webmaster@shipsimu.org>
  * @version            0.0.0
-<<<<<<< HEAD:framework/main/interfaces/resolver/controller/class_ControllerResolver.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/controller/class_ControllerResolver.php
  * @license            GNU GPL 3.0 or any newer version
  * @link               http://www.shipsimu.org
  *

diff --git a/framework/main/interfaces/response/class_Responseable.php b/framework/main/interfaces/response/class_Responseable.php
index 341bf8e8477c8d35e86f73c60a82b960a6fdffb0..a7708eb837b358e0fee91b13cae7c56fa963f3b3 100644 (file)
--- a/framework/main/interfaces/response/class_Responseable.php
+++ b/framework/main/interfaces/response/class_Responseable.php
@@ -10,11 +10,7 @@ use Org\Mxchange\CoreFramework\Generic\FrameworkInterface;
  *
  * @author             Roland Haeder <webmaster@shipsimu.org>
  * @version            0.0.0
-<<<<<<< HEAD:framework/main/interfaces/response/class_Responseable.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/response/class_Responseable.php
  * @license            GNU GPL 3.0 or any newer version
  * @link               http://www.shipsimu.org
  *

diff --git a/framework/main/interfaces/result/class_SearchableResult.php b/framework/main/interfaces/result/class_SearchableResult.php
index 186d3d1b25bb1a780eeeb594cb0921db6c24053a..2daead2c2f53065d3b50323262bc915e9ba64615 100644 (file)
--- a/framework/main/interfaces/result/class_SearchableResult.php
+++ b/framework/main/interfaces/result/class_SearchableResult.php
@@ -12,11 +12,7 @@ use Org\Mxchange\CoreFramework\Generic\FrameworkInterface;
  *
  * @author             Roland Haeder <webmaster@shipsimu.org>
  * @version            0.0.0
-<<<<<<< HEAD:framework/main/interfaces/result/class_SearchableResult.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/result/class_SearchableResult.php
  * @license            GNU GPL 3.0 or any newer version
  * @link               http://www.shipsimu.org
  *

diff --git a/framework/main/interfaces/result/class_UpdateableResult.php b/framework/main/interfaces/result/class_UpdateableResult.php
index 21c5970b114b48201c7d8c805ec9f0c885270b0a..66968da15658e5cdc0072dc52796d24c95d5b443 100644 (file)
--- a/framework/main/interfaces/result/class_UpdateableResult.php
+++ b/framework/main/interfaces/result/class_UpdateableResult.php
@@ -11,11 +11,7 @@ use Org\Mxchange\CoreFramework\Criteria\Local\LocalUpdateCriteria;
  *
  * @author             Roland Haeder <webmaster@shipsimu.org>
  * @version            0.0.0
-<<<<<<< HEAD:framework/main/interfaces/result/class_UpdateableResult.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/result/class_UpdateableResult.php
  * @license            GNU GPL 3.0 or any newer version
  * @link               http://www.shipsimu.org
  *

diff --git a/framework/main/interfaces/stacker/class_Stackable.php b/framework/main/interfaces/stacker/class_Stackable.php
index 8cdb6e7dfaf1b46457c236c711cf06cfc7fef487..b1e783979c2179e3d0199debaa57a3682b76d7da 100644 (file)
--- a/framework/main/interfaces/stacker/class_Stackable.php
+++ b/framework/main/interfaces/stacker/class_Stackable.php
@@ -10,11 +10,7 @@ use Org\Mxchange\CoreFramework\Generic\FrameworkInterface;
  *
  * @author             Roland Haeder <webmaster@shipsimu.org>
  * @version            0.0.0
-<<<<<<< HEAD:framework/main/interfaces/stacker/class_Stackable.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/stacker/class_Stackable.php
  * @license            GNU GPL 3.0 or any newer version
  * @link               http://www.shipsimu.org
  *

diff --git a/framework/main/interfaces/stacker/file/class_StackableFile.php b/framework/main/interfaces/stacker/file/class_StackableFile.php
index b4526e2193a12d0dd37a46036eebb93527deee2b..c3f9ebc941527b226f60c60c61a2d9b6cbac1ff0 100644 (file)
--- a/framework/main/interfaces/stacker/file/class_StackableFile.php
+++ b/framework/main/interfaces/stacker/file/class_StackableFile.php
@@ -10,11 +10,7 @@ use Org\Mxchange\CoreFramework\Stacker\Stackable;
  *
  * @author             Roland Haeder <webmaster@shipsimu.org>
  * @version            0.0.0
-<<<<<<< HEAD:framework/main/interfaces/stacker/file/class_StackableFile.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/stacker/file/class_StackableFile.php
  * @license            GNU GPL 3.0 or any newer version
  * @link               http://www.shipsimu.org
  *

diff --git a/framework/main/interfaces/state/class_Stateable.php b/framework/main/interfaces/state/class_Stateable.php
index 16ab5ae03c3114e549968893651fbfcf5b24d152..b3954b9f935c4c48906b0b93f9eaa6ad0b4a33d9 100644 (file)
--- a/framework/main/interfaces/state/class_Stateable.php
+++ b/framework/main/interfaces/state/class_Stateable.php
@@ -10,11 +10,7 @@ use Org\Mxchange\CoreFramework\Generic\FrameworkInterface;
  *
  * @author             Roland Haeder <webmaster@shipsimu.org>
  * @version            0.0.0
-<<<<<<< HEAD:framework/main/interfaces/state/class_Stateable.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/state/class_Stateable.php
  * @license            GNU GPL 3.0 or any newer version
  * @link               http://www.shipsimu.org
  *

diff --git a/framework/main/interfaces/streams/class_Stream.php b/framework/main/interfaces/streams/class_Stream.php
index 966eb361a7adf40b5d9ade458911dc41414b02a7..212c2ebaf21288de4b0272c1a606ecdc35e25c66 100644 (file)
--- a/framework/main/interfaces/streams/class_Stream.php
+++ b/framework/main/interfaces/streams/class_Stream.php
@@ -10,11 +10,7 @@ use Org\Mxchange\CoreFramework\Generic\FrameworkInterface;
  *
  * @author             Roland Haeder <webmaster@shipsimu.org>
  * @version            0.0.0
-<<<<<<< HEAD:framework/main/interfaces/streams/class_Stream.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/streams/class_Stream.php
  * @license            GNU GPL 3.0 or any newer version
  * @link               http://www.shipsimu.org
  *

diff --git a/framework/main/interfaces/streams/crypto/class_EncryptableStream.php b/framework/main/interfaces/streams/crypto/class_EncryptableStream.php
index 9f95492e414722fbbeb7bb6b53254a2d15fd6eeb..7f20dc669e4f3b9f0079bb0bd9aa82ab0993c118 100644 (file)
--- a/framework/main/interfaces/streams/crypto/class_EncryptableStream.php
+++ b/framework/main/interfaces/streams/crypto/class_EncryptableStream.php
@@ -10,11 +10,7 @@ use Org\Mxchange\CoreFramework\Stream\Stream;
  *
  * @author             Roland Haeder <webmaster@shipsimu.org>
  * @version            0.0.0
-<<<<<<< HEAD:framework/main/interfaces/streams/crypto/class_EncryptableStream.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/streams/crypto/class_EncryptableStream.php
  * @license            GNU GPL 3.0 or any newer version
  * @link               http://www.shipsimu.org
  *

diff --git a/framework/main/interfaces/streams/input/class_InputStream.php b/framework/main/interfaces/streams/input/class_InputStream.php
index f9677fa22ced320ee567207e4c3fd9c134a0d504..7f3632d91dc4076cc96976577dd88db5961ec80e 100644 (file)
--- a/framework/main/interfaces/streams/input/class_InputStream.php
+++ b/framework/main/interfaces/streams/input/class_InputStream.php
@@ -10,11 +10,7 @@ use Org\Mxchange\CoreFramework\Stream\Stream;
  *
  * @author             Roland Haeder <webmaster@shipsimu.org>
  * @version            0.0.0
-<<<<<<< HEAD:framework/main/interfaces/streams/input/class_InputStream.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/streams/input/class_InputStream.php
  * @license            GNU GPL 3.0 or any newer version
  * @link               http://www.shipsimu.org
  *

diff --git a/framework/main/interfaces/streams/output/class_OutputStream.php b/framework/main/interfaces/streams/output/class_OutputStream.php
index dd841f45ce1f64c6301c3c36cc98ad0aa6fdeda5..1cb286f710626d0bd10158d6e2f4f60b945c7acc 100644 (file)
--- a/framework/main/interfaces/streams/output/class_OutputStream.php
+++ b/framework/main/interfaces/streams/output/class_OutputStream.php
@@ -10,11 +10,7 @@ use Org\Mxchange\CoreFramework\Stream\Stream;
  *
  * @author             Roland Haeder <webmaster@shipsimu.org>
  * @version            0.0.0
-<<<<<<< HEAD:framework/main/interfaces/streams/output/class_OutputStream.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/streams/output/class_OutputStream.php
  * @license            GNU GPL 3.0 or any newer version
  * @link               http://www.shipsimu.org
  *

diff --git a/framework/main/interfaces/tasks/class_Taskable.php b/framework/main/interfaces/tasks/class_Taskable.php
index 4c57b583c03b665b904d0398805f5bbc8f32d58a..9bed5ecaa1ebbc26c65ef64c56c9166224bde9db 100644 (file)
--- a/framework/main/interfaces/tasks/class_Taskable.php
+++ b/framework/main/interfaces/tasks/class_Taskable.php
@@ -11,11 +11,7 @@ use Org\Mxchange\CoreFramework\Visitor\Visitor;
  *
  * @author             Roland Haeder <webmaster@shipsimu.org>
  * @version            0.0.0
-<<<<<<< HEAD:framework/main/interfaces/tasks/class_Taskable.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/tasks/class_Taskable.php
  * @license            GNU GPL 3.0 or any newer version
  * @link               http://www.shipsimu.org
  *

diff --git a/framework/main/interfaces/template/class_CompileableTemplate.php b/framework/main/interfaces/template/class_CompileableTemplate.php
index 761e5619a3b9af3082668e78990d598fba498dc5..480a25af022a985fbcdfed0e7d65d78af7aabfd1 100644 (file)
--- a/framework/main/interfaces/template/class_CompileableTemplate.php
+++ b/framework/main/interfaces/template/class_CompileableTemplate.php
@@ -12,11 +12,7 @@ use Org\Mxchange\CoreFramework\Response\Responseable;
  *
  * @author             Roland Haeder <webmaster@shipsimu.org>
  * @version            0.0.0
-<<<<<<< HEAD:framework/main/interfaces/template/class_CompileableTemplate.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/template/class_CompileableTemplate.php
  * @license            GNU GPL 3.0 or any newer version
  * @link               http://www.shipsimu.org
  *

diff --git a/framework/main/interfaces/template/view/class_ViewHelper.php b/framework/main/interfaces/template/view/class_ViewHelper.php
index 5123be459a244391328d257c32e1882d7212ba83..c9b43ab4186c8d0ebadba6d13eb70dab4dc9663c 100644 (file)
--- a/framework/main/interfaces/template/view/class_ViewHelper.php
+++ b/framework/main/interfaces/template/view/class_ViewHelper.php
@@ -10,11 +10,7 @@ use Org\Mxchange\CoreFramework\Generic\FrameworkInterface;
  *
  * @author             Roland Haeder <webmaster@shipsimu.org>
  * @version            0.0.0
-<<<<<<< HEAD:framework/main/interfaces/template/view/class_ViewHelper.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/template/view/class_ViewHelper.php
  * @license            GNU GPL 3.0 or any newer version
  * @link               http://www.shipsimu.org
  *

diff --git a/framework/main/interfaces/user/class_ManageableAccount.php b/framework/main/interfaces/user/class_ManageableAccount.php
index d84ec446f07a107e962075456f65ce551a16bada..fd61d1adc2573e7bc9b7af92aca350743a4cd17c 100644 (file)
--- a/framework/main/interfaces/user/class_ManageableAccount.php
+++ b/framework/main/interfaces/user/class_ManageableAccount.php
@@ -11,11 +11,7 @@ use Org\Mxchange\CoreFramework\Request\Requestable;
  *
  * @author             Roland Haeder <webmaster@shipsimu.org>
  * @version            0.0.0
-<<<<<<< HEAD:framework/main/interfaces/user/class_ManageableAccount.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/user/class_ManageableAccount.php
  * @license            GNU GPL 3.0 or any newer version
  * @link               http://www.shipsimu.org
  *

diff --git a/framework/main/interfaces/user/extended/class_ManageableGuest.php b/framework/main/interfaces/user/extended/class_ManageableGuest.php
index 368210916bb8846ef9e55f8b6a1e6bee3a24e760..8de61d8242478fd7c30aa4c145ea67a37014ac69 100644 (file)
--- a/framework/main/interfaces/user/extended/class_ManageableGuest.php
+++ b/framework/main/interfaces/user/extended/class_ManageableGuest.php
@@ -10,11 +10,7 @@ use Org\Mxchange\CoreFramework\User\ManageableAccount;
  *
  * @author             Roland Haeder <webmaster@shipsimu.org>
  * @version            0.0.0
-<<<<<<< HEAD:framework/main/interfaces/user/extended/class_ManageableGuest.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/user/extended/class_ManageableGuest.php
  * @license            GNU GPL 3.0 or any newer version
  * @link               http://www.shipsimu.org
  *

diff --git a/framework/main/interfaces/user/extended/class_ManageableMember.php b/framework/main/interfaces/user/extended/class_ManageableMember.php
index 1eac1454973b56969a700b1bc5d217293aedf090..c7e247a80c7f316245c9564250251f2cb5d465f2 100644 (file)
--- a/framework/main/interfaces/user/extended/class_ManageableMember.php
+++ b/framework/main/interfaces/user/extended/class_ManageableMember.php
@@ -10,11 +10,7 @@ use Org\Mxchange\CoreFramework\User\ManageableAccount;
  *
  * @author             Roland Haeder <webmaster@shipsimu.org>
  * @version            0.0.0
-<<<<<<< HEAD:framework/main/interfaces/user/extended/class_ManageableMember.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/user/extended/class_ManageableMember.php
  * @license            GNU GPL 3.0 or any newer version
  * @link               http://www.shipsimu.org
  *

diff --git a/framework/main/interfaces/visitor/class_Visitable.php b/framework/main/interfaces/visitor/class_Visitable.php
index c90e118adc240612d26ec1afca074c4109e50909..5af535613e5bbe0b5e77b5d29b4fc5762575e71c 100644 (file)
--- a/framework/main/interfaces/visitor/class_Visitable.php
+++ b/framework/main/interfaces/visitor/class_Visitable.php
@@ -11,11 +11,7 @@ use Org\Mxchange\CoreFramework\Visitor\Visitor;
  *
  * @author             Roland Haeder <webmaster@shipsimu.org>
  * @version            0.0.0
-<<<<<<< HEAD:framework/main/interfaces/visitor/class_Visitable.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/visitor/class_Visitable.php
  * @license            GNU GPL 3.0 or any newer version
  * @link               http://www.shipsimu.org
  *

diff --git a/framework/main/interfaces/visitor/class_Visitor.php b/framework/main/interfaces/visitor/class_Visitor.php
index 13b72c996a1844f389fa853ef709fa2365a55689..c968f9fa00e262e4a5f4eabe68364c513f32d39c 100644 (file)
--- a/framework/main/interfaces/visitor/class_Visitor.php
+++ b/framework/main/interfaces/visitor/class_Visitor.php
@@ -10,11 +10,7 @@ use Org\Mxchange\CoreFramework\Generic\FrameworkInterface;
  *
  * @author             Roland Haeder <webmaster@shipsimu.org>
  * @version            0.0.0
-<<<<<<< HEAD:framework/main/interfaces/visitor/class_Visitor.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/visitor/class_Visitor.php
  * @license            GNU GPL 3.0 or any newer version
  * @link               http://www.shipsimu.org
  *

diff --git a/framework/main/interfaces/visitor/decorator/class_DecoratorVisitor.php b/framework/main/interfaces/visitor/decorator/class_DecoratorVisitor.php
index 9c79170eb4a7955a5a9c5eb29376ccd1b87d74f3..3d9617e9091729f5e058fe4c381869039983cc91 100644 (file)
--- a/framework/main/interfaces/visitor/decorator/class_DecoratorVisitor.php
+++ b/framework/main/interfaces/visitor/decorator/class_DecoratorVisitor.php
@@ -11,11 +11,7 @@ use Org\Mxchange\CoreFramework\Visitor\Visitor;
  *
  * @author             Roland Haeder <webmaster@shipsimu.org>
  * @version            0.0.0
-<<<<<<< HEAD:framework/main/interfaces/visitor/decorator/class_DecoratorVisitor.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/visitor/decorator/class_DecoratorVisitor.php
  * @license            GNU GPL 3.0 or any newer version
  * @link               http://www.shipsimu.org
  *

diff --git a/framework/main/interfaces/visitor/tasks/class_TaskVisitor.php b/framework/main/interfaces/visitor/tasks/class_TaskVisitor.php
index e595f64603222cb891b1f5b07a09007bf49cf9a1..5a6708e2c15d6dfcd88d387018ab7f24ca8d3831 100644 (file)
--- a/framework/main/interfaces/visitor/tasks/class_TaskVisitor.php
+++ b/framework/main/interfaces/visitor/tasks/class_TaskVisitor.php
@@ -11,11 +11,7 @@ use Org\Mxchange\CoreFramework\Visitor\Visitor;
  *
  * @author             Roland Haeder <webmaster@shipsimu.org>
  * @version            0.0.0
-<<<<<<< HEAD:framework/main/interfaces/visitor/tasks/class_TaskVisitor.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/visitor/tasks/class_TaskVisitor.php
  * @license            GNU GPL 3.0 or any newer version
  * @link               http://www.shipsimu.org
  *

diff --git a/framework/main/middleware/class_BaseMiddleware.php b/framework/main/middleware/class_BaseMiddleware.php
index 2009af0f29aaf4941b3d6b47efe80228449e6f93..589b887627a1aa97fdcc5ecb46a8d4f30c7150b4 100644 (file)
--- a/framework/main/middleware/class_BaseMiddleware.php
+++ b/framework/main/middleware/class_BaseMiddleware.php
@@ -10,11 +10,7 @@ use Org\Mxchange\CoreFramework\Object\BaseFrameworkSystem;
  *
  * @author             Roland Haeder <webmaster@shipsimu.org>
  * @version            0.0.0
-<<<<<<< HEAD:framework/main/middleware/class_BaseMiddleware.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/middleware/class_BaseMiddleware.php
  * @license            GNU GPL 3.0 or any newer version
  * @link               http://www.shipsimu.org
  * 

diff --git a/framework/main/middleware/compressor/class_CompressorChannel.php b/framework/main/middleware/compressor/class_CompressorChannel.php
index 622244dce623e59148aec47b399b6ba5d81bc59a..8ec776d9c935ac8ff3c0d883540d1d0a94867606 100644 (file)
--- a/framework/main/middleware/compressor/class_CompressorChannel.php
+++ b/framework/main/middleware/compressor/class_CompressorChannel.php
@@ -13,11 +13,7 @@ use Org\Mxchange\CoreFramework\Registry\Registerable;
  *
  * @author             Roland Haeder <webmaster@shipsimu.org>
  * @version            0.0.0
-<<<<<<< HEAD:framework/main/middleware/compressor/class_CompressorChannel.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/middleware/compressor/class_CompressorChannel.php
  * @license            GNU GPL 3.0 or any newer version
  * @link               http://www.shipsimu.org
  *

diff --git a/framework/main/middleware/database/class_DatabaseConnection.php b/framework/main/middleware/database/class_DatabaseConnection.php
index 5754b74530d579a3ae83126b159c6e9d16fc0cc7..83b13eb5f9fd1bc71c183939f939c6ce3390f9e6 100644 (file)
--- a/framework/main/middleware/database/class_DatabaseConnection.php
+++ b/framework/main/middleware/database/class_DatabaseConnection.php
@@ -16,11 +16,7 @@ use Org\Mxchange\CoreFramework\Middleware\Debug\DebugMiddleware;
  *
  * @author             Roland Haeder <webmaster@shipsimu.org>
  * @version            0.0.0
-<<<<<<< HEAD:framework/main/middleware/database/class_DatabaseConnection.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/middleware/database/class_DatabaseConnection.php
  * @license            GNU GPL 3.0 or any newer version
  * @link               http://www.shipsimu.org
  *

diff --git a/framework/main/middleware/debug/class_DebugMiddleware.php b/framework/main/middleware/debug/class_DebugMiddleware.php
index 59dbba4eb9d219147de0f75baa20a778aeefa9d5..a4855e5dd4c20224296d1aad78e113f4e5bd4204 100644 (file)
--- a/framework/main/middleware/debug/class_DebugMiddleware.php
+++ b/framework/main/middleware/debug/class_DebugMiddleware.php
@@ -16,11 +16,7 @@ use Org\Mxchange\CoreFramework\Stream\Output\OutputStreamer;
  *
  * @author             Roland Haeder <webmaster@shipsimu.org>
  * @version            0.0.0
-<<<<<<< HEAD:framework/main/middleware/debug/class_DebugMiddleware.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/middleware/debug/class_DebugMiddleware.php
  * @license            GNU GPL 3.0 or any newer version
  * @link               http://www.shipsimu.org
  * @deprecated See LoggerFactory for a more flexible approach

diff --git a/framework/main/middleware/io/class_FileIoHandler.php b/framework/main/middleware/io/class_FileIoHandler.php
index 02c80344dd2ed7092b81518ffacebbcb38e94286..350151943e97307a1877e024236bc4976c3fab69 100644 (file)
--- a/framework/main/middleware/io/class_FileIoHandler.php
+++ b/framework/main/middleware/io/class_FileIoHandler.php
@@ -20,11 +20,7 @@ use \SplFileInfo;
  *
  * @author             Roland Haeder <webmaster@shipsimu.org>
  * @version            0.0.0
-<<<<<<< HEAD:framework/main/middleware/io/class_FileIoHandler.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/middleware/io/class_FileIoHandler.php
  * @license            GNU GPL 3.0 or any newer version
  * @link               http://www.shipsimu.org
  *

diff --git a/framework/main/tests/commands/console/class_TestsConsoleMainCommand.php b/framework/main/tests/commands/console/class_TestsConsoleMainCommand.php
index b9429357e26074868469f130327b29d43b913fde..9548edd41b43629dc3b4b66f23f2dffde86cf611 100644 (file)
--- a/framework/main/tests/commands/console/class_TestsConsoleMainCommand.php
+++ b/framework/main/tests/commands/console/class_TestsConsoleMainCommand.php
@@ -7,7 +7,7 @@ use Org\Mxchange\CoreFramework\Command\BaseCommand;
 use Org\Mxchange\CoreFramework\Command\Commandable;
 use Org\Mxchange\CoreFramework\Controller\Controller;
 use Org\Mxchange\CoreFramework\Factory\ObjectFactory;
-use Org\Mxchange\CoreFramework\Registry\Registry;
+use Org\Mxchange\CoreFramework\Registry\GenericRegistry;
 use Org\Mxchange\CoreFramework\Request\Requestable;
 use Org\Mxchange\CoreFramework\Resolver\Command\CommandResolver;
 use Org\Mxchange\CoreFramework\Response\Responseable;
@@ -74,7 +74,7 @@ class TestsConsoleMainCommand extends BaseCommand implements Commandable {
                self::createDebugInstance(__CLASS__, __LINE__)->debugOutput('MAIN: --- Starting tests ... ---');
 
                // Get controller
-               $controllerInstance = Registry::getRegistry()->getInstance('controller');
+               $controllerInstance = GenericRegistry::getRegistry()->getInstance('controller');
 
                // Run all tests
                $controllerInstance->executeTestsFilters($requestInstance, $responseInstance);

diff --git a/framework/main/third_party/api/wernisportal/class_WernisApi.php b/framework/main/third_party/api/wernisportal/class_WernisApi.php
index f217f103c6665dc03860bf76380dd3550619cfdc..cb85170a326d0538c4204d1378f25c2f9c6618bc 100644 (file)
--- a/framework/main/third_party/api/wernisportal/class_WernisApi.php
+++ b/framework/main/third_party/api/wernisportal/class_WernisApi.php
@@ -10,11 +10,7 @@ use Org\Mxchange\CoreFramework\Object\BaseFrameworkSystem;
  *
  * @author             Roland Haeder <webmaster@shipsimu.org>
  * @version            0.0.0
-<<<<<<< HEAD:framework/main/third_party/api/wernisportal/class_WernisApi.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/third_party/api/wernisportal/class_WernisApi.php
  * @license            GNU GPL 3.0 or any newer version
  * @link               http://www.shipsimu.org
  * @todo               Out-dated since 0.6-BETA

diff --git a/inc/config.php b/inc/config.php
index 5cc93a133c10158ab9c2edd753f0ab2bccba3817..a1ba03c99104fe0aacbc62cd79121c277bdd3079 100644 (file)
--- a/inc/config.php
+++ b/inc/config.php
@@ -469,6 +469,3 @@ $cfg->setConfigEntry('extension_scrypt_loaded', FALSE);
 
 // CFG: EXTENSION-UUID-LOADED (By default uuid is assumed absent and later tested being there)
 $cfg->setConfigEntry('extension_uuid_loaded', FALSE);
-
-// [EOF]
-?>

diff --git a/inc/config/class_FrameworkConfiguration.php b/inc/config/class_FrameworkConfiguration.php
index b89791beddc6604077db572c4b1f9d80569fd46a..a4181bca61880ef01da331af8a8de31d3c21f7c1 100644 (file)
--- a/inc/config/class_FrameworkConfiguration.php
+++ b/inc/config/class_FrameworkConfiguration.php
@@ -408,7 +408,5 @@ class FrameworkConfiguration implements Registerable {
                // Return the result
                return $equals;
        }
-}
 
-// [EOF]
-?>
+}

diff --git a/inc/database.php b/inc/database.php
index ec973cb0642484b0704c703f38c8367e2194511b..28ad6743294a12264742e7477afce852a5e82453 100644 (file)
--- a/inc/database.php
+++ b/inc/database.php
@@ -50,6 +50,3 @@ $connectionInstance = DatabaseConnection::createDatabaseConnection(DebugMiddlewa
 // Is the app variable there and valid?
 // @TODO Rewrite this
 if (is_object($app)) $app->setDatabaseInstance($connectionInstance);
-
-// [EOF]
-?>

diff --git a/inc/database/lib-local.php b/inc/database/lib-local.php
index 86b1c3805dfce61f481be2f79d64ea3297ac2def..5abbc1512bbdf2d7d30c45c793ae393cae523a2f 100644 (file)
--- a/inc/database/lib-local.php
+++ b/inc/database/lib-local.php
@@ -24,6 +24,3 @@
 
 // For testing purposes we use a local file database
 $databaseInstance = ObjectFactory::createObjectByConfiguredName('local_file_database_class');
-
-// [EOF]
-?>

diff --git a/inc/includes.php b/inc/includes.php
index e235a9e6575a60079a6c9c4ef91444f92671cf6d..2acfa7fb96df6196772a9058a1e573cce08e90ff 100644 (file)
--- a/inc/includes.php
+++ b/inc/includes.php
@@ -69,6 +69,3 @@ FrameworkConfiguration::getSelfInstance()->setConfigEntry('app_name', $applicati
 
 // Scan for all framework classes, exceptions and interfaces
 ClassLoader::scanFrameworkClasses();
-
-// [EOF]
-?>

diff --git a/inc/main/classes/client/http/class_HttpClient.php b/inc/main/classes/client/http/class_HttpClient.php
index 8d6271df1ffeaba3555e72fd1453ac16f0ff509f..0ec24318b0a15c0b66f1ccf27f1d00a1763cfa7f 100644 (file)
--- a/inc/main/classes/client/http/class_HttpClient.php
+++ b/inc/main/classes/client/http/class_HttpClient.php
@@ -158,7 +158,5 @@ class HttpClient extends BaseClient implements Client {
                // Return response array
                return $responseArray;
        }
-}
 
-// [EOF]
-?>
+}

diff --git a/inc/main/classes/container/socket/class_SocketContainer.php b/inc/main/classes/container/socket/class_SocketContainer.php
index 2d3ab2aa4c47bcdc160d8a8b4c8d8310d8b79597..968115923110d51101e304b67374a17e7f50ab11 100644 (file)
--- a/inc/main/classes/container/socket/class_SocketContainer.php
+++ b/inc/main/classes/container/socket/class_SocketContainer.php
@@ -122,7 +122,5 @@ class SocketContainer extends BaseContainer implements Registerable {
                // Return result
                return $matches;
        }
-}
 
-// [EOF]
-?>
+}

diff --git a/inc/main/classes/database/migration/class_ b/inc/main/classes/database/migration/class_
index 963756de90a2f45d9c52507e21b06de7fa4bd3bf..4a9c91c4e84f8f2ab32dfc9c93a890b1556127f9 100644 (file)
--- a/inc/main/classes/database/migration/class_
+++ b/inc/main/classes/database/migration/class_
@@ -1,6 +1,6 @@
 <?php
 /**
- * 
+ * A ??? database migration class
  *
  * @author             Roland Haeder <webmaster@ship-simu.org>
  * @version            0.0.0
@@ -21,7 +21,7 @@
  * 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  extends BaseDatabaseMigration implements MigrateableDatabase {
+class ???DatabaseMigration extends BaseDatabaseMigration implements MigrateableDatabase {
        /**
         * Protected constructor
         *
@@ -31,7 +31,5 @@ class  extends BaseDatabaseMigration implements MigrateableDatabase {
                // Call parent constructor
                parent::__construct($class);
        }
-}
 
-// [EOF]
-?>
+}

diff --git a/inc/main/classes/database/migration/class_BaseDatabaseMigration.php b/inc/main/classes/database/migration/class_BaseDatabaseMigration.php
index 753a629228ace6899a09e9656b537d3c6583c0c1..2f44c5e00322e4735d96e53ada41eba667c9bb53 100644 (file)
--- a/inc/main/classes/database/migration/class_BaseDatabaseMigration.php
+++ b/inc/main/classes/database/migration/class_BaseDatabaseMigration.php
@@ -21,7 +21,7 @@
  * 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 BaseDatabaseMigration extends BaseFrameworkSystem {
+abstract class BaseDatabaseMigration extends BaseFrameworkSystem {
        /**
         * Protected constructor
         *
@@ -31,7 +31,5 @@ class BaseDatabaseMigration extends BaseFrameworkSystem {
                // Call parent constructor
                parent::__construct($class);
        }
-}
 
-// [EOF]
-?>
+}

diff --git a/inc/main/classes/database/migration/format_upgrade/class_ b/inc/main/classes/database/migration/format_upgrade/class_
index 36ec4ec01541561711902e990ef561e62aa78c33..33cd7d7669622cc969266b163d18317284e5dbd5 100644 (file)
--- a/inc/main/classes/database/migration/format_upgrade/class_
+++ b/inc/main/classes/database/migration/format_upgrade/class_
@@ -44,7 +44,5 @@ class ???FormatVersion01To02Upgrade extends BaseFormatUpgrade implements Upgrade
                // Return the prepared instance
                return $upgradeInstance;
        }
-}
 
-// [EOF]
-?>
+}

diff --git a/inc/main/classes/database/migration/format_upgrade/class_BaseFormatUpgrade.php b/inc/main/classes/database/migration/format_upgrade/class_BaseFormatUpgrade.php
index ebeff25cf9c6f16ff5d0941de45f282aa0ab7031..d4b105c38f7d22622a8ffbaf5043a837df920b6d 100644 (file)
--- a/inc/main/classes/database/migration/format_upgrade/class_BaseFormatUpgrade.php
+++ b/inc/main/classes/database/migration/format_upgrade/class_BaseFormatUpgrade.php
@@ -21,7 +21,7 @@
  * 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 BaseFormatUpgrade extends BaseDatabaseMigration implements MigrateableDatabase {
+abstract class BaseFormatUpgrade extends BaseDatabaseMigration implements MigrateableDatabase {
        /**
         * Protected constructor
         *
@@ -31,7 +31,5 @@ class BaseFormatUpgrade extends BaseDatabaseMigration implements MigrateableData
                // Call parent constructor
                parent::__construct($class);
        }
-}
 
-// [EOF]
-?>
+}

diff --git a/inc/main/classes/database/migration/format_upgrade/lfdb/class_LocalFileDatabaseFormatVersion01To02Upgrade.php b/inc/main/classes/database/migration/format_upgrade/lfdb/class_LocalFileDatabaseFormatVersion01To02Upgrade.php
index 7d9c850896ee4e5304103890bc36cf7ecbaf18e0..cebc325fe8c86e0b900053b4947f38c7c20ef993 100644 (file)
--- a/inc/main/classes/database/migration/format_upgrade/lfdb/class_LocalFileDatabaseFormatVersion01To02Upgrade.php
+++ b/inc/main/classes/database/migration/format_upgrade/lfdb/class_LocalFileDatabaseFormatVersion01To02Upgrade.php
@@ -44,7 +44,5 @@ class LocalFileDatabaseFormatVersion01To02Upgrade extends BaseFormatUpgrade impl
                // Return the prepared instance
                return $upgradeInstance;
        }
-}
 
-// [EOF]
-?>
+}

diff --git a/inc/main/classes/factories/client/class_ClientFactory.php b/inc/main/classes/factories/client/class_ClientFactory.php
index 4c7c4211b37f25947702484e2738715cb1ba2443..56ad8ab4f44cd8967a3d51935218c0e117193262 100644 (file)
--- a/inc/main/classes/factories/client/class_ClientFactory.php
+++ b/inc/main/classes/factories/client/class_ClientFactory.php
@@ -48,9 +48,9 @@ class ClientFactory extends ObjectFactory {
                $registryKey = strtolower($protocolInstance->getProtocolName()) . '_client';
 
                // Is the key already in registry?
-               if (Registry::getRegistry()->instanceExists($registryKey)) {
+               if (GenericRegistry::getRegistry()->instanceExists($registryKey)) {
                        // Then use that instance
-                       $clientInstance = Registry::getRegistry()->getInstance($registryKey);
+                       $clientInstance = GenericRegistry::getRegistry()->getInstance($registryKey);
 
                        // Set socket resource
                        $clientInstance->setSocketResource($socketResource);
@@ -65,7 +65,5 @@ class ClientFactory extends ObjectFactory {
                // Return the prepared instance
                return $clientInstance;
        }
-}
 
-// [EOF]
-?>
+}

diff --git a/inc/main/classes/handler/raw_data/class_ b/inc/main/classes/handler/raw_data/class_
index 06173e62cac86748a0b463f2ca6291acffb2fb50..6a0e25f2822e7f6087ad7330e7d5457a228ff670 100644 (file)
--- a/inc/main/classes/handler/raw_data/class_
+++ b/inc/main/classes/handler/raw_data/class_
@@ -67,7 +67,5 @@ class ???NetworkPackageHandler extends BaseNetworkPackageHandler implements Netw
                // Implement processing here
                $this->partialStub('Please implement this method.');
        }
-}
 
-// [EOF]
-?>
+}

diff --git a/inc/main/classes/handler/raw_data/class_BaseDataHandler.php b/inc/main/classes/handler/raw_data/class_BaseDataHandler.php
index 24f2913ed592b0cf15b49940358676830a1571cd..ffe568c61a4b7b5835f9f17b6484d154946f9290 100644 (file)
--- a/inc/main/classes/handler/raw_data/class_BaseDataHandler.php
+++ b/inc/main/classes/handler/raw_data/class_BaseDataHandler.php
@@ -191,7 +191,5 @@ abstract class BaseDataHandler extends BaseHandler {
         * @return      void
         */
        abstract protected function removeMessageConfigurationData (array $messageData);
-}
 
-// [EOF]
-?>
+}

diff --git a/inc/main/classes/handler/raw_data/network/class_ b/inc/main/classes/handler/raw_data/network/class_
index 9323d99ab217f5c2620ca8e91a310538386d1880..d87cd84676ef9686987b1205827c8e50122ecb86 100644 (file)
--- a/inc/main/classes/handler/raw_data/network/class_
+++ b/inc/main/classes/handler/raw_data/network/class_
@@ -62,7 +62,5 @@ class ???RawDataHandler extends BaseRawDataHandler implements Networkable {
         */
        public function processRawDataFromResource (array $socketArray) {
        }
-}
 
-// [EOF]
-?>
+}

diff --git a/inc/main/classes/handler/raw_data/network/class_BaseRawDataHandler.php b/inc/main/classes/handler/raw_data/network/class_BaseRawDataHandler.php
index 012e15a5714044873a623932e21495f652760286..df084395e7c1efa3e7b50338b3dc7a5d481504ac 100644 (file)
--- a/inc/main/classes/handler/raw_data/network/class_BaseRawDataHandler.php
+++ b/inc/main/classes/handler/raw_data/network/class_BaseRawDataHandler.php
@@ -177,7 +177,5 @@ class BaseRawDataHandler extends BaseHandler {
        public final function getErrorCode () {
                return $this->errorCode;
        }
-}
 
-// [EOF]
-?>
+}

diff --git a/inc/main/classes/listener/class_ b/inc/main/classes/listener/class_
index 00c6eb75122ae64ad55ffec88c8608efd75deab9..b5ed6089c1fe7715b43866ecd7ddfb31e9fde46e 100644 (file)
--- a/inc/main/classes/listener/class_
+++ b/inc/main/classes/listener/class_
@@ -96,7 +96,5 @@ class ???Listener extends BaseListener implements Listenable {
        public function getConnectionType () {
                $this->partialStub('Need to implement this method.') {
        }
-}
 
-// [EOF]
-?>
+}

diff --git a/inc/main/classes/listener/class_BaseListener.php b/inc/main/classes/listener/class_BaseListener.php
index 5b17e79607e5c36c319ba204873dbac15fa576f9..e22ceea1d155b851c5f51a815afb663554ebde36 100644 (file)
--- a/inc/main/classes/listener/class_BaseListener.php
+++ b/inc/main/classes/listener/class_BaseListener.php
@@ -21,7 +21,7 @@
  * 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 BaseListener extends BaseFrameworkSystem implements Visitable {
+abstract class BaseListener extends BaseFrameworkSystem implements Visitable {
        // Exception code constants
        const EXCEPTION_INVALID_SOCKET                   = 0xa00;
        const EXCEPTION_SOCKET_ALREADY_REGISTERED        = 0xa01;
@@ -591,7 +591,5 @@ class BaseListener extends BaseFrameworkSystem implements Visitable {
                // Advance to next entry. This should be the last line.
                $this->getIteratorInstance()->next();
        }
-}
 
-// [EOF]
-?>
+}

diff --git a/inc/main/classes/listener/class_BaseListenerDecorator.php b/inc/main/classes/listener/class_BaseListenerDecorator.php
index ae66a5c75e8ca6e3cdf27e6e165f57faabada416..88734973b5ec9709e85d4ef48b45917e7f03ec34 100644 (file)
--- a/inc/main/classes/listener/class_BaseListenerDecorator.php
+++ b/inc/main/classes/listener/class_BaseListenerDecorator.php
@@ -21,7 +21,7 @@
  * 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 BaseListenerDecorator extends BaseDecorator implements Visitable {
+abstract class BaseListenerDecorator extends BaseDecorator implements Visitable {
        /**
         * Listener type
         */
@@ -147,7 +147,5 @@ class BaseListenerDecorator extends BaseDecorator implements Visitable {
                //* NOISY-DEBUG: */ self::createDebugInstance(__CLASS__)->debugOutput('BASE-LISTENER-DECORATOR[' . __METHOD__ . ':' . __LINE__ . '] Going to handle over some raw data to receiver instance (' . $receiverInstance->__toString() . ') ...');
                $receiverInstance->addRawDataToIncomingStack($handlerInstance);
        }
-}
 
-// [EOF]
-?>
+}

diff --git a/inc/main/classes/listener/socket/class_SocketFileListener.php b/inc/main/classes/listener/socket/class_SocketFileListener.php
index 65b94039b1a073e6a47214c80d0d48dfe0546729..470744102b4591b0bf9259ea91ebc356de5122d0 100644 (file)
--- a/inc/main/classes/listener/socket/class_SocketFileListener.php
+++ b/inc/main/classes/listener/socket/class_SocketFileListener.php
@@ -213,7 +213,5 @@ class SocketFileListener extends BaseListener implements Listenable {
        public function monitorIncomingRawData () {
                $this->partialStub('Need to implement this method.');
        }
-}
 
-// [EOF]
-?>
+}

diff --git a/inc/main/classes/listener/socket/decorator/class_SocketFileListenerDecorator.php b/inc/main/classes/listener/socket/decorator/class_SocketFileListenerDecorator.php
index e03980b6384bd202e01d26ecd598833153ff3153..140460ebe96978b2807d0d4c9c138265d4efdd0b 100644 (file)
--- a/inc/main/classes/listener/socket/decorator/class_SocketFileListenerDecorator.php
+++ b/inc/main/classes/listener/socket/decorator/class_SocketFileListenerDecorator.php
@@ -91,7 +91,5 @@ class SocketFileListenerDecorator extends BaseListenerDecorator implements Liste
                // Return the result
                return $accepts;
        }
-}
 
-// [EOF]
-?>
+}

diff --git a/inc/main/classes/registry/generic/class_GenericRegistry.php b/inc/main/classes/registry/generic/class_GenericRegistry.php
new file mode 100644 (file)
index 0000000..8ac6da7
--- /dev/null
+++ b/inc/main/classes/registry/generic/class_GenericRegistry.php
@@ -0,0 +1,58 @@
+<?php
+/**
+ * A registry for several data types and objects. Objects should be added by
+ * addInstance() and therefore must implement the interface Registerable.
+ *
+ * @author             Roland Haeder <webmaster@shipsimu.org>
+ * @version            0.0.0
+ * @copyright  Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2016 Core Developer Team
+ * @license            GNU GPL 3.0 or any newer version
+ * @link               http://www.shipsimu.org
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * 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 GenericRegistry extends BaseRegistry implements Register {
+       /**
+        * Instance of this class
+        */
+       private static $registryInstance = NULL;
+
+       /**
+        * Protected constructor
+        *
+        * @return      void
+        */
+       protected function __construct () {
+               // Call parent constructor
+               parent::__construct(__CLASS__);
+       }
+
+       /**
+        * Singleton getter for self instance. This class has no factory pattern
+        * because here is no need for special parameters.
+        *
+        * @return      $registryInstance       Instance of this class
+        */
+       public static final function getRegistry () {
+               // Is an instance there?
+               if (is_null(self::$registryInstance)) {
+                       // Not yet, so create one
+                       self::$registryInstance = new GenericRegistry();
+               } // END - if
+
+               // Return the instance
+               return self::$registryInstance;
+       }
+
+}

diff --git a/inc/main/classes/resolver/class_ b/inc/main/classes/resolver/class_
index 0813fe57970b127f18f327ee6d849479d4cfc2b4..763479a3a7af65a43fe281ea49d8157690326b09 100644 (file)
--- a/inc/main/classes/resolver/class_
+++ b/inc/main/classes/resolver/class_
@@ -1,437 +1,4 @@
 <?php
-/**
- * A ??? resolver
- * @TODO Clean up this template
- *
- * @author             Roland Haeder <webmaster@ship-simu.org>
- * @version            0.0.0
- * @copyright  Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2016 Core Developer Team
- * @license            GNU GPL 3.0 or any newer version
- * @link               http://www.ship-simu.org
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * 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 ???Resolver extends BaseResolver implements Resolver {
-       /**
-        * Protected constructor
-        *
-        * @return      void
-        */
-       protected function __construct () {
-               // Call parent constructor
-               parent::__construct(__CLASS__);
-
-               // Set prefix to '???'
-               $this->setClassPrefix('???');
-       }
-
-       /**
-        * Creates an instance of a Html action resolver with a given default action
-        *
-        * @param       $!!!Name                                The default action we shall execute
-        * @param       $appInstance                    An instance of a manageable application helper class
-        * @return      $resolverInstance               The prepared action resolver instance
-        * @throws      EmptyVariableException  Thrown if default action is not set
-        * @throws      Invalid|||Exception     Thrown if default action is invalid
-        */
-       public static final function create???Resolver ($!!!Name, ManageableApplication $appInstance) {
-               // Create the new instance
-               $resolverInstance = new ???Resolver();
-
-               // Is the variable $!!!Name set and the action is valid?
-               if (empty($!!!Name)) {
-                       // Then thrown an exception here
-                       throw new EmptyVariableException(array($resolverInstance, 'default|||'), self::EXCEPTION_UNEXPECTED_EMPTY_STRING);
-               } elseif ($resolverInstance->is|||Valid($!!!Name) === FALSE) {
-                       // Invalid action found
-                       throw new Invalid|||Exception(array($resolverInstance, $!!!Name), self::EXCEPTION_INVALID_ACTION);
-               }
-
-               // Set the application instance
-               $resolverInstance->setApplicationInstance($appInstance);
-
-               // Return the prepared instance
-               return $resolverInstance;
-       }
-
-       /**
-        * Returns an action instance for a given request class or null if
-        * it was not found
-        *
-        * @param       $requestInstance        An instance of a request class
-        * @return      $!!!Instance    An instance of the resolved action
-        * @throws      Invalid|||Exception                             Thrown if $!!!Name is
-        *                                                                                              invalid
-        * @throws      Invalid|||InstanceException             Thrown if $!!!Instance
-        *                                                                                              is an invalid instance
-        */
-       public function resolve|||ByRequest (Requestable $requestInstance) {
-               // Init variables
-               $!!!Name = '';
-               $!!!Instance = null;
-
-               // This goes fine so let's resolve the action
-               $!!!Name = $requestInstance->getRequestElement('action');
-
-               // Is the action empty? Then fall back to default action
-               if (empty($!!!Name)) $!!!Name = $this->getConfigInstance()->getConfigEntry('default_action');
-
-               // Check if action is valid
-               if ($this->is|||Valid($!!!Name) === FALSE) {
-                       // This action is invalid!
-                       throw new Invalid|||Exception(array($this, $!!!Name), self::EXCEPTION_INVALID_ACTION);
-               } // END - if
-
-               // Get the action
-               $!!!Instance = $this->load|||();
-
-               // And validate it
-               if ((!is_object($!!!Instance)) || (!$!!!Instance instanceof |||able)) {
-                       // This action has an invalid instance!
-                       throw new Invalid|||InstanceException(array($this, $!!!Name), self::EXCEPTION_INVALID_ACTION);
-               } // END - if
-
-               // Set last action
-               $this->setResolvedInstance($!!!Instance);
-
-               // Return the resolved action instance
-               return $!!!Instance;
-       }
-
-       /**
-        * Resolves the action by its direct name and returns an instance of its class
-        *
-        * @return      $!!!Instance            An instance of the action class
-        * @throws      Invalid|||Exception     Thrown if $!!!Name is invalid
-        */
-       public function resolve||| () {
-               // Initiate the instance variable
-               $!!!Instance = null;
-
-               // Get action name
-               $!!!Name = $this->get|||Name();
-
-               // Is the action empty? Then fall back to default action
-               if (empty($!!!Name)) {
-                       $!!!Name = $this->getConfigInstance()->getConfigEntry('default_action');
-               } // END - if
-
-               // Check if action is valid
-               if ($this->is|||Valid($!!!Name) === FALSE) {
-                       // This action is invalid!
-                       throw new Invalid|||Exception(array($this, $!!!Name), self::EXCEPTION_INVALID_ACTION);
-               } // END - if
-
-               // Get the action
-               $!!!Instance = $this->load|||();
-
-               // Return the instance
-               return $!!!Instance;
-       }
-}
-
-// [EOF]
-?>
-<?php
-/**
- * A ??? resolver
- *
- * @author             Roland Haeder <webmaster@ship-simu.org>
- * @version            0.0.0
- * @copyright  Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2016 Core Developer Team
- * @license            GNU GPL 3.0 or any newer version
- * @link               http://www.ship-simu.org
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * 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 ???Resolver extends BaseResolver implements Resolver {
-       /**
-        * Protected constructor
-        *
-        * @return      void
-        */
-       protected function __construct () {
-               // Call parent constructor
-               parent::__construct(__CLASS__);
-
-               // Set prefix to '???'
-               $this->setClassPrefix('???');
-       }
-
-       /**
-        * Creates an instance of a Html action resolver with a given default action
-        *
-        * @param       $!!!Name                                The default action we shall execute
-        * @param       $appInstance                    An instance of a manageable application helper class
-        * @return      $resolverInstance               The prepared action resolver instance
-        * @throws      EmptyVariableException  Thrown if default action is not set
-        * @throws      Invalid|||Exception     Thrown if default action is invalid
-        */
-       public static final function create???Resolver ($!!!Name, ManageableApplication $appInstance) {
-               // Create the new instance
-               $resolverInstance = new ???Resolver();
-
-               // Is the variable $!!!Name set and the action is valid?
-               if (empty($!!!Name)) {
-                       // Then thrown an exception here
-                       throw new EmptyVariableException(array($resolverInstance, 'default|||'), self::EXCEPTION_UNEXPECTED_EMPTY_STRING);
-               } elseif ($resolverInstance->is|||Valid($!!!Name) === FALSE) {
-                       // Invalid action found
-                       throw new Invalid|||Exception(array($resolverInstance, $!!!Name), self::EXCEPTION_INVALID_ACTION);
-               }
-
-               // Set the application instance
-               $resolverInstance->setApplicationInstance($appInstance);
-
-               // Return the prepared instance
-               return $resolverInstance;
-       }
-
-       /**
-        * Returns an action instance for a given request class or null if
-        * it was not found
-        *
-        * @param       $requestInstance        An instance of a request class
-        * @return      $!!!Instance    An instance of the resolved action
-        * @throws      Invalid|||Exception                             Thrown if $!!!Name is
-        *                                                                                              invalid
-        * @throws      Invalid|||InstanceException             Thrown if $!!!Instance
-        *                                                                                              is an invalid instance
-        */
-       public function resolve|||ByRequest (Requestable $requestInstance) {
-               // Init variables
-               $!!!Name = '';
-               $!!!Instance = null;
-
-               // This goes fine so let's resolve the action
-               $!!!Name = $requestInstance->getRequestElement('action');
-
-               // Is the action empty? Then fall back to default action
-               if (empty($!!!Name)) $!!!Name = $this->getConfigInstance()->getConfigEntry('default_action');
-
-               // Check if action is valid
-               if ($this->is|||Valid($!!!Name) === FALSE) {
-                       // This action is invalid!
-                       throw new Invalid|||Exception(array($this, $!!!Name), self::EXCEPTION_INVALID_ACTION);
-               } // END - if
-
-               // Get the action
-               $!!!Instance = $this->load|||();
-
-               // And validate it
-               if ((!is_object($!!!Instance)) || (!$!!!Instance instanceof |||able)) {
-                       // This action has an invalid instance!
-                       throw new Invalid|||InstanceException(array($this, $!!!Name), self::EXCEPTION_INVALID_ACTION);
-               } // END - if
-
-               // Set last action
-               $this->setResolvedInstance($!!!Instance);
-
-               // Return the resolved action instance
-               return $!!!Instance;
-       }
-
-       /**
-        * Resolves the action by its direct name and returns an instance of its class
-        *
-        * @return      $!!!Instance            An instance of the action class
-        * @throws      Invalid|||Exception     Thrown if $!!!Name is invalid
-        */
-       public function resolve||| () {
-               // Initiate the instance variable
-               $!!!Instance = null;
-
-               // Get action name
-               $!!!Name = $this->get|||Name();
-
-               // Is the action empty? Then fall back to default action
-               if (empty($!!!Name)) {
-                       $!!!Name = $this->getConfigInstance()->getConfigEntry('default_action');
-               } // END - if
-
-               // Check if action is valid
-               if ($this->is|||Valid($!!!Name) === FALSE) {
-                       // This action is invalid!
-                       throw new Invalid|||Exception(array($this, $!!!Name), self::EXCEPTION_INVALID_ACTION);
-               } // END - if
-
-               // Get the action
-               $!!!Instance = $this->load|||();
-
-               // Return the instance
-               return $!!!Instance;
-       }
-}
-
-// [EOF]
-?>
-<?php
-/**
- * A ??? resolver
- *
- * @author             Roland Haeder <webmaster@ship-simu.org>
- * @version            0.0.0
- * @copyright  Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2016 Core Developer Team
- * @license            GNU GPL 3.0 or any newer version
- * @link               http://www.ship-simu.org
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * 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 ???Resolver extends BaseResolver implements Resolver {
-       /**
-        * Protected constructor
-        *
-        * @return      void
-        */
-       protected function __construct () {
-               // Call parent constructor
-               parent::__construct(__CLASS__);
-
-               // Set prefix to '???'
-               $this->setClassPrefix('???');
-       }
-
-       /**
-        * Creates an instance of a Html action resolver with a given default action
-        *
-        * @param       $!!!Name                                The default action we shall execute
-        * @param       $appInstance                    An instance of a manageable application helper class
-        * @return      $resolverInstance               The prepared action resolver instance
-        * @throws      EmptyVariableException  Thrown if default action is not set
-        * @throws      Invalid|||Exception     Thrown if default action is invalid
-        */
-       public static final function create???Resolver ($!!!Name, ManageableApplication $appInstance) {
-               // Create the new instance
-               $resolverInstance = new ???Resolver();
-
-               // Is the variable $!!!Name set and the action is valid?
-               if (empty($!!!Name)) {
-                       // Then thrown an exception here
-                       throw new EmptyVariableException(array($resolverInstance, 'default|||'), self::EXCEPTION_UNEXPECTED_EMPTY_STRING);
-               } elseif ($resolverInstance->is|||Valid($!!!Name) === FALSE) {
-                       // Invalid action found
-                       throw new Invalid|||Exception(array($resolverInstance, $!!!Name), self::EXCEPTION_INVALID_ACTION);
-               }
-
-               // Set the application instance
-               $resolverInstance->setApplicationInstance($appInstance);
-
-               // Return the prepared instance
-               return $resolverInstance;
-       }
-
-       /**
-        * Returns an action instance for a given request class or null if
-        * it was not found
-        *
-        * @param       $requestInstance        An instance of a request class
-        * @return      $!!!Instance    An instance of the resolved action
-        * @throws      Invalid|||Exception                             Thrown if $!!!Name is
-        *                                                                                              invalid
-        * @throws      Invalid|||InstanceException             Thrown if $!!!Instance
-        *                                                                                              is an invalid instance
-        */
-       public function resolve|||ByRequest (Requestable $requestInstance) {
-               // Init variables
-               $!!!Name = '';
-               $!!!Instance = null;
-
-               // This goes fine so let's resolve the action
-               $!!!Name = $requestInstance->getRequestElement('action');
-
-               // Is the action empty? Then fall back to default action
-               if (empty($!!!Name)) $!!!Name = $this->getConfigInstance()->getConfigEntry('default_action');
-
-               // Check if action is valid
-               if ($this->is|||Valid($!!!Name) === FALSE) {
-                       // This action is invalid!
-                       throw new Invalid|||Exception(array($this, $!!!Name), self::EXCEPTION_INVALID_ACTION);
-               } // END - if
-
-               // Get the action
-               $!!!Instance = $this->load|||();
-
-               // And validate it
-               if ((!is_object($!!!Instance)) || (!$!!!Instance instanceof |||able)) {
-                       // This action has an invalid instance!
-                       throw new Invalid|||InstanceException(array($this, $!!!Name), self::EXCEPTION_INVALID_ACTION);
-               } // END - if
-
-               // Set last action
-               $this->setResolvedInstance($!!!Instance);
-
-               // Return the resolved action instance
-               return $!!!Instance;
-       }
-
-       /**
-        * Resolves the action by its direct name and returns an instance of its class
-        *
-        * @return      $!!!Instance            An instance of the action class
-        * @throws      Invalid|||Exception     Thrown if $!!!Name is invalid
-        */
-       public function resolve||| () {
-               // Initiate the instance variable
-               $!!!Instance = null;
-
-               // Get action name
-               $!!!Name = $this->get|||Name();
-
-               // Is the action empty? Then fall back to default action
-               if (empty($!!!Name)) {
-                       $!!!Name = $this->getConfigInstance()->getConfigEntry('default_action');
-               } // END - if
-
-               // Check if action is valid
-               if ($this->is|||Valid($!!!Name) === FALSE) {
-                       // This action is invalid!
-                       throw new Invalid|||Exception(array($this, $!!!Name), self::EXCEPTION_INVALID_ACTION);
-               } // END - if
-
-               // Get the action
-               $!!!Instance = $this->load|||();
-
-               // Return the instance
-               return $!!!Instance;
-       }
-}
-
-// [EOF]
-?>
-<?php
 /**
  * A ??? resolver
  *
@@ -571,7 +138,5 @@ class ???Resolver extends BaseResolver implements Resolver {
                // Return the instance
                return $!!!Instance;
        }
-}
 
-// [EOF]
-?>
+}

diff --git a/inc/main/classes/visitor/tasks/class_ActiveTaskVisitor.php b/inc/main/classes/visitor/tasks/class_ActiveTaskVisitor.php
index 891f32fd3d262d5386687842df2b7c05a3579487..b9e7a1ce6fb32ff22aad863cb84edb054e0406d0 100644 (file)
--- a/inc/main/classes/visitor/tasks/class_ActiveTaskVisitor.php
+++ b/inc/main/classes/visitor/tasks/class_ActiveTaskVisitor.php
@@ -98,7 +98,5 @@ class ActiveTaskVisitor extends BaseVisitor implements TaskVisitor, PoolVisitor,
                // A decorator itself can never become an active task so this method
                // remains empty.
        }
-}
 
-// [EOF]
-?>
+}

diff --git a/inc/main/classes/visitor/tasks/class_ShutdownTaskVisitor.php b/inc/main/classes/visitor/tasks/class_ShutdownTaskVisitor.php
index 7bfbc5bd013bd2252c158e4c7206d1f68815db32..822c645736eb7a5afc9774fd9a0f5f219b0b3d14 100644 (file)
--- a/inc/main/classes/visitor/tasks/class_ShutdownTaskVisitor.php
+++ b/inc/main/classes/visitor/tasks/class_ShutdownTaskVisitor.php
@@ -91,7 +91,5 @@ class ShutdownTaskVisitor extends BaseVisitor implements TaskVisitor, PoolVisito
                // Shutdown the decorator instance
                $decoratorInstance->doShutdown();
        }
-}
 
-// [EOF]
-?>
+}

diff --git a/inc/main/exceptions/config/class_ConfigEntryIsEmptyException.php b/inc/main/exceptions/config/class_ConfigEntryIsEmptyException.php
index bbddc178cd08e61e96d1cdf3ca536a5d600c1eb9..e5497822a5a042a5453f8cb39e94a81a27affe06 100644 (file)
--- a/inc/main/exceptions/config/class_ConfigEntryIsEmptyException.php
+++ b/inc/main/exceptions/config/class_ConfigEntryIsEmptyException.php
@@ -39,7 +39,5 @@ class ConfigEntryIsEmptyException extends FrameworkException {
                // Call parent constructor
                parent::__construct($message, $code);
        }
-}
 
-// [EOF]
-?>
+}

diff --git a/inc/main/exceptions/database/local_file/class_SavePathIsEmptyException.php b/inc/main/exceptions/database/local_file/class_SavePathIsEmptyException.php
index af89d4211d6f8d71c04dcdba24e18c14431661b4..97b3b2873ac23a4930976c12f3e5c55e09b9c476 100644 (file)
--- a/inc/main/exceptions/database/local_file/class_SavePathIsEmptyException.php
+++ b/inc/main/exceptions/database/local_file/class_SavePathIsEmptyException.php
@@ -39,7 +39,5 @@ class SavePathIsEmptyException extends DatabaseException {
                // Call parent constructor
                parent::__construct($message, $code);
        }
-}
 
-// [EOF]
-?>
+}

diff --git a/inc/main/exceptions/file_directory/class_FileIsEmptyException.php b/inc/main/exceptions/file_directory/class_FileIsEmptyException.php
index 6703a1026a9ca839d8d771cda6718525c677e048..a899278bf93d7f69e20202aa3f26355f8fd64106 100644 (file)
--- a/inc/main/exceptions/file_directory/class_FileIsEmptyException.php
+++ b/inc/main/exceptions/file_directory/class_FileIsEmptyException.php
@@ -33,7 +33,5 @@ class FileIsEmptyException extends FrameworkException {
                // Call parent constructor
                parent::__construct('No file name provided.', $code);
        }
-}
 
-// [EOF]
-?>
+}

diff --git a/inc/main/exceptions/file_directory/class_PathIsEmptyException.php b/inc/main/exceptions/file_directory/class_PathIsEmptyException.php
index 54838d6c3b0a9a121332c8db215fdb1c8aa0edbb..b2e60f75beaacd9abc28488d7acd6f5cefebce9a 100644 (file)
--- a/inc/main/exceptions/file_directory/class_PathIsEmptyException.php
+++ b/inc/main/exceptions/file_directory/class_PathIsEmptyException.php
@@ -39,7 +39,5 @@ class PathIsEmptyException extends FrameworkException {
                // Call parent constructor
                parent::__construct($message, $code);
        }
-}
 
-// [EOF]
-?>
+}

diff --git a/inc/main/exceptions/language/class_LanguagePathIsEmptyException.php b/inc/main/exceptions/language/class_LanguagePathIsEmptyException.php
index 87aac8c97306051566142e0afa392e8db3f9f2f0..80a96a0d3ce8cd9e5488e4610543f78fd14a3f87 100644 (file)
--- a/inc/main/exceptions/language/class_LanguagePathIsEmptyException.php
+++ b/inc/main/exceptions/language/class_LanguagePathIsEmptyException.php
@@ -39,7 +39,5 @@ class LanguagePathIsEmptyException extends FrameworkException {
                // Call parent constructor
                parent::__construct($message, $code);
        }
-}
 
-// [EOF]
-?>
+}

diff --git a/inc/main/exceptions/main/class_InvalidCommandInstanceException.php b/inc/main/exceptions/main/class_InvalidCommandInstanceException.php
index f35021a00ea5c41d02c79399ae7b3f99d58b6382..582a9a5496b02e99b5df6ae8e0fd2fe8b5b08d78 100644 (file)
--- a/inc/main/exceptions/main/class_InvalidCommandInstanceException.php
+++ b/inc/main/exceptions/main/class_InvalidCommandInstanceException.php
@@ -40,7 +40,5 @@ class InvalidCommandInstanceException extends FrameworkException {
                // Call parent constructor
                parent::__construct($message, $code);
        }
-}
 
-// [EOF]
-?>
+}

diff --git a/inc/main/exceptions/main/class_MissingMethodException.php b/inc/main/exceptions/main/class_MissingMethodException.php
index b06ae95a022a47f2341134839e540e23001dcad3..c63e6ef711e474eb3600765a83325d510e281c61 100644 (file)
--- a/inc/main/exceptions/main/class_MissingMethodException.php
+++ b/inc/main/exceptions/main/class_MissingMethodException.php
@@ -45,7 +45,5 @@ class MissingMethodException extends FrameworkException {
                // Call parent constructor
                parent::__construct($message, $code);
        }
-}
 
-// [EOF]
-?>
+}

diff --git a/inc/main/exceptions/socket/class_NoSocketRegisteredException.php b/inc/main/exceptions/socket/class_NoSocketRegisteredException.php
index fd9207bafd0c117a2529d24843060409a00ed996..383013457ce333873ec8017b8128b836fd0d3182 100644 (file)
--- a/inc/main/exceptions/socket/class_NoSocketRegisteredException.php
+++ b/inc/main/exceptions/socket/class_NoSocketRegisteredException.php
@@ -38,7 +38,5 @@ class NoSocketRegisteredException extends AbstractSocketException {
                // Call parent exception constructor
                parent::__construct($message, $code);
        }
-}
 
-// [EOF]
-?>
+}

diff --git a/inc/main/exceptions/socket/class_SocketShutdownException.php b/inc/main/exceptions/socket/class_SocketShutdownException.php
index 9cdb27b23dfc2846d390d067304486ddd054a1b7..a72c88bb9ecdbbc34846541d4d5957d37158077d 100644 (file)
--- a/inc/main/exceptions/socket/class_SocketShutdownException.php
+++ b/inc/main/exceptions/socket/class_SocketShutdownException.php
@@ -45,7 +45,5 @@ class SocketShutdownException extends AbstractSocketException {
                // Call parent exception constructor
                parent::__construct($message, $code);
        }
-}
 
-// [EOF]
-?>
+}

diff --git a/inc/main/exceptions/template/class_BasePathIsEmptyException.php b/inc/main/exceptions/template/class_BasePathIsEmptyException.php
index 3aa8778963ac9201ab4c52f4223de70da26d2b69..6ddd8d2e989acb696aeadf3a5cba27c17118a00b 100644 (file)
--- a/inc/main/exceptions/template/class_BasePathIsEmptyException.php
+++ b/inc/main/exceptions/template/class_BasePathIsEmptyException.php
@@ -39,7 +39,5 @@ class BasePathIsEmptyException extends FrameworkException {
                // Call parent constructor
                parent::__construct($message, $code);
        }
-}
 
-// [EOF]
-?>
+}

diff --git a/inc/main/exceptions/template/class_InvalidBasePathStringException.php b/inc/main/exceptions/template/class_InvalidBasePathStringException.php
index ec97d1deb903951cdcda63ff8fc78b441ed08fed..bacbeb57757a617e212e6267d3ca8829970270d8 100644 (file)
--- a/inc/main/exceptions/template/class_InvalidBasePathStringException.php
+++ b/inc/main/exceptions/template/class_InvalidBasePathStringException.php
@@ -40,7 +40,5 @@ class InvalidBasePathStringException extends FrameworkException {
                // Call parent constructor
                parent::__construct($message, $code);
        }
-}
 
-// [EOF]
-?>
+}

diff --git a/inc/main/interfaces/database/migration/class_MigrateableDatabase.php b/inc/main/interfaces/database/migration/class_MigrateableDatabase.php
index 4a84d17c1304eb095cd0dd9eab9413d95e762925..cc150424ca0479ec0f1310928374060ad2950547 100644 (file)
--- a/inc/main/interfaces/database/migration/class_MigrateableDatabase.php
+++ b/inc/main/interfaces/database/migration/class_MigrateableDatabase.php
@@ -22,7 +22,5 @@
  * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 interface MigrateableDatabase extends FrameworkDatabase {
-}
 
-// [EOF]
-?>
+}

diff --git a/inc/main/interfaces/database/migration/format_upgrade/class_UpgradeableDatabaseFormat.php b/inc/main/interfaces/database/migration/format_upgrade/class_UpgradeableDatabaseFormat.php
index 574bc040203030b6454a6ce10206e09bd5e89b41..42515863613f0202cdca2fce0dce3d318f8c6ad5 100644 (file)
--- a/inc/main/interfaces/database/migration/format_upgrade/class_UpgradeableDatabaseFormat.php
+++ b/inc/main/interfaces/database/migration/format_upgrade/class_UpgradeableDatabaseFormat.php
@@ -22,7 +22,5 @@
  * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 interface UpgradeableDatabaseFormat extends MigrateableDatabase {
-}
 
-// [EOF]
-?>
+}

diff --git a/inc/main/interfaces/handler/protocol/class_HandleableProtocol.php b/inc/main/interfaces/handler/protocol/class_HandleableProtocol.php
index d35b62d0729b2f03d63de0e366afeabfc529c769..866ca600f217d2fc5490ba88713694c2dbe16c58 100644 (file)
--- a/inc/main/interfaces/handler/protocol/class_HandleableProtocol.php
+++ b/inc/main/interfaces/handler/protocol/class_HandleableProtocol.php
@@ -52,7 +52,5 @@ interface HandleableProtocol extends Handleable {
         * @return      $ifMatches      Whether the found UNL matches own addresss
         */
        function isOwnAddress ($unl);
-}
 
-// [EOF]
-?>
+}

diff --git a/inc/main/interfaces/listener/class_Listenable.php b/inc/main/interfaces/listener/class_Listenable.php
index def265bb45b93e750ac701c5af58630d95efeaa3..450305b1999d9ea58590824c80d27ac8a49109db 100644 (file)
--- a/inc/main/interfaces/listener/class_Listenable.php
+++ b/inc/main/interfaces/listener/class_Listenable.php
@@ -79,7 +79,5 @@ interface Listenable extends FrameworkInterface {
         * @return      $poolInstance   The peer pool instance we shall set
         */
        function getPoolInstance ();
-}
 
-// [EOF]
-?>
+}

diff --git a/inc/main/interfaces/registry/socket/class_RegisterableSocket.php b/inc/main/interfaces/registry/socket/class_RegisterableSocket.php
index fc90e4e7f220e177ba79a696096aa3cc76537696..ad6391878cd0174f25638b28ea3a82237348f1ee 100644 (file)
--- a/inc/main/interfaces/registry/socket/class_RegisterableSocket.php
+++ b/inc/main/interfaces/registry/socket/class_RegisterableSocket.php
@@ -58,7 +58,5 @@ interface RegisterableSocket extends Registerable {
         * @return      $infoInstance   An instance of a ShareableInfo class
         */
        function getInfoInstanceFromPackageData (array $packageData);
-}
 
-// [EOF]
-?>
+}

diff --git a/inc/main/interfaces/resolver/state/class_StateResolver.php b/inc/main/interfaces/resolver/state/class_StateResolver.php
index dee63b83de2b0ecf9a1b41374c5681766f871fcc..56a6220d9d268f803d93b5a4edf68895092fc41a 100644 (file)
--- a/inc/main/interfaces/resolver/state/class_StateResolver.php
+++ b/inc/main/interfaces/resolver/state/class_StateResolver.php
@@ -40,7 +40,5 @@ interface StateResolver extends Resolver {
         * @throws      EmptyVariableException  Thrown if given state is not set
         */
        function isStateValid ($stateName);
-}
 
-// [EOF]
-?>
+}

diff --git a/inc/main/interfaces/visitor/listener/class_ListenerVisitor.php b/inc/main/interfaces/visitor/listener/class_ListenerVisitor.php
index 36a1541921e844f4508653e892fda8ad8aac61b9..2a05186bc73f6614bb6984cf4e4a811b61742e5e 100644 (file)
--- a/inc/main/interfaces/visitor/listener/class_ListenerVisitor.php
+++ b/inc/main/interfaces/visitor/listener/class_ListenerVisitor.php
@@ -29,7 +29,5 @@ interface ListenerVisitor extends Visitor {
         * @return      void
         */
        function visitListener (Listenable $listenerInstance);
-}
 
-// [EOF]
-?>
+}

diff --git a/inc/main/interfaces/visitor/pool/class_PoolVisitor.php b/inc/main/interfaces/visitor/pool/class_PoolVisitor.php
index bc746ac94a88b28fcf94efa6028580f88c3a1026..426a12b17e5c96b931b93936ba38c9717cf9b633 100644 (file)
--- a/inc/main/interfaces/visitor/pool/class_PoolVisitor.php
+++ b/inc/main/interfaces/visitor/pool/class_PoolVisitor.php
@@ -29,7 +29,5 @@ interface PoolVisitor extends Visitor {
         * @return      void
         */
        function visitPool (Poolable $poolInstance);
-}
 
-// [EOF]
-?>
+}

diff --git a/inc/selector.php b/inc/selector.php
index 3c402b4064a4dc2d48f8e571e9de15cd84e02e66..e736e00c88550e9f1e4280498690559caba7de58 100644 (file)
--- a/inc/selector.php
+++ b/inc/selector.php
@@ -78,6 +78,3 @@ unset($appInc);
 unset($configAppIncludes);
 unset($appFqFn);
 unset($basePathFile);
-
-// [EOF]
-?>