From: Roland Haeder Date: Fri, 28 Oct 2016 19:33:15 +0000 (+0200) Subject: Renamed Registry -> GenericRegistry to make it clear that this registry does X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=b002c5909aa0f781505dde5414964b0f014cde01;p=core.git 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 --- diff --git a/application/tests/class_ApplicationHelper.php b/application/tests/class_ApplicationHelper.php index 0111e924..eab5a2c7 100644 --- 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 36175015..9e8bfdda 100644 --- 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 256eb561..7d6dceec 100644 --- a/application/tests/init.php +++ b/application/tests/init.php @@ -1,31 +1,2 @@ - * @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 . - */ - -// Get config instance -$cfg = FrameworkConfiguration::getSelfInstance(); - -// [EOF] -?> +// @DEPRECATED diff --git a/application/tests/loader.php b/application/tests/loader.php index be84b026..7ddcb41f 100644 --- 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 bb6a79df..9898ac36 100644 --- 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 fb7d0365..c18593eb 100644 --- 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 3fd420fa..fab4e559 100644 --- 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 -<<<<<<< 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 a5d9364c..786e8349 100644 --- 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 * @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 e8fdaf99..4205c9ea 100644 --- 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 * @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 7430f562..44e9c5ef 100644 --- 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 * @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 061617c6..0903d931 100644 --- 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 * @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 e18a620c..ea60fb1c 100644 --- 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 * @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 0652bb17..6cd6559a 100644 --- 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 * @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 ee5cf263..8762a34d 100644 --- 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 * @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 a2afb21a..a6c0d3ba 100644 --- a/framework/main/classes/class_ +++ b/framework/main/classes/class_ @@ -4,11 +4,7 @@ * * @author Roland Haeder * @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 b2eb7bf5..fa836345 100644 --- a/framework/main/classes/class_Base +++ b/framework/main/classes/class_Base @@ -4,11 +4,7 @@ * * @author Roland Haeder * @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 e015b575..0390d528 100644 --- 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 * @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 8d68eaba..a75c861a 100644 --- a/framework/main/classes/class_FrameworkArrayObject.php +++ b/framework/main/classes/class_FrameworkArrayObject.php @@ -12,11 +12,7 @@ use \ArrayObject; * * @author Roland Haeder * @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 cc14e154..363cc00a 100644 --- a/framework/main/classes/client/class_ +++ b/framework/main/classes/client/class_ @@ -4,11 +4,7 @@ * * @author Roland Haeder * @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 79333d5c..72f9f253 100644 --- 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 * @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 cf8c6baf..40181f41 100644 --- a/framework/main/classes/commands/class_ +++ b/framework/main/classes/commands/class_ @@ -4,11 +4,7 @@ * * @author Roland Haeder * @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 b6694988..8417f019 100644 --- 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 * @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 d7be8346..55ca37ce 100644 --- a/framework/main/classes/commands/console/class_Console +++ b/framework/main/classes/commands/console/class_Console @@ -4,11 +4,7 @@ * * @author Roland Haeder * @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 2d645245..3744c1cf 100644 --- 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 * @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 cbe3fa47..917c94cf 100644 --- a/framework/main/classes/commands/html/class_Html +++ b/framework/main/classes/commands/html/class_Html @@ -4,11 +4,7 @@ * * @author Roland Haeder * @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 689ece38..cc074a86 100644 --- 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 * @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 4d681500..d844e3e5 100644 --- 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 * @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 dff305b7..7ed5a751 100644 --- 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 * @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 728fcddb..dbbd4518 100644 --- 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 * @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 b7006730..4b317f30 100644 --- 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 * @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 6b299c35..47e2c725 100644 --- 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 * @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 b8471401..38624b10 100644 --- 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 * @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 7a7a281d..120229f6 100644 --- 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 * @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 0abf7e2f..98f78fa4 100644 --- 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 * @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 92c3efad..5fa9543f 100644 --- 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 * @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 e4ea48aa..f16c7fbc 100644 --- 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 * @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 429e3719..08167e29 100644 --- 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 * @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 ef36945c..34c1d00b 100644 --- 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 * @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 71d35e26..bf19554a 100644 --- 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 * @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 41792611..3163c9e7 100644 --- 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 * @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 50722313..3bc22cc8 100644 --- 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 * @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 690668e2..8992b4c3 100644 --- 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 * @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 82fd6738..c3bf332e 100644 --- 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 * @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 4b9da382..b55c5b4d 100644 --- 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 * @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 75be2d3d..79c7a596 100644 --- a/framework/main/classes/controller/class_ +++ b/framework/main/classes/controller/class_ @@ -4,11 +4,7 @@ * * @author Roland Haeder * @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 729f51e1..e32b6781 100644 --- 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 * @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 dc091878..4157c72a 100644 --- 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 * @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 adc8ca8e..c8870c8b 100644 --- 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 * @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 06bc37cf..dbecaee8 100644 --- 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 * @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 c9d5c184..fc82cccb 100644 --- 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 * @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 55f6b1a7..c2e579da 100644 --- 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 * @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 6806dd89..96cdf2d3 100644 --- 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 * @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 5170d4ca..d643b9dd 100644 --- 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 * @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 6b941967..696f3b1d 100644 --- 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 * @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 4d2c7822..59399733 100644 --- 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 * @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 f906a76c..484a5bdc 100644 --- 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 * @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 64d289a8..6f2a36f1 100644 --- 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 * @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 9b82d4cf..eb5c5ab6 100644 --- 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 * @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 f4a4479c..fad03b89 100644 --- 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 * @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 761ab386..9466de75 100644 --- 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 * @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 cb98da01..522aef85 100644 --- 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 * @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 1178684f..7dc1bbda 100644 --- 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 * @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 4452760a..e9f9a853 100644 --- 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 * @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 ed36dd36..f443623e 100644 --- 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 * @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 db6a2526..7ab52f40 100644 --- 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 * @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 cec42687..1d9d1e95 100644 --- 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 * @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 830c23cc..1bf22a34 100644 --- 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 * @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 2933d57c..dd8c3356 100644 --- 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 * @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 1a8bf5fd..1e6e7a3e 100644 --- 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 * @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 ad33fae1..025a9879 100644 --- 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 * @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 5a78394a..e0f9a950 100644 --- 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 * @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 ea4f3402..d8b47b58 100644 --- 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 * @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 20874d8a..88b98cbd 100644 --- 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 * @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 afd49a54..116e474d 100644 --- 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 * @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 59e2c376..9ed16737 100644 --- 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 * @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 affde5b0..d9242d8a 100644 --- 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 * @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 4064f21a..6c36cdc0 100644 --- 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 * @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 e8f5ae23..5ab0019c 100644 --- 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 * @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 46ac2c5c..4325fffc 100644 --- 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 * @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 f5b4a407..bf35ecce 100644 --- 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 * @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 baf610f9..f33d64f0 100644 --- 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 * @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 1a812b03..2b175c0d 100644 --- 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 * @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 8e314580..79d2da41 100644 --- 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 * @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 028bf4f4..a3207449 100644 --- 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 * @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 60182743..9c9ab026 100644 --- a/framework/main/classes/factories/class_ +++ b/framework/main/classes/factories/class_ @@ -4,11 +4,7 @@ * * @author Roland Haeder * @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 fd76f21c..103d9215 100644 --- 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 * @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 c082070e..a138a245 100644 --- 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 * @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 062d6755..880606a1 100644 --- 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 * @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 0f7ffa3e..b9c7130f 100644 --- 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 * @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 a0099eff..952d14c4 100644 --- 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 * @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 29ba36c7..bc8e86d9 100644 --- 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 * @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 5467f403..f06a70a1 100644 --- 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 * @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 ed1442f0..150acfaa 100644 --- 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 * @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 8b30ffea..5198806b 100644 --- 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 * @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 2a84ea28..d56ab74f 100644 --- 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 * @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 7b92ab72..7c544b68 100644 --- 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 * @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 e40f81e9..f48cd3cf 100644 --- 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 * @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 e439104b..68a30fe9 100644 --- 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 * @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 371d2cda..84410bc3 100644 --- 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 * @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 a42fda14..cd70e38f 100644 --- 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 * @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 4c1f0e12..40a24c55 100644 --- 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 * @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 133f346c..958792df 100644 --- 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 * @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 3c980fc8..444302ba 100644 --- 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 * @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 d9cb807a..92b3f114 100644 --- 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 * @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 72a6a165..ce65bd89 100644 --- 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 * @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 9695a7ab..4c033024 100644 --- 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 * @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 1481444f..fc3ab6db 100644 --- 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 * @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 6694f003..1b3c88ee 100644 --- 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 * @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 b2a9ff8d..971b3aca 100644 --- 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 * @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 dcd34e42..ae0f6352 100644 --- 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 * @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 7e596bd7..81bd3433 100644 --- 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 * @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 56c502f4..d94ec9ce 100644 --- 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 * @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 f8dc38d5..f56cc96e 100644 --- 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 * @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 e4992bb0..1767a55a 100644 --- 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 * @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 a2e30e73..3343c6dd 100644 --- 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 * @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 00894d0a..30212999 100644 --- 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 * @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 a1cc285c..2d5ea467 100644 --- a/framework/main/classes/filesystem/class_ +++ b/framework/main/classes/filesystem/class_ @@ -4,11 +4,7 @@ * * @author Roland Haeder * @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 64739adc..20c2fe10 100644 --- 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 * @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 a6873b12..bfc185af 100644 --- 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 * @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 e7c3be06..35ebd400 100644 --- 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 * @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 ce6a1c46..1a7ecdaa 100644 --- 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 * @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 6fe6972d..a5d88210 100644 --- 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 * @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 11f46c9a..0bdc5e69 100644 --- 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 * @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 7285f751..18c78800 100644 --- 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 * @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 60d743bd..d4e81e7c 100644 --- 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 * @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 045deeee..ad376f9b 100644 --- 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 * @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 955af143..128e06fa 100644 --- 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 * @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 3a2c21cf..20683cb6 100644 --- 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 * @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 205043cf..e9f2f06c 100644 --- 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 * @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 3eae3714..adf18ed2 100644 --- 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 * @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 781312f9..f8a92eab 100644 --- 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 * @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 22b43174..7ba94262 100644 --- 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 * @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 13e82f16..dc59912a 100644 --- 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 * @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 c49bddfb..551ae500 100644 --- 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 * @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 8e6fcf59..d609d865 100644 --- 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 * @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 3c0ad071..80a02acc 100644 --- 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 * @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 dac5153b..358a759d 100644 --- 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 * @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 a8c99970..8e4c0b80 100644 --- 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 * @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 e824c3e8..cf608314 100644 --- 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 * @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 474a81d3..f0635c08 100644 --- 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 * @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 db321359..3a123427 100644 --- 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 * @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 931f6a4c..faceca02 100644 --- 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 * @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 099fad3a..1fff8de6 100644 --- 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 * @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 c6ec0215..7ef16a6b 100644 --- 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 * @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 c56c8c6f..4a024552 100644 --- 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 * @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 b9f060bf..6e1e0749 100644 --- 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 * @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 2a064ba5..9c4e21b1 100644 --- 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 * @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 14a4c47a..6f17387c 100644 --- 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 * @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 4cb03987..0faf7277 100644 --- 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 * @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 48a6b084..c5dcd485 100644 --- 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 * @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 be1c8fde..dfc01422 100644 --- 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 * @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 5eefd012..c2938918 100644 --- 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 * @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 385460f9..f0bb7aeb 100644 --- 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 * @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 81f30c7e..da87bb80 100644 --- 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 * @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 9ffe45aa..45eaf4a8 100644 --- 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 * @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 bbeaf312..dd3b11b4 100644 --- a/framework/main/classes/helper/class_ +++ b/framework/main/classes/helper/class_ @@ -4,11 +4,7 @@ * * @author Roland Haeder * @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 3c40725f..625220f7 100644 --- 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 * @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 b81c8025..ac4c008a 100644 --- 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 * @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 ea053068..7ddd9e5d 100644 --- 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 * @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 5617d41e..1f439d8e 100644 --- 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 * @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 acfb8d0d..7927b353 100644 --- 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 * @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 f02a8292..3d163550 100644 --- 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 * @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 4d113043..2957c937 100644 --- 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 * @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 67f9fda2..2197725e 100644 --- a/framework/main/classes/images/class_ +++ b/framework/main/classes/images/class_ @@ -4,11 +4,7 @@ * * @author Roland Haeder * @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 d7cf32e3..e83375f9 100644 --- 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 * @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 ae77b5cb..86f6124c 100644 --- 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 * @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 1e9ca164..4bda48c0 100644 --- 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 * @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 24e9f79d..dbc65fe8 100644 --- 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 * @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 7e8bc50c..7d330609 100644 --- 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 * @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 d04bc16b..37ff89a9 100644 --- a/framework/main/classes/iterator/class_ +++ b/framework/main/classes/iterator/class_ @@ -13,11 +13,7 @@ use \Iterator; * * @author Roland Haeder * @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 eb9ae21e..36f1bb0e 100644 --- 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 * @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 79e9f788..5b482861 100644 --- 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 * @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 ba9fd2c8..b4945aee 100644 --- 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 * @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 566302bd..99df4209 100644 --- 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 * @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 c7ea5936..a6dfa935 100644 --- a/framework/main/classes/lists/class_ +++ b/framework/main/classes/lists/class_ @@ -4,11 +4,7 @@ * * @author Roland Haeder * @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 599b1bb4..bb583636 100644 --- 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 * @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 25462f80..0c0557dc 100644 --- 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 * @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 afe34e61..722fa150 100644 --- 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 * @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 344579bf..b25be3f6 100644 --- 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 * @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 fe82ab31..6c0a52aa 100644 --- 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 * @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 200a0ece..372aed8e 100644 --- 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 * @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 4855031d..642a01ba 100644 --- 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 60b0b2fd..f2894d84 100644 --- 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 * @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 2507207b..c4ba1305 100644 --- 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 * @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 d48acd30..3d75464a 100644 --- 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 * @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 dd640de4..f4c82617 100644 --- 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 * @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 22a146f2..113428a4 100644 --- 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 * @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 48911988..2a797869 100644 --- 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 * @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 8cae7db6..930ff9e6 100644 --- 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 * @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 267a4f60..48ef1106 100644 --- 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 * @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 9271b7d9..d8721cb3 100644 --- a/framework/main/classes/parser/class_ +++ b/framework/main/classes/parser/class_ @@ -4,11 +4,7 @@ * * @author Roland Haeder * @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 dec3f0be..1020c0e9 100644 --- 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 * @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 f232c289..9ebf852c 100644 --- 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 * @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 5f655a53..786446c6 100644 --- 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 * @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 31e47ef9..dbbc8dec 100644 --- 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 * @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 b988f43e..a79102bf 100644 --- 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 * @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 9f6affe2..6dad6fdf 100644 --- 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 * @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 cd322446..7aa0e913 100644 --- 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 * @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 cf406493..871975af 100644 --- 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 * @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 ca9ec099..476628e9 100644 --- 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 * @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 e7725baa..1df76b28 100644 --- 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 * @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 f46f5000..48b31cea 100644 --- a/framework/main/classes/request/class_ +++ b/framework/main/classes/request/class_ @@ -7,11 +7,7 @@ namespace CoreFramework\Request; * * @author Roland Haeder * @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 56ff6b06..0fa759a1 100644 --- 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 * @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 3a85f3e2..6aa36c57 100644 --- 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 * @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 714b4cc0..13267002 100644 --- 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 * @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 7136ba69..58996de9 100644 --- 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 * @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 eb7862b6..38040fd4 100644 --- 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 * @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 177525e4..e93bcd81 100644 --- 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 * @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 6c463cd3..b0ddb5cc 100644 --- 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 * @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 1793bf2d..2a12036e 100644 --- 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 * @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 4f134737..06160b66 100644 --- 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 * @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 a164f720..df9262af 100644 --- 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 * @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 0c9ce924..9e642c38 100644 --- 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 * @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 a38b4ef3..ff10fc88 100644 --- 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 * @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 d9b6b647..72929591 100644 --- 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 * @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 3a79138c..cbc46d0b 100644 --- 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 * @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 e8c97015..02024241 100644 --- 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 * @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 4092a010..0c2c8a17 100644 --- 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 * @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 321c6ff6..d98de4be 100644 --- 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 * @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 ed050493..bd3f450e 100644 --- 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 * @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 8594ca4f..13101d9e 100644 --- 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 * @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 c2e04ae2..e1a34ea8 100644 --- 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 * @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 629bcd41..c3c188ed 100644 --- 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 * @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 602de195..d6d627ca 100644 --- 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 * @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 689f2103..6e73709e 100644 --- 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 * @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 b3a3934a..952279a2 100644 --- a/framework/main/classes/stacker/file/class_ +++ b/framework/main/classes/stacker/file/class_ @@ -4,11 +4,7 @@ * * @author Roland Haeder * @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 8bf35ac9..fbad6cd4 100644 --- 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 * @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 d44ba9f6..9994e38c 100644 --- 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 * @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 43e84b84..61caf361 100644 --- 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 * @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 b81eaaf9..f211a130 100644 --- a/framework/main/classes/states/class_ +++ b/framework/main/classes/states/class_ @@ -4,11 +4,7 @@ * * @author Roland Haeder * @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 5c7945db..820f31c3 100644 --- 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 * @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 7e21392d..137016ae 100644 --- 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 * @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 f56018f4..0c2fd314 100644 --- 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 * @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 fe6ac768..41a5bbcd 100644 --- 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 * @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 d948a4d5..4f53883c 100644 --- 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 * @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 4b149324..7652b588 100644 --- 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 * @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 5e16c251..fbea34b6 100644 --- 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 * @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 3bbeb010..01ff9a92 100644 --- 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 * @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 4367807f..7ee90554 100644 --- 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 * @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 706b4a2f..9d1bb119 100644 --- 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 * @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 5aa7e95d..608038fe 100644 --- 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 * @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 a1cef5cc..6973d80e 100644 --- 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 * @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 a5baa283..f5cace25 100644 --- 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 * @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 fbf17137..feafde70 100644 --- 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 * @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 393ebee0..d4e1d511 100644 --- 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 * @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 94e45ab2..60192e00 100644 --- 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 * @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 122448fc..f06d1c30 100644 --- 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 * @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 11ff3fd8..17f2a5f3 100644 --- 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 * @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 51af653e..19ab9221 100644 --- 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 * @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 013794ab..8b709c6f 100644 --- 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 * @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 d707ca12..0d4495b1 100644 --- 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 * @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 77fe03be..2fa669ae 100644 --- 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 * @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 ea6b8161..433d9272 100644 --- 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 * @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 a6a81f4f..2af02c8d 100644 --- a/framework/main/exceptions/class_ +++ b/framework/main/exceptions/class_ @@ -4,11 +4,7 @@ * * @author Roland Haeder * @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 c75ed900..e1dedd97 100644 --- a/framework/main/exceptions/class_FrameworkException.php +++ b/framework/main/exceptions/class_FrameworkException.php @@ -12,11 +12,7 @@ use \ReflectionException; * * @author Roland Haeder * @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 bca572be..6a66dbe5 100644 --- 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 * @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 6ac3ecc7..d4b5002a 100644 --- 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 * @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 a662fc5d..5c24a5b8 100644 --- 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 * @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 30a05733..9a9185a1 100644 --- 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 * @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 3163c0b8..7a247d30 100644 --- 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 * @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 b9d7f5ea..aacc2e24 100644 --- 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 * @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 afda6d5e..b1d470a1 100644 --- 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 * @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 dc7685ec..a6633ed2 100644 --- 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 * @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 fc36e2a1..5098f7ba 100644 --- a/framework/main/exceptions/database/class_ +++ b/framework/main/exceptions/database/class_ @@ -4,11 +4,7 @@ * * @author Roland Haeder * @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 3a493b03..ba71bd17 100644 --- 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 * @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 e43f6deb..cf385f22 100644 --- 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 * @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 f55a9604..290f83a8 100644 --- 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 * @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 2509edba..9bb34605 100644 --- 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 * @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 ad5e55f5..439b3352 100644 --- 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 * @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 e999d30e..c96712e1 100644 --- 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 * @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 389579c5..c686e8b0 100644 --- 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 * @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 afba88f3..3a6339d5 100644 --- 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 * @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 535e5230..e1649d03 100644 --- 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 * @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 b05965c6..5285157d 100644 --- 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 * @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 b1634fb8..d791c3ed 100644 --- 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 * @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 ad799053..3961d559 100644 --- 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 * @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 a3058c35..826f1ea2 100644 --- 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 * @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 42143609..cb72311b 100644 --- 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 * @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 ea616c11..0e50681d 100644 --- 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 * @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 a969b3e3..b26387e4 100644 --- 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 * @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 0a50d077..b15a5fc3 100644 --- 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 * @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 8366a53a..4e04017f 100644 --- 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 * @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 bd335527..f36495d3 100644 --- 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 * @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 87d7dcfe..b117c960 100644 --- 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 * @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 396ee34d..be2d4b8d 100644 --- 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 * @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 3c3dc740..f45c8f1e 100644 --- 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 * @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 6401ec2c..7e172479 100644 --- 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 * @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 6e5a1c69..2c35f5e0 100644 --- 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 * @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 d401eb4c..6da141e5 100644 --- 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 * @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 d44f3602..c00875c9 100644 --- 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 * @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 c58711d3..59663373 100644 --- 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 * @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 9aa5b8b0..fd28e2ac 100644 --- 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 * @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 aa046bef..d6e34290 100644 --- 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 * @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 69e17809..edaef0d9 100644 --- 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 * @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 19213d73..59aefe4b 100644 --- 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 * @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 39759a00..cfaaa946 100644 --- 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 * @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 dc337c4f..933c52ab 100644 --- 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 * @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 e24f0f2c..e69f4621 100644 --- 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 * @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 2d172421..2be4f6f3 100644 --- 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 * @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 b2ae4873..7b139844 100644 --- 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 * @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 a72ae893..37475283 100644 --- 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 * @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 8d630f0f..1ec609cf 100644 --- 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 * @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 965e3609..ca84cd07 100644 --- 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 * @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 34c73996..dc38900e 100644 --- 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 * @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 cec325b1..0f28af78 100644 --- 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 * @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 93af76c2..a7b250fd 100644 --- 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 * @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 91504045..74344cb4 100644 --- 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 * @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 c47806e1..61f275dc 100644 --- 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 * @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 9f4b0fc5..62b1e341 100644 --- 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 * @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 54e80d92..b0dfeb53 100644 --- 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 * @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 02490bdc..a27c076e 100644 --- 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 * @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 f0ad6db1..9573a843 100644 --- 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 * @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 fccf8199..3901ef8f 100644 --- 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 * @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 b46b2887..d0e492f1 100644 --- 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 * @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 da3b1117..ff3d610c 100644 --- 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 * @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 286e89c7..d28e5d10 100644 --- 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 * @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 65212e0d..c663ea3a 100644 --- 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 * @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 ae9fab95..b086bcf4 100644 --- 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 * @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 d6308eb8..0612f581 100644 --- 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 * @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 6383dfa5..d1cd271d 100644 --- 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 * @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 9b10453d..96ead0cb 100644 --- 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 * @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 af37c613..5735bf2f 100644 --- 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 * @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 b701c4e9..54cd20df 100644 --- 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 * @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 64d60363..0c9e7948 100644 --- 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 * @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 1edb630c..d98ddbe2 100644 --- 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 * @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 b1b6e952..91b53f47 100644 --- 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 * @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 00447302..1388995b 100644 --- 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 * @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 38633313..166edaed 100644 --- 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 * @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 69b701ff..f529843b 100644 --- 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 * @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 d64b5bda..b2af8ba9 100644 --- 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 * @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 62fa1374..36b3c0a3 100644 --- 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 * @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 bce750ff..3fb79123 100644 --- 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 * @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 515d64f6..a8931b4e 100644 --- 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 * @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 2d3bdb3b..671ee88a 100644 --- 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 * @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 2572bea8..c0c558cb 100644 --- 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 * @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 b1fbe423..cfc40553 100644 --- 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 * @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 65b3a9e8..73ac7bd9 100644 --- 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 * @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 bd6f3c28..2525610a 100644 --- 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 * @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 80309188..38c4cfae 100644 --- 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 * @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 51e2ec01..aa719890 100644 --- 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 * @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 bfb6934a..c039a3b4 100644 --- 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 * @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 f557c71f..ff0725a9 100644 --- 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 * @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 e1c11aa5..fc658552 100644 --- 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 * @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 db2e749b..00667c11 100644 --- 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 * @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 a6d86852..fb5cf584 100644 --- 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 * @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 9a99d9e0..d60b094b 100644 --- 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 * @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 b1b099e0..d4c60e2d 100644 --- 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 * @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 1f6dcb56..bf409cba 100644 --- 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 * @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 8e192acd..4f00465e 100644 --- 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 * @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 5820c38d..b6f076ae 100644 --- 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 * @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 b7f88f84..5815f2de 100644 --- 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 * @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 d3cc0623..2ea48a47 100644 --- 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 * @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 bb087f12..5545289c 100644 --- 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 * @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 725dee1c..b7c59130 100644 --- a/framework/main/interfaces/class_ +++ b/framework/main/interfaces/class_ @@ -10,11 +10,7 @@ use Org\Mxchange\CoreFramework\Generic\FrameworkInterface; * * @author Roland Haeder * @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 f1d3725f..d40ffb35 100644 --- 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 * @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 697aa0bd..56626d6f 100644 --- 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 * @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 cae3105e..1f9270ad 100644 --- 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 * @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 8c5c9479..30239686 100644 --- 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 * @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 f3bcf61a..ae646cd4 100644 --- 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 * @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 d057ceab..df52c7e1 100644 --- 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 * @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 cc0b0747..10ee38ad 100644 --- 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 * @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 2657e2a8..f851ad83 100644 --- 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 * @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 ebc067b7..f183a6ad 100644 --- 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 * @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 54e6ce4c..890b0d32 100644 --- 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 * @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 a354bb15..13f2c61c 100644 --- 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 * @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 401e85fd..e314256b 100644 --- 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 * @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 032dd820..dcf2e244 100644 --- 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 * @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 73c093c0..6fd4c1bb 100644 --- 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 * @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 bcc43a3b..21ca43ff 100644 --- 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 * @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 223eab79..e57a7459 100644 --- 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 * @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 b39347ab..7c90ca6d 100644 --- 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 * @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 ab90dff4..4ce86a65 100644 --- 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 * @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 88e8a4fd..06fe8796 100644 --- 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 * @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 35a6e7ed..42acc363 100644 --- 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 * @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 72d61d5b..2a8ed806 100644 --- 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 * @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 6954bd7d..81927529 100644 --- 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 * @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 e334c4fa..da13e865 100644 --- 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 * @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 ade59e73..b2fea4f4 100644 --- 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 * @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 b19e5f30..db0c8a02 100644 --- 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 * @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 e6284ad5..dea2550f 100644 --- 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 * @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 95345a29..c81982b3 100644 --- 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 * @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 63848249..5122260e 100644 --- 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 * @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 ce6f2fb3..68242260 100644 --- 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 * @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 fdf5aa93..c9263284 100644 --- 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 * @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 b6051190..6fa47bc3 100644 --- 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 * @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 44a02b7c..ebfc1c3c 100644 --- 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 * @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 29e579f1..124a8b06 100644 --- 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 * @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 79d6e7bc..2dea38dc 100644 --- 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 * @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 530acff5..b3806d63 100644 --- 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 * @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 a5efa3ad..f27d344a 100644 --- 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 * @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 83b2c32d..a87ba801 100644 --- 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 * @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 bd5247d8..c4c75a5b 100644 --- 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 * @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 . */ 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 9bc30c6e..8b08e882 100644 --- 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 * @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 3de7eacd..8e9885a9 100644 --- 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 * @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 8d095b86..b8a5293e 100644 --- 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 * @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 . */ 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 eb968405..a98d185c 100644 --- 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 * @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 d5d1ed45..334ed78c 100644 --- 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 * @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 bda35da8..403e6625 100644 --- 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 * @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 ea718700..4d361616 100644 --- 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 * @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 ad24331e..d134ff36 100644 --- 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 * @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 8b097d33..faf9fa25 100644 --- 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 * @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 1df8c4de..16f1bd7a 100644 --- 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 * @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 c71df7f5..eb1edccd 100644 --- 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 * @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 fe406818..b0727de2 100644 --- 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 * @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 305ffab2..3f9636ef 100644 --- 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 * @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 bfe36a01..0ede2556 100644 --- 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 * @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 ce1d16e0..c206cff8 100644 --- 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 * @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 eda82f6e..9503525e 100644 --- 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 * @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 4be9dfda..177be139 100644 --- 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 * @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 ef42c5aa..8106d413 100644 --- 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 * @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 755a3610..1f33bcc3 100644 --- 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 * @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 3af3fe22..80f06b9c 100644 --- 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 * @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 2e8135cf..711fdc79 100644 --- 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 * @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 967b5022..87f56a60 100644 --- 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 * @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 99777c04..daac133c 100644 --- 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 * @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 341bf8e8..a7708eb8 100644 --- 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 * @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 186d3d1b..2daead2c 100644 --- 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 * @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 21c5970b..66968da1 100644 --- 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 * @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 8cdb6e7d..b1e78397 100644 --- 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 * @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 b4526e21..c3f9ebc9 100644 --- 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 * @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 16ab5ae0..b3954b9f 100644 --- 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 * @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 966eb361..212c2eba 100644 --- 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 * @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 9f95492e..7f20dc66 100644 --- 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 * @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 f9677fa2..7f3632d9 100644 --- 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 * @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 dd841f45..1cb286f7 100644 --- 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 * @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 4c57b583..9bed5eca 100644 --- 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 * @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 761e5619..480a25af 100644 --- 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 * @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 5123be45..c9b43ab4 100644 --- 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 * @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 d84ec446..fd61d1ad 100644 --- 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 * @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 36821091..8de61d82 100644 --- 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 * @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 1eac1454..c7e247a8 100644 --- 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 * @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 c90e118a..5af53561 100644 --- 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 * @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 13b72c99..c968f9fa 100644 --- 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 * @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 9c79170e..3d9617e9 100644 --- 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 * @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 e595f646..5a6708e2 100644 --- 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 * @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 2009af0f..589b8876 100644 --- 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 * @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 622244dc..8ec776d9 100644 --- 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 * @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 5754b745..83b13eb5 100644 --- 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 * @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 59dbba4e..a4855e5d 100644 --- 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 * @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 02c80344..35015194 100644 --- 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 * @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 b9429357..9548edd4 100644 --- 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 f217f103..cb85170a 100644 --- 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 * @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 5cc93a13..a1ba03c9 100644 --- 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 b89791be..a4181bca 100644 --- 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 ec973cb0..28ad6743 100644 --- 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 86b1c380..5abbc151 100644 --- 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 e235a9e6..2acfa7fb 100644 --- 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 8d6271df..0ec24318 100644 --- 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 2d3ab2aa..96811592 100644 --- 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 963756de..4a9c91c4 100644 --- a/inc/main/classes/database/migration/class_ +++ b/inc/main/classes/database/migration/class_ @@ -1,6 +1,6 @@ * @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 . */ -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 753a6292..2f44c5e0 100644 --- 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 . */ -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 36ec4ec0..33cd7d76 100644 --- 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 ebeff25c..d4b105c3 100644 --- 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 . */ -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 7d9c8508..cebc325f 100644 --- 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 4c7c4211..56ad8ab4 100644 --- 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 06173e62..6a0e25f2 100644 --- 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 24f2913e..ffe568c6 100644 --- 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 9323d99a..d87cd846 100644 --- 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 012e15a5..df084395 100644 --- 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 00c6eb75..b5ed6089 100644 --- 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 5b17e796..e22ceea1 100644 --- 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 . */ -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 ae66a5c7..88734973 100644 --- 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 . */ -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 65b94039..47074410 100644 --- 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 e03980b6..140460eb 100644 --- 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 index 00000000..8ac6da77 --- /dev/null +++ b/inc/main/classes/registry/generic/class_GenericRegistry.php @@ -0,0 +1,58 @@ + + * @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 . + */ +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 0813fe57..763479a3 100644 --- a/inc/main/classes/resolver/class_ +++ b/inc/main/classes/resolver/class_ @@ -1,437 +1,4 @@ - * @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 . - */ -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] -?> - - * @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 . - */ -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] -?> - - * @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 . - */ -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] -?> - +} diff --git a/inc/main/classes/visitor/tasks/class_ActiveTaskVisitor.php b/inc/main/classes/visitor/tasks/class_ActiveTaskVisitor.php index 891f32fd..b9e7a1ce 100644 --- 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 7bfbc5bd..822c6457 100644 --- 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 bbddc178..e5497822 100644 --- 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 af89d421..97b3b287 100644 --- 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 6703a102..a899278b 100644 --- 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 54838d6c..b2e60f75 100644 --- 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 87aac8c9..80a96a0d 100644 --- 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 f35021a0..582a9a54 100644 --- 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 b06ae95a..c63e6ef7 100644 --- 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 fd9207ba..38301345 100644 --- 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 9cdb27b2..a72c88bb 100644 --- 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 3aa87789..6ddd8d2e 100644 --- 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 ec97d1de..bacbeb57 100644 --- 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 4a84d17c..cc150424 100644 --- 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 . */ 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 574bc040..42515863 100644 --- 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 . */ 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 d35b62d0..866ca600 100644 --- 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 def265bb..450305b1 100644 --- 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 fc90e4e7..ad639187 100644 --- 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 dee63b83..56a6220d 100644 --- 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 36a15419..2a05186b 100644 --- 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 bc746ac9..426a12b1 100644 --- 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 3c402b40..e736e00c 100644 --- a/inc/selector.php +++ b/inc/selector.php @@ -78,6 +78,3 @@ unset($appInc); unset($configAppIncludes); unset($appFqFn); unset($basePathFile); - -// [EOF] -?>