Some updates:

- inc/config/config-local.php is no longer supported as it requires a (mostly)
  application-specific file being placed into core which is not a good idea.
  Better is strict separation of core-specific (framework only) and
  application-specific.
- updated all file's copyright year to 2016
- added dummy for upcoming datbase migration support (later also between
  different engines, if possible?)

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

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

diff --git a/application/tests/loader.php b/application/tests/loader.php
new file mode 100644 (file)
index 0000000..be84b02
--- /dev/null
+++ b/application/tests/loader.php
@@ -0,0 +1,28 @@
+<?php
+/**
+ * The application's class loader
+ *
+ * @author             Roland Haeder <webmaster@shipsimu.org>
+ * @version            0.0
+ * @copyright  Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2016 Core Developer Team
+ * @license            GNU GPL 3.0 or any newer version
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+// Scan for application's classes, exceptions and interfaces
+ClassLoader::scanApplicationClasses();
+
+// [EOF]
+?>

diff --git a/application/tests/starter.php b/application/tests/starter.php
new file mode 100644 (file)
index 0000000..bb6a79d
--- /dev/null
+++ b/application/tests/starter.php
@@ -0,0 +1,57 @@
+<?php
+/**
+ * The application launcher
+ *
+ * @author             Roland Haeder <webmaster@shipsimu.org>
+ * @version            0.0.0
+ * @copyright  Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2016 Core Developer Team
+ * @license            GNU GPL 3.0 or any newer version
+ * @link               http://www.shipsimu.org
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+
+// Is there an application helper instance? We need the method main() for
+// maining the application
+$app = call_user_func_array(
+       array(
+               FrameworkConfiguration::getSelfInstance()->getConfigEntry('app_helper_class'), 'getSelfInstance'
+       ), array()
+);
+
+// Some sanity checks
+if ((empty($app)) || (is_null($app))) {
+       // Something went wrong!
+       ApplicationEntryPoint::app_exit(sprintf("[Main:] The application <span class=\"app_name\">%s</span> could not be launched because the helper class <span class=\"class_name\">%s</span> is not loaded.",
+               $application,
+               FrameworkConfiguration::getSelfInstance()->getConfigEntry('app_helper_class')
+       ));
+} elseif (!is_object($app)) {
+       // No object!
+       ApplicationEntryPoint::app_exit(sprintf("[Main:] The application <span class=\"app_name\">%s</span> could not be launched because &#39;app&#39; is not an object.",
+               $application
+       ));
+} elseif (!method_exists($app, FrameworkConfiguration::getSelfInstance()->getConfigEntry('entry_method'))) {
+       // Method not found!
+       ApplicationEntryPoint::app_exit(sprintf("[Main:] The application <span class=\"app_name\">%s</span> could not be launched because the method <span class=\"method_name\">%s</span> is missing.",
+               $application,
+               FrameworkConfiguration::getSelfInstance()->getConfigEntry('entry_method')
+       ));
+}
+
+// Call user function
+call_user_func_array(array($app, FrameworkConfiguration::getSelfInstance()->getConfigEntry('entry_method')), array());
+
+// [EOF]
+?>

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

diff --git a/framework/main/classes/actions/class_ b/framework/main/classes/actions/class_
index 786e8349293f85184e34b6c56e1ba066dd393640..a5d9364c3bf83f7af4a460b344aa4466c7648c8b 100644 (file)
--- a/framework/main/classes/actions/class_
+++ b/framework/main/classes/actions/class_
@@ -10,7 +10,11 @@ use Org\Mxchange\CoreFramework\Action\BaseAction;
  *
  * @author             Roland Haeder <webmaster@ship-simu.org>
  * @version            0.0.0
+<<<<<<< HEAD:framework/main/classes/actions/class_
  * @copyright  Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2017 Core Developer Team
+=======
+ * @copyright  Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2016 Core Developer Team
+>>>>>>> Some updates::inc/main/classes/actions/class_
  * @license            GNU GPL 3.0 or any newer version
  * @link               http://www.ship-simu.org
  *

diff --git a/framework/main/classes/actions/class_BaseAction.php b/framework/main/classes/actions/class_BaseAction.php
index 4205c9eac000d7af928e41473a2bfdde56d2af01..e8fdaf99900042150e76c890c90ddea47c71fc2b 100644 (file)
--- a/framework/main/classes/actions/class_BaseAction.php
+++ b/framework/main/classes/actions/class_BaseAction.php
@@ -12,7 +12,11 @@ use Org\Mxchange\CoreFramework\Object\BaseFrameworkSystem;
  *
  * @author             Roland Haeder <webmaster@shipsimu.org>
  * @version            0.0.0
+<<<<<<< HEAD:framework/main/classes/actions/class_BaseAction.php
  * @copyright  Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2017 Core Developer Team
+=======
+ * @copyright  Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2016 Core Developer Team
+>>>>>>> Some updates::inc/main/classes/actions/class_BaseAction.php
  * @license            GNU GPL 3.0 or any newer version
  * @link               http://www.shipsimu.org
  *

diff --git a/framework/main/classes/actions/html/class_HtmlLoginProfileAction.php b/framework/main/classes/actions/html/class_HtmlLoginProfileAction.php
index 44e9c5ef72cec8e59c9c5372f2fb9612852058e7..7430f5622d4acc174bcc7dafc635f854da27cfa4 100644 (file)
--- a/framework/main/classes/actions/html/class_HtmlLoginProfileAction.php
+++ b/framework/main/classes/actions/html/class_HtmlLoginProfileAction.php
@@ -16,7 +16,11 @@ use Org\Mxchange\CoreFramework\Response\Responseable;
  *
  * @author             Roland Haeder <webmaster@shipsimu.org>
  * @version            0.0.0
+<<<<<<< HEAD:framework/main/classes/actions/html/class_HtmlLoginProfileAction.php
  * @copyright  Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2017 Core Developer Team
+=======
+ * @copyright  Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2016 Core Developer Team
+>>>>>>> Some updates::inc/main/classes/actions/html/class_HtmlLoginProfileAction.php
  * @license            GNU GPL 3.0 or any newer version
  * @link               http://www.shipsimu.org
  *

diff --git a/framework/main/classes/actions/post_registration/class_LoginAfterRegistrationAction.php b/framework/main/classes/actions/post_registration/class_LoginAfterRegistrationAction.php
index 0903d931eb5c3c71e8ff301feceda7b247806d7a..061617c6a8ace1da2b7c8d21833f32219a89ad93 100644 (file)
--- a/framework/main/classes/actions/post_registration/class_LoginAfterRegistrationAction.php
+++ b/framework/main/classes/actions/post_registration/class_LoginAfterRegistrationAction.php
@@ -14,7 +14,11 @@ use Org\Mxchange\CoreFramework\Response\Responseable;
  *
  * @author             Roland Haeder <webmaster@shipsimu.org>
  * @version            0.0.0
+<<<<<<< HEAD:framework/main/classes/actions/post_registration/class_LoginAfterRegistrationAction.php
  * @copyright  Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2017 Core Developer Team
+=======
+ * @copyright  Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2016 Core Developer Team
+>>>>>>> Some updates::inc/main/classes/actions/post_registration/class_LoginAfterRegistrationAction.php
  * @license            GNU GPL 3.0 or any newer version
  * @link               http://www.shipsimu.org
  *

diff --git a/framework/main/classes/application/class_BaseApplication.php b/framework/main/classes/application/class_BaseApplication.php
index d4c37398f15b993b45327b4b67181d094494f3fa..e18a620cb4de64c09271fd59d282be0eeda38044 100644 (file)
--- a/framework/main/classes/application/class_BaseApplication.php
+++ b/framework/main/classes/application/class_BaseApplication.php
@@ -11,7 +11,11 @@ use Org\Mxchange\CoreFramework\Registry\Registry;
  *
  * @author             Roland Haeder <webmaster@shipsimu.org>
  * @version            0.0.0
+<<<<<<< HEAD:framework/main/classes/application/class_BaseApplication.php
  * @copyright  Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2017 Core Developer Team
+=======
+ * @copyright  Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2016 Core Developer Team
+>>>>>>> Some updates::inc/main/classes/application/class_BaseApplication.php
  * @license            GNU GPL 3.0 or any newer version
  * @link               http://www.shipsimu.org
  *

diff --git a/framework/main/classes/auth/class_CookieAuth.php b/framework/main/classes/auth/class_CookieAuth.php
index 6cd6559a7264868197174fad08420afe5c14f43e..0652bb173a19bcc896a2210f5f1baf9a6c3ba5d7 100644 (file)
--- a/framework/main/classes/auth/class_CookieAuth.php
+++ b/framework/main/classes/auth/class_CookieAuth.php
@@ -13,7 +13,11 @@ use Org\Mxchange\CoreFramework\Response\Responseable;
  *
  * @author             Roland Haeder <webmaster@shipsimu.org>
  * @version            0.0.0
+<<<<<<< HEAD:framework/main/classes/auth/class_CookieAuth.php
  * @copyright  Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2017 Core Developer Team
+=======
+ * @copyright  Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2016 Core Developer Team
+>>>>>>> Some updates::inc/main/classes/auth/class_CookieAuth.php
  * @license            GNU GPL 3.0 or any newer version
  * @link               http://www.shipsimu.org
  *

diff --git a/framework/main/classes/cache/class_MemoryCache.php b/framework/main/classes/cache/class_MemoryCache.php
index 8762a34df9ccd4a83ecf1a383b5cb847a7f0c15b..ee5cf263c0058213a25662b9f25922bbd0577929 100644 (file)
--- a/framework/main/classes/cache/class_MemoryCache.php
+++ b/framework/main/classes/cache/class_MemoryCache.php
@@ -11,7 +11,11 @@ use Org\Mxchange\CoreFramework\Object\BaseFrameworkSystem;
  *
  * @author             Roland Haeder <webmaster@shipsimu.org>
  * @version            0.0.0
+<<<<<<< HEAD:framework/main/classes/cache/class_MemoryCache.php
  * @copyright  Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2017 Core Developer Team
+=======
+ * @copyright  Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2016 Core Developer Team
+>>>>>>> Some updates::inc/main/classes/cache/class_MemoryCache.php
  * @license            GNU GPL 3.0 or any newer version
  * @link               http://www.shipsimu.org
  * @todo               Rename to InProgressCache

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

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

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

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

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

diff --git a/framework/main/classes/client/class_BaseClient.php b/framework/main/classes/client/class_BaseClient.php
index 72f9f253692f2ca339284ab7ad4d2f5b8f7529bd..79333d5c527585318287999ea2b0305fe1e723c8 100644 (file)
--- a/framework/main/classes/client/class_BaseClient.php
+++ b/framework/main/classes/client/class_BaseClient.php
@@ -10,7 +10,11 @@ use Org\Mxchange\CoreFramework\Object\BaseFrameworkSystem;
  *
  * @author             Roland Haeder <webmaster@ship-simu.org>
  * @version            0.0.0
+<<<<<<< HEAD:framework/main/classes/client/class_BaseClient.php
  * @copyright  Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2017 Core Developer Team
+=======
+ * @copyright  Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2016 Core Developer Team
+>>>>>>> Some updates::inc/main/classes/client/class_BaseClient.php
  * @license            GNU GPL 3.0 or any newer version
  * @link               http://www.ship-simu.org
  *

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

diff --git a/framework/main/classes/commands/class_BaseCommand.php b/framework/main/classes/commands/class_BaseCommand.php
index 9787fb0b7bbfe0c80c668434aa0c2e17d0c6ade3..b66949885f9e03039bef9caeb95ea14b176bb0c8 100644 (file)
--- a/framework/main/classes/commands/class_BaseCommand.php
+++ b/framework/main/classes/commands/class_BaseCommand.php
@@ -14,7 +14,11 @@ use Org\Mxchange\CoreFramework\Response\Responseable;
  *
  * @author             Roland Haeder <webmaster@shipsimu.org>
  * @version            0.0.0
+<<<<<<< HEAD:framework/main/classes/commands/class_BaseCommand.php
  * @copyright  Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2017 Core Developer Team
+=======
+ * @copyright  Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2016 Core Developer Team
+>>>>>>> Some updates::inc/main/classes/commands/class_BaseCommand.php
  * @license            GNU GPL 3.0 or any newer version
  * @link               http://www.shipsimu.org
  *

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

diff --git a/framework/main/classes/commands/console/class_ConsoleFuseCommand.php b/framework/main/classes/commands/console/class_ConsoleFuseCommand.php
index 3744c1cff1e32125ed07a78ded407bd372f566e6..2d6452458d1a4d2a28334f85e3aa097d18e608a5 100644 (file)
--- a/framework/main/classes/commands/console/class_ConsoleFuseCommand.php
+++ b/framework/main/classes/commands/console/class_ConsoleFuseCommand.php
@@ -16,7 +16,11 @@ use Org\Mxchange\CoreFramework\Response\Responseable;
  *
  * @author             Roland Haeder <webmaster@ship-simu.org>
  * @version            0.0.0
+<<<<<<< HEAD:framework/main/classes/commands/console/class_ConsoleFuseCommand.php
  * @copyright  Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2017 Core Developer Team
+=======
+ * @copyright  Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2016 Core Developer Team
+>>>>>>> Some updates::inc/main/classes/commands/console/class_ConsoleFuseCommand.php
  * @license            GNU GPL 3.0 or any newer version
  * @link               http://www.ship-simu.org
  *

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

diff --git a/framework/main/classes/commands/html/class_HtmlConfirmCommand.php b/framework/main/classes/commands/html/class_HtmlConfirmCommand.php
index 33a654fcd22b114846c56475008961a4ecf68403..689ece383cf68bf0f591c5c6a95355aea6b0dd4e 100644 (file)
--- a/framework/main/classes/commands/html/class_HtmlConfirmCommand.php
+++ b/framework/main/classes/commands/html/class_HtmlConfirmCommand.php
@@ -19,7 +19,11 @@ use Org\Mxchange\CoreFramework\Response\Responseable;
  *
  * @author             Roland Haeder <webmaster@shipsimu.org>
  * @version            0.0.0
+<<<<<<< HEAD:framework/main/classes/commands/html/class_HtmlConfirmCommand.php
  * @copyright  Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2017 Core Developer Team
+=======
+ * @copyright  Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2016 Core Developer Team
+>>>>>>> Some updates::inc/main/classes/commands/html/class_HtmlConfirmCommand.php
  * @license            GNU GPL 3.0 or any newer version
  * @link               http://www.shipsimu.org
  *

diff --git a/framework/main/classes/commands/html/class_HtmlDoFormCommand.php b/framework/main/classes/commands/html/class_HtmlDoFormCommand.php
index d844e3e51f853019cd73cc2879a8e9c77594fa19..4d681500979f840860f6a6a7e1da6f754274e32b 100644 (file)
--- a/framework/main/classes/commands/html/class_HtmlDoFormCommand.php
+++ b/framework/main/classes/commands/html/class_HtmlDoFormCommand.php
@@ -15,7 +15,11 @@ use Org\Mxchange\CoreFramework\Response\Responseable;
  *
  * @author             Roland Haeder <webmaster@shipsimu.org>
  * @version            0.0.0
+<<<<<<< HEAD:framework/main/classes/commands/html/class_HtmlDoFormCommand.php
  * @copyright  Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2017 Core Developer Team
+=======
+ * @copyright  Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2016 Core Developer Team
+>>>>>>> Some updates::inc/main/classes/commands/html/class_HtmlDoFormCommand.php
  * @license            GNU GPL 3.0 or any newer version
  * @link               http://www.shipsimu.org
  *

diff --git a/framework/main/classes/commands/html/class_HtmlHomeCommand.php b/framework/main/classes/commands/html/class_HtmlHomeCommand.php
index e8bb81d0cba86a955335d74bc5ea8c3cd34b2219..dff305b7f02d379ed0a1613747d2d8a6889ccc6a 100644 (file)
--- a/framework/main/classes/commands/html/class_HtmlHomeCommand.php
+++ b/framework/main/classes/commands/html/class_HtmlHomeCommand.php
@@ -17,7 +17,11 @@ use Org\Mxchange\CoreFramework\Response\Responseable;
  *
  * @author             Roland Haeder <webmaster@shipsimu.org>
  * @version            0.0.0
+<<<<<<< HEAD:framework/main/classes/commands/html/class_HtmlHomeCommand.php
  * @copyright  Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2017 Core Developer Team
+=======
+ * @copyright  Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2016 Core Developer Team
+>>>>>>> Some updates::inc/main/classes/commands/html/class_HtmlHomeCommand.php
  * @license            GNU GPL 3.0 or any newer version
  * @link               http://www.shipsimu.org
  *

diff --git a/framework/main/classes/commands/html/class_HtmlLoginAreaCommand.php b/framework/main/classes/commands/html/class_HtmlLoginAreaCommand.php
index 8d99f4158e8cef63452573dedf800986c8672b6e..728fcddb9e7dd890c339c6b1ee1e9dc6bc413d27 100644 (file)
--- a/framework/main/classes/commands/html/class_HtmlLoginAreaCommand.php
+++ b/framework/main/classes/commands/html/class_HtmlLoginAreaCommand.php
@@ -18,7 +18,11 @@ use Org\Mxchange\CoreFramework\Response\Responseable;
  *
  * @author             Roland Haeder <webmaster@shipsimu.org>
  * @version            0.0.0
+<<<<<<< HEAD:framework/main/classes/commands/html/class_HtmlLoginAreaCommand.php
  * @copyright  Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2017 Core Developer Team
+=======
+ * @copyright  Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2016 Core Developer Team
+>>>>>>> Some updates::inc/main/classes/commands/html/class_HtmlLoginAreaCommand.php
  * @license            GNU GPL 3.0 or any newer version
  * @link               http://www.shipsimu.org
  *

diff --git a/framework/main/classes/commands/html/class_HtmlLoginCommand.php b/framework/main/classes/commands/html/class_HtmlLoginCommand.php
index d3df3f3e79d00361fb531b68e84e73cc98fb1598..b70067303e9b626878d9dbc139a39706870d53e7 100644 (file)
--- a/framework/main/classes/commands/html/class_HtmlLoginCommand.php
+++ b/framework/main/classes/commands/html/class_HtmlLoginCommand.php
@@ -17,7 +17,11 @@ use Org\Mxchange\CoreFramework\Response\Responseable;
  *
  * @author             Roland Haeder <webmaster@shipsimu.org>
  * @version            0.0.0
+<<<<<<< HEAD:framework/main/classes/commands/html/class_HtmlLoginCommand.php
  * @copyright  Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2017 Core Developer Team
+=======
+ * @copyright  Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2016 Core Developer Team
+>>>>>>> Some updates::inc/main/classes/commands/html/class_HtmlLoginCommand.php
  * @license            GNU GPL 3.0 or any newer version
  * @link               http://www.shipsimu.org
  *

diff --git a/framework/main/classes/commands/html/class_HtmlLoginFailedCommand.php b/framework/main/classes/commands/html/class_HtmlLoginFailedCommand.php
index 6a574d1b87776b06885a927296fda678695f41ba..6b299c359a6ffb3c8049744f96307af39f1b85d4 100644 (file)
--- a/framework/main/classes/commands/html/class_HtmlLoginFailedCommand.php
+++ b/framework/main/classes/commands/html/class_HtmlLoginFailedCommand.php
@@ -17,7 +17,11 @@ use Org\Mxchange\CoreFramework\Response\Responseable;
  *
  * @author             Roland Haeder <webmaster@shipsimu.org>
  * @version            0.0.0
+<<<<<<< HEAD:framework/main/classes/commands/html/class_HtmlLoginFailedCommand.php
  * @copyright  Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2017 Core Developer Team
+=======
+ * @copyright  Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2016 Core Developer Team
+>>>>>>> Some updates::inc/main/classes/commands/html/class_HtmlLoginFailedCommand.php
  * @license            GNU GPL 3.0 or any newer version
  * @link               http://www.shipsimu.org
  *

diff --git a/framework/main/classes/commands/html/class_HtmlLogoutCommand.php b/framework/main/classes/commands/html/class_HtmlLogoutCommand.php
index 1270fa37ce5953e4b600988e8b1ce6cdedae6310..b8471401e2b320dc6662d1e41366389a0cbcb7ce 100644 (file)
--- a/framework/main/classes/commands/html/class_HtmlLogoutCommand.php
+++ b/framework/main/classes/commands/html/class_HtmlLogoutCommand.php
@@ -17,7 +17,11 @@ use Org\Mxchange\CoreFramework\Response\Responseable;
  *
  * @author             Roland Haeder <webmaster@shipsimu.org>
  * @version            0.0.0
+<<<<<<< HEAD:framework/main/classes/commands/html/class_HtmlLogoutCommand.php
  * @copyright  Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2017 Core Developer Team
+=======
+ * @copyright  Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2016 Core Developer Team
+>>>>>>> Some updates::inc/main/classes/commands/html/class_HtmlLogoutCommand.php
  * @license            GNU GPL 3.0 or any newer version
  * @link               http://www.shipsimu.org
  *

diff --git a/framework/main/classes/commands/html/class_HtmlLogoutDoneCommand.php b/framework/main/classes/commands/html/class_HtmlLogoutDoneCommand.php
index 361c9599fa53b0b5d3b2ccc1e3cea84d54231842..7a7a281d75a66debae7744d59d2168f919913400 100644 (file)
--- a/framework/main/classes/commands/html/class_HtmlLogoutDoneCommand.php
+++ b/framework/main/classes/commands/html/class_HtmlLogoutDoneCommand.php
@@ -17,7 +17,11 @@ use Org\Mxchange\CoreFramework\Response\Responseable;
  *
  * @author             Roland Haeder <webmaster@shipsimu.org>
  * @version            0.0.0
+<<<<<<< HEAD:framework/main/classes/commands/html/class_HtmlLogoutDoneCommand.php
  * @copyright  Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2017 Core Developer Team
+=======
+ * @copyright  Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2016 Core Developer Team
+>>>>>>> Some updates::inc/main/classes/commands/html/class_HtmlLogoutDoneCommand.php
  * @license            GNU GPL 3.0 or any newer version
  * @link               http://www.shipsimu.org
  *

diff --git a/framework/main/classes/commands/html/class_HtmlProblemCommand.php b/framework/main/classes/commands/html/class_HtmlProblemCommand.php
index d2ae2e33bac0084c8469952663f96646b0bcaecc..0abf7e2f91a5c618dc7b0fdf2cee7970097f8e6b 100644 (file)
--- a/framework/main/classes/commands/html/class_HtmlProblemCommand.php
+++ b/framework/main/classes/commands/html/class_HtmlProblemCommand.php
@@ -16,7 +16,11 @@ use Org\Mxchange\CoreFramework\Response\Responseable;
  *
  * @author             Roland Haeder <webmaster@shipsimu.org>
  * @version            0.0.0
+<<<<<<< HEAD:framework/main/classes/commands/html/class_HtmlProblemCommand.php
  * @copyright  Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2017 Core Developer Team
+=======
+ * @copyright  Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2016 Core Developer Team
+>>>>>>> Some updates::inc/main/classes/commands/html/class_HtmlProblemCommand.php
  * @license            GNU GPL 3.0 or any newer version
  * @link               http://www.shipsimu.org
  *

diff --git a/framework/main/classes/commands/html/class_HtmlRegisterCommand.php b/framework/main/classes/commands/html/class_HtmlRegisterCommand.php
index b0088af64e5f722b622cbcc43f99163112117277..92c3efad400a5060f6ee1a3b613b4c5c2958f2e5 100644 (file)
--- a/framework/main/classes/commands/html/class_HtmlRegisterCommand.php
+++ b/framework/main/classes/commands/html/class_HtmlRegisterCommand.php
@@ -17,7 +17,11 @@ use Org\Mxchange\CoreFramework\Response\Responseable;
  *
  * @author             Roland Haeder <webmaster@shipsimu.org>
  * @version            0.0.0
+<<<<<<< HEAD:framework/main/classes/commands/html/class_HtmlRegisterCommand.php
  * @copyright  Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2017 Core Developer Team
+=======
+ * @copyright  Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2016 Core Developer Team
+>>>>>>> Some updates::inc/main/classes/commands/html/class_HtmlRegisterCommand.php
  * @license            GNU GPL 3.0 or any newer version
  * @link               http://www.shipsimu.org
  *

diff --git a/framework/main/classes/commands/html/class_HtmlResendLinkCommand.php b/framework/main/classes/commands/html/class_HtmlResendLinkCommand.php
index 62dd1fd9f9a2b0ab533f4ec027b905afd1220d39..e4ea48aab23ff616dfb0da6de2c7b7c3a01398ba 100644 (file)
--- a/framework/main/classes/commands/html/class_HtmlResendLinkCommand.php
+++ b/framework/main/classes/commands/html/class_HtmlResendLinkCommand.php
@@ -18,7 +18,11 @@ use Org\Mxchange\CoreFramework\Response\Responseable;
  *
  * @author             Roland Haeder <webmaster@shipsimu.org>
  * @version            0.0.0
+<<<<<<< HEAD:framework/main/classes/commands/html/class_HtmlResendLinkCommand.php
  * @copyright  Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2017 Core Developer Team
+=======
+ * @copyright  Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2016 Core Developer Team
+>>>>>>> Some updates::inc/main/classes/commands/html/class_HtmlResendLinkCommand.php
  * @license            GNU GPL 3.0 or any newer version
  * @link               http://www.shipsimu.org
  *

diff --git a/framework/main/classes/commands/html/class_HtmlStatusCommand.php b/framework/main/classes/commands/html/class_HtmlStatusCommand.php
index 467c3622ad8ffe2064af82a08212da1b8959ba4d..429e3719abb004fdd1485ba690bb2a2c4808c526 100644 (file)
--- a/framework/main/classes/commands/html/class_HtmlStatusCommand.php
+++ b/framework/main/classes/commands/html/class_HtmlStatusCommand.php
@@ -16,7 +16,11 @@ use Org\Mxchange\CoreFramework\Response\Responseable;
  *
  * @author             Roland Haeder <webmaster@shipsimu.org>
  * @version            0.0.0
+<<<<<<< HEAD:framework/main/classes/commands/html/class_HtmlStatusCommand.php
  * @copyright  Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2017 Core Developer Team
+=======
+ * @copyright  Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2016 Core Developer Team
+>>>>>>> Some updates::inc/main/classes/commands/html/class_HtmlStatusCommand.php
  * @license            GNU GPL 3.0 or any newer version
  * @link               http://www.shipsimu.org
  *

diff --git a/framework/main/classes/commands/image/class_ImageCodeCaptchaCommand.php b/framework/main/classes/commands/image/class_ImageCodeCaptchaCommand.php
index b9e2c2f9b88ea6574a4e14304525618ec724ab82..ef36945cc149e092ac9d0dd9076da4cb7f1d3ee0 100644 (file)
--- a/framework/main/classes/commands/image/class_ImageCodeCaptchaCommand.php
+++ b/framework/main/classes/commands/image/class_ImageCodeCaptchaCommand.php
@@ -16,7 +16,11 @@ use Org\Mxchange\CoreFramework\Response\Responseable;
  *
  * @author             Roland Haeder <webmaster@shipsimu.org>
  * @version            0.0.0
+<<<<<<< HEAD:framework/main/classes/commands/image/class_ImageCodeCaptchaCommand.php
  * @copyright  Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2017 Core Developer Team
+=======
+ * @copyright  Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2016 Core Developer Team
+>>>>>>> Some updates::inc/main/classes/commands/image/class_ImageCodeCaptchaCommand.php
  * @license            GNU GPL 3.0 or any newer version
  * @link               http://www.shipsimu.org
  *

diff --git a/framework/main/classes/compressor/class_Bzip2Compressor.php b/framework/main/classes/compressor/class_Bzip2Compressor.php
index bf19554a77b538e390e3d1df3274ee7043a9c772..71d35e267588e7952f5a87f11fa30f956383828b 100644 (file)
--- a/framework/main/classes/compressor/class_Bzip2Compressor.php
+++ b/framework/main/classes/compressor/class_Bzip2Compressor.php
@@ -11,7 +11,11 @@ use Org\Mxchange\CoreFramework\Object\BaseFrameworkSystem;
  *
  * @author             Roland Haeder <webmaster@shipsimu.org>
  * @version            0.0.0
+<<<<<<< HEAD:framework/main/classes/compressor/class_Bzip2Compressor.php
  * @copyright  Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2017 Core Developer Team
+=======
+ * @copyright  Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2016 Core Developer Team
+>>>>>>> Some updates::inc/main/classes/compressor/class_Bzip2Compressor.php
  * @license            GNU GPL 3.0 or any newer version
  * @link               http://www.shipsimu.org
  *

diff --git a/framework/main/classes/compressor/class_GzipCompressor.php b/framework/main/classes/compressor/class_GzipCompressor.php
index 3163c9e70596d1bd67b2826c8d8ae9879b7fdabf..41792611112f174447b802c1818393d86d782b40 100644 (file)
--- a/framework/main/classes/compressor/class_GzipCompressor.php
+++ b/framework/main/classes/compressor/class_GzipCompressor.php
@@ -11,7 +11,11 @@ use Org\Mxchange\CoreFramework\Object\BaseFrameworkSystem;
  *
  * @author             Roland Haeder <webmaster@shipsimu.org>
  * @version            0.0.0
+<<<<<<< HEAD:framework/main/classes/compressor/class_GzipCompressor.php
  * @copyright  Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2017 Core Developer Team
+=======
+ * @copyright  Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2016 Core Developer Team
+>>>>>>> Some updates::inc/main/classes/compressor/class_GzipCompressor.php
  * @license            GNU GPL 3.0 or any newer version
  * @link               http://www.shipsimu.org
  *

diff --git a/framework/main/classes/compressor/class_NullCompressor.php b/framework/main/classes/compressor/class_NullCompressor.php
index 3bc22cc8049fdb735285dd2f8fb2607f7aee7b1f..50722313b15b231a871d81a0a4ac822ffe18f96e 100644 (file)
--- a/framework/main/classes/compressor/class_NullCompressor.php
+++ b/framework/main/classes/compressor/class_NullCompressor.php
@@ -11,7 +11,11 @@ use Org\Mxchange\CoreFramework\Object\BaseFrameworkSystem;
  *
  * @author             Roland Haeder <webmaster@shipsimu.org>
  * @version            0.0.0
+<<<<<<< HEAD:framework/main/classes/compressor/class_NullCompressor.php
  * @copyright  Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2017 Core Developer Team
+=======
+ * @copyright  Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2016 Core Developer Team
+>>>>>>> Some updates::inc/main/classes/compressor/class_NullCompressor.php
  * @license            GNU GPL 3.0 or any newer version
  * @link               http://www.shipsimu.org
  *

diff --git a/framework/main/classes/compressor/class_ZlibCompressor.php b/framework/main/classes/compressor/class_ZlibCompressor.php
index 8992b4c30cac29d1485325d630a5ee8b043b7bda..690668e2a06ddb63aaa4d20e3382c280cf018896 100644 (file)
--- a/framework/main/classes/compressor/class_ZlibCompressor.php
+++ b/framework/main/classes/compressor/class_ZlibCompressor.php
@@ -11,7 +11,11 @@ use Org\Mxchange\CoreFramework\Object\BaseFrameworkSystem;
  *
  * @author             Roland Haeder <webmaster@shipsimu.org>
  * @version            0.0.0
+<<<<<<< HEAD:framework/main/classes/compressor/class_ZlibCompressor.php
  * @copyright  Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2017 Core Developer Team
+=======
+ * @copyright  Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2016 Core Developer Team
+>>>>>>> Some updates::inc/main/classes/compressor/class_ZlibCompressor.php
  * @license            GNU GPL 3.0 or any newer version
  * @link               http://www.shipsimu.org
  *

diff --git a/framework/main/classes/container/class_ b/framework/main/classes/container/class_
index c3bf332e7f00ba27551e4f14b59633d68cd264f0..82fd673852a65de7a55971a85104217e7a765c9c 100644 (file)
--- a/framework/main/classes/container/class_
+++ b/framework/main/classes/container/class_
@@ -11,7 +11,11 @@ use Org\Mxchange\CoreFramework\Registry\Registerable;
  *
  * @author             Roland Haeder <webmaster@ship-simu.org>
  * @version            0.0.0
+<<<<<<< HEAD:framework/main/classes/container/class_
  * @copyright  Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2017 Core Developer Team
+=======
+ * @copyright  Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2016 Core Developer Team
+>>>>>>> Some updates::inc/main/classes/container/class_
  * @license            GNU GPL 3.0 or any newer version
  * @link               http://www.ship-simu.org
  *

diff --git a/framework/main/classes/container/class_BaseContainer.php b/framework/main/classes/container/class_BaseContainer.php
index b55c5b4d752a8ca85d84283f850a8c43b3f16c74..4b9da3829c31dcec3fabd1043e1674a526ceb041 100644 (file)
--- a/framework/main/classes/container/class_BaseContainer.php
+++ b/framework/main/classes/container/class_BaseContainer.php
@@ -10,7 +10,11 @@ use Org\Mxchange\CoreFramework\Object\BaseFrameworkSystem;
  *
  * @author             Roland Haeder <webmaster@shipsimu.org>
  * @version            0.0.0
+<<<<<<< HEAD:framework/main/classes/container/class_BaseContainer.php
  * @copyright  Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2017 Core Developer Team
+=======
+ * @copyright  Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2016 Core Developer Team
+>>>>>>> Some updates::inc/main/classes/container/class_BaseContainer.php
  * @license            GNU GPL 3.0 or any newer version
  * @link               http://www.shipsimu.org
  *

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

diff --git a/framework/main/classes/controller/class_BaseController.php b/framework/main/classes/controller/class_BaseController.php
index b9f593279385921607fd8b0e3058c40454cdae37..729f51e1dd1108fb6dd7ac9ed00a4ba52c6a5c31 100644 (file)
--- a/framework/main/classes/controller/class_BaseController.php
+++ b/framework/main/classes/controller/class_BaseController.php
@@ -19,7 +19,11 @@ use Org\Mxchange\CoreFramework\Response\Responseable;
  *
  * @author             Roland Haeder <webmaster@shipsimu.org>
  * @version            0.0.0
+<<<<<<< HEAD:framework/main/classes/controller/class_BaseController.php
  * @copyright  Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2017 Core Developer Team
+=======
+ * @copyright  Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2016 Core Developer Team
+>>>>>>> Some updates::inc/main/classes/controller/class_BaseController.php
  * @license            GNU GPL 3.0 or any newer version
  * @link               http://www.shipsimu.org
  *

diff --git a/framework/main/classes/controller/console/class_ConsoleDefaultController.php b/framework/main/classes/controller/console/class_ConsoleDefaultController.php
index 4157c72a167f8ff4c2c0b5b2579127b6faa2641f..dc0918784951a236d08a3f6c6af6dede1897ebdd 100644 (file)
--- a/framework/main/classes/controller/console/class_ConsoleDefaultController.php
+++ b/framework/main/classes/controller/console/class_ConsoleDefaultController.php
@@ -13,7 +13,11 @@ use Org\Mxchange\CoreFramework\Response\Responseable;
  *
  * @author             Roland Haeder <webmaster@shipsimu.org>
  * @version            0.0.0
+<<<<<<< HEAD:framework/main/classes/controller/console/class_ConsoleDefaultController.php
  * @copyright  Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2017 Core Developer Team
+=======
+ * @copyright  Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2016 Core Developer Team
+>>>>>>> Some updates::inc/main/classes/controller/console/class_ConsoleDefaultController.php
  * @license            GNU GPL 3.0 or any newer version
  * @link               http://www.shipsimu.org
  * @todo               This controller shall still provide some headlines for sidebars

diff --git a/framework/main/classes/controller/console/class_ConsoleDefaultNewsController.php b/framework/main/classes/controller/console/class_ConsoleDefaultNewsController.php
index c8870c8b553c3e45bd0ce71b8b616db62504ad6f..adc8ca8e0bb69aa56dc017560b5771f52335b700 100644 (file)
--- a/framework/main/classes/controller/console/class_ConsoleDefaultNewsController.php
+++ b/framework/main/classes/controller/console/class_ConsoleDefaultNewsController.php
@@ -15,7 +15,11 @@ use Org\Mxchange\CoreFramework\Response\Responseable;
  *
  * @author             Roland Haeder <webmaster@shipsimu.org>
  * @version            0.0.0
+<<<<<<< HEAD:framework/main/classes/controller/console/class_ConsoleDefaultNewsController.php
  * @copyright  Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2017 Core Developer Team
+=======
+ * @copyright  Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2016 Core Developer Team
+>>>>>>> Some updates::inc/main/classes/controller/console/class_ConsoleDefaultNewsController.php
  * @license            GNU GPL 3.0 or any newer version
  * @link               http://www.shipsimu.org
  *

diff --git a/framework/main/classes/controller/html/class_Html b/framework/main/classes/controller/html/class_Html
index dbecaee8d69c8d13317d14f87b8a045bad0aea63..06bc37cf7a49254dfb74ed100efadfe1a881370b 100644 (file)
--- a/framework/main/classes/controller/html/class_Html
+++ b/framework/main/classes/controller/html/class_Html
@@ -15,7 +15,11 @@ use Org\Mxchange\CoreFramework\Response\Responseable;
  *
  * @author             Roland Haeder <webmaster@ship-simu.org>
  * @version            0.0.0
+<<<<<<< HEAD:framework/main/classes/controller/html/class_Html
  * @copyright  Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2017 Core Developer Team
+=======
+ * @copyright  Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2016 Core Developer Team
+>>>>>>> Some updates::inc/main/classes/controller/html/class_Html
  * @license            GNU GPL 3.0 or any newer version
  * @link               http://www.ship-simu.org
  *

diff --git a/framework/main/classes/controller/html/class_HtmlConfirmController.php b/framework/main/classes/controller/html/class_HtmlConfirmController.php
index fc82cccb99078a78a18137f437c4d85db562d57f..c9d5c184d0df8dca3924e2c0fccce2f96d5f5e82 100644 (file)
--- a/framework/main/classes/controller/html/class_HtmlConfirmController.php
+++ b/framework/main/classes/controller/html/class_HtmlConfirmController.php
@@ -15,7 +15,11 @@ use Org\Mxchange\CoreFramework\Response\Responseable;
  *
  * @author             Roland Haeder <webmaster@shipsimu.org>
  * @version            0.0.0
+<<<<<<< HEAD:framework/main/classes/controller/html/class_HtmlConfirmController.php
  * @copyright  Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2017 Core Developer Team
+=======
+ * @copyright  Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2016 Core Developer Team
+>>>>>>> Some updates::inc/main/classes/controller/html/class_HtmlConfirmController.php
  * @license            GNU GPL 3.0 or any newer version
  * @link               http://www.shipsimu.org
  *

diff --git a/framework/main/classes/controller/html/class_HtmlDefaultController.php b/framework/main/classes/controller/html/class_HtmlDefaultController.php
index c2e579daa510bc97da68a385aa7153a6751f81bf..55f6b1a7b01df1953009249b0164808db0fdb4ff 100644 (file)
--- a/framework/main/classes/controller/html/class_HtmlDefaultController.php
+++ b/framework/main/classes/controller/html/class_HtmlDefaultController.php
@@ -14,7 +14,11 @@ use Org\Mxchange\CoreFramework\Response\Responseable;
  *
  * @author             Roland Haeder <webmaster@shipsimu.org>
  * @version            0.0.0
+<<<<<<< HEAD:framework/main/classes/controller/html/class_HtmlDefaultController.php
  * @copyright  Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2017 Core Developer Team
+=======
+ * @copyright  Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2016 Core Developer Team
+>>>>>>> Some updates::inc/main/classes/controller/html/class_HtmlDefaultController.php
  * @license            GNU GPL 3.0 or any newer version
  * @link               http://www.shipsimu.org
  * @todo               This controller shall still provide some headlines for sidebars

diff --git a/framework/main/classes/controller/html/class_HtmlDefaultNewsController.php b/framework/main/classes/controller/html/class_HtmlDefaultNewsController.php
index 96cdf2d32c52bd6f38347212fcf5abf46fdf90b6..6806dd898bfa8759cfbd0557845de10f6a34c5d4 100644 (file)
--- a/framework/main/classes/controller/html/class_HtmlDefaultNewsController.php
+++ b/framework/main/classes/controller/html/class_HtmlDefaultNewsController.php
@@ -15,7 +15,11 @@ use Org\Mxchange\CoreFramework\Response\Responseable;
  *
  * @author             Roland Haeder <webmaster@shipsimu.org>
  * @version            0.0.0
+<<<<<<< HEAD:framework/main/classes/controller/html/class_HtmlDefaultNewsController.php
  * @copyright  Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2017 Core Developer Team
+=======
+ * @copyright  Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2016 Core Developer Team
+>>>>>>> Some updates::inc/main/classes/controller/html/class_HtmlDefaultNewsController.php
  * @license            GNU GPL 3.0 or any newer version
  * @link               http://www.shipsimu.org
  *

diff --git a/framework/main/classes/controller/html/class_HtmlLoginController.php b/framework/main/classes/controller/html/class_HtmlLoginController.php
index d643b9dd60d19c33f43ffd267d7e58894c2c906f..5170d4ca9e75cbb64dc2564a8aa96222660f2a30 100644 (file)
--- a/framework/main/classes/controller/html/class_HtmlLoginController.php
+++ b/framework/main/classes/controller/html/class_HtmlLoginController.php
@@ -15,7 +15,11 @@ use Org\Mxchange\CoreFramework\Response\Responseable;
  *
  * @author             Roland Haeder <webmaster@shipsimu.org>
  * @version            0.0.0
+<<<<<<< HEAD:framework/main/classes/controller/html/class_HtmlLoginController.php
  * @copyright  Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2017 Core Developer Team
+=======
+ * @copyright  Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2016 Core Developer Team
+>>>>>>> Some updates::inc/main/classes/controller/html/class_HtmlLoginController.php
  * @license            GNU GPL 3.0 or any newer version
  * @link               http://www.shipsimu.org
  *

diff --git a/framework/main/classes/controller/html/class_HtmlLoginFailedController.php b/framework/main/classes/controller/html/class_HtmlLoginFailedController.php
index 696f3b1ddaf98a091eeff71648eae4b3ccc616ac..6b9419676ec13322f97dbdade3326706a98256bd 100644 (file)
--- a/framework/main/classes/controller/html/class_HtmlLoginFailedController.php
+++ b/framework/main/classes/controller/html/class_HtmlLoginFailedController.php
@@ -14,7 +14,11 @@ use Org\Mxchange\CoreFramework\Response\Responseable;
  *
  * @author             Roland Haeder <webmaster@shipsimu.org>
  * @version            0.0.0
+<<<<<<< HEAD:framework/main/classes/controller/html/class_HtmlLoginFailedController.php
  * @copyright  Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2017 Core Developer Team
+=======
+ * @copyright  Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2016 Core Developer Team
+>>>>>>> Some updates::inc/main/classes/controller/html/class_HtmlLoginFailedController.php
  * @license            GNU GPL 3.0 or any newer version
  * @link               http://www.shipsimu.org
  *

diff --git a/framework/main/classes/controller/html/class_HtmlLogoutController.php b/framework/main/classes/controller/html/class_HtmlLogoutController.php
index 59399733aba28f79995533bf8646dac4969322e9..4d2c7822665b46a3fafd06d018621a9615326c75 100644 (file)
--- a/framework/main/classes/controller/html/class_HtmlLogoutController.php
+++ b/framework/main/classes/controller/html/class_HtmlLogoutController.php
@@ -15,7 +15,11 @@ use Org\Mxchange\CoreFramework\Response\Responseable;
  *
  * @author             Roland Haeder <webmaster@shipsimu.org>
  * @version            0.0.0
+<<<<<<< HEAD:framework/main/classes/controller/html/class_HtmlLogoutController.php
  * @copyright  Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2017 Core Developer Team
+=======
+ * @copyright  Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2016 Core Developer Team
+>>>>>>> Some updates::inc/main/classes/controller/html/class_HtmlLogoutController.php
  * @license            GNU GPL 3.0 or any newer version
  * @link               http://www.shipsimu.org
  * @todo               This controller shall still provide some headlines for sidebars

diff --git a/framework/main/classes/controller/html/class_HtmlLogoutDoneController.php b/framework/main/classes/controller/html/class_HtmlLogoutDoneController.php
index 484a5bdcb482a2f8dc8f87507646e540d0c4ba93..f906a76cb8ac35621ab6b6569be99b18620d3be5 100644 (file)
--- a/framework/main/classes/controller/html/class_HtmlLogoutDoneController.php
+++ b/framework/main/classes/controller/html/class_HtmlLogoutDoneController.php
@@ -14,7 +14,11 @@ use Org\Mxchange\CoreFramework\Response\Responseable;
  *
  * @author             Roland Haeder <webmaster@shipsimu.org>
  * @version            0.0.0
+<<<<<<< HEAD:framework/main/classes/controller/html/class_HtmlLogoutDoneController.php
  * @copyright  Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2017 Core Developer Team
+=======
+ * @copyright  Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2016 Core Developer Team
+>>>>>>> Some updates::inc/main/classes/controller/html/class_HtmlLogoutDoneController.php
  * @license            GNU GPL 3.0 or any newer version
  * @link               http://www.shipsimu.org
  *

diff --git a/framework/main/classes/controller/html/class_HtmlRegisterController.php b/framework/main/classes/controller/html/class_HtmlRegisterController.php
index 6f2a36f13ca1037479b5a284ab51857a6b33c75c..64d289a8e315736bb6e94f5442856a893615d37f 100644 (file)
--- a/framework/main/classes/controller/html/class_HtmlRegisterController.php
+++ b/framework/main/classes/controller/html/class_HtmlRegisterController.php
@@ -14,7 +14,11 @@ use Org\Mxchange\CoreFramework\Response\Responseable;
  *
  * @author             Roland Haeder <webmaster@shipsimu.org>
  * @version            0.0.0
+<<<<<<< HEAD:framework/main/classes/controller/html/class_HtmlRegisterController.php
  * @copyright  Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2017 Core Developer Team
+=======
+ * @copyright  Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2016 Core Developer Team
+>>>>>>> Some updates::inc/main/classes/controller/html/class_HtmlRegisterController.php
  * @license            GNU GPL 3.0 or any newer version
  * @link               http://www.shipsimu.org
  *

diff --git a/framework/main/classes/controller/html/class_HtmlStatusController.php b/framework/main/classes/controller/html/class_HtmlStatusController.php
index eb5c5ab61d747b94cceb997c9464984a230d96c2..9b82d4cfb37d5642c77e4fea3cfea10c47d245c0 100644 (file)
--- a/framework/main/classes/controller/html/class_HtmlStatusController.php
+++ b/framework/main/classes/controller/html/class_HtmlStatusController.php
@@ -14,7 +14,11 @@ use Org\Mxchange\CoreFramework\Response\Responseable;
  *
  * @author             Roland Haeder <webmaster@shipsimu.org>
  * @version            0.0.0
+<<<<<<< HEAD:framework/main/classes/controller/html/class_HtmlStatusController.php
  * @copyright  Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2017 Core Developer Team
+=======
+ * @copyright  Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2016 Core Developer Team
+>>>>>>> Some updates::inc/main/classes/controller/html/class_HtmlStatusController.php
  * @license            GNU GPL 3.0 or any newer version
  * @link               http://www.shipsimu.org
  * @todo               This controller shall still provide some headlines for sidebars

diff --git a/framework/main/classes/controller/html/form/class_HtmlDoFormController.php b/framework/main/classes/controller/html/form/class_HtmlDoFormController.php
index fad03b89a49de33a714f21342d9dc72ec4a87480..f4a4479cd4fd513982fd3ab1b5ee16c61e904a71 100644 (file)
--- a/framework/main/classes/controller/html/form/class_HtmlDoFormController.php
+++ b/framework/main/classes/controller/html/form/class_HtmlDoFormController.php
@@ -14,7 +14,11 @@ use Org\Mxchange\CoreFramework\Response\Responseable;
  *
  * @author             Roland Haeder <webmaster@shipsimu.org>
  * @version            0.0.0
+<<<<<<< HEAD:framework/main/classes/controller/html/form/class_HtmlDoFormController.php
  * @copyright  Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2017 Core Developer Team
+=======
+ * @copyright  Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2016 Core Developer Team
+>>>>>>> Some updates::inc/main/classes/controller/html/form/class_HtmlDoFormController.php
  * @license            GNU GPL 3.0 or any newer version
  * @link               http://www.shipsimu.org
  *

diff --git a/framework/main/classes/controller/html/login/class_HtmlLoginAreaController.php b/framework/main/classes/controller/html/login/class_HtmlLoginAreaController.php
index 9466de757337d90b2be31db944f490e5e7ff1885..761ab3869133ecd5d68a63b2bd6a02b3e44602a4 100644 (file)
--- a/framework/main/classes/controller/html/login/class_HtmlLoginAreaController.php
+++ b/framework/main/classes/controller/html/login/class_HtmlLoginAreaController.php
@@ -15,7 +15,11 @@ use Org\Mxchange\CoreFramework\Response\Responseable;
  *
  * @author             Roland Haeder <webmaster@shipsimu.org>
  * @version            0.0.0
+<<<<<<< HEAD:framework/main/classes/controller/html/login/class_HtmlLoginAreaController.php
  * @copyright  Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2017 Core Developer Team
+=======
+ * @copyright  Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2016 Core Developer Team
+>>>>>>> Some updates::inc/main/classes/controller/html/login/class_HtmlLoginAreaController.php
  * @license            GNU GPL 3.0 or any newer version
  * @link               http://www.shipsimu.org
  *

diff --git a/framework/main/classes/controller/image/captcha/class_ImageCodeCaptchaController.php b/framework/main/classes/controller/image/captcha/class_ImageCodeCaptchaController.php
index 522aef85ae68f71b93d4fedc2168da7f9716163e..cb98da0142ede2d651ebffca2e646ce1b5230f5c 100644 (file)
--- a/framework/main/classes/controller/image/captcha/class_ImageCodeCaptchaController.php
+++ b/framework/main/classes/controller/image/captcha/class_ImageCodeCaptchaController.php
@@ -15,7 +15,11 @@ use Org\Mxchange\CoreFramework\Response\Responseable;
  *
  * @author             Roland Haeder <webmaster@shipsimu.org>
  * @version            0.0.0
+<<<<<<< HEAD:framework/main/classes/controller/image/captcha/class_ImageCodeCaptchaController.php
  * @copyright  Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2017 Core Developer Team
+=======
+ * @copyright  Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2016 Core Developer Team
+>>>>>>> Some updates::inc/main/classes/controller/image/captcha/class_ImageCodeCaptchaController.php
  * @license            GNU GPL 3.0 or any newer version
  * @link               http://www.shipsimu.org
  *

diff --git a/framework/main/classes/controller/image/class_ImageDefaultController.php b/framework/main/classes/controller/image/class_ImageDefaultController.php
index 7dc1bbda8a99c4c3a59d35aad5f4d3a362a5bd85..1178684f0256fe04cdbb4289807f66141de236ef 100644 (file)
--- a/framework/main/classes/controller/image/class_ImageDefaultController.php
+++ b/framework/main/classes/controller/image/class_ImageDefaultController.php
@@ -14,7 +14,11 @@ use Org\Mxchange\CoreFramework\Response\Responseable;
  *
  * @author             Roland Haeder <webmaster@shipsimu.org>
  * @version            0.0.0
+<<<<<<< HEAD:framework/main/classes/controller/image/class_ImageDefaultController.php
  * @copyright  Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2017 Core Developer Team
+=======
+ * @copyright  Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2016 Core Developer Team
+>>>>>>> Some updates::inc/main/classes/controller/image/class_ImageDefaultController.php
  * @license            GNU GPL 3.0 or any newer version
  * @link               http://www.shipsimu.org
  *

diff --git a/framework/main/classes/criteria/class_BaseCriteria.php b/framework/main/classes/criteria/class_BaseCriteria.php
index e9f9a853adf7084d8979c983e60dca7a8130e558..4452760a6f3bf58b513478c358cfe5d8dda324a8 100644 (file)
--- a/framework/main/classes/criteria/class_BaseCriteria.php
+++ b/framework/main/classes/criteria/class_BaseCriteria.php
@@ -11,7 +11,11 @@ use Org\Mxchange\CoreFramework\Object\BaseFrameworkSystem;
  *
  * @author             Roland Haeder <webmaster@shipsimu.org>
  * @version            0.0.0
+<<<<<<< HEAD:framework/main/classes/criteria/class_BaseCriteria.php
  * @copyright  Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2017 Core Developer Team
+=======
+ * @copyright  Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2016 Core Developer Team
+>>>>>>> Some updates::inc/main/classes/criteria/class_BaseCriteria.php
  * @license            GNU GPL 3.0 or any newer version
  * @link               http://www.shipsimu.org
  *

diff --git a/framework/main/classes/criteria/dataset/class_DataSetCriteria.php b/framework/main/classes/criteria/dataset/class_DataSetCriteria.php
index f443623e870435c120263aa93c5feafc9e5d8e85..ed36dd361417912e44808cc2b2cc268bc32a3956 100644 (file)
--- a/framework/main/classes/criteria/dataset/class_DataSetCriteria.php
+++ b/framework/main/classes/criteria/dataset/class_DataSetCriteria.php
@@ -12,7 +12,11 @@ use Org\Mxchange\CoreFramework\EntryPoint\ApplicationEntryPoint;
  *
  * @author             Roland Haeder <webmaster@shipsimu.org>
  * @version            0.0.0
+<<<<<<< HEAD:framework/main/classes/criteria/dataset/class_DataSetCriteria.php
  * @copyright  Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2017 Core Developer Team
+=======
+ * @copyright  Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2016 Core Developer Team
+>>>>>>> Some updates::inc/main/classes/criteria/dataset/class_DataSetCriteria.php
  * @license            GNU GPL 3.0 or any newer version
  * @link               http://www.shipsimu.org
  *

diff --git a/framework/main/classes/criteria/search/class_SearchCriteria.php b/framework/main/classes/criteria/search/class_SearchCriteria.php
index 7ab52f40c62e8444980cc5fe4bfb5f53cde22513..db6a25268897d7a020739f7986a268c1f0fa3b56 100644 (file)
--- a/framework/main/classes/criteria/search/class_SearchCriteria.php
+++ b/framework/main/classes/criteria/search/class_SearchCriteria.php
@@ -13,7 +13,11 @@ use Org\Mxchange\CoreFramework\Criteria\Local\LocalSearchCriteria;
  *
  * @author             Roland Haeder <webmaster@shipsimu.org>
  * @version            0.0.0
+<<<<<<< HEAD:framework/main/classes/criteria/search/class_SearchCriteria.php
  * @copyright  Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2017 Core Developer Team
+=======
+ * @copyright  Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2016 Core Developer Team
+>>>>>>> Some updates::inc/main/classes/criteria/search/class_SearchCriteria.php
  * @license            GNU GPL 3.0 or any newer version
  * @link               http://www.shipsimu.org
  *

diff --git a/framework/main/classes/criteria/update/class_UpdateCriteria.php b/framework/main/classes/criteria/update/class_UpdateCriteria.php
index 1d9d1e9515a9a48afd55008611ea47819f94cd02..cec42687d8ec015f4642fd0afa12fd0b314ad76e 100644 (file)
--- a/framework/main/classes/criteria/update/class_UpdateCriteria.php
+++ b/framework/main/classes/criteria/update/class_UpdateCriteria.php
@@ -13,7 +13,11 @@ use Org\Mxchange\CoreFramework\Criteria\Local\LocalUpdateCriteria;
  *
  * @author             Roland Haeder <webmaster@shipsimu.org>
  * @version            0.0.0
+<<<<<<< HEAD:framework/main/classes/criteria/update/class_UpdateCriteria.php
  * @copyright  Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2017 Core Developer Team
+=======
+ * @copyright  Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2016 Core Developer Team
+>>>>>>> Some updates::inc/main/classes/criteria/update/class_UpdateCriteria.php
  * @license            GNU GPL 3.0 or any newer version
  * @link               http://www.shipsimu.org
  *

diff --git a/framework/main/classes/crypto/class_CryptoHelper.php b/framework/main/classes/crypto/class_CryptoHelper.php
index 1bf22a341543eae677c2a64549013fa942f18bb5..830c23cc52c660326a047c629c6e320567abcf90 100644 (file)
--- a/framework/main/classes/crypto/class_CryptoHelper.php
+++ b/framework/main/classes/crypto/class_CryptoHelper.php
@@ -12,7 +12,11 @@ use Org\Mxchange\CoreFramework\Object\BaseFrameworkSystem;
  *
  * @author             Roland Haeder <webmaster@shipsimu.org>
  * @version            0.0.0
+<<<<<<< HEAD:framework/main/classes/crypto/class_CryptoHelper.php
  * @copyright  Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2017 Core Developer Team
+=======
+ * @copyright  Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2016 Core Developer Team
+>>>>>>> Some updates::inc/main/classes/crypto/class_CryptoHelper.php
  * @license            GNU GPL 3.0 or any newer version
  * @link               http://www.shipsimu.org
  *

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

diff --git a/framework/main/classes/database/class_ b/framework/main/classes/database/class_
index 1e6e7a3e2db648c5693573f3b94b92b47ecf6ad5..1a8bf5fdf28f56601f11cfe2c384c9113e13621c 100644 (file)
--- a/framework/main/classes/database/class_
+++ b/framework/main/classes/database/class_
@@ -5,7 +5,11 @@
  * @see                        DatabaseBackendInterface - An interface for database backends
  * @author             Roland Haeder <webmaster@ship-simu.org>
  * @version            0.0.0
+<<<<<<< HEAD:framework/main/classes/database/class_
  * @copyright  Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2017 Core Developer Team
+=======
+ * @copyright  Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2016 Core Developer Team
+>>>>>>> Some updates::inc/main/classes/database/class_
  * @license            GNU GPL 3.0 or any newer version
  * @link               http://www.ship-simu.org
  *

diff --git a/framework/main/classes/database/class_BaseDatabaseBackend.php b/framework/main/classes/database/class_BaseDatabaseBackend.php
index 025a9879059997d12672390d1ae1673dbe4cd4c4..ad33fae184cb44648d5e78ab358f16ddb0301258 100644 (file)
--- a/framework/main/classes/database/class_BaseDatabaseBackend.php
+++ b/framework/main/classes/database/class_BaseDatabaseBackend.php
@@ -13,7 +13,11 @@ use Org\Mxchange\CoreFramework\Object\BaseFrameworkSystem;
  * @see                        DatabaseBackend - An interface for database backends
  * @author             Roland Haeder <webmaster@shipsimu.org>
  * @version            0.0.0
+<<<<<<< HEAD:framework/main/classes/database/class_BaseDatabaseBackend.php
  * @copyright  Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2017 Core Developer Team
+=======
+ * @copyright  Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2016 Core Developer Team
+>>>>>>> Some updates::inc/main/classes/database/class_BaseDatabaseBackend.php
  * @license            GNU GPL 3.0 or any newer version
  * @link               http://www.shipsimu.org
  *

diff --git a/framework/main/classes/database/class_BaseDatabaseResult.php b/framework/main/classes/database/class_BaseDatabaseResult.php
index e0f9a950992580f575663c07f012cdb43c7ce4fa..5a78394a9f77f59021879f0474b2de6982686c08 100644 (file)
--- a/framework/main/classes/database/class_BaseDatabaseResult.php
+++ b/framework/main/classes/database/class_BaseDatabaseResult.php
@@ -11,7 +11,11 @@ use Org\Mxchange\CoreFramework\Object\BaseFrameworkSystem;
  * @see                        DatabaseBackend - An interface for database backends
  * @author             Roland Haeder <webmaster@ship-simu.org>
  * @version            0.0.0
+<<<<<<< HEAD:framework/main/classes/database/class_BaseDatabaseResult.php
  * @copyright  Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2017 Core Developer Team
+=======
+ * @copyright  Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2016 Core Developer Team
+>>>>>>> Some updates::inc/main/classes/database/class_BaseDatabaseResult.php
  * @license            GNU GPL 3.0 or any newer version
  * @link               http://www.ship-simu.org
  *

diff --git a/framework/main/classes/database/class_BaseDatabaseWrapper.php b/framework/main/classes/database/class_BaseDatabaseWrapper.php
index d8b47b5825101ec018b7320db9368baa1f396653..ea4f3402e737005b2214de8495f21fbb994521f0 100644 (file)
--- a/framework/main/classes/database/class_BaseDatabaseWrapper.php
+++ b/framework/main/classes/database/class_BaseDatabaseWrapper.php
@@ -14,7 +14,11 @@ use Org\Mxchange\CoreFramework\Object\BaseFrameworkSystem;
  *
  * @author             Roland Haeder <webmaster@shipsimu.org>
  * @version            0.0.0
+<<<<<<< HEAD:framework/main/classes/database/class_BaseDatabaseWrapper.php
  * @copyright  Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2017 Core Developer Team
+=======
+ * @copyright  Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2016 Core Developer Team
+>>>>>>> Some updates::inc/main/classes/database/class_BaseDatabaseWrapper.php
  * @license            GNU GPL 3.0 or any newer version
  * @link               http://www.shipsimu.org
  *

diff --git a/framework/main/classes/database/frontend/class_NewsDatabaseWrapper.php b/framework/main/classes/database/frontend/class_NewsDatabaseWrapper.php
index 88b98cbd05cafc4fae01ed8ad8d2bf78d9c38740..20874d8a7be25d7706d6d1541b216ef456807b41 100644 (file)
--- a/framework/main/classes/database/frontend/class_NewsDatabaseWrapper.php
+++ b/framework/main/classes/database/frontend/class_NewsDatabaseWrapper.php
@@ -11,7 +11,11 @@ use Org\Mxchange\CoreFramework\Registry\Registerable;
  *
  * @author             Roland Haeder <webmaster@shipsimu.org>
  * @version            0.0.0
+<<<<<<< HEAD:framework/main/classes/database/frontend/class_NewsDatabaseWrapper.php
  * @copyright  Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2017 Core Developer Team
+=======
+ * @copyright  Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2016 Core Developer Team
+>>>>>>> Some updates::inc/main/classes/database/frontend/class_NewsDatabaseWrapper.php
  * @license            GNU GPL 3.0 or any newer version
  * @link               http://www.shipsimu.org
  * @todo               Add missing own interface for public methods

diff --git a/framework/main/classes/database/frontend/class_PaymentsDatabaseWrapper.php b/framework/main/classes/database/frontend/class_PaymentsDatabaseWrapper.php
index 116e474d8ea96bb4a0b8de2487424a26c6b009af..afd49a54872f4f7e9cbe978f792c734778f65ea3 100644 (file)
--- a/framework/main/classes/database/frontend/class_PaymentsDatabaseWrapper.php
+++ b/framework/main/classes/database/frontend/class_PaymentsDatabaseWrapper.php
@@ -11,7 +11,11 @@ use Org\Mxchange\CoreFramework\Registry\Registerable;
  *
  * @author             Roland Haeder <webmaster@shipsimu.org>
  * @version            0.0.0
+<<<<<<< HEAD:framework/main/classes/database/frontend/class_PaymentsDatabaseWrapper.php
  * @copyright  Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2017 Core Developer Team
+=======
+ * @copyright  Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2016 Core Developer Team
+>>>>>>> Some updates::inc/main/classes/database/frontend/class_PaymentsDatabaseWrapper.php
  * @license            GNU GPL 3.0 or any newer version
  * @link               http://www.shipsimu.org
  * @todo               Add missing own interface for public methods

diff --git a/framework/main/classes/database/frontend/class_UserDatabaseWrapper.php b/framework/main/classes/database/frontend/class_UserDatabaseWrapper.php
index 9ed16737a210e71fd2b7f2d5ea2f4f20ce1a0e9c..59e2c376b0247a7a9479b79521270b32033b863f 100644 (file)
--- a/framework/main/classes/database/frontend/class_UserDatabaseWrapper.php
+++ b/framework/main/classes/database/frontend/class_UserDatabaseWrapper.php
@@ -16,7 +16,11 @@ use Org\Mxchange\CoreFramework\Wrapper\Account\ManageableAccountWrapper;
  *
  * @author             Roland Haeder <webmaster@shipsimu.org>
  * @version            0.0.0
+<<<<<<< HEAD:framework/main/classes/database/frontend/class_UserDatabaseWrapper.php
  * @copyright  Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2017 Core Developer Team
+=======
+ * @copyright  Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2016 Core Developer Team
+>>>>>>> Some updates::inc/main/classes/database/frontend/class_UserDatabaseWrapper.php
  * @license            GNU GPL 3.0 or any newer version
  * @link               http://www.shipsimu.org
  *

diff --git a/framework/main/classes/database/frontend/class_UserPointsDatabaseWrapper.php b/framework/main/classes/database/frontend/class_UserPointsDatabaseWrapper.php
index d9242d8aa8b60e547b6da819533a2191726fc8ee..affde5b06788c607d0427e271f292435b34a4656 100644 (file)
--- a/framework/main/classes/database/frontend/class_UserPointsDatabaseWrapper.php
+++ b/framework/main/classes/database/frontend/class_UserPointsDatabaseWrapper.php
@@ -13,7 +13,11 @@ use Org\Mxchange\CoreFramework\Result\Update\UpdateableResult;
  *
  * @author             Roland Haeder <webmaster@shipsimu.org>
  * @version            0.0.0
+<<<<<<< HEAD:framework/main/classes/database/frontend/class_UserPointsDatabaseWrapper.php
  * @copyright  Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2017 Core Developer Team
+=======
+ * @copyright  Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2016 Core Developer Team
+>>>>>>> Some updates::inc/main/classes/database/frontend/class_UserPointsDatabaseWrapper.php
  * @license            GNU GPL 3.0 or any newer version
  * @link               http://www.shipsimu.org
  *

diff --git a/framework/main/classes/database/result/class_CachedDatabaseResult.php b/framework/main/classes/database/result/class_CachedDatabaseResult.php
index 6c36cdc04c6004f510e769dc7a7637c64386037f..4064f21a0ed2dc9a1c14f43db6a2664828aabc0f 100644 (file)
--- a/framework/main/classes/database/result/class_CachedDatabaseResult.php
+++ b/framework/main/classes/database/result/class_CachedDatabaseResult.php
@@ -19,7 +19,11 @@ use \SeekableIterator;
  *
  * @author             Roland Haeder <webmaster@shipsimu.org>
  * @version            0.0.0
+<<<<<<< HEAD:framework/main/classes/database/result/class_CachedDatabaseResult.php
  * @copyright  Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2017 Core Developer Team
+=======
+ * @copyright  Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2016 Core Developer Team
+>>>>>>> Some updates::inc/main/classes/database/result/class_CachedDatabaseResult.php
  * @license            GNU GPL 3.0 or any newer version
  * @link               http://www.shipsimu.org
  *

diff --git a/framework/main/classes/decorator/class_BaseDecorator.php b/framework/main/classes/decorator/class_BaseDecorator.php
index 5ab0019cfeb84fee3d0d4441b5bd29fae286674d..e8f5ae237f3fd7b77b11acd0c584b4df8e9d39d0 100644 (file)
--- a/framework/main/classes/decorator/class_BaseDecorator.php
+++ b/framework/main/classes/decorator/class_BaseDecorator.php
@@ -10,7 +10,11 @@ use Org\Mxchange\CoreFramework\Object\BaseFrameworkSystem;
  *
  * @author             Roland Haeder <webmaster@shipsimu.org>
  * @version            0.0.0
+<<<<<<< HEAD:framework/main/classes/decorator/class_BaseDecorator.php
  * @copyright  Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2017 Core Developer Team
+=======
+ * @copyright  Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2016 Core Developer Team
+>>>>>>> Some updates::inc/main/classes/decorator/class_BaseDecorator.php
  * @license            GNU GPL 3.0 or any newer version
  * @link               http://www.shipsimu.org
  *

diff --git a/framework/main/classes/decorator/template/class_XmlRewriterTemplateDecorator.php b/framework/main/classes/decorator/template/class_XmlRewriterTemplateDecorator.php
index 4325fffc8a2a5934459adf92caf94ecae9d4e577..46ac2c5c456ecff66dcdf9c9d6d7c2f2d09a77de 100644 (file)
--- a/framework/main/classes/decorator/template/class_XmlRewriterTemplateDecorator.php
+++ b/framework/main/classes/decorator/template/class_XmlRewriterTemplateDecorator.php
@@ -14,7 +14,11 @@ use Org\Mxchange\CoreFramework\Template\CompileableTemplate;
  *
  * @author             Roland Haeder <webmaster@shipsimu.org>
  * @version            0.0.0
+<<<<<<< HEAD:framework/main/classes/decorator/template/class_XmlRewriterTemplateDecorator.php
  * @copyright  Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2017 Core Developer Team
+=======
+ * @copyright  Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2016 Core Developer Team
+>>>>>>> Some updates::inc/main/classes/decorator/template/class_XmlRewriterTemplateDecorator.php
  * @license            GNU GPL 3.0 or any newer version
  * @link               http://www.shipsimu.org
  *

diff --git a/framework/main/classes/decorator/xml/class_XmlCompactorDecorator.php b/framework/main/classes/decorator/xml/class_XmlCompactorDecorator.php
index bf35ecce34caad4da85ea3ca9930c9809365434b..f5b4a407c18470e9e286429de6c263ee0841d270 100644 (file)
--- a/framework/main/classes/decorator/xml/class_XmlCompactorDecorator.php
+++ b/framework/main/classes/decorator/xml/class_XmlCompactorDecorator.php
@@ -12,7 +12,11 @@ use Org\Mxchange\CoreFramework\Parser\Parseable;
  *
  * @author             Roland Haeder <webmaster@shipsimu.org>
  * @version            0.0.0
+<<<<<<< HEAD:framework/main/classes/decorator/xml/class_XmlCompactorDecorator.php
  * @copyright  Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2017 Core Developer Team
+=======
+ * @copyright  Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2016 Core Developer Team
+>>>>>>> Some updates::inc/main/classes/decorator/xml/class_XmlCompactorDecorator.php
  * @license            GNU GPL 3.0 or any newer version
  * @link               http://www.shipsimu.org
  *

diff --git a/framework/main/classes/discovery/class_ b/framework/main/classes/discovery/class_
index f33d64f003a064d4432e43aad004365a26164075..baf610f97411e14da2666d17cac2d9b53240b323 100644 (file)
--- a/framework/main/classes/discovery/class_
+++ b/framework/main/classes/discovery/class_
@@ -10,7 +10,11 @@ use Org\Mxchange\CoreFramework\Helper\Template\HelpableTemplate;
  *
  * @author             Roland Haeder <webmaster@ship-simu.org>
  * @version            0.0.0
+<<<<<<< HEAD:framework/main/classes/discovery/class_
  * @copyright  Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2017 Core Developer Team
+=======
+ * @copyright  Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2016 Core Developer Team
+>>>>>>> Some updates::inc/main/classes/discovery/class_
  * @license            GNU GPL 3.0 or any newer version
  * @link               http://www.ship-simu.org
  *

diff --git a/framework/main/classes/discovery/class_BaseDiscovery.php b/framework/main/classes/discovery/class_BaseDiscovery.php
index 2b175c0d00f3354006d7cb484c62d0926d397069..1a812b03408c7d3788ec9eead231205be8c4f1f7 100644 (file)
--- a/framework/main/classes/discovery/class_BaseDiscovery.php
+++ b/framework/main/classes/discovery/class_BaseDiscovery.php
@@ -10,7 +10,11 @@ use Org\Mxchange\CoreFramework\Object\BaseFrameworkSystem;
  *
  * @author             Roland Haeder <webmaster@shipsimu.org>
  * @version            0.0.0
+<<<<<<< HEAD:framework/main/classes/discovery/class_BaseDiscovery.php
  * @copyright  Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2017 Core Developer Team
+=======
+ * @copyright  Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2016 Core Developer Team
+>>>>>>> Some updates::inc/main/classes/discovery/class_BaseDiscovery.php
  * @license            GNU GPL 3.0 or any newer version
  * @link               http://www.shipsimu.org
  *

diff --git a/framework/main/classes/discovery/payment/class_LocalPaymentDiscovery.php b/framework/main/classes/discovery/payment/class_LocalPaymentDiscovery.php
index 79d2da4144b83f9a7eb95cf86d9a6207497cae62..8e314580ebf11b8d006c2384feb5455e38cd8b7e 100644 (file)
--- a/framework/main/classes/discovery/payment/class_LocalPaymentDiscovery.php
+++ b/framework/main/classes/discovery/payment/class_LocalPaymentDiscovery.php
@@ -19,7 +19,11 @@ use Org\Mxchange\CoreFramework\Request\Requestable;
  *
  * @author             Roland Haeder <webmaster@shipsimu.org>
  * @version            0.0.0
+<<<<<<< HEAD:framework/main/classes/discovery/payment/class_LocalPaymentDiscovery.php
  * @copyright  Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2017 Core Developer Team
+=======
+ * @copyright  Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2016 Core Developer Team
+>>>>>>> Some updates::inc/main/classes/discovery/payment/class_LocalPaymentDiscovery.php
  * @license            GNU GPL 3.0 or any newer version
  * @link               http://www.shipsimu.org
  *

diff --git a/framework/main/classes/factories/cache/class_CacheFactory.php b/framework/main/classes/factories/cache/class_CacheFactory.php
index a32074496afb2918072661e33a611ed35721ba11..028bf4f411b72a9e77e7b858896f9316cb20d550 100644 (file)
--- a/framework/main/classes/factories/cache/class_CacheFactory.php
+++ b/framework/main/classes/factories/cache/class_CacheFactory.php
@@ -11,7 +11,11 @@ use Org\Mxchange\CoreFramework\Factory\ObjectFactory;
  *
  * @author             Roland Haeder <webmaster@shipsimu.org>
  * @version            0.0.0
+<<<<<<< HEAD:framework/main/classes/factories/cache/class_CacheFactory.php
  * @copyright  Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2017 Core Developer Team
+=======
+ * @copyright  Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2016 Core Developer Team
+>>>>>>> Some updates::inc/main/classes/factories/cache/class_CacheFactory.php
  * @license            GNU GPL 3.0 or any newer version
  * @link               http://www.shipsimu.org
  *

diff --git a/framework/main/classes/factories/class_ b/framework/main/classes/factories/class_
index 9c9ab02692ef228fc16b847310694fe60b545d81..60182743700cf960a1bb3e0f78cda29c91b22bdc 100644 (file)
--- a/framework/main/classes/factories/class_
+++ b/framework/main/classes/factories/class_
@@ -4,7 +4,11 @@
  *
  * @author             Roland Haeder <webmaster@shipsimu.org>
  * @version            0.0.0
+<<<<<<< HEAD:framework/main/classes/factories/class_
  * @copyright  Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2017 Core Developer Team
+=======
+ * @copyright  Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2016 Core Developer Team
+>>>>>>> Some updates::inc/main/classes/factories/class_
  * @license            GNU GPL 3.0 or any newer version
  * @link               http://www.shipsimu.org
  *

diff --git a/framework/main/classes/factories/class_BaseFactory.php b/framework/main/classes/factories/class_BaseFactory.php
index 103d9215948a6ff6be42e813ed55582330886a81..fd76f21cf7fe454df986a19280b18b819aecbfb7 100644 (file)
--- a/framework/main/classes/factories/class_BaseFactory.php
+++ b/framework/main/classes/factories/class_BaseFactory.php
@@ -10,7 +10,11 @@ use Org\Mxchange\CoreFramework\Object\BaseFrameworkSystem;
  *
  * @author             Roland Haeder <webmaster@shipsimu.org>
  * @version            0.0.0
+<<<<<<< HEAD:framework/main/classes/factories/class_BaseFactory.php
  * @copyright  Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2017 Core Developer Team
+=======
+ * @copyright  Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2016 Core Developer Team
+>>>>>>> Some updates::inc/main/classes/factories/class_BaseFactory.php
  * @license            GNU GPL 3.0 or any newer version
  * @link               http://www.shipsimu.org
  *

diff --git a/framework/main/classes/factories/database/class_DatabaseWrapperFactory.php b/framework/main/classes/factories/database/class_DatabaseWrapperFactory.php
index c272f7517e8e27898cc4eb771a803f856fb5f1b9..c082070e4de122df38e9bf6313107b525c69785c 100644 (file)
--- a/framework/main/classes/factories/database/class_DatabaseWrapperFactory.php
+++ b/framework/main/classes/factories/database/class_DatabaseWrapperFactory.php
@@ -11,7 +11,11 @@ use Org\Mxchange\CoreFramework\Registry\Registry;
  *
  * @author             Roland Haeder <webmaster@shipsimu.org>
  * @version            0.0.0
+<<<<<<< HEAD:framework/main/classes/factories/database/class_DatabaseWrapperFactory.php
  * @copyright  Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2017 Core Developer Team
+=======
+ * @copyright  Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2016 Core Developer Team
+>>>>>>> Some updates::inc/main/classes/factories/database/class_DatabaseWrapperFactory.php
  * @license            GNU GPL 3.0 or any newer version
  * @link               http://www.shipsimu.org
  *

diff --git a/framework/main/classes/factories/html/class_HtmlNewsFactory.php b/framework/main/classes/factories/html/class_HtmlNewsFactory.php
index 880606a1092d1ba1b7812db4b4ffe6fcb1434d27..062d6755d2d981151f4358b3b8d1b16efb00cbfb 100644 (file)
--- a/framework/main/classes/factories/html/class_HtmlNewsFactory.php
+++ b/framework/main/classes/factories/html/class_HtmlNewsFactory.php
@@ -12,7 +12,11 @@ use Org\Mxchange\CoreFramework\Request\Requestable;
  *
  * @author             Roland Haeder <webmaster@shipsimu.org>
  * @version            0.0.0
+<<<<<<< HEAD:framework/main/classes/factories/html/class_HtmlNewsFactory.php
  * @copyright  Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2017 Core Developer Team
+=======
+ * @copyright  Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2016 Core Developer Team
+>>>>>>> Some updates::inc/main/classes/factories/html/class_HtmlNewsFactory.php
  * @license            GNU GPL 3.0 or any newer version
  * @link               http://www.shipsimu.org
  *

diff --git a/framework/main/classes/factories/index/class_FileStackIndexFactory.php b/framework/main/classes/factories/index/class_FileStackIndexFactory.php
index 8d366c0e2e5bb804e53b85df13b84e63a1b9739e..0f7ffa3e999c8f79f2fbca4b00223f951f0ea942 100644 (file)
--- a/framework/main/classes/factories/index/class_FileStackIndexFactory.php
+++ b/framework/main/classes/factories/index/class_FileStackIndexFactory.php
@@ -15,7 +15,11 @@ use \SplFileInfo;
  *
  * @author             Roland Haeder <webmaster@ship-simu.org>
  * @version            0.0.0
+<<<<<<< HEAD:framework/main/classes/factories/index/class_FileStackIndexFactory.php
  * @copyright  Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2017 Core Developer Team
+=======
+ * @copyright  Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2016 Core Developer Team
+>>>>>>> Some updates::inc/main/classes/factories/index/class_FileStackIndexFactory.php
  * @license            GNU GPL 3.0 or any newer version
  * @link               http://www.ship-simu.org
  *

diff --git a/framework/main/classes/factories/logger/class_LoggerFactory.php b/framework/main/classes/factories/logger/class_LoggerFactory.php
index 952d14c4646d56a440a08485e93b6c286c11985f..a0099eff83e44fcdebb70f24df6f361309ea6acb 100644 (file)
--- a/framework/main/classes/factories/logger/class_LoggerFactory.php
+++ b/framework/main/classes/factories/logger/class_LoggerFactory.php
@@ -11,7 +11,11 @@ use Org\Mxchange\CoreFramework\Generic\FrameworkInterface;
  *
  * @author             Roland Haeder <webmaster@shipsimu.org>
  * @version            0.0.0
+<<<<<<< HEAD:framework/main/classes/factories/logger/class_LoggerFactory.php
  * @copyright  Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2017 Core Developer Team
+=======
+ * @copyright  Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2016 Core Developer Team
+>>>>>>> Some updates::inc/main/classes/factories/logger/class_LoggerFactory.php
  * @license            GNU GPL 3.0 or any newer version
  * @link               http://www.shipsimu.org
  *

diff --git a/framework/main/classes/factories/login/class_LoginFactory.php b/framework/main/classes/factories/login/class_LoginFactory.php
index fc3e1586eaf77e155bc9f0c9974c1312b1d173d3..29ba36c7a7d1c29d5734d2d10ac6ab784282c44e 100644 (file)
--- a/framework/main/classes/factories/login/class_LoginFactory.php
+++ b/framework/main/classes/factories/login/class_LoginFactory.php
@@ -12,7 +12,11 @@ use Org\Mxchange\CoreFramework\Request\Requestable;
  *
  * @author             Roland Haeder <webmaster@shipsimu.org>
  * @version            0.0.0
+<<<<<<< HEAD:framework/main/classes/factories/login/class_LoginFactory.php
  * @copyright  Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2017 Core Developer Team
+=======
+ * @copyright  Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2016 Core Developer Team
+>>>>>>> Some updates::inc/main/classes/factories/login/class_LoginFactory.php
  * @license            GNU GPL 3.0 or any newer version
  * @link               http://www.shipsimu.org
  *

diff --git a/framework/main/classes/factories/objects/class_ObjectFactory.php b/framework/main/classes/factories/objects/class_ObjectFactory.php
index f06a70a16b6a82a4ff32738853114b89ffdbb4b9..5467f403fa62c616ae68bcf206d803e9abeb0f97 100644 (file)
--- a/framework/main/classes/factories/objects/class_ObjectFactory.php
+++ b/framework/main/classes/factories/objects/class_ObjectFactory.php
@@ -14,7 +14,11 @@ use \InvalidArgumentException;
  *
  * @author             Roland Haeder <webmaster@shipsimu.org>
  * @version            0.0.0
+<<<<<<< HEAD:framework/main/classes/factories/objects/class_ObjectFactory.php
  * @copyright  Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2017 Core Developer Team
+=======
+ * @copyright  Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2016 Core Developer Team
+>>>>>>> Some updates::inc/main/classes/factories/objects/class_ObjectFactory.php
  * @license            GNU GPL 3.0 or any newer version
  * @link               http://www.shipsimu.org
  *

diff --git a/framework/main/classes/factories/registry/class_SocketRegistryFactory.php b/framework/main/classes/factories/registry/class_SocketRegistryFactory.php
index 14c4eab2c5d3e4c699690d00dca0abcd075e649a..ed1442f0af5cd0dd650aea4f7f245bacdbfbe346 100644 (file)
--- a/framework/main/classes/factories/registry/class_SocketRegistryFactory.php
+++ b/framework/main/classes/factories/registry/class_SocketRegistryFactory.php
@@ -11,7 +11,11 @@ use Org\Mxchange\CoreFramework\Registry\Registry;
  *
  * @author             Roland Haeder <webmaster@shipsimu.org>
  * @version            0.0.0
+<<<<<<< HEAD:framework/main/classes/factories/registry/class_SocketRegistryFactory.php
  * @copyright  Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2017 Core Developer Team
+=======
+ * @copyright  Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2016 Core Developer Team
+>>>>>>> Some updates::inc/main/classes/factories/registry/class_SocketRegistryFactory.php
  * @license            GNU GPL 3.0 or any newer version
  * @link               http://www.shipsimu.org
  *

diff --git a/framework/main/classes/factories/stacks/class_FileStackFactory.php b/framework/main/classes/factories/stacks/class_FileStackFactory.php
index 8b875c2a1a81045e13168530fda7be22a0a3ac99..8b30ffea5aafe7b410aca836dbd01fa97683d663 100644 (file)
--- a/framework/main/classes/factories/stacks/class_FileStackFactory.php
+++ b/framework/main/classes/factories/stacks/class_FileStackFactory.php
@@ -15,7 +15,11 @@ use \SplFileInfo;
  *
  * @author             Roland Haeder <webmaster@ship-simu.org>
  * @version            0.0.0
+<<<<<<< HEAD:framework/main/classes/factories/stacks/class_FileStackFactory.php
  * @copyright  Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2017 Core Developer Team
+=======
+ * @copyright  Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2016 Core Developer Team
+>>>>>>> Some updates::inc/main/classes/factories/stacks/class_FileStackFactory.php
  * @license            GNU GPL 3.0 or any newer version
  * @link               http://www.ship-simu.org
  *

diff --git a/framework/main/classes/factories/user/class_UserFactory.php b/framework/main/classes/factories/user/class_UserFactory.php
index 19ef3d955063a169958a32e98a755d1c0fde0f15..2a84ea283821196c934c64d4d55caec186b748c8 100644 (file)
--- a/framework/main/classes/factories/user/class_UserFactory.php
+++ b/framework/main/classes/factories/user/class_UserFactory.php
@@ -13,7 +13,11 @@ use Org\Mxchange\CoreFramework\Request\Requestable;
  *
  * @author             Roland Haeder <webmaster@shipsimu.org>
  * @version            0.0.0
+<<<<<<< HEAD:framework/main/classes/factories/user/class_UserFactory.php
  * @copyright  Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2017 Core Developer Team
+=======
+ * @copyright  Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2016 Core Developer Team
+>>>>>>> Some updates::inc/main/classes/factories/user/class_UserFactory.php
  * @license            GNU GPL 3.0 or any newer version
  * @link               http://www.shipsimu.org
  *

diff --git a/framework/main/classes/factories/xml/class_XmlTemplateEngineFactory.php b/framework/main/classes/factories/xml/class_XmlTemplateEngineFactory.php
index 5995010afa4eefbedbc5eb327f3f0213aae0aed9..7b92ab7215d4766d43933a27752d4a214c68788f 100644 (file)
--- a/framework/main/classes/factories/xml/class_XmlTemplateEngineFactory.php
+++ b/framework/main/classes/factories/xml/class_XmlTemplateEngineFactory.php
@@ -13,7 +13,11 @@ use Org\Mxchange\CoreFramework\Registry\Registry;
  *
  * @author             Roland Haeder <webmaster@shipsimu.org>
  * @version            0.0.0
+<<<<<<< HEAD:framework/main/classes/factories/xml/class_XmlTemplateEngineFactory.php
  * @copyright  Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2017 Core Developer Team
+=======
+ * @copyright  Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2016 Core Developer Team
+>>>>>>> Some updates::inc/main/classes/factories/xml/class_XmlTemplateEngineFactory.php
  * @license            GNU GPL 3.0 or any newer version
  * @link               http://www.shipsimu.org
  *

diff --git a/framework/main/classes/feature/class_ b/framework/main/classes/feature/class_
index f48cd3cf286075cacecdea3031a91c97399c2a62..e40f81e93ab5e8b4e49f9b0fad77f780f406466d 100644 (file)
--- a/framework/main/classes/feature/class_
+++ b/framework/main/classes/feature/class_
@@ -11,7 +11,11 @@ use Org\Mxchange\CoreFramework\Feature\Feature;
  *
  * @author             Roland Haeder <webmaster@ship-simu.org>
  * @version            0.0.0
+<<<<<<< HEAD:framework/main/classes/feature/class_
  * @copyright  Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2017 Core Developer Team
+=======
+ * @copyright  Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2016 Core Developer Team
+>>>>>>> Some updates::inc/main/classes/feature/class_
  * @license            GNU GPL 3.0 or any newer version
  * @link               http://www.ship-simu.org
  *

diff --git a/framework/main/classes/feature/class_BaseFeature.php b/framework/main/classes/feature/class_BaseFeature.php
index 68a30fe9a4b50a7b89d749a2537160cc60d74240..e439104b760af50ea0db1b9f3fd919843ba996de 100644 (file)
--- a/framework/main/classes/feature/class_BaseFeature.php
+++ b/framework/main/classes/feature/class_BaseFeature.php
@@ -10,7 +10,11 @@ use Org\Mxchange\CoreFramework\Object\BaseFrameworkSystem;
  *
  * @author             Roland Haeder <webmaster@ship-simu.org>
  * @version            0.0.0
+<<<<<<< HEAD:framework/main/classes/feature/class_BaseFeature.php
  * @copyright  Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2017 Core Developer Team
+=======
+ * @copyright  Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2016 Core Developer Team
+>>>>>>> Some updates::inc/main/classes/feature/class_BaseFeature.php
  * @license            GNU GPL 3.0 or any newer version
  * @link               http://www.ship-simu.org
  *

diff --git a/framework/main/classes/feature/class_FrameworkFeature.php b/framework/main/classes/feature/class_FrameworkFeature.php
index 84410bc36505fab91dcf50394fb0e412809b3a8c..371d2cda382ba288304c509fa1fac3f3458ebfea 100644 (file)
--- a/framework/main/classes/feature/class_FrameworkFeature.php
+++ b/framework/main/classes/feature/class_FrameworkFeature.php
@@ -14,7 +14,11 @@ use Org\Mxchange\CoreFramework\Object\BaseFrameworkSystem;
  *
  * @author             Roland Haeder <webmaster@ship-simu.org>
  * @version            0.0.0
+<<<<<<< HEAD:framework/main/classes/feature/class_FrameworkFeature.php
  * @copyright  Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2017 Core Developer Team
+=======
+ * @copyright  Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2016 Core Developer Team
+>>>>>>> Some updates::inc/main/classes/feature/class_FrameworkFeature.php
  * @license            GNU GPL 3.0 or any newer version
  * @link               http://www.ship-simu.org
  *

diff --git a/framework/main/classes/feature/fuse/class_FuseFeature.php b/framework/main/classes/feature/fuse/class_FuseFeature.php
index cd70e38f2383c3d2f5e80bbbdd7b8f5a2588fdd8..a42fda14a05b46f02dec96cd6222abf9892cc5dd 100644 (file)
--- a/framework/main/classes/feature/fuse/class_FuseFeature.php
+++ b/framework/main/classes/feature/fuse/class_FuseFeature.php
@@ -11,7 +11,11 @@ use Org\Mxchange\CoreFramework\Feature\Feature;
  *
  * @author             Roland Haeder <webmaster@ship-simu.org>
  * @version            0.0.0
+<<<<<<< HEAD:framework/main/classes/feature/fuse/class_FuseFeature.php
  * @copyright  Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2017 Core Developer Team
+=======
+ * @copyright  Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2016 Core Developer Team
+>>>>>>> Some updates::inc/main/classes/feature/fuse/class_FuseFeature.php
  * @license            GNU GPL 3.0 or any newer version
  * @link               http://www.ship-simu.org
  *

diff --git a/framework/main/classes/file_directories/binary/class_BaseBinaryFile.php b/framework/main/classes/file_directories/binary/class_BaseBinaryFile.php
index 40a24c552f5970f5773e1cee0bb9cf1761996969..4c1f0e12024497ae002482ea929de477baba07b0 100644 (file)
--- a/framework/main/classes/file_directories/binary/class_BaseBinaryFile.php
+++ b/framework/main/classes/file_directories/binary/class_BaseBinaryFile.php
@@ -16,7 +16,11 @@ use \SplFileInfo;
  *
  * @author             Roland Haeder <webmaster@ship-simu.org>
  * @version            0.0.0
+<<<<<<< HEAD:framework/main/classes/file_directories/binary/class_BaseBinaryFile.php
  * @copyright  Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2017 Core Developer Team
+=======
+ * @copyright  Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2016 Core Developer Team
+>>>>>>> Some updates::inc/main/classes/file_directories/binary/class_BaseBinaryFile.php
  * @license            GNU GPL 3.0 or any newer version
  * @link               http://www.ship-simu.org
  *

diff --git a/framework/main/classes/file_directories/binary/index/class_IndexFile.php b/framework/main/classes/file_directories/binary/index/class_IndexFile.php
index 958792df018ceb9420f4eb1b6b9d6182eb2fa370..133f346c635ea74d7cfd74f32c696d8f0131131a 100644 (file)
--- a/framework/main/classes/file_directories/binary/index/class_IndexFile.php
+++ b/framework/main/classes/file_directories/binary/index/class_IndexFile.php
@@ -15,7 +15,11 @@ use \SplFileInfo;
  *
  * @author             Roland Haeder <webmaster@ship-simu.org>
  * @version            0.0.0
+<<<<<<< HEAD:framework/main/classes/file_directories/binary/index/class_IndexFile.php
  * @copyright  Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2017 Core Developer Team
+=======
+ * @copyright  Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2016 Core Developer Team
+>>>>>>> Some updates::inc/main/classes/file_directories/binary/index/class_IndexFile.php
  * @license            GNU GPL 3.0 or any newer version
  * @link               http://www.ship-simu.org
  *

diff --git a/framework/main/classes/file_directories/binary/stack/class_StackFile.php b/framework/main/classes/file_directories/binary/stack/class_StackFile.php
index 444302ba74e7daa317816b0546a2ebe96cb325ab..3c980fc8e082bb39685514bbc0aea4506104b6ed 100644 (file)
--- a/framework/main/classes/file_directories/binary/stack/class_StackFile.php
+++ b/framework/main/classes/file_directories/binary/stack/class_StackFile.php
@@ -15,7 +15,11 @@ use \SplFileInfo;
  *
  * @author             Roland Haeder <webmaster@ship-simu.org>
  * @version            0.0.0
+<<<<<<< HEAD:framework/main/classes/file_directories/binary/stack/class_StackFile.php
  * @copyright  Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2017 Core Developer Team
+=======
+ * @copyright  Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2016 Core Developer Team
+>>>>>>> Some updates::inc/main/classes/file_directories/binary/stack/class_StackFile.php
  * @license            GNU GPL 3.0 or any newer version
  * @link               http://www.ship-simu.org
  *

diff --git a/framework/main/classes/file_directories/class_BaseAbstractFile.php b/framework/main/classes/file_directories/class_BaseAbstractFile.php
index 92b3f114dce1f1ad9b8cf9552ea5d1eb1ecbb921..d9cb807a6b0e81f5048d207e9316e88f9cbde556 100644 (file)
--- a/framework/main/classes/file_directories/class_BaseAbstractFile.php
+++ b/framework/main/classes/file_directories/class_BaseAbstractFile.php
@@ -13,7 +13,11 @@ use Org\Mxchange\CoreFramework\Object\BaseFrameworkSystem;
  *
  * @author             Roland Haeder <webmaster@ship-simu.org>
  * @version            0.0.0
+<<<<<<< HEAD:framework/main/classes/file_directories/class_BaseAbstractFile.php
  * @copyright  Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2017 Core Developer Team
+=======
+ * @copyright  Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2016 Core Developer Team
+>>>>>>> Some updates::inc/main/classes/file_directories/class_BaseAbstractFile.php
  * @license            GNU GPL 3.0 or any newer version
  * @link               http://www.ship-simu.org
  *

diff --git a/framework/main/classes/file_directories/class_BaseFileIo.php b/framework/main/classes/file_directories/class_BaseFileIo.php
index ce65bd898a9b8f087af82ffdd4ad13f3fa580295..72a6a1651b821e383ac251767d5dec8a56ac2a71 100644 (file)
--- a/framework/main/classes/file_directories/class_BaseFileIo.php
+++ b/framework/main/classes/file_directories/class_BaseFileIo.php
@@ -16,7 +16,11 @@ use \SplFileObject;
  *
  * @author             Roland Haeder <webmaster@ship-simu.org>
  * @version            0.0.0
+<<<<<<< HEAD:framework/main/classes/file_directories/class_BaseFileIo.php
  * @copyright  Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2017 Core Developer Team
+=======
+ * @copyright  Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2016 Core Developer Team
+>>>>>>> Some updates::inc/main/classes/file_directories/class_BaseFileIo.php
  * @license            GNU GPL 3.0 or any newer version
  * @link               http://www.ship-simu.org
  *

diff --git a/framework/main/classes/file_directories/directory/class_FrameworkDirectoryPointer.php b/framework/main/classes/file_directories/directory/class_FrameworkDirectoryPointer.php
index 4c033024fac389928d9ee40f961e22d9e21ca572..9695a7ab7e7767ca86924aaf091e4f8a426247c4 100644 (file)
--- a/framework/main/classes/file_directories/directory/class_FrameworkDirectoryPointer.php
+++ b/framework/main/classes/file_directories/directory/class_FrameworkDirectoryPointer.php
@@ -15,7 +15,11 @@ use \DirectoryIterator;
  *
  * @author             Roland Haeder <webmaster@shipsimu.org>
  * @version            0.0.0
+<<<<<<< HEAD:framework/main/classes/file_directories/directory/class_FrameworkDirectoryPointer.php
  * @copyright  Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2017 Core Developer Team
+=======
+ * @copyright  Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2016 Core Developer Team
+>>>>>>> Some updates::inc/main/classes/file_directories/directory/class_FrameworkDirectoryPointer.php
  * @license            GNU GPL 3.0 or any newer version
  * @link               http://www.shipsimu.org
  *

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

diff --git a/framework/main/classes/file_directories/input/text/class_FrameworkTextFileInputPointer.php b/framework/main/classes/file_directories/input/text/class_FrameworkTextFileInputPointer.php
index 1b3c88eee1a338a85763a67f16b5a8770648f370..6694f00387ba252545977b9cc189014848b3e769 100644 (file)
--- a/framework/main/classes/file_directories/input/text/class_FrameworkTextFileInputPointer.php
+++ b/framework/main/classes/file_directories/input/text/class_FrameworkTextFileInputPointer.php
@@ -17,7 +17,11 @@ use Org\Mxchange\CoreFramework\Object\BaseFrameworkSystem;
  *
  * @author             Roland Haeder <webmaster@shipsimu.org>
  * @version            0.0.0
+<<<<<<< HEAD:framework/main/classes/file_directories/input/text/class_FrameworkTextFileInputPointer.php
  * @copyright  Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2017 Core Developer Team
+=======
+ * @copyright  Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2016 Core Developer Team
+>>>>>>> Some updates::inc/main/classes/file_directories/input/text/class_FrameworkTextFileInputPointer.php
  * @license            GNU GPL 3.0 or any newer version
  * @link               http://www.shipsimu.org
  *

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

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

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

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

diff --git a/framework/main/classes/file_directories/text/class_BaseTextFile.php b/framework/main/classes/file_directories/text/class_BaseTextFile.php
index f56cc96e2556ac2fe7bb315fead6606d4178aa7f..f8dc38d5be7b919b12bd6962c06a241e6f002028 100644 (file)
--- a/framework/main/classes/file_directories/text/class_BaseTextFile.php
+++ b/framework/main/classes/file_directories/text/class_BaseTextFile.php
@@ -14,7 +14,11 @@ use \SplFileInfo;
  *
  * @author             Roland Haeder <webmaster@ship-simu.org>
  * @version            0.0.0
+<<<<<<< HEAD:framework/main/classes/file_directories/text/class_BaseTextFile.php
  * @copyright  Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2017 Core Developer Team
+=======
+ * @copyright  Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2016 Core Developer Team
+>>>>>>> Some updates::inc/main/classes/file_directories/text/class_BaseTextFile.php
  * @license            GNU GPL 3.0 or any newer version
  * @link               http://www.ship-simu.org
  *

diff --git a/framework/main/classes/file_directories/text/input/class_BaseInputTextFile.php b/framework/main/classes/file_directories/text/input/class_BaseInputTextFile.php
index 1767a55a753c620b47976b431863a763456d8f15..e4992bb0d170b3cba834828f7336fcd645a0f60c 100644 (file)
--- a/framework/main/classes/file_directories/text/input/class_BaseInputTextFile.php
+++ b/framework/main/classes/file_directories/text/input/class_BaseInputTextFile.php
@@ -11,7 +11,11 @@ use Org\Mxchange\CoreFramework\Filesystem\File\BaseTextFile;
  *
  * @author             Roland Haeder <webmaster@ship-simu.org>
  * @version            0.0.0
+<<<<<<< HEAD:framework/main/classes/file_directories/text/input/class_BaseInputTextFile.php
  * @copyright  Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2017 Core Developer Team
+=======
+ * @copyright  Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2016 Core Developer Team
+>>>>>>> Some updates::inc/main/classes/file_directories/text/input/class_BaseInputTextFile.php
  * @license            GNU GPL 3.0 or any newer version
  * @link               http://www.ship-simu.org
  *

diff --git a/framework/main/classes/file_directories/text/input/csv/class_CsvInputFile.php b/framework/main/classes/file_directories/text/input/csv/class_CsvInputFile.php
index 3343c6dd6fe11b5551578752e877be333d54b0d9..a2e30e735d59b7b31a814aacc374e0bdce6d7151 100644 (file)
--- a/framework/main/classes/file_directories/text/input/csv/class_CsvInputFile.php
+++ b/framework/main/classes/file_directories/text/input/csv/class_CsvInputFile.php
@@ -11,7 +11,11 @@ use Org\Mxchange\CoreFramework\Stream\Filesystem\CsvInputStreamer;
  *
  * @author             Roland Haeder <webmaster@ship-simu.org>
  * @version            0.0.0
+<<<<<<< HEAD:framework/main/classes/file_directories/text/input/csv/class_CsvInputFile.php
  * @copyright  Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2017 Core Developer Team
+=======
+ * @copyright  Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2016 Core Developer Team
+>>>>>>> Some updates::inc/main/classes/file_directories/text/input/csv/class_CsvInputFile.php
  * @license            GNU GPL 3.0 or any newer version
  * @link               http://www.ship-simu.org
  *

diff --git a/framework/main/classes/file_directories/text/output/class_BaseOutputTextFile.php b/framework/main/classes/file_directories/text/output/class_BaseOutputTextFile.php
index 30212999244066aa58eaf965f39e48ddc653f06f..00894d0a73e3073391d3f14e2304d4e982566881 100644 (file)
--- a/framework/main/classes/file_directories/text/output/class_BaseOutputTextFile.php
+++ b/framework/main/classes/file_directories/text/output/class_BaseOutputTextFile.php
@@ -12,7 +12,11 @@ use Org\Mxchange\CoreFramework\Output\BaseOutput;
  *
  * @author             Roland Haeder <webmaster@ship-simu.org>
  * @version            0.0.0
+<<<<<<< HEAD:framework/main/classes/file_directories/text/output/class_BaseOutputTextFile.php
  * @copyright  Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2017 Core Developer Team
+=======
+ * @copyright  Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2016 Core Developer Team
+>>>>>>> Some updates::inc/main/classes/file_directories/text/output/class_BaseOutputTextFile.php
  * @license            GNU GPL 3.0 or any newer version
  * @link               http://www.ship-simu.org
  *

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

diff --git a/framework/main/classes/filesystem/class_BaseFilesystem.php b/framework/main/classes/filesystem/class_BaseFilesystem.php
index 20c2fe10cc86eae288a9f726726e8b69df539671..64739adc99e3ebafedc364b8050941ac83f6e734 100644 (file)
--- a/framework/main/classes/filesystem/class_BaseFilesystem.php
+++ b/framework/main/classes/filesystem/class_BaseFilesystem.php
@@ -11,7 +11,11 @@ use Org\Mxchange\CoreFramework\Object\BaseFrameworkSystem;
  *
  * @author             Roland Haeder <webmaster@ship-simu.org>
  * @version            0.0.0
+<<<<<<< HEAD:framework/main/classes/filesystem/class_BaseFilesystem.php
  * @copyright  Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2017 Core Developer Team
+=======
+ * @copyright  Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2016 Core Developer Team
+>>>>>>> Some updates::inc/main/classes/filesystem/class_BaseFilesystem.php
  * @license            GNU GPL 3.0 or any newer version
  * @link               http://www.ship-simu.org
  *

diff --git a/framework/main/classes/filter/auth/class_UserAuthFilter.php b/framework/main/classes/filter/auth/class_UserAuthFilter.php
index 8846379a66346facbb58df51653d26cc29b18fd5..a6873b122c00d9649394c8ac9af5bc2cb7cad501 100644 (file)
--- a/framework/main/classes/filter/auth/class_UserAuthFilter.php
+++ b/framework/main/classes/filter/auth/class_UserAuthFilter.php
@@ -17,7 +17,11 @@ use Org\Mxchange\CoreFramework\User\BaseUser;
  *
  * @author             Roland Haeder <webmaster@shipsimu.org>
  * @version            0.0.0
+<<<<<<< HEAD:framework/main/classes/filter/auth/class_UserAuthFilter.php
  * @copyright  Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2017 Core Developer Team
+=======
+ * @copyright  Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2016 Core Developer Team
+>>>>>>> Some updates::inc/main/classes/filter/auth/class_UserAuthFilter.php
  * @license            GNU GPL 3.0 or any newer version
  * @link               http://www.shipsimu.org
  *

diff --git a/framework/main/classes/filter/change/class_EmailChangeFilter.php b/framework/main/classes/filter/change/class_EmailChangeFilter.php
index e4fcd5196f2080ad104b2cd986ea9134d6c3c699..e7c3be06a997b3c8aadb2e012812adaf25baadc4 100644 (file)
--- a/framework/main/classes/filter/change/class_EmailChangeFilter.php
+++ b/framework/main/classes/filter/change/class_EmailChangeFilter.php
@@ -14,7 +14,11 @@ use Org\Mxchange\CoreFramework\Response\Responseable;
  *
  * @author             Roland Haeder <webmaster@shipsimu.org>
  * @version            0.0.0
+<<<<<<< HEAD:framework/main/classes/filter/change/class_EmailChangeFilter.php
  * @copyright  Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2017 Core Developer Team
+=======
+ * @copyright  Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2016 Core Developer Team
+>>>>>>> Some updates::inc/main/classes/filter/change/class_EmailChangeFilter.php
  * @license            GNU GPL 3.0 or any newer version
  * @link               http://www.shipsimu.org
  *

diff --git a/framework/main/classes/filter/change/class_PasswordChangeFilter.php b/framework/main/classes/filter/change/class_PasswordChangeFilter.php
index 331860fa0ca6ff6dc8b33cabb9fa53f2b7698453..ce6a1c463742548d1ca84c8134feed2f3ff13a0c 100644 (file)
--- a/framework/main/classes/filter/change/class_PasswordChangeFilter.php
+++ b/framework/main/classes/filter/change/class_PasswordChangeFilter.php
@@ -14,7 +14,11 @@ use Org\Mxchange\CoreFramework\Response\Responseable;
  *
  * @author             Roland Haeder <webmaster@shipsimu.org>
  * @version            0.0.0
+<<<<<<< HEAD:framework/main/classes/filter/change/class_PasswordChangeFilter.php
  * @copyright  Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2017 Core Developer Team
+=======
+ * @copyright  Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2016 Core Developer Team
+>>>>>>> Some updates::inc/main/classes/filter/change/class_PasswordChangeFilter.php
  * @license            GNU GPL 3.0 or any newer version
  * @link               http://www.shipsimu.org
  *

diff --git a/framework/main/classes/filter/checkboxes/class_RulesAcceptedFilter.php b/framework/main/classes/filter/checkboxes/class_RulesAcceptedFilter.php
index a5d882105c4d9ce0c07172dbab62ebe99794236d..6fe6972df207575c0c6b104dbe20d725b034fab0 100644 (file)
--- a/framework/main/classes/filter/checkboxes/class_RulesAcceptedFilter.php
+++ b/framework/main/classes/filter/checkboxes/class_RulesAcceptedFilter.php
@@ -15,7 +15,11 @@ use Org\Mxchange\CoreFramework\Response\Responseable;
  *
  * @author             Roland Haeder <webmaster@shipsimu.org>
  * @version            0.0.0
+<<<<<<< HEAD:framework/main/classes/filter/checkboxes/class_RulesAcceptedFilter.php
  * @copyright  Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2017 Core Developer Team
+=======
+ * @copyright  Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2016 Core Developer Team
+>>>>>>> Some updates::inc/main/classes/filter/checkboxes/class_RulesAcceptedFilter.php
  * @license            GNU GPL 3.0 or any newer version
  * @link               http://www.shipsimu.org
  *

diff --git a/framework/main/classes/filter/class_ b/framework/main/classes/filter/class_
index 0bdc5e69d885464b99b2bc9d1277369477bd633b..11f46c9a88d9d5cd01016887ac4c5232b1e33a85 100644 (file)
--- a/framework/main/classes/filter/class_
+++ b/framework/main/classes/filter/class_
@@ -13,7 +13,11 @@ use Org\Mxchange\CoreFramework\Response\Responseable;
  *
  * @author             Roland Haeder <webmaster@ship-simu.org>
  * @version            0.0.0
+<<<<<<< HEAD:framework/main/classes/filter/class_
  * @copyright  Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2017 Core Developer Team
+=======
+ * @copyright  Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2016 Core Developer Team
+>>>>>>> Some updates::inc/main/classes/filter/class_
  * @license            GNU GPL 3.0 or any newer version
  * @link               http://www.ship-simu.org
  *

diff --git a/framework/main/classes/filter/class_BaseFilter.php b/framework/main/classes/filter/class_BaseFilter.php
index 18c78800ba5b062f594d7edef3b6053a1eb3abbb..7285f7513e243c16bc27acd0845dd97880b7006f 100644 (file)
--- a/framework/main/classes/filter/class_BaseFilter.php
+++ b/framework/main/classes/filter/class_BaseFilter.php
@@ -10,7 +10,11 @@ use Org\Mxchange\CoreFramework\Object\BaseFrameworkSystem;
  *
  * @author             Roland Haeder <webmaster@shipsimu.org>
  * @version            0.0.0
+<<<<<<< HEAD:framework/main/classes/filter/class_BaseFilter.php
  * @copyright  Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2017 Core Developer Team
+=======
+ * @copyright  Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2016 Core Developer Team
+>>>>>>> Some updates::inc/main/classes/filter/class_BaseFilter.php
  * @license            GNU GPL 3.0 or any newer version
  * @link               http://www.shipsimu.org
  *

diff --git a/framework/main/classes/filter/class_BaseFilterDecorator.php b/framework/main/classes/filter/class_BaseFilterDecorator.php
index d4e81e7c7ae33c02cefc55dfcec531de5e51f8f2..60d743bd5d1dfc53d4537e8a79ab9efcef12fe21 100644 (file)
--- a/framework/main/classes/filter/class_BaseFilterDecorator.php
+++ b/framework/main/classes/filter/class_BaseFilterDecorator.php
@@ -12,7 +12,11 @@ use Org\Mxchange\CoreFramework\Response\Responseable;
  *
  * @author             Roland Haeder <webmaster@shipsimu.org>
  * @version            0.0.0
+<<<<<<< HEAD:framework/main/classes/filter/class_BaseFilterDecorator.php
  * @copyright  Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2017 Core Developer Team
+=======
+ * @copyright  Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2016 Core Developer Team
+>>>>>>> Some updates::inc/main/classes/filter/class_BaseFilterDecorator.php
  * @license            GNU GPL 3.0 or any newer version
  * @link               http://www.shipsimu.org
  *

diff --git a/framework/main/classes/filter/class_FilterChain.php b/framework/main/classes/filter/class_FilterChain.php
index ad376f9b6dda5dc761de98dd9377bf4b5d5d6ba3..045deeee77550a3960731a28eebd38ddc0fdbecf 100644 (file)
--- a/framework/main/classes/filter/class_FilterChain.php
+++ b/framework/main/classes/filter/class_FilterChain.php
@@ -14,7 +14,11 @@ use Org\Mxchange\CoreFramework\Response\Responseable;
  *
  * @author             Roland Haeder <webmaster@shipsimu.org>
  * @version            0.0.0
+<<<<<<< HEAD:framework/main/classes/filter/class_FilterChain.php
  * @copyright  Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2017 Core Developer Team
+=======
+ * @copyright  Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2016 Core Developer Team
+>>>>>>> Some updates::inc/main/classes/filter/class_FilterChain.php
  * @license            GNU GPL 3.0 or any newer version
  * @link               http://www.shipsimu.org
  *

diff --git a/framework/main/classes/filter/crypto/class_CaptchaEncryptFilter.php b/framework/main/classes/filter/crypto/class_CaptchaEncryptFilter.php
index 128e06fab9ef40b81799e930b4936d639f810088..955af1438f6b1f61cb7461b92f6a5756ad854ed9 100644 (file)
--- a/framework/main/classes/filter/crypto/class_CaptchaEncryptFilter.php
+++ b/framework/main/classes/filter/crypto/class_CaptchaEncryptFilter.php
@@ -15,7 +15,11 @@ use Org\Mxchange\CoreFramework\Response\Responseable;
  *
  * @author             Roland Haeder <webmaster@shipsimu.org>
  * @version            0.0.0
+<<<<<<< HEAD:framework/main/classes/filter/crypto/class_CaptchaEncryptFilter.php
  * @copyright  Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2017 Core Developer Team
+=======
+ * @copyright  Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2016 Core Developer Team
+>>>>>>> Some updates::inc/main/classes/filter/crypto/class_CaptchaEncryptFilter.php
  * @license            GNU GPL 3.0 or any newer version
  * @link               http://www.shipsimu.org
  *

diff --git a/framework/main/classes/filter/guest/class_UserNameIsGuestFilter.php b/framework/main/classes/filter/guest/class_UserNameIsGuestFilter.php
index 20683cb61f1c692fe46f71d7522d92fa60ac46b5..3a2c21cf97aaca91b46beb8f57d2b486a049e30e 100644 (file)
--- a/framework/main/classes/filter/guest/class_UserNameIsGuestFilter.php
+++ b/framework/main/classes/filter/guest/class_UserNameIsGuestFilter.php
@@ -14,7 +14,11 @@ use Org\Mxchange\CoreFramework\Response\Responseable;
  *
  * @author             Roland Haeder <webmaster@shipsimu.org>
  * @version            0.0.0
+<<<<<<< HEAD:framework/main/classes/filter/guest/class_UserNameIsGuestFilter.php
  * @copyright  Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2017 Core Developer Team
+=======
+ * @copyright  Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2016 Core Developer Team
+>>>>>>> Some updates::inc/main/classes/filter/guest/class_UserNameIsGuestFilter.php
  * @license            GNU GPL 3.0 or any newer version
  * @link               http://www.shipsimu.org
  *

diff --git a/framework/main/classes/filter/news/class_NewsDownloadFilter.php b/framework/main/classes/filter/news/class_NewsDownloadFilter.php
index 3b68ea3c4205774ad34c2c3bdf0e896f4b741587..205043cf6c1a006db01e81284e631c2abc442f89 100644 (file)
--- a/framework/main/classes/filter/news/class_NewsDownloadFilter.php
+++ b/framework/main/classes/filter/news/class_NewsDownloadFilter.php
@@ -17,7 +17,11 @@ use Org\Mxchange\CoreFramework\Response\Responseable;
  *
  * @author             Roland Haeder <webmaster@shipsimu.org>
  * @version            0.0.0
+<<<<<<< HEAD:framework/main/classes/filter/news/class_NewsDownloadFilter.php
  * @copyright  Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2017 Core Developer Team
+=======
+ * @copyright  Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2016 Core Developer Team
+>>>>>>> Some updates::inc/main/classes/filter/news/class_NewsDownloadFilter.php
  * @license            GNU GPL 3.0 or any newer version
  * @link               http://www.shipsimu.org
  *

diff --git a/framework/main/classes/filter/news/class_NewsProcessFilter.php b/framework/main/classes/filter/news/class_NewsProcessFilter.php
index adf18ed291a93448aa951189c29a90f522dcf0c3..3eae3714ffa0758ebc9ab3981c33879e19379e2b 100644 (file)
--- a/framework/main/classes/filter/news/class_NewsProcessFilter.php
+++ b/framework/main/classes/filter/news/class_NewsProcessFilter.php
@@ -14,7 +14,11 @@ use Org\Mxchange\CoreFramework\Response\Responseable;
  *
  * @author             Roland Haeder <webmaster@shipsimu.org>
  * @version            0.0.0
+<<<<<<< HEAD:framework/main/classes/filter/news/class_NewsProcessFilter.php
  * @copyright  Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2017 Core Developer Team
+=======
+ * @copyright  Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2016 Core Developer Team
+>>>>>>> Some updates::inc/main/classes/filter/news/class_NewsProcessFilter.php
  * @license            GNU GPL 3.0 or any newer version
  * @link               http://www.shipsimu.org
  *

diff --git a/framework/main/classes/filter/null/class_NullFilter.php b/framework/main/classes/filter/null/class_NullFilter.php
index f8a92eaba7192ae1e1af1aaf38a60b5f877c5fce..781312f9a585183a35cc00cf0d3c3bf05839a249 100644 (file)
--- a/framework/main/classes/filter/null/class_NullFilter.php
+++ b/framework/main/classes/filter/null/class_NullFilter.php
@@ -14,7 +14,11 @@ use Org\Mxchange\CoreFramework\Response\Responseable;
  *
  * @author             Roland Haeder <webmaster@shipsimu.org>
  * @version            0.0.0
+<<<<<<< HEAD:framework/main/classes/filter/null/class_NullFilter.php
  * @copyright  Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2017 Core Developer Team
+=======
+ * @copyright  Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2016 Core Developer Team
+>>>>>>> Some updates::inc/main/classes/filter/null/class_NullFilter.php
  * @license            GNU GPL 3.0 or any newer version
  * @link               http://www.shipsimu.org
  *

diff --git a/framework/main/classes/filter/payment/class_PaymentDiscoveryFilter.php b/framework/main/classes/filter/payment/class_PaymentDiscoveryFilter.php
index 71bec6af67b2eccb8509bb4da07425123316f1a7..22b4317432b73b85a6f808d0d9bf508d11aa1cac 100644 (file)
--- a/framework/main/classes/filter/payment/class_PaymentDiscoveryFilter.php
+++ b/framework/main/classes/filter/payment/class_PaymentDiscoveryFilter.php
@@ -20,7 +20,11 @@ use Org\Mxchange\CoreFramework\Response\Responseable;
  *
  * @author             Roland Haeder <webmaster@shipsimu.org>
  * @version            0.0.0
+<<<<<<< HEAD:framework/main/classes/filter/payment/class_PaymentDiscoveryFilter.php
  * @copyright  Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2017 Core Developer Team
+=======
+ * @copyright  Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2016 Core Developer Team
+>>>>>>> Some updates::inc/main/classes/filter/payment/class_PaymentDiscoveryFilter.php
  * @license            GNU GPL 3.0 or any newer version
  * @link               http://www.shipsimu.org
  *

diff --git a/framework/main/classes/filter/update/class_UserStatusConfimedUpdateFilter.php b/framework/main/classes/filter/update/class_UserStatusConfimedUpdateFilter.php
index dd5c4c79df8cb539794be74fa6921a0d105d3ac3..13e82f16514f79d1c04682d4c3aa8d24d47c141c 100644 (file)
--- a/framework/main/classes/filter/update/class_UserStatusConfimedUpdateFilter.php
+++ b/framework/main/classes/filter/update/class_UserStatusConfimedUpdateFilter.php
@@ -15,7 +15,11 @@ use Org\Mxchange\CoreFramework\Response\Responseable;
  *
  * @author             Roland Haeder <webmaster@shipsimu.org>
  * @version            0.0.0
+<<<<<<< HEAD:framework/main/classes/filter/update/class_UserStatusConfimedUpdateFilter.php
  * @copyright  Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2017 Core Developer Team
+=======
+ * @copyright  Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2016 Core Developer Team
+>>>>>>> Some updates::inc/main/classes/filter/update/class_UserStatusConfimedUpdateFilter.php
  * @license            GNU GPL 3.0 or any newer version
  * @link               http://www.shipsimu.org
  *

diff --git a/framework/main/classes/filter/update/class_UserUpdateFilter.php b/framework/main/classes/filter/update/class_UserUpdateFilter.php
index a6163692f7ee8d02381d4229c35bda127853aedc..c49bddfbf4a6220ff6ac7c4e3d01d70b79d3433b 100644 (file)
--- a/framework/main/classes/filter/update/class_UserUpdateFilter.php
+++ b/framework/main/classes/filter/update/class_UserUpdateFilter.php
@@ -15,7 +15,11 @@ use Org\Mxchange\CoreFramework\Response\Responseable;
  *
  * @author             Roland Haeder <webmaster@shipsimu.org>
  * @version            0.0.0
+<<<<<<< HEAD:framework/main/classes/filter/update/class_UserUpdateFilter.php
  * @copyright  Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2017 Core Developer Team
+=======
+ * @copyright  Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2016 Core Developer Team
+>>>>>>> Some updates::inc/main/classes/filter/update/class_UserUpdateFilter.php
  * @license            GNU GPL 3.0 or any newer version
  * @link               http://www.shipsimu.org
  *

diff --git a/framework/main/classes/filter/validator/class_EmailValidatorFilter.php b/framework/main/classes/filter/validator/class_EmailValidatorFilter.php
index 15bde1692ec2da579660071e46c2d3f6a600390f..8e6fcf592ac09b5bb14327893efb51f73e584e93 100644 (file)
--- a/framework/main/classes/filter/validator/class_EmailValidatorFilter.php
+++ b/framework/main/classes/filter/validator/class_EmailValidatorFilter.php
@@ -17,7 +17,11 @@ use Org\Mxchange\CoreFramework\Response\Responseable;
  *
  * @author             Roland Haeder <webmaster@shipsimu.org>
  * @version            0.0.0
+<<<<<<< HEAD:framework/main/classes/filter/validator/class_EmailValidatorFilter.php
  * @copyright  Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2017 Core Developer Team
+=======
+ * @copyright  Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2016 Core Developer Team
+>>>>>>> Some updates::inc/main/classes/filter/validator/class_EmailValidatorFilter.php
  * @license            GNU GPL 3.0 or any newer version
  * @link               http://www.shipsimu.org
  *

diff --git a/framework/main/classes/filter/validator/class_PasswordValidatorFilter.php b/framework/main/classes/filter/validator/class_PasswordValidatorFilter.php
index 80a02acc80eb9edc31708a3ce46d2c4657681807..3c0ad07113dd851db4002e3f62f93d53f5da7889 100644 (file)
--- a/framework/main/classes/filter/validator/class_PasswordValidatorFilter.php
+++ b/framework/main/classes/filter/validator/class_PasswordValidatorFilter.php
@@ -14,7 +14,11 @@ use Org\Mxchange\CoreFramework\Response\Responseable;
  *
  * @author             Roland Haeder <webmaster@shipsimu.org>
  * @version            0.0.0
+<<<<<<< HEAD:framework/main/classes/filter/validator/class_PasswordValidatorFilter.php
  * @copyright  Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2017 Core Developer Team
+=======
+ * @copyright  Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2016 Core Developer Team
+>>>>>>> Some updates::inc/main/classes/filter/validator/class_PasswordValidatorFilter.php
  * @license            GNU GPL 3.0 or any newer version
  * @link               http://www.shipsimu.org
  *

diff --git a/framework/main/classes/filter/validator/class_UserNameValidatorFilter.php b/framework/main/classes/filter/validator/class_UserNameValidatorFilter.php
index 1b0aa6e2523e299ef5ac31cb05df507998157b5c..dac5153b9c3c5e30927dd13afe381ef1128b57dd 100644 (file)
--- a/framework/main/classes/filter/validator/class_UserNameValidatorFilter.php
+++ b/framework/main/classes/filter/validator/class_UserNameValidatorFilter.php
@@ -16,7 +16,11 @@ use Org\Mxchange\CoreFramework\Response\Responseable;
  *
  * @author             Roland Haeder <webmaster@shipsimu.org>
  * @version            0.0.0
+<<<<<<< HEAD:framework/main/classes/filter/validator/class_UserNameValidatorFilter.php
  * @copyright  Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2017 Core Developer Team
+=======
+ * @copyright  Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2016 Core Developer Team
+>>>>>>> Some updates::inc/main/classes/filter/validator/class_UserNameValidatorFilter.php
  * @license            GNU GPL 3.0 or any newer version
  * @link               http://www.shipsimu.org
  *

diff --git a/framework/main/classes/filter/verifier/class_AccountPasswordVerifierFilter.php b/framework/main/classes/filter/verifier/class_AccountPasswordVerifierFilter.php
index 0c9fc307a1d824c1770aadbfef001d1b36ebcdc1..a8c999701083ad225e552a987e99e865866176ee 100644 (file)
--- a/framework/main/classes/filter/verifier/class_AccountPasswordVerifierFilter.php
+++ b/framework/main/classes/filter/verifier/class_AccountPasswordVerifierFilter.php
@@ -17,7 +17,11 @@ use Org\Mxchange\CoreFramework\User\BaseUser;
  *
  * @author             Roland Haeder <webmaster@shipsimu.org>
  * @version            0.0.0
+<<<<<<< HEAD:framework/main/classes/filter/verifier/class_AccountPasswordVerifierFilter.php
  * @copyright  Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2017 Core Developer Team
+=======
+ * @copyright  Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2016 Core Developer Team
+>>>>>>> Some updates::inc/main/classes/filter/verifier/class_AccountPasswordVerifierFilter.php
  * @license            GNU GPL 3.0 or any newer version
  * @link               http://www.shipsimu.org
  *

diff --git a/framework/main/classes/filter/verifier/class_BirthdayVerifierFilter.php b/framework/main/classes/filter/verifier/class_BirthdayVerifierFilter.php
index cf608314896bcfb26a8ffd5d59e8f312072d6cd8..e824c3e8b65b00d0e4cbdd17fa18f49e372359af 100644 (file)
--- a/framework/main/classes/filter/verifier/class_BirthdayVerifierFilter.php
+++ b/framework/main/classes/filter/verifier/class_BirthdayVerifierFilter.php
@@ -13,7 +13,11 @@ use Org\Mxchange\CoreFramework\Response\Responseable;
  *
  * @author             Roland Haeder <webmaster@shipsimu.org>
  * @version            0.0.0
+<<<<<<< HEAD:framework/main/classes/filter/verifier/class_BirthdayVerifierFilter.php
  * @copyright  Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2017 Core Developer Team
+=======
+ * @copyright  Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2016 Core Developer Team
+>>>>>>> Some updates::inc/main/classes/filter/verifier/class_BirthdayVerifierFilter.php
  * @license            GNU GPL 3.0 or any newer version
  * @link               http://www.shipsimu.org
  *

diff --git a/framework/main/classes/filter/verifier/class_ConfirmCodeVerifierFilter.php b/framework/main/classes/filter/verifier/class_ConfirmCodeVerifierFilter.php
index 53817198dca05698091404347f805e579fcb908e..474a81d3368a4b2b72d3c68b75b124ec0dc8af28 100644 (file)
--- a/framework/main/classes/filter/verifier/class_ConfirmCodeVerifierFilter.php
+++ b/framework/main/classes/filter/verifier/class_ConfirmCodeVerifierFilter.php
@@ -15,7 +15,11 @@ use Org\Mxchange\CoreFramework\Response\Responseable;
  *
  * @author             Roland Haeder <webmaster@shipsimu.org>
  * @version            0.0.0
+<<<<<<< HEAD:framework/main/classes/filter/verifier/class_ConfirmCodeVerifierFilter.php
  * @copyright  Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2017 Core Developer Team
+=======
+ * @copyright  Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2016 Core Developer Team
+>>>>>>> Some updates::inc/main/classes/filter/verifier/class_ConfirmCodeVerifierFilter.php
  * @license            GNU GPL 3.0 or any newer version
  * @link               http://www.shipsimu.org
  *

diff --git a/framework/main/classes/filter/verifier/class_GraphicalCodeCaptchaVerifierFilter.php b/framework/main/classes/filter/verifier/class_GraphicalCodeCaptchaVerifierFilter.php
index 3a123427a76ad3dee257457fbb66f5f1192a7371..db32135929f992b457edbaed0391c3c6d448e17b 100644 (file)
--- a/framework/main/classes/filter/verifier/class_GraphicalCodeCaptchaVerifierFilter.php
+++ b/framework/main/classes/filter/verifier/class_GraphicalCodeCaptchaVerifierFilter.php
@@ -14,7 +14,11 @@ use Org\Mxchange\CoreFramework\Response\Responseable;
  *
  * @author             Roland Haeder <webmaster@shipsimu.org>
  * @version            0.0.0
+<<<<<<< HEAD:framework/main/classes/filter/verifier/class_GraphicalCodeCaptchaVerifierFilter.php
  * @copyright  Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2017 Core Developer Team
+=======
+ * @copyright  Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2016 Core Developer Team
+>>>>>>> Some updates::inc/main/classes/filter/verifier/class_GraphicalCodeCaptchaVerifierFilter.php
  * @license            GNU GPL 3.0 or any newer version
  * @link               http://www.shipsimu.org
  *

diff --git a/framework/main/classes/filter/verifier/class_PasswordGuestVerifierFilter.php b/framework/main/classes/filter/verifier/class_PasswordGuestVerifierFilter.php
index faceca0225233d8345b1d4eb85c67e3e7f7580ac..931f6a4c03c06d973d85527e0bd2c04d03ab45f5 100644 (file)
--- a/framework/main/classes/filter/verifier/class_PasswordGuestVerifierFilter.php
+++ b/framework/main/classes/filter/verifier/class_PasswordGuestVerifierFilter.php
@@ -14,7 +14,11 @@ use Org\Mxchange\CoreFramework\Response\Responseable;
  *
  * @author             Roland Haeder <webmaster@shipsimu.org>
  * @version            0.0.0
+<<<<<<< HEAD:framework/main/classes/filter/verifier/class_PasswordGuestVerifierFilter.php
  * @copyright  Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2017 Core Developer Team
+=======
+ * @copyright  Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2016 Core Developer Team
+>>>>>>> Some updates::inc/main/classes/filter/verifier/class_PasswordGuestVerifierFilter.php
  * @license            GNU GPL 3.0 or any newer version
  * @link               http://www.shipsimu.org
  *

diff --git a/framework/main/classes/filter/verifier/class_PasswordVerifierFilter.php b/framework/main/classes/filter/verifier/class_PasswordVerifierFilter.php
index 1fff8de638996b07d6b91fdb7f31d0baeea80900..099fad3a404bf8af4fdd9f8b0a0d882a997f3ad4 100644 (file)
--- a/framework/main/classes/filter/verifier/class_PasswordVerifierFilter.php
+++ b/framework/main/classes/filter/verifier/class_PasswordVerifierFilter.php
@@ -14,7 +14,11 @@ use Org\Mxchange\CoreFramework\Response\Responseable;
  *
  * @author             Roland Haeder <webmaster@shipsimu.org>
  * @version            0.0.0
+<<<<<<< HEAD:framework/main/classes/filter/verifier/class_PasswordVerifierFilter.php
  * @copyright  Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2017 Core Developer Team
+=======
+ * @copyright  Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2016 Core Developer Team
+>>>>>>> Some updates::inc/main/classes/filter/verifier/class_PasswordVerifierFilter.php
  * @license            GNU GPL 3.0 or any newer version
  * @link               http://www.shipsimu.org
  *

diff --git a/framework/main/classes/filter/verifier/class_UserGuestVerifierFilter.php b/framework/main/classes/filter/verifier/class_UserGuestVerifierFilter.php
index 9e559c6e49b58c00e424acf9060067e5add0039b..c6ec0215fa03442528a7b8e351aa9d3c7539421b 100644 (file)
--- a/framework/main/classes/filter/verifier/class_UserGuestVerifierFilter.php
+++ b/framework/main/classes/filter/verifier/class_UserGuestVerifierFilter.php
@@ -16,7 +16,11 @@ use Org\Mxchange\CoreFramework\Response\Responseable;
  *
  * @author             Roland Haeder <webmaster@shipsimu.org>
  * @version            0.0.0
+<<<<<<< HEAD:framework/main/classes/filter/verifier/class_UserGuestVerifierFilter.php
  * @copyright  Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2017 Core Developer Team
+=======
+ * @copyright  Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2016 Core Developer Team
+>>>>>>> Some updates::inc/main/classes/filter/verifier/class_UserGuestVerifierFilter.php
  * @license            GNU GPL 3.0 or any newer version
  * @link               http://www.shipsimu.org
  *

diff --git a/framework/main/classes/filter/verifier/class_UserNameVerifierFilter.php b/framework/main/classes/filter/verifier/class_UserNameVerifierFilter.php
index bc6613aa7a708cf3549558e3bdbb395ab6479b5c..c56c8c6fcfd7fa3573caed7cbaec8951ce6996ab 100644 (file)
--- a/framework/main/classes/filter/verifier/class_UserNameVerifierFilter.php
+++ b/framework/main/classes/filter/verifier/class_UserNameVerifierFilter.php
@@ -16,7 +16,11 @@ use Org\Mxchange\CoreFramework\Response\Responseable;
  *
  * @author             Roland Haeder <webmaster@shipsimu.org>
  * @version            0.0.0
+<<<<<<< HEAD:framework/main/classes/filter/verifier/class_UserNameVerifierFilter.php
  * @copyright  Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2017 Core Developer Team
+=======
+ * @copyright  Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2016 Core Developer Team
+>>>>>>> Some updates::inc/main/classes/filter/verifier/class_UserNameVerifierFilter.php
  * @license            GNU GPL 3.0 or any newer version
  * @link               http://www.shipsimu.org
  *

diff --git a/framework/main/classes/filter/verifier/class_UserStatusVerifierFilter.php b/framework/main/classes/filter/verifier/class_UserStatusVerifierFilter.php
index 3d77ab6df09f4f773aa6ec564115f67a6f4b0360..b9f060bfc003b05e974c0111afced22f85c55848 100644 (file)
--- a/framework/main/classes/filter/verifier/class_UserStatusVerifierFilter.php
+++ b/framework/main/classes/filter/verifier/class_UserStatusVerifierFilter.php
@@ -14,7 +14,11 @@ use Org\Mxchange\CoreFramework\Response\Responseable;
  *
  * @author             Roland Haeder <webmaster@shipsimu.org>
  * @version            0.0.0
+<<<<<<< HEAD:framework/main/classes/filter/verifier/class_UserStatusVerifierFilter.php
  * @copyright  Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2017 Core Developer Team
+=======
+ * @copyright  Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2016 Core Developer Team
+>>>>>>> Some updates::inc/main/classes/filter/verifier/class_UserStatusVerifierFilter.php
  * @license            GNU GPL 3.0 or any newer version
  * @link               http://www.shipsimu.org
  *

diff --git a/framework/main/classes/filter/verifier/class_UserUnconfirmedVerifierFilter.php b/framework/main/classes/filter/verifier/class_UserUnconfirmedVerifierFilter.php
index ddc4edd54f2f1d2ea43e17c899a57da56040d461..2a064ba507f0f7cbce2485fc06b7f8b0504a1506 100644 (file)
--- a/framework/main/classes/filter/verifier/class_UserUnconfirmedVerifierFilter.php
+++ b/framework/main/classes/filter/verifier/class_UserUnconfirmedVerifierFilter.php
@@ -15,7 +15,11 @@ use Org\Mxchange\CoreFramework\Response\Responseable;
  *
  * @author             Roland Haeder <webmaster@shipsimu.org>
  * @version            0.0.0
+<<<<<<< HEAD:framework/main/classes/filter/verifier/class_UserUnconfirmedVerifierFilter.php
  * @copyright  Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2017 Core Developer Team
+=======
+ * @copyright  Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2016 Core Developer Team
+>>>>>>> Some updates::inc/main/classes/filter/verifier/class_UserUnconfirmedVerifierFilter.php
  * @license            GNU GPL 3.0 or any newer version
  * @link               http://www.shipsimu.org
  *

diff --git a/framework/main/classes/fuse/class_FrameworkFuseWrapper.php_discontinued b/framework/main/classes/fuse/class_FrameworkFuseWrapper.php_discontinued
index 6f17387ca9e103a6c6ef1d52a5b72bb310e8075a..14a4c47af4326a90f987c5a073d178d814677c88 100644 (file)
--- a/framework/main/classes/fuse/class_FrameworkFuseWrapper.php_discontinued
+++ b/framework/main/classes/fuse/class_FrameworkFuseWrapper.php_discontinued
@@ -17,7 +17,11 @@ use \FuseWrapper;
  *
  * @author             Roland Haeder <webmaster@ship-simu.org>
  * @version            0.0.0
+<<<<<<< HEAD:framework/main/classes/fuse/class_FrameworkFuseWrapper.php_discontinued
  * @copyright  Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2017 Core Developer Team
+=======
+ * @copyright  Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2016 Core Developer Team
+>>>>>>> Some updates::inc/main/classes/fuse/class_FrameworkFuseWrapper.php
  * @license            GNU GPL 3.0 or any newer version
  * @link               http://www.ship-simu.org
  *

diff --git a/framework/main/classes/handler/class_ b/framework/main/classes/handler/class_
index 0faf72777193a627b325ffcda286a538f9afcfc7..4cb0398749051d4bc1b4c9513398ab7b41c16467 100644 (file)
--- a/framework/main/classes/handler/class_
+++ b/framework/main/classes/handler/class_
@@ -10,7 +10,11 @@ use Org\Mxchange\CoreFramework\Handler\BaseHandler;
  *
  * @author             Roland Haeder <webmaster@ship-simu.org>
  * @version            0.0.0
+<<<<<<< HEAD:framework/main/classes/handler/class_
  * @copyright  Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2017 Core Developer Team
+=======
+ * @copyright  Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2016 Core Developer Team
+>>>>>>> Some updates::inc/main/classes/handler/class_
  * @license            GNU GPL 3.0 or any newer version
  * @link               http://www.ship-simu.org
  *

diff --git a/framework/main/classes/handler/class_BaseHandler.php b/framework/main/classes/handler/class_BaseHandler.php
index c5dcd4857f373cd5cd82c8eced287f1a17764ce7..48a6b084fa9a16f2cc956d3687c6e5e616a0f166 100644 (file)
--- a/framework/main/classes/handler/class_BaseHandler.php
+++ b/framework/main/classes/handler/class_BaseHandler.php
@@ -12,7 +12,11 @@ use Org\Mxchange\CoreFramework\Object\BaseFrameworkSystem;
  *
  * @author             Roland Haeder <webmaster@shipsimu.org>
  * @version            0.0.0
+<<<<<<< HEAD:framework/main/classes/handler/class_BaseHandler.php
  * @copyright  Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2017 Core Developer Team
+=======
+ * @copyright  Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2016 Core Developer Team
+>>>>>>> Some updates::inc/main/classes/handler/class_BaseHandler.php
  * @license            GNU GPL 3.0 or any newer version
  * @link               http://www.shipsimu.org
  *

diff --git a/framework/main/classes/handler/tasks/class_TaskHandler.php b/framework/main/classes/handler/tasks/class_TaskHandler.php
index dfc0142281f1f3ce3a6663f386c0162d8534c6e6..be1c8fdea0694caa5a66b39a10fb4aea22a1246f 100644 (file)
--- a/framework/main/classes/handler/tasks/class_TaskHandler.php
+++ b/framework/main/classes/handler/tasks/class_TaskHandler.php
@@ -15,7 +15,11 @@ use Org\Mxchange\CoreFramework\Visitor\Visitable;
  *
  * @author             Roland Haeder <webmaster@shipsimu.org>
  * @version            0.0.0
+<<<<<<< HEAD:framework/main/classes/handler/tasks/class_TaskHandler.php
  * @copyright  Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2017 Core Developer Team
+=======
+ * @copyright  Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2016 Core Developer Team
+>>>>>>> Some updates::inc/main/classes/handler/tasks/class_TaskHandler.php
  * @license            GNU GPL 3.0 or any newer version
  * @link               http://www.shipsimu.org
  *

diff --git a/framework/main/classes/helper/captcha/class_ b/framework/main/classes/helper/captcha/class_
index c293891800e342d2e8a23362a651205385c032bf..5eefd012e25cb534b537ed842d8e70968601ecaf 100644 (file)
--- a/framework/main/classes/helper/captcha/class_
+++ b/framework/main/classes/helper/captcha/class_
@@ -10,7 +10,11 @@ use Org\Mxchange\CoreFramework\Generic\FrameworkInterface;
  *
  * @author             Roland Haeder <webmaster@ship-simu.org>
  * @version            0.0.0
+<<<<<<< HEAD:framework/main/classes/helper/captcha/class_
  * @copyright  Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2017 Core Developer Team
+=======
+ * @copyright  Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2016 Core Developer Team
+>>>>>>> Some updates::inc/main/classes/helper/captcha/class_
  * @license            GNU GPL 3.0 or any newer version
  * @link               http://www.ship-simu.org
  *

diff --git a/framework/main/classes/helper/captcha/class_BaseCaptcha.php b/framework/main/classes/helper/captcha/class_BaseCaptcha.php
index f0bb7aeb0245c9e5090e4b925cb0a69ffb754ad3..385460f9a75f712bfa02e317888ba905974648aa 100644 (file)
--- a/framework/main/classes/helper/captcha/class_BaseCaptcha.php
+++ b/framework/main/classes/helper/captcha/class_BaseCaptcha.php
@@ -12,7 +12,11 @@ use Org\Mxchange\CoreFramework\Helper\BaseHelper;
  *
  * @author             Roland Haeder <webmaster@shipsimu.org>
  * @version            0.0.0
+<<<<<<< HEAD:framework/main/classes/helper/captcha/class_BaseCaptcha.php
  * @copyright  Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2017 Core Developer Team
+=======
+ * @copyright  Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2016 Core Developer Team
+>>>>>>> Some updates::inc/main/classes/helper/captcha/class_BaseCaptcha.php
  * @license            GNU GPL 3.0 or any newer version
  * @link               http://www.shipsimu.org
  *

diff --git a/framework/main/classes/helper/captcha/images/class_ImageHelper.php b/framework/main/classes/helper/captcha/images/class_ImageHelper.php
index da87bb80dcb72bde873c64b80b663ff1fcdd3e12..81f30c7e62c80d7ddf5367de1dbaffef5aa1fd04 100644 (file)
--- a/framework/main/classes/helper/captcha/images/class_ImageHelper.php
+++ b/framework/main/classes/helper/captcha/images/class_ImageHelper.php
@@ -12,7 +12,11 @@ use Org\Mxchange\CoreFramework\Template\CompileableTemplate;
  *
  * @author             Roland Haeder <webmaster@shipsimu.org>
  * @version            0.0.0
+<<<<<<< HEAD:framework/main/classes/helper/captcha/images/class_ImageHelper.php
  * @copyright  Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2017 Core Developer Team
+=======
+ * @copyright  Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2016 Core Developer Team
+>>>>>>> Some updates::inc/main/classes/helper/captcha/images/class_ImageHelper.php
  * @license            GNU GPL 3.0 or any newer version
  * @link               http://www.shipsimu.org
  *

diff --git a/framework/main/classes/helper/captcha/web/class_GraphicalCodeCaptcha.php b/framework/main/classes/helper/captcha/web/class_GraphicalCodeCaptcha.php
index 45eaf4a8f94b89aa8d715f7b6a6099732b264218..9ffe45aa02885c7eeef9c83d49bd3c2fe623ed10 100644 (file)
--- a/framework/main/classes/helper/captcha/web/class_GraphicalCodeCaptcha.php
+++ b/framework/main/classes/helper/captcha/web/class_GraphicalCodeCaptcha.php
@@ -12,7 +12,11 @@ use Org\Mxchange\CoreFramework\Helper\Template\HelpableTemplate;
  *
  * @author             Roland Haeder <webmaster@shipsimu.org>
  * @version            0.0.0
+<<<<<<< HEAD:framework/main/classes/helper/captcha/web/class_GraphicalCodeCaptcha.php
  * @copyright  Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2017 Core Developer Team
+=======
+ * @copyright  Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2016 Core Developer Team
+>>>>>>> Some updates::inc/main/classes/helper/captcha/web/class_GraphicalCodeCaptcha.php
  * @license            GNU GPL 3.0 or any newer version
  * @link               http://www.shipsimu.org
  *

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

diff --git a/framework/main/classes/helper/class_BaseHelper.php b/framework/main/classes/helper/class_BaseHelper.php
index 1ab249c50956c6eae75fcaa0b3af57583c682ece..3c40725f99224064745115996afe97dde3ef7ad7 100644 (file)
--- a/framework/main/classes/helper/class_BaseHelper.php
+++ b/framework/main/classes/helper/class_BaseHelper.php
@@ -14,7 +14,11 @@ use Org\Mxchange\CoreFramework\Registry\Registry;
  *
  * @author             Roland Haeder <webmaster@shipsimu.org>
  * @version            0.0.0
+<<<<<<< HEAD:framework/main/classes/helper/class_BaseHelper.php
  * @copyright  Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2017 Core Developer Team
+=======
+ * @copyright  Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2016 Core Developer Team
+>>>>>>> Some updates::inc/main/classes/helper/class_BaseHelper.php
  * @license            GNU GPL 3.0 or any newer version
  * @link               http://www.shipsimu.org
  *

diff --git a/framework/main/classes/helper/html/blocks/class_HtmlBlockHelper.php b/framework/main/classes/helper/html/blocks/class_HtmlBlockHelper.php
index ac4c008aef1d99dd2c27ea1877cf77d0c565bae9..b81c8025ff7084b800bbadce738d07683adc6754 100644 (file)
--- a/framework/main/classes/helper/html/blocks/class_HtmlBlockHelper.php
+++ b/framework/main/classes/helper/html/blocks/class_HtmlBlockHelper.php
@@ -11,7 +11,11 @@ use Org\Mxchange\CoreFramework\Template\CompileableTemplate;
  *
  * @author             Roland Haeder <webmaster@shipsimu.org>
  * @version            0.0.0
+<<<<<<< HEAD:framework/main/classes/helper/html/blocks/class_HtmlBlockHelper.php
  * @copyright  Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2017 Core Developer Team
+=======
+ * @copyright  Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2016 Core Developer Team
+>>>>>>> Some updates::inc/main/classes/helper/html/blocks/class_HtmlBlockHelper.php
  * @license            GNU GPL 3.0 or any newer version
  * @link               http://www.shipsimu.org
  *

diff --git a/framework/main/classes/helper/html/class_ b/framework/main/classes/helper/html/class_
index 7ddd9e5de57d377bae983df5686e9f52918f031d..ea0530687be53ef95fcf508e319b437067f3f468 100644 (file)
--- a/framework/main/classes/helper/html/class_
+++ b/framework/main/classes/helper/html/class_
@@ -10,7 +10,11 @@ use Org\Mxchange\CoreFramework\Helper\Template\HelpableTemplate;
  *
  * @author             Roland Haeder <webmaster@ship-simu.org>
  * @version            0.0.0
+<<<<<<< HEAD:framework/main/classes/helper/html/class_
  * @copyright  Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2017 Core Developer Team
+=======
+ * @copyright  Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2016 Core Developer Team
+>>>>>>> Some updates::inc/main/classes/helper/html/class_
  * @license            GNU GPL 3.0 or any newer version
  * @link               http://www.ship-simu.org
  *

diff --git a/framework/main/classes/helper/html/class_BaseHtmlHelper.php b/framework/main/classes/helper/html/class_BaseHtmlHelper.php
index 1f439d8e4426b5cc7ef2be20a0925974c679bab9..5617d41e3cb64b050c86f658b9da3434e40b8ab1 100644 (file)
--- a/framework/main/classes/helper/html/class_BaseHtmlHelper.php
+++ b/framework/main/classes/helper/html/class_BaseHtmlHelper.php
@@ -11,7 +11,11 @@ use Org\Mxchange\CoreFramework\Helper\BaseHelper;
  *
  * @author             Roland Haeder <webmaster@shipsimu.org>
  * @version            0.0.0
+<<<<<<< HEAD:framework/main/classes/helper/html/class_BaseHtmlHelper.php
  * @copyright  Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2017 Core Developer Team
+=======
+ * @copyright  Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2016 Core Developer Team
+>>>>>>> Some updates::inc/main/classes/helper/html/class_BaseHtmlHelper.php
  * @license            GNU GPL 3.0 or any newer version
  * @link               http://www.shipsimu.org
  *

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

diff --git a/framework/main/classes/helper/html/links/class_HtmlLinkHelper.php b/framework/main/classes/helper/html/links/class_HtmlLinkHelper.php
index 7c02df3d81eb19b337e0251d4e3bfeda0ebc9421..f02a829295dc65ca2afd41768856568f7f1e85aa 100644 (file)
--- a/framework/main/classes/helper/html/links/class_HtmlLinkHelper.php
+++ b/framework/main/classes/helper/html/links/class_HtmlLinkHelper.php
@@ -15,7 +15,11 @@ use Org\Mxchange\CoreFramework\Template\CompileableTemplate;
  *
  * @author             Roland Haeder <webmaster@shipsimu.org>
  * @version            0.0.0
+<<<<<<< HEAD:framework/main/classes/helper/html/links/class_HtmlLinkHelper.php
  * @copyright  Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2017 Core Developer Team
+=======
+ * @copyright  Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2016 Core Developer Team
+>>>>>>> Some updates::inc/main/classes/helper/html/links/class_HtmlLinkHelper.php
  * @license            GNU GPL 3.0 or any newer version
  * @link               http://www.shipsimu.org
  *

diff --git a/framework/main/classes/helper/login/class_BaseLoginHelper.php b/framework/main/classes/helper/login/class_BaseLoginHelper.php
index 2957c93780747fb18c881f6a2a7e2f38be57e375..4d1130431e26a185a6e281602c609bb2f63b21d6 100644 (file)
--- a/framework/main/classes/helper/login/class_BaseLoginHelper.php
+++ b/framework/main/classes/helper/login/class_BaseLoginHelper.php
@@ -10,7 +10,11 @@ use Org\Mxchange\CoreFramework\Helper\BaseHelper;
  *
  * @author             Roland Haeder <webmaster@shipsimu.org>
  * @version            0.0.0
+<<<<<<< HEAD:framework/main/classes/helper/login/class_BaseLoginHelper.php
  * @copyright  Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2017 Core Developer Team
+=======
+ * @copyright  Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2016 Core Developer Team
+>>>>>>> Some updates::inc/main/classes/helper/login/class_BaseLoginHelper.php
  * @license            GNU GPL 3.0 or any newer version
  * @link               http://www.shipsimu.org
  *

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

diff --git a/framework/main/classes/images/class_BaseImage.php b/framework/main/classes/images/class_BaseImage.php
index e83375f9953c95608efa99ef07d3638f89c05cb5..d7cf32e3e0e603b6a32cb17cad8bfe8b274d9740 100644 (file)
--- a/framework/main/classes/images/class_BaseImage.php
+++ b/framework/main/classes/images/class_BaseImage.php
@@ -11,7 +11,11 @@ use Org\Mxchange\CoreFramework\Registry\Registerable;
  *
  * @author             Roland Haeder <webmaster@shipsimu.org>
  * @version            0.0.0
+<<<<<<< HEAD:framework/main/classes/images/class_BaseImage.php
  * @copyright  Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2017 Core Developer Team
+=======
+ * @copyright  Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2016 Core Developer Team
+>>>>>>> Some updates::inc/main/classes/images/class_BaseImage.php
  * @license            GNU GPL 3.0 or any newer version
  * @link               http://www.shipsimu.org
  *

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

diff --git a/framework/main/classes/index/class_ b/framework/main/classes/index/class_
index 4bda48c0dd07271df918864b14eb6631b6128685..1e9ca1649cd166b4d938b3a9fb91979c3038ef24 100644 (file)
--- a/framework/main/classes/index/class_
+++ b/framework/main/classes/index/class_
@@ -11,7 +11,11 @@ use Org\Mxchange\CoreFramework\Index\Indexable;
  *
  * @author             Roland Haeder <webmaster@ship-simu.org>
  * @version            0.0.0
+<<<<<<< HEAD:framework/main/classes/index/class_
  * @copyright  Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2017 Core Developer Team
+=======
+ * @copyright  Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2016 Core Developer Team
+>>>>>>> Some updates::inc/main/classes/index/class_
  * @license            GNU GPL 3.0 or any newer version
  * @link               http://www.ship-simu.org
  *

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

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

diff --git a/framework/main/classes/iterator/class_ b/framework/main/classes/iterator/class_
index 37ff89a9b3aebdbe70027f0d4662f6a2418400a2..d04bc16b2cd560d02f93a28834ea36a81997518b 100644 (file)
--- a/framework/main/classes/iterator/class_
+++ b/framework/main/classes/iterator/class_
@@ -13,7 +13,11 @@ use \Iterator;
  *
  * @author             Roland Haeder <webmaster@ship-simu.org>
  * @version            0.0.0
+<<<<<<< HEAD:framework/main/classes/iterator/class_
  * @copyright  Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2017 Core Developer Team
+=======
+ * @copyright  Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2016 Core Developer Team
+>>>>>>> Some updates::inc/main/classes/iterator/class_
  * @license            GNU GPL 3.0 or any newer version
  * @link               http://www.ship-simu.org
  *

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

diff --git a/framework/main/classes/iterator/default/class_DefaultIterator.php b/framework/main/classes/iterator/default/class_DefaultIterator.php
index 5b482861a81073e35e199a901614fabe463995d1..79e9f788d2b1155cadeac650a031adaf2fa47c2f 100644 (file)
--- a/framework/main/classes/iterator/default/class_DefaultIterator.php
+++ b/framework/main/classes/iterator/default/class_DefaultIterator.php
@@ -15,7 +15,11 @@ use \Iterator;
  *
  * @author             Roland Haeder <webmaster@shipsimu.org>
  * @version            0.0.0
+<<<<<<< HEAD:framework/main/classes/iterator/default/class_DefaultIterator.php
  * @copyright  Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2017 Core Developer Team
+=======
+ * @copyright  Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2016 Core Developer Team
+>>>>>>> Some updates::inc/main/classes/iterator/default/class_DefaultIterator.php
  * @license            GNU GPL 3.0 or any newer version
  * @link               http://www.shipsimu.org
  *

diff --git a/framework/main/classes/iterator/file/class_FileIterator.php b/framework/main/classes/iterator/file/class_FileIterator.php
index b4945aeec1dbc92110aba430fc892f027456a7b1..ba9fd2c8b45271de45faf8280daf719923bc84bc 100644 (file)
--- a/framework/main/classes/iterator/file/class_FileIterator.php
+++ b/framework/main/classes/iterator/file/class_FileIterator.php
@@ -12,7 +12,11 @@ use Org\Mxchange\CoreFramework\Iterator\Filesystem\SeekableWritableFileIterator;
  *
  * @author             Roland Haeder <webmaster@ship-simu.org>
  * @version            0.0.0
+<<<<<<< HEAD:framework/main/classes/iterator/file/class_FileIterator.php
  * @copyright  Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2017 Core Developer Team
+=======
+ * @copyright  Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2016 Core Developer Team
+>>>>>>> Some updates::inc/main/classes/iterator/file/class_FileIterator.php
  * @license            GNU GPL 3.0 or any newer version
  * @link               http://www.ship-simu.org
  *

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

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

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

diff --git a/framework/main/classes/lists/groups/class_ListGroupList.php b/framework/main/classes/lists/groups/class_ListGroupList.php
index 0c0557dc631a0d53a43b765f6091bce7008293da..25462f80348392b011c6387d21a60043a8273814 100644 (file)
--- a/framework/main/classes/lists/groups/class_ListGroupList.php
+++ b/framework/main/classes/lists/groups/class_ListGroupList.php
@@ -11,7 +11,11 @@ use Org\Mxchange\CoreFramework\Lists\Listable;
  *
  * @author             Roland Haeder <webmaster@shipsimu.org>
  * @version            0.0.0
+<<<<<<< HEAD:framework/main/classes/lists/groups/class_ListGroupList.php
  * @copyright  Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2017 Core Developer Team
+=======
+ * @copyright  Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2016 Core Developer Team
+>>>>>>> Some updates::inc/main/classes/lists/groups/class_ListGroupList.php
  * @license            GNU GPL 3.0 or any newer version
  * @link               http://www.shipsimu.org
  *

diff --git a/framework/main/classes/lists/tasks/class_TaskList.php b/framework/main/classes/lists/tasks/class_TaskList.php
index 722fa150a3fd6880c775e4de9c5a48d1388e58f1..afe34e61d08fa6b6ebdb05d5293d2f5fd5b0cd89 100644 (file)
--- a/framework/main/classes/lists/tasks/class_TaskList.php
+++ b/framework/main/classes/lists/tasks/class_TaskList.php
@@ -11,7 +11,11 @@ use Org\Mxchange\CoreFramework\Lists\Listable;
  *
  * @author             Roland Haeder <webmaster@shipsimu.org>
  * @version            0.0.0
+<<<<<<< HEAD:framework/main/classes/lists/tasks/class_TaskList.php
  * @copyright  Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2017 Core Developer Team
+=======
+ * @copyright  Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2016 Core Developer Team
+>>>>>>> Some updates::inc/main/classes/lists/tasks/class_TaskList.php
  * @license            GNU GPL 3.0 or any newer version
  * @link               http://www.shipsimu.org
  *

diff --git a/framework/main/classes/mailer/class_ b/framework/main/classes/mailer/class_
index b25be3f6b30bbbbc30c96b1c1d098b739dc5d456..344579bffe765fa52053cf638d3cdfaff5744b81 100644 (file)
--- a/framework/main/classes/mailer/class_
+++ b/framework/main/classes/mailer/class_
@@ -11,7 +11,11 @@ use Org\Mxchange\CoreFramework\Mailer\DeliverableMail;
  *
  * @author             Roland Haeder <webmaster@ship-simu.org>
  * @version            0.0.0
+<<<<<<< HEAD:framework/main/classes/mailer/class_
  * @copyright  Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2017 Core Developer Team
+=======
+ * @copyright  Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2016 Core Developer Team
+>>>>>>> Some updates::inc/main/classes/mailer/class_
  * @license            GNU GPL 3.0 or any newer version
  * @link               http://www.ship-simu.org
  *

diff --git a/framework/main/classes/mailer/class_BaseMailer.php b/framework/main/classes/mailer/class_BaseMailer.php
index 6c0a52aa67820fe4d41d8c29a59f28a743b9e9f3..fe82ab31b00fa6be78265c7ca590c74efbc90bbd 100644 (file)
--- a/framework/main/classes/mailer/class_BaseMailer.php
+++ b/framework/main/classes/mailer/class_BaseMailer.php
@@ -12,7 +12,11 @@ use Org\Mxchange\CoreFramework\Object\BaseFrameworkSystem;
  *
  * @author             Roland Haeder <webmaster@shipsimu.org>
  * @version            0.0.0
+<<<<<<< HEAD:framework/main/classes/mailer/class_BaseMailer.php
  * @copyright  Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2017 Core Developer Team
+=======
+ * @copyright  Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2016 Core Developer Team
+>>>>>>> Some updates::inc/main/classes/mailer/class_BaseMailer.php
  * @license            GNU GPL 3.0 or any newer version
  * @link               http://www.shipsimu.org
  *

diff --git a/framework/main/classes/mailer/debug/class_DebugMailer.php b/framework/main/classes/mailer/debug/class_DebugMailer.php
index a0a18c42491a34f14a8b5ddfc8677e410639907b..200a0ececf04383026a123dafe93c5078c7c532f 100644 (file)
--- a/framework/main/classes/mailer/debug/class_DebugMailer.php
+++ b/framework/main/classes/mailer/debug/class_DebugMailer.php
@@ -18,7 +18,11 @@ use Org\Mxchange\CoreFramework\Template\CompileableTemplate;
  *
  * @author             Roland Haeder <webmaster@shipsimu.org>
  * @version            0.0.0
+<<<<<<< HEAD:framework/main/classes/mailer/debug/class_DebugMailer.php
  * @copyright  Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2017 Core Developer Team
+=======
+ * @copyright  Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2016 Core Developer Team
+>>>>>>> Some updates::inc/main/classes/mailer/debug/class_DebugMailer.php
  * @license            GNU GPL 3.0 or any newer version
  * @link               http://www.shipsimu.org
  *

diff --git a/framework/main/classes/output/class_ b/framework/main/classes/output/class_
index f2894d84dd155e046a7a69eeceb2947fdae4e0f7..60b0b2fd90f08b10e8e337d0524571a85aea5dd6 100644 (file)
--- a/framework/main/classes/output/class_
+++ b/framework/main/classes/output/class_
@@ -11,7 +11,11 @@ use Org\Mxchange\CoreFramework\Generic\UnsupportedOperationException;
  *
  * @author             Roland Haeder <webmaster@shipsimu.org>
  * @version            0.0.0
+<<<<<<< HEAD:framework/main/classes/output/class_
  * @copyright  Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2017 Core Developer Team
+=======
+ * @copyright  Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2016 Core Developer Team
+>>>>>>> Some updates::inc/main/classes/output/class_
  * @license            GNU GPL 3.0 or any newer version
  * @link               http://www.shipsimu.org
  *

diff --git a/framework/main/classes/output/class_BaseOutput.php b/framework/main/classes/output/class_BaseOutput.php
index c4ba130555cbf45db160b0788ac5e0c364a41a31..2507207bbceb402bdbeba71cd0c7e857a4fb3604 100644 (file)
--- a/framework/main/classes/output/class_BaseOutput.php
+++ b/framework/main/classes/output/class_BaseOutput.php
@@ -10,7 +10,11 @@ use Org\Mxchange\CoreFramework\Object\BaseFrameworkSystem;
  *
  * @author             Roland Haeder <webmaster@shipsimu.org>
  * @version            0.0.0
+<<<<<<< HEAD:framework/main/classes/output/class_BaseOutput.php
  * @copyright  Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2017 Core Developer Team
+=======
+ * @copyright  Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2016 Core Developer Team
+>>>>>>> Some updates::inc/main/classes/output/class_BaseOutput.php
  * @license            GNU GPL 3.0 or any newer version
  * @link               http://www.shipsimu.org
  *

diff --git a/framework/main/classes/output/console/class_ConsoleOutput.php b/framework/main/classes/output/console/class_ConsoleOutput.php
index 3d75464aef0eb4256b68cbff391e9d800359884e..d48acd3097fef8ccec156f05732660682594a522 100644 (file)
--- a/framework/main/classes/output/console/class_ConsoleOutput.php
+++ b/framework/main/classes/output/console/class_ConsoleOutput.php
@@ -14,7 +14,11 @@ use Org\Mxchange\CoreFramework\Stream\Output\OutputStreamer;
  *
  * @author             Roland Haeder <webmaster@shipsimu.org>
  * @version            0.0.0
+<<<<<<< HEAD:framework/main/classes/output/console/class_ConsoleOutput.php
  * @copyright  Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2017 Core Developer Team
+=======
+ * @copyright  Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2016 Core Developer Team
+>>>>>>> Some updates::inc/main/classes/output/console/class_ConsoleOutput.php
  * @license            GNU GPL 3.0 or any newer version
  * @link               http://www.shipsimu.org
  *

diff --git a/framework/main/classes/output/debug/class_BaseDebugOutput.php b/framework/main/classes/output/debug/class_BaseDebugOutput.php
index f4c826170ace0abf4f38ab81fa6afbdcf3c0c982..dd640de4391452e88b6f8857d9ad5d97f94d2c21 100644 (file)
--- a/framework/main/classes/output/debug/class_BaseDebugOutput.php
+++ b/framework/main/classes/output/debug/class_BaseDebugOutput.php
@@ -10,7 +10,11 @@ use Org\Mxchange\CoreFramework\Output\BaseOutput;
  *
  * @author             Roland Haeder <webmaster@shipsimu.org>
  * @version            0.0.0
+<<<<<<< HEAD:framework/main/classes/output/debug/class_BaseDebugOutput.php
  * @copyright  Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2017 Core Developer Team
+=======
+ * @copyright  Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2016 Core Developer Team
+>>>>>>> Some updates::inc/main/classes/output/debug/class_BaseDebugOutput.php
  * @license            GNU GPL 3.0 or any newer version
  * @link               http://www.shipsimu.org
  *

diff --git a/framework/main/classes/output/debug/console/class_DebugConsoleOutput.php b/framework/main/classes/output/debug/console/class_DebugConsoleOutput.php
index 113428a409b2af933b98191c03d703b8c5a07904..22a146f2531e127ade3132935a50bfedac6437a5 100644 (file)
--- a/framework/main/classes/output/debug/console/class_DebugConsoleOutput.php
+++ b/framework/main/classes/output/debug/console/class_DebugConsoleOutput.php
@@ -15,7 +15,11 @@ use Org\Mxchange\CoreFramework\Stream\Output\OutputStreamer;
  *
  * @author             Roland Haeder <webmaster@shipsimu.org>
  * @version            0.0.0
+<<<<<<< HEAD:framework/main/classes/output/debug/console/class_DebugConsoleOutput.php
  * @copyright  Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2017 Core Developer Team
+=======
+ * @copyright  Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2016 Core Developer Team
+>>>>>>> Some updates::inc/main/classes/output/debug/console/class_DebugConsoleOutput.php
  * @license            GNU GPL 3.0 or any newer version
  * @link               http://www.shipsimu.org
  *

diff --git a/framework/main/classes/output/debug/error/class_DebugErrorLogOutput.php b/framework/main/classes/output/debug/error/class_DebugErrorLogOutput.php
index 2a7978695de5576ea631cf408a6aa0b84a305522..48911988e7be2e4159cd6cc6740daa8558659e79 100644 (file)
--- a/framework/main/classes/output/debug/error/class_DebugErrorLogOutput.php
+++ b/framework/main/classes/output/debug/error/class_DebugErrorLogOutput.php
@@ -13,7 +13,11 @@ use Org\Mxchange\CoreFramework\Stream\Output\OutputStreamer;
  *
  * @author             Roland Haeder <webmaster@shipsimu.org>
  * @version            0.0.0
+<<<<<<< HEAD:framework/main/classes/output/debug/error/class_DebugErrorLogOutput.php
  * @copyright  Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2017 Core Developer Team
+=======
+ * @copyright  Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2016 Core Developer Team
+>>>>>>> Some updates::inc/main/classes/output/debug/error/class_DebugErrorLogOutput.php
  * @license            GNU GPL 3.0 or any newer version
  * @link               http://www.shipsimu.org
  *

diff --git a/framework/main/classes/output/debug/web/class_DebugWebOutput.php b/framework/main/classes/output/debug/web/class_DebugWebOutput.php
index 930ff9e69324845518c7f064d0f8151b46fc118b..8cae7db609bc9e29ed0728a7c28a1d2a1a207feb 100644 (file)
--- a/framework/main/classes/output/debug/web/class_DebugWebOutput.php
+++ b/framework/main/classes/output/debug/web/class_DebugWebOutput.php
@@ -13,7 +13,11 @@ use Org\Mxchange\CoreFramework\Stream\Output\OutputStreamer;
  *
  * @author             Roland Haeder <webmaster@shipsimu.org>
  * @version            0.0.0
+<<<<<<< HEAD:framework/main/classes/output/debug/web/class_DebugWebOutput.php
  * @copyright  Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2017 Core Developer Team
+=======
+ * @copyright  Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2016 Core Developer Team
+>>>>>>> Some updates::inc/main/classes/output/debug/web/class_DebugWebOutput.php
  * @license            GNU GPL 3.0 or any newer version
  * @link               http://www.shipsimu.org
  *

diff --git a/framework/main/classes/output/web/class_WebOutput.php b/framework/main/classes/output/web/class_WebOutput.php
index 48ef11064772c471d64d62c288dca7cab6a111c3..267a4f604373491270ed88c051772adefb99eb9d 100644 (file)
--- a/framework/main/classes/output/web/class_WebOutput.php
+++ b/framework/main/classes/output/web/class_WebOutput.php
@@ -16,7 +16,11 @@ use Org\Mxchange\CoreFramework\Stream\Output\OutputStreamer;
  *
  * @author             Roland Haeder <webmaster@shipsimu.org>
  * @version            0.0.0
+<<<<<<< HEAD:framework/main/classes/output/web/class_WebOutput.php
  * @copyright  Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2017 Core Developer Team
+=======
+ * @copyright  Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2016 Core Developer Team
+>>>>>>> Some updates::inc/main/classes/output/web/class_WebOutput.php
  * @license            GNU GPL 3.0 or any newer version
  * @link               http://www.shipsimu.org
  *

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

diff --git a/framework/main/classes/parser/class_BaseParser.php b/framework/main/classes/parser/class_BaseParser.php
index 1020c0e9c1f776e22eef766f39cb6a9120e0d740..dec3f0be8662430dcf365dd0145429e4b682381f 100644 (file)
--- a/framework/main/classes/parser/class_BaseParser.php
+++ b/framework/main/classes/parser/class_BaseParser.php
@@ -10,7 +10,11 @@ use Org\Mxchange\CoreFramework\Object\BaseFrameworkSystem;
  *
  * @author             Roland Haeder <webmaster@shipsimu.org>
  * @version            0.0.0
+<<<<<<< HEAD:framework/main/classes/parser/class_BaseParser.php
  * @copyright  Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2017 Core Developer Team
+=======
+ * @copyright  Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2016 Core Developer Team
+>>>>>>> Some updates::inc/main/classes/parser/class_BaseParser.php
  * @license            GNU GPL 3.0 or any newer version
  * @link               http://www.shipsimu.org
  *

diff --git a/framework/main/classes/parser/xml/class_XmlParser.php b/framework/main/classes/parser/xml/class_XmlParser.php
index 9ebf852cf4107560556d3fcd244235ec7092f56e..f232c289f7a5815f72c05c65ee2859b562281224 100644 (file)
--- a/framework/main/classes/parser/xml/class_XmlParser.php
+++ b/framework/main/classes/parser/xml/class_XmlParser.php
@@ -12,7 +12,11 @@ use Org\Mxchange\CoreFramework\Template\CompileableTemplate;
  *
  * @author             Roland Haeder <webmaster@shipsimu.org>
  * @version            0.0.0
+<<<<<<< HEAD:framework/main/classes/parser/xml/class_XmlParser.php
  * @copyright  Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2017 Core Developer Team
+=======
+ * @copyright  Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2016 Core Developer Team
+>>>>>>> Some updates::inc/main/classes/parser/xml/class_XmlParser.php
  * @license            GNU GPL 3.0 or any newer version
  * @link               http://www.shipsimu.org
  *

diff --git a/framework/main/classes/points/class_UserPoints.php b/framework/main/classes/points/class_UserPoints.php
index 786446c60bf3bc95bfa3fa96e987eb4b8e324113..5f655a538f05ccfcb834b57ea415f6b25aebacae 100644 (file)
--- a/framework/main/classes/points/class_UserPoints.php
+++ b/framework/main/classes/points/class_UserPoints.php
@@ -15,7 +15,11 @@ use Org\Mxchange\CoreFramework\User\ManageableAccount;
  *
  * @author             Roland Haeder <webmaster@shipsimu.org>
  * @version            0.0.0
+<<<<<<< HEAD:framework/main/classes/points/class_UserPoints.php
  * @copyright  Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2017 Core Developer Team
+=======
+ * @copyright  Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2016 Core Developer Team
+>>>>>>> Some updates::inc/main/classes/points/class_UserPoints.php
  * @license            GNU GPL 3.0 or any newer version
  * @link               http://www.shipsimu.org
  *

diff --git a/framework/main/classes/reader/class_ConsoleNewsReader.php b/framework/main/classes/reader/class_ConsoleNewsReader.php
index dbbc8decc46bffd258485ba78ac3001a045115c3..31e47ef92ec523218a18e1d5602bdc43aacb9d3b 100644 (file)
--- a/framework/main/classes/reader/class_ConsoleNewsReader.php
+++ b/framework/main/classes/reader/class_ConsoleNewsReader.php
@@ -16,7 +16,11 @@ use Org\Mxchange\CoreFramework\Request\Requestable;
  *
  * @author             Roland Haeder <webmaster@shipsimu.org>
  * @version            0.0.0
+<<<<<<< HEAD:framework/main/classes/reader/class_ConsoleNewsReader.php
  * @copyright  Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2017 Core Developer Team
+=======
+ * @copyright  Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2016 Core Developer Team
+>>>>>>> Some updates::inc/main/classes/reader/class_ConsoleNewsReader.php
  * @license            GNU GPL 3.0 or any newer version
  * @link               http://www.shipsimu.org
  *

diff --git a/framework/main/classes/reader/class_DefaultNewsReader.php b/framework/main/classes/reader/class_DefaultNewsReader.php
index a79102bf1d745756466d4f53a44cc5135b8c9c3b..b988f43ef867e9de7c7ef9aff6dc1c744718b60a 100644 (file)
--- a/framework/main/classes/reader/class_DefaultNewsReader.php
+++ b/framework/main/classes/reader/class_DefaultNewsReader.php
@@ -15,7 +15,11 @@ use Org\Mxchange\CoreFramework\Request\Requestable;
  *
  * @author             Roland Haeder <webmaster@shipsimu.org>
  * @version            0.0.0
+<<<<<<< HEAD:framework/main/classes/reader/class_DefaultNewsReader.php
  * @copyright  Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2017 Core Developer Team
+=======
+ * @copyright  Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2016 Core Developer Team
+>>>>>>> Some updates::inc/main/classes/reader/class_DefaultNewsReader.php
  * @license            GNU GPL 3.0 or any newer version
  * @link               http://www.shipsimu.org
  *

diff --git a/framework/main/classes/registration/class_BaseRegistration.php b/framework/main/classes/registration/class_BaseRegistration.php
index 6dad6fdff0634c47af61d84fb5bdf0c4f33e23cc..9f6affe26101f329f4f910aa426d36698bacff14 100644 (file)
--- a/framework/main/classes/registration/class_BaseRegistration.php
+++ b/framework/main/classes/registration/class_BaseRegistration.php
@@ -13,7 +13,11 @@ use Org\Mxchange\CoreFramework\Object\BaseFrameworkSystem;
  *
  * @author             Roland Haeder <webmaster@shipsimu.org>
  * @version            0.0.0
+<<<<<<< HEAD:framework/main/classes/registration/class_BaseRegistration.php
  * @copyright  Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2017 Core Developer Team
+=======
+ * @copyright  Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2016 Core Developer Team
+>>>>>>> Some updates::inc/main/classes/registration/class_BaseRegistration.php
  * @license            GNU GPL 3.0 or any newer version
  * @link               http://www.shipsimu.org
  *

diff --git a/framework/main/classes/registry/class_ b/framework/main/classes/registry/class_
index 7aa0e9138884a11c0780aa7ab098c68f6823d867..cd322446363abb64dd2032fa85cfca448a122779 100644 (file)
--- a/framework/main/classes/registry/class_
+++ b/framework/main/classes/registry/class_
@@ -11,7 +11,11 @@ use Org\Mxchange\CoreFramework\Registry\Register;
  *
  * @author             Roland Haeder <webmaster@ship-simu.org>
  * @version            0.0.0
+<<<<<<< HEAD:framework/main/classes/registry/class_
  * @copyright  Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2017 Core Developer Team
+=======
+ * @copyright  Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2016 Core Developer Team
+>>>>>>> Some updates::inc/main/classes/registry/class_
  * @license            GNU GPL 3.0 or any newer version
  * @link               http://www.ship-simu.org
  *

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

diff --git a/framework/main/classes/registry/generic/class_Registry.php b/framework/main/classes/registry/generic/class_Registry.php
index 476628e91d436bfb9c1ebd93131dfd725f0c8dcf..ca9ec0999fae8813e56e48aacde4300dd0150795 100644 (file)
--- a/framework/main/classes/registry/generic/class_Registry.php
+++ b/framework/main/classes/registry/generic/class_Registry.php
@@ -12,7 +12,11 @@ use Org\Mxchange\CoreFramework\Registry\Register;
  *
  * @author             Roland Haeder <webmaster@shipsimu.org>
  * @version            0.0.0
+<<<<<<< HEAD:framework/main/classes/registry/generic/class_Registry.php
  * @copyright  Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2017 Core Developer Team
+=======
+ * @copyright  Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2016 Core Developer Team
+>>>>>>> Some updates::inc/main/classes/registry/generic/class_Registry.php
  * @license            GNU GPL 3.0 or any newer version
  * @link               http://www.shipsimu.org
  *

diff --git a/framework/main/classes/registry/sub/class_SubRegistry.php b/framework/main/classes/registry/sub/class_SubRegistry.php
index 1df76b280cb881b588d57e53758724cc915f5164..e7725baa4f2b113d586ebe40ad196720a2d61446 100644 (file)
--- a/framework/main/classes/registry/sub/class_SubRegistry.php
+++ b/framework/main/classes/registry/sub/class_SubRegistry.php
@@ -11,7 +11,11 @@ use Org\Mxchange\CoreFramework\Registry\Register;
  *
  * @author             Roland Haeder <webmaster@shipsimu.org>
  * @version            0.0.0
+<<<<<<< HEAD:framework/main/classes/registry/sub/class_SubRegistry.php
  * @copyright  Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2017 Core Developer Team
+=======
+ * @copyright  Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2016 Core Developer Team
+>>>>>>> Some updates::inc/main/classes/registry/sub/class_SubRegistry.php
  * @license            GNU GPL 3.0 or any newer version
  * @link               http://www.shipsimu.org
  *

diff --git a/framework/main/classes/request/class_ b/framework/main/classes/request/class_
index 48b31ceab0c1b3bdcd83f51b37fb5ed703cf1ae1..f46f50006d467635b989106dd61e9b81ad236fb1 100644 (file)
--- a/framework/main/classes/request/class_
+++ b/framework/main/classes/request/class_
@@ -7,7 +7,11 @@ namespace CoreFramework\Request;
  *
  * @author             Roland Haeder <webmaster@ship-simu.org>
  * @version            0.0.0
+<<<<<<< HEAD:framework/main/classes/request/class_
  * @copyright  Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2017 Core Developer Team
+=======
+ * @copyright  Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2016 Core Developer Team
+>>>>>>> Some updates::inc/main/classes/request/class_
  * @license            GNU GPL 3.0 or any newer version
  * @link               http://www.ship-simu.org
  *

diff --git a/framework/main/classes/request/class_BaseRequest.php b/framework/main/classes/request/class_BaseRequest.php
index 0fa759a1b8af043425cc9a8da2b4fe510d083111..56ff6b06d0e9c3a8d7adbb024a4cffedb5467222 100644 (file)
--- a/framework/main/classes/request/class_BaseRequest.php
+++ b/framework/main/classes/request/class_BaseRequest.php
@@ -10,7 +10,11 @@ use Org\Mxchange\CoreFramework\Object\BaseFrameworkSystem;
  *
  * @author             Roland Haeder <webmaster@shipsimu.org>
  * @version            0.0.0
+<<<<<<< HEAD:framework/main/classes/request/class_BaseRequest.php
  * @copyright  Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2017 Core Developer Team
+=======
+ * @copyright  Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2016 Core Developer Team
+>>>>>>> Some updates::inc/main/classes/request/class_BaseRequest.php
  * @license            GNU GPL 3.0 or any newer version
  * @link               http://www.shipsimu.org
  *

diff --git a/framework/main/classes/request/console/class_ConsoleRequest.php b/framework/main/classes/request/console/class_ConsoleRequest.php
index 6aa36c57cda541477715eea99e277647fad49a44..3a85f3e2b495698177d8bbbc8badfafc5853c3ea 100644 (file)
--- a/framework/main/classes/request/console/class_ConsoleRequest.php
+++ b/framework/main/classes/request/console/class_ConsoleRequest.php
@@ -11,7 +11,11 @@ use Org\Mxchange\CoreFramework\Request\Requestable;
  *
  * @author             Roland Haeder <webmaster@shipsimu.org>
  * @version            0.0.0
+<<<<<<< HEAD:framework/main/classes/request/console/class_ConsoleRequest.php
  * @copyright  Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2017 Core Developer Team
+=======
+ * @copyright  Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2016 Core Developer Team
+>>>>>>> Some updates::inc/main/classes/request/console/class_ConsoleRequest.php
  * @license            GNU GPL 3.0 or any newer version
  * @link               http://www.shipsimu.org
  *

diff --git a/framework/main/classes/request/html/class_HtmlRequest.php b/framework/main/classes/request/html/class_HtmlRequest.php
index 1326700259d049c14757b80d1b5b65974225b6ba..714b4cc08deb4c70553577f434c70ea012b9cefb 100644 (file)
--- a/framework/main/classes/request/html/class_HtmlRequest.php
+++ b/framework/main/classes/request/html/class_HtmlRequest.php
@@ -10,7 +10,11 @@ use Org\Mxchange\CoreFramework\Request\Requestable;
  *
  * @author             Roland Haeder <webmaster@shipsimu.org>
  * @version            0.0.0
+<<<<<<< HEAD:framework/main/classes/request/html/class_HtmlRequest.php
  * @copyright  Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2017 Core Developer Team
+=======
+ * @copyright  Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2016 Core Developer Team
+>>>>>>> Some updates::inc/main/classes/request/html/class_HtmlRequest.php
  * @license            GNU GPL 3.0 or any newer version
  * @link               http://www.shipsimu.org
  * @todo               Move out the cookie part to a seperate class, e.g. Cookie

diff --git a/framework/main/classes/resolver/action/class_BaseActionResolver.php b/framework/main/classes/resolver/action/class_BaseActionResolver.php
index 58996de9a07894b275ec4ffa668b4e4d7ae2693f..7136ba6989086cd4d9d3e9316dcaba412400dad0 100644 (file)
--- a/framework/main/classes/resolver/action/class_BaseActionResolver.php
+++ b/framework/main/classes/resolver/action/class_BaseActionResolver.php
@@ -14,7 +14,11 @@ use \InvalidArgumentException;
  *
  * @author             Roland Haeder <webmaster@shipsimu.org>
  * @version            0.0.0
+<<<<<<< HEAD:framework/main/classes/resolver/action/class_BaseActionResolver.php
  * @copyright  Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2017 Core Developer Team
+=======
+ * @copyright  Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2016 Core Developer Team
+>>>>>>> Some updates::inc/main/classes/resolver/action/class_BaseActionResolver.php
  * @license            GNU GPL 3.0 or any newer version
  * @link               http://www.shipsimu.org
  *

diff --git a/framework/main/classes/resolver/action/html/class_HtmlActionResolver.php b/framework/main/classes/resolver/action/html/class_HtmlActionResolver.php
index 38040fd458faa4f5121502eff7c5a7dfde2ff279..eb7862b620d17cc042d40b0a56102255a6d59b31 100644 (file)
--- a/framework/main/classes/resolver/action/html/class_HtmlActionResolver.php
+++ b/framework/main/classes/resolver/action/html/class_HtmlActionResolver.php
@@ -14,7 +14,11 @@ use \InvalidArgumentException;
  *
  * @author             Roland Haeder <webmaster@shipsimu.org>
  * @version            0.0.0
+<<<<<<< HEAD:framework/main/classes/resolver/action/html/class_HtmlActionResolver.php
  * @copyright  Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2017 Core Developer Team
+=======
+ * @copyright  Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2016 Core Developer Team
+>>>>>>> Some updates::inc/main/classes/resolver/action/html/class_HtmlActionResolver.php
  * @license            GNU GPL 3.0 or any newer version
  * @link               http://www.shipsimu.org
  *

diff --git a/framework/main/classes/resolver/class_BaseResolver.php b/framework/main/classes/resolver/class_BaseResolver.php
index e93bcd81dc5f1970090f1345de115e0c4f8d1ca8..177525e430a16b15f6af2ed57d0f5eb10e3e7933 100644 (file)
--- a/framework/main/classes/resolver/class_BaseResolver.php
+++ b/framework/main/classes/resolver/class_BaseResolver.php
@@ -11,7 +11,11 @@ use Org\Mxchange\CoreFramework\Object\BaseFrameworkSystem;
  *
  * @author             Roland Haeder <webmaster@shipsimu.org>
  * @version            0.0.0
+<<<<<<< HEAD:framework/main/classes/resolver/class_BaseResolver.php
  * @copyright  Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2017 Core Developer Team
+=======
+ * @copyright  Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2016 Core Developer Team
+>>>>>>> Some updates::inc/main/classes/resolver/class_BaseResolver.php
  * @license            GNU GPL 3.0 or any newer version
  * @link               http://www.shipsimu.org
  *

diff --git a/framework/main/classes/resolver/command/class_BaseCommandResolver.php b/framework/main/classes/resolver/command/class_BaseCommandResolver.php
index b0ddb5cc6dc81368d057e1f48a9a5696776b6fbb..6c463cd3368e3f5add1baf5b820b096fe7d78d58 100644 (file)
--- a/framework/main/classes/resolver/command/class_BaseCommandResolver.php
+++ b/framework/main/classes/resolver/command/class_BaseCommandResolver.php
@@ -19,7 +19,11 @@ use \UnexpectedValueException;
  *
  * @author             Roland Haeder <webmaster@shipsimu.org>
  * @version            0.0.0
+<<<<<<< HEAD:framework/main/classes/resolver/command/class_BaseCommandResolver.php
  * @copyright  Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2017 Core Developer Team
+=======
+ * @copyright  Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2016 Core Developer Team
+>>>>>>> Some updates::inc/main/classes/resolver/command/class_BaseCommandResolver.php
  * @license            GNU GPL 3.0 or any newer version
  * @link               http://www.shipsimu.org
  *

diff --git a/framework/main/classes/resolver/command/console/class_ConsoleCommandResolver.php b/framework/main/classes/resolver/command/console/class_ConsoleCommandResolver.php
index 2a12036ecc8af86f3adade35895ff2545484a805..1793bf2df8d07af1754f0a3e5dde2042951fc28a 100644 (file)
--- a/framework/main/classes/resolver/command/console/class_ConsoleCommandResolver.php
+++ b/framework/main/classes/resolver/command/console/class_ConsoleCommandResolver.php
@@ -16,7 +16,11 @@ use \InvalidArgumentException;
  *
  * @author             Roland Haeder <webmaster@shipsimu.org>
  * @version            0.0.0
+<<<<<<< HEAD:framework/main/classes/resolver/command/console/class_ConsoleCommandResolver.php
  * @copyright  Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2017 Core Developer Team
+=======
+ * @copyright  Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2016 Core Developer Team
+>>>>>>> Some updates::inc/main/classes/resolver/command/console/class_ConsoleCommandResolver.php
  * @license            GNU GPL 3.0 or any newer version
  * @link               http://www.shipsimu.org
  *

diff --git a/framework/main/classes/resolver/command/html/class_Html b/framework/main/classes/resolver/command/html/class_Html
index 06160b66f9eb826379ccebc2ebb6d1487cb25d99..4f13473795a60ccbea7c47a664bff8eb493bcba7 100644 (file)
--- a/framework/main/classes/resolver/command/html/class_Html
+++ b/framework/main/classes/resolver/command/html/class_Html
@@ -4,7 +4,11 @@
  *
  * @author             Roland Haeder <webmaster@ship-simu.org>
  * @version            0.0.0
+<<<<<<< HEAD:framework/main/classes/resolver/command/html/class_Html
  * @copyright  Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2017 Core Developer Team
+=======
+ * @copyright  Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2016 Core Developer Team
+>>>>>>> Some updates::inc/main/classes/resolver/command/html/class_Html
  * @license            GNU GPL 3.0 or any newer version
  * @link               http://www.ship-simu.org
  *

diff --git a/framework/main/classes/resolver/command/html/class_HtmlCommandResolver.php b/framework/main/classes/resolver/command/html/class_HtmlCommandResolver.php
index df9262af0ba7d6e139bd9444e09a0a4dad029f75..a164f720829b5da49c5371521d1fa4c008265233 100644 (file)
--- a/framework/main/classes/resolver/command/html/class_HtmlCommandResolver.php
+++ b/framework/main/classes/resolver/command/html/class_HtmlCommandResolver.php
@@ -15,7 +15,11 @@ use \InvalidArgumentException;
  *
  * @author             Roland Haeder <webmaster@shipsimu.org>
  * @version            0.0.0
+<<<<<<< HEAD:framework/main/classes/resolver/command/html/class_HtmlCommandResolver.php
  * @copyright  Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2017 Core Developer Team
+=======
+ * @copyright  Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2016 Core Developer Team
+>>>>>>> Some updates::inc/main/classes/resolver/command/html/class_HtmlCommandResolver.php
  * @license            GNU GPL 3.0 or any newer version
  * @link               http://www.shipsimu.org
  *

diff --git a/framework/main/classes/resolver/command/image/class_ImageCommandResolver.php b/framework/main/classes/resolver/command/image/class_ImageCommandResolver.php
index 9e642c38979840d6229c4569af38c2295c1b05f6..0c9ce924c3960dfa0c5a00a396a0bad4ed792839 100644 (file)
--- a/framework/main/classes/resolver/command/image/class_ImageCommandResolver.php
+++ b/framework/main/classes/resolver/command/image/class_ImageCommandResolver.php
@@ -14,7 +14,11 @@ use \InvalidArgumentException;
  *
  * @author             Roland Haeder <webmaster@shipsimu.org>
  * @version            0.0.0
+<<<<<<< HEAD:framework/main/classes/resolver/command/image/class_ImageCommandResolver.php
  * @copyright  Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2017 Core Developer Team
+=======
+ * @copyright  Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2016 Core Developer Team
+>>>>>>> Some updates::inc/main/classes/resolver/command/image/class_ImageCommandResolver.php
  * @license            GNU GPL 3.0 or any newer version
  * @link               http://www.shipsimu.org
  *

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

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

diff --git a/framework/main/classes/resolver/controller/html/class_HtmlControllerResolver.php b/framework/main/classes/resolver/controller/html/class_HtmlControllerResolver.php
index cbc46d0b961d29c8e1779dab6f166ba4ab733a52..3a79138c35eccab595f9bdba5af6bf7a1060d2a1 100644 (file)
--- a/framework/main/classes/resolver/controller/html/class_HtmlControllerResolver.php
+++ b/framework/main/classes/resolver/controller/html/class_HtmlControllerResolver.php
@@ -16,7 +16,11 @@ use \InvalidArgumentException;
  *
  * @author             Roland Haeder <webmaster@shipsimu.org>
  * @version            0.0.0
+<<<<<<< HEAD:framework/main/classes/resolver/controller/html/class_HtmlControllerResolver.php
  * @copyright  Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2017 Core Developer Team
+=======
+ * @copyright  Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2016 Core Developer Team
+>>>>>>> Some updates::inc/main/classes/resolver/controller/html/class_HtmlControllerResolver.php
  * @license            GNU GPL 3.0 or any newer version
  * @link               http://www.shipsimu.org
  *

diff --git a/framework/main/classes/resolver/controller/image/class_ImageControllerResolver.php b/framework/main/classes/resolver/controller/image/class_ImageControllerResolver.php
index 02024241224bf99dfc97c9dcbd3a37f996f1bade..e8c970156df36770c58f30adcf48de3d70035f76 100644 (file)
--- a/framework/main/classes/resolver/controller/image/class_ImageControllerResolver.php
+++ b/framework/main/classes/resolver/controller/image/class_ImageControllerResolver.php
@@ -16,7 +16,11 @@ use \InvalidArgumentException;
  *
  * @author             Roland Haeder <webmaster@shipsimu.org>
  * @version            0.0.0
+<<<<<<< HEAD:framework/main/classes/resolver/controller/image/class_ImageControllerResolver.php
  * @copyright  Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2017 Core Developer Team
+=======
+ * @copyright  Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2016 Core Developer Team
+>>>>>>> Some updates::inc/main/classes/resolver/controller/image/class_ImageControllerResolver.php
  * @license            GNU GPL 3.0 or any newer version
  * @link               http://www.shipsimu.org
  *

diff --git a/framework/main/classes/response/class_BaseResponse.php b/framework/main/classes/response/class_BaseResponse.php
index fdce9724b6a572ab4c9c801e29400f4965777193..4092a010c2772f54ab27542629616233f9b968fc 100644 (file)
--- a/framework/main/classes/response/class_BaseResponse.php
+++ b/framework/main/classes/response/class_BaseResponse.php
@@ -11,7 +11,11 @@ use Org\Mxchange\CoreFramework\Registry\Registry;
  *
  * @author             Roland Haeder <webmaster@shipsimu.org>
  * @version            0.0.0
+<<<<<<< HEAD:framework/main/classes/response/class_BaseResponse.php
  * @copyright  Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2017 Core Developer Team
+=======
+ * @copyright  Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2016 Core Developer Team
+>>>>>>> Some updates::inc/main/classes/response/class_BaseResponse.php
  * @license            GNU GPL 3.0 or any newer version
  * @link               http://www.shipsimu.org
  *

diff --git a/framework/main/classes/response/console/class_ConsoleResponse.php b/framework/main/classes/response/console/class_ConsoleResponse.php
index d98de4bedf25751703a13c7d7df1b08bc9638a71..321c6ff6505a5b76144ec09c390c9fbc92d71689 100644 (file)
--- a/framework/main/classes/response/console/class_ConsoleResponse.php
+++ b/framework/main/classes/response/console/class_ConsoleResponse.php
@@ -10,7 +10,11 @@ use Org\Mxchange\CoreFramework\Response\Responseable;
  *
  * @author             Roland Haeder <webmaster@shipsimu.org>
  * @version            0.0.0
+<<<<<<< HEAD:framework/main/classes/response/console/class_ConsoleResponse.php
  * @copyright  Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2017 Core Developer Team
+=======
+ * @copyright  Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2016 Core Developer Team
+>>>>>>> Some updates::inc/main/classes/response/console/class_ConsoleResponse.php
  * @license            GNU GPL 3.0 or any newer version
  * @link               http://www.shipsimu.org
  *

diff --git a/framework/main/classes/response/html/class_HtmlResponse.php b/framework/main/classes/response/html/class_HtmlResponse.php
index 07036f7104810e766afdf83770d3d044dd59b7af..ed0504930fd68177a2216b4ea5b0a47a0a373387 100644 (file)
--- a/framework/main/classes/response/html/class_HtmlResponse.php
+++ b/framework/main/classes/response/html/class_HtmlResponse.php
@@ -11,7 +11,11 @@ use Org\Mxchange\CoreFramework\Response\Responseable;
  *
  * @author             Roland Haeder <webmaster@shipsimu.org>
  * @version            0.0.0
+<<<<<<< HEAD:framework/main/classes/response/html/class_HtmlResponse.php
  * @copyright  Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2017 Core Developer Team
+=======
+ * @copyright  Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2016 Core Developer Team
+>>>>>>> Some updates::inc/main/classes/response/html/class_HtmlResponse.php
  * @license            GNU GPL 3.0 or any newer version
  * @link               http://www.shipsimu.org
  *

diff --git a/framework/main/classes/response/image/class_ImageResponse.php b/framework/main/classes/response/image/class_ImageResponse.php
index 3521252adcad5c33e72cc510f4992d0058b5d75e..8594ca4f6ae605b8045862424298d0a44800daa2 100644 (file)
--- a/framework/main/classes/response/image/class_ImageResponse.php
+++ b/framework/main/classes/response/image/class_ImageResponse.php
@@ -11,7 +11,11 @@ use Org\Mxchange\CoreFramework\Response\Responseable;
  *
  * @author             Roland Haeder <webmaster@shipsimu.org>
  * @version            0.0.0
+<<<<<<< HEAD:framework/main/classes/response/image/class_ImageResponse.php
  * @copyright  Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2017 Core Developer Team
+=======
+ * @copyright  Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2016 Core Developer Team
+>>>>>>> Some updates::inc/main/classes/response/image/class_ImageResponse.php
  * @license            GNU GPL 3.0 or any newer version
  * @link               http://www.shipsimu.org
  *

diff --git a/framework/main/classes/rng/class_RandomNumberGenerator.php b/framework/main/classes/rng/class_RandomNumberGenerator.php
index e1a34ea8849b63cf2914f0dec618aea6c15284ca..c2e04ae25af328e88941b2b16f7d2fc4a2b59b40 100644 (file)
--- a/framework/main/classes/rng/class_RandomNumberGenerator.php
+++ b/framework/main/classes/rng/class_RandomNumberGenerator.php
@@ -12,7 +12,11 @@ use Org\Mxchange\CoreFramework\Generic\FrameworkInterface;
  *
  * @author             Roland Haeder <webmaster@shipsimu.org>
  * @version            0.0.0
+<<<<<<< HEAD:framework/main/classes/rng/class_RandomNumberGenerator.php
  * @copyright  Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2017 Core Developer Team
+=======
+ * @copyright  Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2016 Core Developer Team
+>>>>>>> Some updates::inc/main/classes/rng/class_RandomNumberGenerator.php
  * @license            GNU GPL 3.0 or any newer version
  * @link               http://www.shipsimu.org
  *

diff --git a/framework/main/classes/stacker/class_ b/framework/main/classes/stacker/class_
index c3c188ed2f2c8865658a28735ebf6f61817ff99d..629bcd4148d62f1db1781dd0433e68d65f4a301a 100644 (file)
--- a/framework/main/classes/stacker/class_
+++ b/framework/main/classes/stacker/class_
@@ -11,7 +11,11 @@ use Org\Mxchange\CoreFramework\Stacker\Stackable;
  *
  * @author             Roland Haeder <webmaster@ship-simu.org>
  * @version            0.0.0
+<<<<<<< HEAD:framework/main/classes/stacker/class_
  * @copyright  Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2017 Core Developer Team
+=======
+ * @copyright  Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2016 Core Developer Team
+>>>>>>> Some updates::inc/main/classes/stacker/class_
  * @license            GNU GPL 3.0 or any newer version
  * @link               http://www.ship-simu.org
  *

diff --git a/framework/main/classes/stacker/class_BaseStacker.php b/framework/main/classes/stacker/class_BaseStacker.php
index d6d627ca19131d7eedb1b565c6853770fb19e787..602de195cf37293d61b8b57758dc97eeefefb5a9 100644 (file)
--- a/framework/main/classes/stacker/class_BaseStacker.php
+++ b/framework/main/classes/stacker/class_BaseStacker.php
@@ -10,7 +10,11 @@ use Org\Mxchange\CoreFramework\Object\BaseFrameworkSystem;
  *
  * @author             Roland Haeder <webmaster@shipsimu.org>
  * @version            0.0.0
+<<<<<<< HEAD:framework/main/classes/stacker/class_BaseStacker.php
  * @copyright  Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2017 Core Developer Team
+=======
+ * @copyright  Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2016 Core Developer Team
+>>>>>>> Some updates::inc/main/classes/stacker/class_BaseStacker.php
  * @license            GNU GPL 3.0 or any newer version
  * @link               http://www.shipsimu.org
  *

diff --git a/framework/main/classes/stacker/fifo/class_FiFoStacker.php b/framework/main/classes/stacker/fifo/class_FiFoStacker.php
index 6e73709eac79431d7411514aeee2ba438fddc76e..689f210375748cea95f98813ec50b391ca010e95 100644 (file)
--- a/framework/main/classes/stacker/fifo/class_FiFoStacker.php
+++ b/framework/main/classes/stacker/fifo/class_FiFoStacker.php
@@ -7,7 +7,11 @@ namespace Org\Mxchange\CoreFramework\Stacker;
  *
  * @author             Roland Haeder <webmaster@shipsimu.org>
  * @version            0.0.0
+<<<<<<< HEAD:framework/main/classes/stacker/fifo/class_FiFoStacker.php
  * @copyright  Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2017 Core Developer Team
+=======
+ * @copyright  Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2016 Core Developer Team
+>>>>>>> Some updates::inc/main/classes/stacker/fifo/class_FiFoStacker.php
  * @license            GNU GPL 3.0 or any newer version
  * @link               http://www.shipsimu.org
  *

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

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

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

diff --git a/framework/main/classes/stacker/filo/class_FiLoStacker.php b/framework/main/classes/stacker/filo/class_FiLoStacker.php
index 61caf361c131e32b8eb3b1d8902ab22b07bd3e8a..43e84b84459b6365f7bf54f5716007ed5ca6021f 100644 (file)
--- a/framework/main/classes/stacker/filo/class_FiLoStacker.php
+++ b/framework/main/classes/stacker/filo/class_FiLoStacker.php
@@ -7,7 +7,11 @@ namespace Org\Mxchange\CoreFramework\Stacker;
  *
  * @author             Roland Haeder <webmaster@shipsimu.org>
  * @version            0.0.0
+<<<<<<< HEAD:framework/main/classes/stacker/filo/class_FiLoStacker.php
  * @copyright  Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2017 Core Developer Team
+=======
+ * @copyright  Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2016 Core Developer Team
+>>>>>>> Some updates::inc/main/classes/stacker/filo/class_FiLoStacker.php
  * @license            GNU GPL 3.0 or any newer version
  * @link               http://www.shipsimu.org
  *

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

diff --git a/framework/main/classes/states/class_BaseState.php b/framework/main/classes/states/class_BaseState.php
index 820f31c385e2d6018512b91c1ac258935cf7388f..5c7945dbf94a469b89d5e29dd6737a3e6f471cd4 100644 (file)
--- a/framework/main/classes/states/class_BaseState.php
+++ b/framework/main/classes/states/class_BaseState.php
@@ -13,7 +13,11 @@ use Org\Mxchange\CoreFramework\State\Stateable;
  *
  * @author             Roland Haeder <webmaster@shipsimu.org>
  * @version            0.0.0
+<<<<<<< HEAD:framework/main/classes/states/class_BaseState.php
  * @copyright  Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2017 Core Developer Team
+=======
+ * @copyright  Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2016 Core Developer Team
+>>>>>>> Some updates::inc/main/classes/states/class_BaseState.php
  * @license            GNU GPL 3.0 or any newer version
  * @link               http://www.shipsimu.org
  *

diff --git a/framework/main/classes/streams/class_BaseStream.php b/framework/main/classes/streams/class_BaseStream.php
index 137016ae71ad255e5f0ca5a595b8b89c5b2d3022..7e21392d2a2543378011acd30d09d3dc53f0ff5a 100644 (file)
--- a/framework/main/classes/streams/class_BaseStream.php
+++ b/framework/main/classes/streams/class_BaseStream.php
@@ -10,7 +10,11 @@ use Org\Mxchange\CoreFramework\Object\BaseFrameworkSystem;
  *
  * @author             Roland Haeder <webmaster@shipsimu.org>
  * @version            0.0.0
+<<<<<<< HEAD:framework/main/classes/streams/class_BaseStream.php
  * @copyright  Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2017 Core Developer Team
+=======
+ * @copyright  Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2016 Core Developer Team
+>>>>>>> Some updates::inc/main/classes/streams/class_BaseStream.php
  * @license            GNU GPL 3.0 or any newer version
  * @link               http://www.shipsimu.org
  *

diff --git a/framework/main/classes/streams/crypto/class_McryptStream.php b/framework/main/classes/streams/crypto/class_McryptStream.php
index 0c2fd3140aef9b2c51d3d7dcaf330f57409937bb..f56018f4a76cff0ac2f61bc7a901f708d0cbf862 100644 (file)
--- a/framework/main/classes/streams/crypto/class_McryptStream.php
+++ b/framework/main/classes/streams/crypto/class_McryptStream.php
@@ -12,7 +12,11 @@ use Org\Mxchange\CoreFramework\Stream\BaseStream;
  *
  * @author             Roland Haeder <webmaster@shipsimu.org>
  * @version            0.0.0
+<<<<<<< HEAD:framework/main/classes/streams/crypto/class_McryptStream.php
  * @copyright  Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2017 Core Developer Team
+=======
+ * @copyright  Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2016 Core Developer Team
+>>>>>>> Some updates::inc/main/classes/streams/crypto/class_McryptStream.php
  * @license            GNU GPL 3.0 or any newer version
  * @link               http://www.shipsimu.org
  * @todo               mcrypt will become deprecated, rewrite to OpenSSL

diff --git a/framework/main/classes/tasks/class_ b/framework/main/classes/tasks/class_
index 41a5bbcda6126f8afd6357ffaa42227c9a4c8cbb..fe6ac768bcfae324b074254cdd89d140bda40c0d 100644 (file)
--- a/framework/main/classes/tasks/class_
+++ b/framework/main/classes/tasks/class_
@@ -13,7 +13,11 @@ use Org\Mxchange\CoreFramework\Visitor\Visitor;
  *
  * @author             Roland Haeder <webmaster@ship-simu.org>
  * @version            0.0.0
+<<<<<<< HEAD:framework/main/classes/tasks/class_
  * @copyright  Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2017 Core Developer Team
+=======
+ * @copyright  Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2016 Core Developer Team
+>>>>>>> Some updates::inc/main/classes/tasks/class_
  * @license            GNU GPL 3.0 or any newer version
  * @link               http://www.ship-simu.org
  *

diff --git a/framework/main/classes/tasks/class_BaseTask.php b/framework/main/classes/tasks/class_BaseTask.php
index 4f53883cfea3bc55ff57e13b5cde159655e463ad..d948a4d5b86700e83046c28d6f946c574d788d0b 100644 (file)
--- a/framework/main/classes/tasks/class_BaseTask.php
+++ b/framework/main/classes/tasks/class_BaseTask.php
@@ -10,7 +10,11 @@ use Org\Mxchange\CoreFramework\Object\BaseFrameworkSystem;
  *
  * @author             Roland Haeder <webmaster@shipsimu.org>
  * @version            0.0.0
+<<<<<<< HEAD:framework/main/classes/tasks/class_BaseTask.php
  * @copyright  Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2017 Core Developer Team
+=======
+ * @copyright  Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2016 Core Developer Team
+>>>>>>> Some updates::inc/main/classes/tasks/class_BaseTask.php
  * @license            GNU GPL 3.0 or any newer version
  * @link               http://www.shipsimu.org
  *

diff --git a/framework/main/classes/tasks/idle/class_IdleLoopTask.php b/framework/main/classes/tasks/idle/class_IdleLoopTask.php
index 7652b5888a301c6436291533f8e90e3dda494137..4b149324a04dac8a30793334273b3fc6b855b685 100644 (file)
--- a/framework/main/classes/tasks/idle/class_IdleLoopTask.php
+++ b/framework/main/classes/tasks/idle/class_IdleLoopTask.php
@@ -13,7 +13,11 @@ use Org\Mxchange\CoreFramework\Visitor\Visitor;
  *
  * @author             Roland Haeder <webmaster@shipsimu.org>
  * @version            0.0.0
+<<<<<<< HEAD:framework/main/classes/tasks/idle/class_IdleLoopTask.php
  * @copyright  Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2017 Core Developer Team
+=======
+ * @copyright  Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2016 Core Developer Team
+>>>>>>> Some updates::inc/main/classes/tasks/idle/class_IdleLoopTask.php
  * @license            GNU GPL 3.0 or any newer version
  * @link               http://www.shipsimu.org
  *

diff --git a/framework/main/classes/template/class_ b/framework/main/classes/template/class_
index fbea34b6f3ce938f6f3c663adb975a7a1386b278..5e16c25145ff8169f7d1985d1e93ad71d488e456 100644 (file)
--- a/framework/main/classes/template/class_
+++ b/framework/main/classes/template/class_
@@ -10,7 +10,11 @@ use Org\Mxchange\CoreFramework\Template\Engine\BaseTemplateEngine;
  *
  * @author             Roland Haeder <webmaster@ship-simu.org>
  * @version            0.0.0
+<<<<<<< HEAD:framework/main/classes/template/class_
  * @copyright  Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2017 Core Developer Team
+=======
+ * @copyright  Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2016 Core Developer Team
+>>>>>>> Some updates::inc/main/classes/template/class_
  * @license            GNU GPL 3.0 or any newer version
  * @link               http://www.ship-simu.org
  *

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

diff --git a/framework/main/classes/template/console/class_ConsoleTemplateEngine.php b/framework/main/classes/template/console/class_ConsoleTemplateEngine.php
index f4f515e9f0286f4643d4149aa8acbc2e1a3f6508..4367807f434b5d2a62bf682f3cf13babd6cf4faa 100644 (file)
--- a/framework/main/classes/template/console/class_ConsoleTemplateEngine.php
+++ b/framework/main/classes/template/console/class_ConsoleTemplateEngine.php
@@ -16,7 +16,11 @@ use \UnexpectedValueException;
  *
  * @author             Roland Haeder <webmaster@shipsimu.org>
  * @version            0.0.0
+<<<<<<< HEAD:framework/main/classes/template/console/class_ConsoleTemplateEngine.php
  * @copyright  Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2017 Core Developer Team
+=======
+ * @copyright  Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2016 Core Developer Team
+>>>>>>> Some updates::inc/main/classes/template/console/class_ConsoleTemplateEngine.php
  * @license            GNU GPL 3.0 or any newer version
  * @link               http://www.shipsimu.org
  * @todo               This template engine does not make use of setTemplateType()

diff --git a/framework/main/classes/template/html/class_HtmlTemplateEngine.php b/framework/main/classes/template/html/class_HtmlTemplateEngine.php
index 2078434ee5ac974614bc26fa7e445b5e2ca36c74..706b4a2fc34e33a0023b23a64a77347320f255bd 100644 (file)
--- a/framework/main/classes/template/html/class_HtmlTemplateEngine.php
+++ b/framework/main/classes/template/html/class_HtmlTemplateEngine.php
@@ -17,7 +17,11 @@ use \UnexpectedValueException;
  *
  * @author             Roland Haeder <webmaster@shipsimu.org>
  * @version            0.0.0
+<<<<<<< HEAD:framework/main/classes/template/html/class_HtmlTemplateEngine.php
  * @copyright  Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2017 Core Developer Team
+=======
+ * @copyright  Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2016 Core Developer Team
+>>>>>>> Some updates::inc/main/classes/template/html/class_HtmlTemplateEngine.php
  * @license            GNU GPL 3.0 or any newer version
  * @link               http://www.shipsimu.org
  *

diff --git a/framework/main/classes/template/image/class_ImageTemplateEngine.php b/framework/main/classes/template/image/class_ImageTemplateEngine.php
index 79fab8e55fe5546dda00cc6d6cd3831b4a4d8c30..5aa7e95d51459a461cda922ededa8f62a9687e9b 100644 (file)
--- a/framework/main/classes/template/image/class_ImageTemplateEngine.php
+++ b/framework/main/classes/template/image/class_ImageTemplateEngine.php
@@ -20,7 +20,11 @@ use \UnexpectedValueException;
  *
  * @author             Roland Haeder <webmaster@shipsimu.org>
  * @version            0.0.0
+<<<<<<< HEAD:framework/main/classes/template/image/class_ImageTemplateEngine.php
  * @copyright  Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2017 Core Developer Team
+=======
+ * @copyright  Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2016 Core Developer Team
+>>>>>>> Some updates::inc/main/classes/template/image/class_ImageTemplateEngine.php
  * @license            GNU GPL 3.0 or any newer version
  * @link               http://www.shipsimu.org
  *

diff --git a/framework/main/classes/template/mail/class_MailTemplateEngine.php b/framework/main/classes/template/mail/class_MailTemplateEngine.php
index b9758140530f1ef38d96d8e4f14fa137bd0d530c..a1cef5ccf0bf87b654577b2a3538157ab5375b9e 100644 (file)
--- a/framework/main/classes/template/mail/class_MailTemplateEngine.php
+++ b/framework/main/classes/template/mail/class_MailTemplateEngine.php
@@ -19,7 +19,11 @@ use \UnexpectedValueException;
  *
  * @author             Roland Haeder <webmaster@shipsimu.org>
  * @version            0.0.0
+<<<<<<< HEAD:framework/main/classes/template/mail/class_MailTemplateEngine.php
  * @copyright  Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2017 Core Developer Team
+=======
+ * @copyright  Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2016 Core Developer Team
+>>>>>>> Some updates::inc/main/classes/template/mail/class_MailTemplateEngine.php
  * @license            GNU GPL 3.0 or any newer version
  * @link               http://www.shipsimu.org
  * @todo               This template engine does not make use of setTemplateType()

diff --git a/framework/main/classes/template/menu/class_MenuTemplateEngine.php b/framework/main/classes/template/menu/class_MenuTemplateEngine.php
index 3521b8dda75689a7d9c06a304765bcec06f269de..a5baa2831ca5a0b0aea7cd67fb1e1014bf904c75 100644 (file)
--- a/framework/main/classes/template/menu/class_MenuTemplateEngine.php
+++ b/framework/main/classes/template/menu/class_MenuTemplateEngine.php
@@ -19,7 +19,11 @@ use \UnexpectedValueException;
  *
  * @author             Roland Haeder <webmaster@shipsimu.org>
  * @version            0.0.0
+<<<<<<< HEAD:framework/main/classes/template/menu/class_MenuTemplateEngine.php
  * @copyright  Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2017 Core Developer Team
+=======
+ * @copyright  Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2016 Core Developer Team
+>>>>>>> Some updates::inc/main/classes/template/menu/class_MenuTemplateEngine.php
  * @license            GNU GPL 3.0 or any newer version
  * @link               http://www.shipsimu.org
  *

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

diff --git a/framework/main/classes/user/class_BaseUser.php b/framework/main/classes/user/class_BaseUser.php
index d4e1d511676747462aa428cf66558f96571908ec..393ebee06bb2e4d430c18237b84e43242c7d4729 100644 (file)
--- a/framework/main/classes/user/class_BaseUser.php
+++ b/framework/main/classes/user/class_BaseUser.php
@@ -15,7 +15,11 @@ use Org\Mxchange\CoreFramework\Result\Search\SearchableResult;
  *
  * @author             Roland Haeder <webmaster@shipsimu.org>
  * @version            0.0.0
+<<<<<<< HEAD:framework/main/classes/user/class_BaseUser.php
  * @copyright  Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2017 Core Developer Team
+=======
+ * @copyright  Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2016 Core Developer Team
+>>>>>>> Some updates::inc/main/classes/user/class_BaseUser.php
  * @license            GNU GPL 3.0 or any newer version
  * @link               http://www.shipsimu.org
  *

diff --git a/framework/main/classes/user/guest/class_Guest.php b/framework/main/classes/user/guest/class_Guest.php
index 60192e00a72b5a76ab02f0cd6146567659cc4d82..94e45ab26e2614472ee3874260fe737ce53e7148 100644 (file)
--- a/framework/main/classes/user/guest/class_Guest.php
+++ b/framework/main/classes/user/guest/class_Guest.php
@@ -13,7 +13,11 @@ use Org\Mxchange\CoreFramework\User\BaseUser;
  *
  * @author             Roland Haeder <webmaster@shipsimu.org>
  * @version            0.0.0
+<<<<<<< HEAD:framework/main/classes/user/guest/class_Guest.php
  * @copyright  Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2017 Core Developer Team
+=======
+ * @copyright  Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2016 Core Developer Team
+>>>>>>> Some updates::inc/main/classes/user/guest/class_Guest.php
  * @license            GNU GPL 3.0 or any newer version
  * @link               http://www.shipsimu.org
  *

diff --git a/framework/main/classes/user/member/class_Member.php b/framework/main/classes/user/member/class_Member.php
index f06d1c306d0406d9547fb53bc7707d9a5731ec76..122448fcf410e8ad49d324a1676639d01f62f663 100644 (file)
--- a/framework/main/classes/user/member/class_Member.php
+++ b/framework/main/classes/user/member/class_Member.php
@@ -14,7 +14,11 @@ use Org\Mxchange\CoreFramework\User\BaseUser;
  *
  * @author             Roland Haeder <webmaster@shipsimu.org>
  * @version            0.0.0
+<<<<<<< HEAD:framework/main/classes/user/member/class_Member.php
  * @copyright  Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2017 Core Developer Team
+=======
+ * @copyright  Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2016 Core Developer Team
+>>>>>>> Some updates::inc/main/classes/user/member/class_Member.php
  * @license            GNU GPL 3.0 or any newer version
  * @link               http://www.shipsimu.org
  *

diff --git a/framework/main/classes/visitor/class_ b/framework/main/classes/visitor/class_
index 17f2a5f3417c20424ce2bdf8fefe1c1fb52959c8..11ff3fd8e6618f6a3eeeef72ac2f839f787d7d2e 100644 (file)
--- a/framework/main/classes/visitor/class_
+++ b/framework/main/classes/visitor/class_
@@ -10,7 +10,11 @@ use Org\Mxchange\CoreFramework\Visitor\BaseVisitor;
  *
  * @author             Roland Haeder <webmaster@ship-simu.org>
  * @version            0.0.0
+<<<<<<< HEAD:framework/main/classes/visitor/class_
  * @copyright  Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2017 Core Developer Team
+=======
+ * @copyright  Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2016 Core Developer Team
+>>>>>>> Some updates::inc/main/classes/visitor/class_
  * @license            GNU GPL 3.0 or any newer version
  * @link               http://www.ship-simu.org
  *

diff --git a/framework/main/classes/visitor/class_BaseVisitor.php b/framework/main/classes/visitor/class_BaseVisitor.php
index 19ab92217adf6e3ede75fdef11c8901b53ef2784..51af653e5efbf5b9031371eb3137b678bb80fd89 100644 (file)
--- a/framework/main/classes/visitor/class_BaseVisitor.php
+++ b/framework/main/classes/visitor/class_BaseVisitor.php
@@ -10,7 +10,11 @@ use Org\Mxchange\CoreFramework\Object\BaseFrameworkSystem;
  *
  * @author             Roland Haeder <webmaster@shipsimu.org>
  * @version            0.0.0
+<<<<<<< HEAD:framework/main/classes/visitor/class_BaseVisitor.php
  * @copyright  Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2017 Core Developer Team
+=======
+ * @copyright  Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2016 Core Developer Team
+>>>>>>> Some updates::inc/main/classes/visitor/class_BaseVisitor.php
  * @license            GNU GPL 3.0 or any newer version
  * @link               http://www.shipsimu.org
  *

diff --git a/framework/main/exceptions/actions/class_InvalidActionException.php b/framework/main/exceptions/actions/class_InvalidActionException.php
index 8b709c6f7a348bf687f256f2f3f794846921aad3..013794abbe6ffc218e26e885b1a446fc02fa8dc7 100644 (file)
--- a/framework/main/exceptions/actions/class_InvalidActionException.php
+++ b/framework/main/exceptions/actions/class_InvalidActionException.php
@@ -10,7 +10,11 @@ use Org\Mxchange\CoreFramework\Generic\FrameworkException;
  *
  * @author             Roland Haeder <webmaster@shipsimu.org>
  * @version            0.0.0
+<<<<<<< HEAD:framework/main/exceptions/actions/class_InvalidActionException.php
  * @copyright  Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2017 Core Developer Team
+=======
+ * @copyright  Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2016 Core Developer Team
+>>>>>>> Some updates::inc/main/exceptions/actions/class_InvalidActionException.php
  * @license            GNU GPL 3.0 or any newer version
  * @link               http://www.shipsimu.org
  *

diff --git a/framework/main/exceptions/auth/class_UserAuthorizationException.php b/framework/main/exceptions/auth/class_UserAuthorizationException.php
index 0d4495b16f48dba3e12ed4678d69bebf099d6eae..d707ca127129b39376e1726caffb9493e5105a11 100644 (file)
--- a/framework/main/exceptions/auth/class_UserAuthorizationException.php
+++ b/framework/main/exceptions/auth/class_UserAuthorizationException.php
@@ -11,7 +11,11 @@ use Org\Mxchange\CoreFramework\Generic\FrameworkException;
  *
  * @author             Roland Haeder <webmaster@shipsimu.org>
  * @version            0.0.0
+<<<<<<< HEAD:framework/main/exceptions/auth/class_UserAuthorizationException.php
  * @copyright  Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2017 Core Developer Team
+=======
+ * @copyright  Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2016 Core Developer Team
+>>>>>>> Some updates::inc/main/exceptions/auth/class_UserAuthorizationException.php
  * @license            GNU GPL 3.0 or any newer version
  * @link               http://www.shipsimu.org
  *

diff --git a/framework/main/exceptions/base64/class_Base64EncodingBadException.php b/framework/main/exceptions/base64/class_Base64EncodingBadException.php
index 2fa669aecd7f8dc92e8bd84293356de90d542f31..77fe03be0e67036569cb87a6728d74047a141908 100644 (file)
--- a/framework/main/exceptions/base64/class_Base64EncodingBadException.php
+++ b/framework/main/exceptions/base64/class_Base64EncodingBadException.php
@@ -11,7 +11,11 @@ use Org\Mxchange\CoreFramework\Generic\FrameworkException;
  *
  * @author             Roland Haeder <webmaster@shipsimu.org>
  * @version            0.0.0
+<<<<<<< HEAD:framework/main/exceptions/base64/class_Base64EncodingBadException.php
  * @copyright  Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2017 Core Developer Team
+=======
+ * @copyright  Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2016 Core Developer Team
+>>>>>>> Some updates::inc/main/exceptions/base64/class_Base64EncodingBadException.php
  * @license            GNU GPL 3.0 or any newer version
  * @link               http://www.shipsimu.org
  * @deprecated Don't use this anymore

diff --git a/framework/main/exceptions/base64/class_Base64EncodingModuloException.php b/framework/main/exceptions/base64/class_Base64EncodingModuloException.php
index 433d9272df4308e6fa52e9fc6810fefec607544f..ea6b81612c37376bb8e6dbfebfd543ade7ed8252 100644 (file)
--- a/framework/main/exceptions/base64/class_Base64EncodingModuloException.php
+++ b/framework/main/exceptions/base64/class_Base64EncodingModuloException.php
@@ -10,7 +10,11 @@ use Org\Mxchange\CoreFramework\Generic\FrameworkException;
  *
  * @author             Roland Haeder <webmaster@shipsimu.org>
  * @version            0.0.0
+<<<<<<< HEAD:framework/main/exceptions/base64/class_Base64EncodingModuloException.php
  * @copyright  Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2017 Core Developer Team
+=======
+ * @copyright  Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2016 Core Developer Team
+>>>>>>> Some updates::inc/main/exceptions/base64/class_Base64EncodingModuloException.php
  * @license            GNU GPL 3.0 or any newer version
  * @link               http://www.shipsimu.org
  * @deprecated Don't use this anymore

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

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

diff --git a/framework/main/exceptions/compressor/class_MismatchingCompressorsException.php b/framework/main/exceptions/compressor/class_MismatchingCompressorsException.php
index 6a66dbe537b94b5b4b005e5403c0f7471c7f397c..bca572be74984763fefb8d2a3b81deec928d524e 100644 (file)
--- a/framework/main/exceptions/compressor/class_MismatchingCompressorsException.php
+++ b/framework/main/exceptions/compressor/class_MismatchingCompressorsException.php
@@ -10,7 +10,11 @@ use Org\Mxchange\CoreFramework\Generic\FrameworkException;
  *
  * @author             Roland Haeder <webmaster@shipsimu.org>
  * @version            0.0.0
+<<<<<<< HEAD:framework/main/exceptions/compressor/class_MismatchingCompressorsException.php
  * @copyright  Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2017 Core Developer Team
+=======
+ * @copyright  Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2016 Core Developer Team
+>>>>>>> Some updates::inc/main/exceptions/compressor/class_MismatchingCompressorsException.php
  * @license            GNU GPL 3.0 or any newer version
  * @link               http://www.shipsimu.org
  * @todo               Rename to CompressorMismatchException

diff --git a/framework/main/exceptions/config/class_ConfigValueTypeUnsupportedException.php b/framework/main/exceptions/config/class_ConfigValueTypeUnsupportedException.php
index d4b5002a9ec56ac34b4cfe4cdfff172aea58b778..6ac3ecc708bf130331e046f24a68114928a0273d 100644 (file)
--- a/framework/main/exceptions/config/class_ConfigValueTypeUnsupportedException.php
+++ b/framework/main/exceptions/config/class_ConfigValueTypeUnsupportedException.php
@@ -12,7 +12,11 @@ use Org\Mxchange\CoreFramework\Generic\FrameworkException;
  *
  * @author             Roland Haeder <webmaster@ship-simu.org>
  * @version            0.0.0
+<<<<<<< HEAD:framework/main/exceptions/config/class_ConfigValueTypeUnsupportedException.php
  * @copyright  Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2017 Core Developer Team
+=======
+ * @copyright  Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2016 Core Developer Team
+>>>>>>> Some updates::inc/main/exceptions/config/class_ConfigValueTypeUnsupportedException.php
  * @license            GNU GPL 3.0 or any newer version
  * @link               http://www.ship-simu.org
  * @todo               These are invalid argument exceptions

diff --git a/framework/main/exceptions/config/class_NoConfigEntryException.php b/framework/main/exceptions/config/class_NoConfigEntryException.php
index 5c24a5b882938ba7134b290986591db1d40b7a2d..a662fc5d30a2708c24bf069a4f52283e93838c67 100644 (file)
--- a/framework/main/exceptions/config/class_NoConfigEntryException.php
+++ b/framework/main/exceptions/config/class_NoConfigEntryException.php
@@ -10,7 +10,11 @@ use Org\Mxchange\CoreFramework\Generic\FrameworkException;
  *
  * @author             Roland Haeder <webmaster@shipsimu.org>
  * @version            0.0.0
+<<<<<<< HEAD:framework/main/exceptions/config/class_NoConfigEntryException.php
  * @copyright  Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2017 Core Developer Team
+=======
+ * @copyright  Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2016 Core Developer Team
+>>>>>>> Some updates::inc/main/exceptions/config/class_NoConfigEntryException.php
  * @license            GNU GPL 3.0 or any newer version
  * @link               http://www.shipsimu.org
  * @todo               Rename this class to NoFoundEntryException

diff --git a/framework/main/exceptions/connection/class_ConnectionAlreadyRegisteredException.php b/framework/main/exceptions/connection/class_ConnectionAlreadyRegisteredException.php
index 9a9185a157cc2e4c810e9d0ea246cf412a4501d9..30a057335c7d714844cd0b92959fe4acaba23ab4 100644 (file)
--- a/framework/main/exceptions/connection/class_ConnectionAlreadyRegisteredException.php
+++ b/framework/main/exceptions/connection/class_ConnectionAlreadyRegisteredException.php
@@ -11,7 +11,11 @@ use Org\Mxchange\CoreFramework\Generic\FrameworkException;
  *
  * @author             Roland Haeder <webmaster@shipsimu.org>
  * @version            0.0.0
+<<<<<<< HEAD:framework/main/exceptions/connection/class_ConnectionAlreadyRegisteredException.php
  * @copyright  Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2017 Core Developer Team
+=======
+ * @copyright  Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2016 Core Developer Team
+>>>>>>> Some updates::inc/main/exceptions/connection/class_ConnectionAlreadyRegisteredException.php
  * @license            GNU GPL 3.0 or any newer version
  * @link               http://www.shipsimu.org
  *

diff --git a/framework/main/exceptions/controller/class_DefaultControllerException.php b/framework/main/exceptions/controller/class_DefaultControllerException.php
index 7a247d30c3a7682b7f0e7d82eefd3f8525198c34..3163c0b8dc9c350b379cb41265355adda1901459 100644 (file)
--- a/framework/main/exceptions/controller/class_DefaultControllerException.php
+++ b/framework/main/exceptions/controller/class_DefaultControllerException.php
@@ -11,7 +11,11 @@ use Org\Mxchange\CoreFramework\Resolver\Controller\ControllerResolver;
  *
  * @author             Roland Haeder <webmaster@shipsimu.org>
  * @version            0.0.0
+<<<<<<< HEAD:framework/main/exceptions/controller/class_DefaultControllerException.php
  * @copyright  Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2017 Core Developer Team
+=======
+ * @copyright  Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2016 Core Developer Team
+>>>>>>> Some updates::inc/main/exceptions/controller/class_DefaultControllerException.php
  * @license            GNU GPL 3.0 or any newer version
  * @link               http://www.shipsimu.org
  *

diff --git a/framework/main/exceptions/controller/class_InvalidControllerException.php b/framework/main/exceptions/controller/class_InvalidControllerException.php
index aacc2e248da80f68541b4db4218497ad3c2184d5..b9d7f5ea7a4ae8ee3a593240938c5a0975491d9e 100644 (file)
--- a/framework/main/exceptions/controller/class_InvalidControllerException.php
+++ b/framework/main/exceptions/controller/class_InvalidControllerException.php
@@ -10,7 +10,11 @@ use Org\Mxchange\CoreFramework\Generic\FrameworkException;
  *
  * @author             Roland Haeder <webmaster@shipsimu.org>
  * @version            0.0.0
+<<<<<<< HEAD:framework/main/exceptions/controller/class_InvalidControllerException.php
  * @copyright  Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2017 Core Developer Team
+=======
+ * @copyright  Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2016 Core Developer Team
+>>>>>>> Some updates::inc/main/exceptions/controller/class_InvalidControllerException.php
  * @license            GNU GPL 3.0 or any newer version
  * @link               http://www.shipsimu.org
  *

diff --git a/framework/main/exceptions/crypto/class_EncryptInvalidLengthException.php b/framework/main/exceptions/crypto/class_EncryptInvalidLengthException.php
index b1d470a116f365515409b6906a629d8cefd24bfb..afda6d5e4d93d0734f0bad57f228d72c3cf10bbc 100644 (file)
--- a/framework/main/exceptions/crypto/class_EncryptInvalidLengthException.php
+++ b/framework/main/exceptions/crypto/class_EncryptInvalidLengthException.php
@@ -11,7 +11,11 @@ use Org\Mxchange\CoreFramework\Generic\FrameworkException;
  *
  * @author             Roland Haeder <webmaster@shipsimu.org>
  * @version            0.0.0
+<<<<<<< HEAD:framework/main/exceptions/crypto/class_EncryptInvalidLengthException.php
  * @copyright  Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2017 Core Developer Team
+=======
+ * @copyright  Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2016 Core Developer Team
+>>>>>>> Some updates::inc/main/exceptions/crypto/class_EncryptInvalidLengthException.php
  * @license            GNU GPL 3.0 or any newer version
  * @link               http://www.shipsimu.org
  * @deprecated Don't use this anymore

diff --git a/framework/main/exceptions/crypto/class_EncryptMissingException.php b/framework/main/exceptions/crypto/class_EncryptMissingException.php
index a6633ed229679e380cc13c844e9f3a0f05d530cb..dc7685ec7b224b608a4c4815e18322db3d2f335a 100644 (file)
--- a/framework/main/exceptions/crypto/class_EncryptMissingException.php
+++ b/framework/main/exceptions/crypto/class_EncryptMissingException.php
@@ -11,7 +11,11 @@ use Org\Mxchange\CoreFramework\Generic\FrameworkException;
  *
  * @author             Roland Haeder <webmaster@shipsimu.org>
  * @version            0.0.0
+<<<<<<< HEAD:framework/main/exceptions/crypto/class_EncryptMissingException.php
  * @copyright  Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2017 Core Developer Team
+=======
+ * @copyright  Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2016 Core Developer Team
+>>>>>>> Some updates::inc/main/exceptions/crypto/class_EncryptMissingException.php
  * @license            GNU GPL 3.0 or any newer version
  * @link               http://www.shipsimu.org
  * @deprecated Don't use this anymore

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

diff --git a/framework/main/exceptions/database/class_DatabaseException.php b/framework/main/exceptions/database/class_DatabaseException.php
index ba71bd17f8c0235983b67cff478324e4e2eee27a..3a493b03b8f9d41436364fbc20880d5f1ba3cb55 100644 (file)
--- a/framework/main/exceptions/database/class_DatabaseException.php
+++ b/framework/main/exceptions/database/class_DatabaseException.php
@@ -10,7 +10,11 @@ use Org\Mxchange\CoreFramework\Generic\FrameworkException;
  *
  * @author             Roland Haeder <webmaster@shipsimu.org>
  * @version            0.0.0
+<<<<<<< HEAD:framework/main/exceptions/database/class_DatabaseException.php
  * @copyright  Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2017 Core Developer Team
+=======
+ * @copyright  Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2016 Core Developer Team
+>>>>>>> Some updates::inc/main/exceptions/database/class_DatabaseException.php
  * @license            GNU GPL 3.0 or any newer version
  * @link               http://www.shipsimu.org
  * 

diff --git a/framework/main/exceptions/database/general/class_SqlException.php b/framework/main/exceptions/database/general/class_SqlException.php
index cf385f224d05f3058a7aadf5271ce3c52a8934c3..e43f6deb6c8be2142535135d4f7bfd29f2b840c9 100644 (file)
--- a/framework/main/exceptions/database/general/class_SqlException.php
+++ b/framework/main/exceptions/database/general/class_SqlException.php
@@ -10,7 +10,11 @@ use Org\Mxchange\CoreFramework\Database\DatabaseException;
  *
  * @author             Roland Haeder <webmaster@shipsimu.org>
  * @version            0.0.0
+<<<<<<< HEAD:framework/main/exceptions/database/general/class_SqlException.php
  * @copyright  Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2017 Core Developer Team
+=======
+ * @copyright  Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2016 Core Developer Team
+>>>>>>> Some updates::inc/main/exceptions/database/general/class_SqlException.php
  * @license            GNU GPL 3.0 or any newer version
  * @link               http://www.shipsimu.org
  * 

diff --git a/framework/main/exceptions/database/local_file/class_SavePathIsNoDirectoryException.php b/framework/main/exceptions/database/local_file/class_SavePathIsNoDirectoryException.php
index 290f83a8faf3c0fb918e2a9d88580291de592ddb..f55a9604a616db8eecde1bb02667c6142340c891 100644 (file)
--- a/framework/main/exceptions/database/local_file/class_SavePathIsNoDirectoryException.php
+++ b/framework/main/exceptions/database/local_file/class_SavePathIsNoDirectoryException.php
@@ -10,7 +10,11 @@ use Org\Mxchange\CoreFramework\Database\DatabaseException;
  *
  * @author             Roland Haeder <webmaster@shipsimu.org>
  * @version            0.0.0
+<<<<<<< HEAD:framework/main/exceptions/database/local_file/class_SavePathIsNoDirectoryException.php
  * @copyright  Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2017 Core Developer Team
+=======
+ * @copyright  Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2016 Core Developer Team
+>>>>>>> Some updates::inc/main/exceptions/database/local_file/class_SavePathIsNoDirectoryException.php
  * @license            GNU GPL 3.0 or any newer version
  * @link               http://www.shipsimu.org
  * @deprecated Don't use this

diff --git a/framework/main/exceptions/database/local_file/class_SavePathReadProtectedException.php b/framework/main/exceptions/database/local_file/class_SavePathReadProtectedException.php
index 9bb346056d751013c48740c5dfd3c17527fbcbc4..2509edba0eeb26cc46523bd4754ce9df1d15e961 100644 (file)
--- a/framework/main/exceptions/database/local_file/class_SavePathReadProtectedException.php
+++ b/framework/main/exceptions/database/local_file/class_SavePathReadProtectedException.php
@@ -10,7 +10,11 @@ use Org\Mxchange\CoreFramework\Database\DatabaseException;
  *
  * @author             Roland Haeder <webmaster@shipsimu.org>
  * @version            0.0.0
+<<<<<<< HEAD:framework/main/exceptions/database/local_file/class_SavePathReadProtectedException.php
  * @copyright  Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2017 Core Developer Team
+=======
+ * @copyright  Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2016 Core Developer Team
+>>>>>>> Some updates::inc/main/exceptions/database/local_file/class_SavePathReadProtectedException.php
  * @license            GNU GPL 3.0 or any newer version
  * @link               http://www.shipsimu.org
  * @deprecated Please don't use this

diff --git a/framework/main/exceptions/database/local_file/class_SavePathWriteProtectedException.php b/framework/main/exceptions/database/local_file/class_SavePathWriteProtectedException.php
index 439b33529f98477e567f6e847e45eb85d8635548..ad5e55f515a0ba76d7382a5484bfbf5f6fcf7ac8 100644 (file)
--- a/framework/main/exceptions/database/local_file/class_SavePathWriteProtectedException.php
+++ b/framework/main/exceptions/database/local_file/class_SavePathWriteProtectedException.php
@@ -10,7 +10,11 @@ use Org\Mxchange\CoreFramework\Database\DatabaseException;
  *
  * @author             Roland Haeder <webmaster@shipsimu.org>
  * @version            0.0.0
+<<<<<<< HEAD:framework/main/exceptions/database/local_file/class_SavePathWriteProtectedException.php
  * @copyright  Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2017 Core Developer Team
+=======
+ * @copyright  Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2016 Core Developer Team
+>>>>>>> Some updates::inc/main/exceptions/database/local_file/class_SavePathWriteProtectedException.php
  * @license            GNU GPL 3.0 or any newer version
  * @link               http://www.shipsimu.org
  * @deprecated Please don't use this

diff --git a/framework/main/exceptions/dns/class_UnknownHostnameException.php b/framework/main/exceptions/dns/class_UnknownHostnameException.php
index c96712e1dbc979964de70b022f595316d4216865..e999d30ebab3fbf6180520a3d88912cca5f1d17c 100644 (file)
--- a/framework/main/exceptions/dns/class_UnknownHostnameException.php
+++ b/framework/main/exceptions/dns/class_UnknownHostnameException.php
@@ -10,7 +10,11 @@ use Org\Mxchange\CoreFramework\Generic\FrameworkException;
  *
  * @author             Roland Haeder <webmaster@shipsimu.org>
  * @version            0.0.0
+<<<<<<< HEAD:framework/main/exceptions/dns/class_UnknownHostnameException.php
  * @copyright  Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2017 Core Developer Team
+=======
+ * @copyright  Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2016 Core Developer Team
+>>>>>>> Some updates::inc/main/exceptions/main/class_EmptyVariableException.php
  * @license            GNU GPL 3.0 or any newer version
  * @link               http://www.shipsimu.org
  *

diff --git a/framework/main/exceptions/feature/class_FeatureMethodNotCallableException.php b/framework/main/exceptions/feature/class_FeatureMethodNotCallableException.php
index c686e8b087a4ad2a4b988b6b46c929f7ae6245b4..389579c5afb28c1e922bf92c363cff6c2adf813a 100644 (file)
--- a/framework/main/exceptions/feature/class_FeatureMethodNotCallableException.php
+++ b/framework/main/exceptions/feature/class_FeatureMethodNotCallableException.php
@@ -10,7 +10,11 @@ use Org\Mxchange\CoreFramework\Generic\FrameworkException;
  *
  * @author             Roland Haeder <webmaster@ship-simu.org>
  * @version            0.0.0
+<<<<<<< HEAD:framework/main/exceptions/feature/class_FeatureMethodNotCallableException.php
  * @copyright  Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2017 Core Developer Team
+=======
+ * @copyright  Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2016 Core Developer Team
+>>>>>>> Some updates::inc/main/exceptions/feature/class_FeatureMethodNotCallableException.php
  * @license            GNU GPL 3.0 or any newer version
  * @link               http://www.ship-simu.org
  *

diff --git a/framework/main/exceptions/file_directory/class_DirPointerNotOpenedException.php b/framework/main/exceptions/file_directory/class_DirPointerNotOpenedException.php
index 3a6339d5c85c0c76a8b78a56e4140ff17d7bae78..afba88f33f32bc3f05e8b5b26021f49866b29bb9 100644 (file)
--- a/framework/main/exceptions/file_directory/class_DirPointerNotOpenedException.php
+++ b/framework/main/exceptions/file_directory/class_DirPointerNotOpenedException.php
@@ -10,7 +10,11 @@ use Org\Mxchange\CoreFramework\Generic\FrameworkException;
  *
  * @author             Roland Haeder <webmaster@shipsimu.org>
  * @version            0.0.0
+<<<<<<< HEAD:framework/main/exceptions/file_directory/class_DirPointerNotOpenedException.php
  * @copyright  Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2017 Core Developer Team
+=======
+ * @copyright  Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2016 Core Developer Team
+>>>>>>> Some updates::inc/main/exceptions/file_directory/class_DirPointerNotOpenedException.php
  * @license            GNU GPL 3.0 or any newer version
  * @link               http://www.shipsimu.org
  * 

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

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

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

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

diff --git a/framework/main/exceptions/file_directory/class_InvalidDataLengthException.php b/framework/main/exceptions/file_directory/class_InvalidDataLengthException.php
index 826f1ea262e1b2a26bb2a4a2004cd0de52a1a4fa..a3058c353898c4ae4b7e0ea9332ed628bc9fd210 100644 (file)
--- a/framework/main/exceptions/file_directory/class_InvalidDataLengthException.php
+++ b/framework/main/exceptions/file_directory/class_InvalidDataLengthException.php
@@ -10,7 +10,11 @@ use Org\Mxchange\CoreFramework\Generic\FrameworkException;
  *
  * @author             Roland Haeder <webmaster@shipsimu.org>
  * @version            0.0.0
+<<<<<<< HEAD:framework/main/exceptions/file_directory/class_InvalidDataLengthException.php
  * @copyright  Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2017 Core Developer Team
+=======
+ * @copyright  Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2016 Core Developer Team
+>>>>>>> Some updates::inc/main/exceptions/file_directory/class_InvalidDataLengthException.php
  * @license            GNU GPL 3.0 or any newer version
  * @link               http://www.shipsimu.org
  * @deprecated Don't use this anymore

diff --git a/framework/main/exceptions/file_directory/class_InvalidMD5ChecksumException.php b/framework/main/exceptions/file_directory/class_InvalidMD5ChecksumException.php
index cb72311b0c72c1a57676e86716ec6d7cf415bc10..42143609152fead4f2d43ecdb8689f73fd2761e9 100644 (file)
--- a/framework/main/exceptions/file_directory/class_InvalidMD5ChecksumException.php
+++ b/framework/main/exceptions/file_directory/class_InvalidMD5ChecksumException.php
@@ -10,7 +10,11 @@ use Org\Mxchange\CoreFramework\Generic\FrameworkException;
  *
  * @author             Roland Haeder <webmaster@shipsimu.org>
  * @version            0.0.0
+<<<<<<< HEAD:framework/main/exceptions/file_directory/class_InvalidMD5ChecksumException.php
  * @copyright  Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2017 Core Developer Team
+=======
+ * @copyright  Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2016 Core Developer Team
+>>>>>>> Some updates::inc/main/exceptions/file_directory/class_InvalidMD5ChecksumException.php
  * @license            GNU GPL 3.0 or any newer version
  * @link               http://www.shipsimu.org
  * @deprecated Don't use this anymore

diff --git a/framework/main/exceptions/file_directory/class_InvalidResourceException.php b/framework/main/exceptions/file_directory/class_InvalidResourceException.php
index 0e50681d30ba646cb97a1ce7a46a76331610b79c..ea616c11a0ee1ff72af3c69baf689a2c27262cc4 100644 (file)
--- a/framework/main/exceptions/file_directory/class_InvalidResourceException.php
+++ b/framework/main/exceptions/file_directory/class_InvalidResourceException.php
@@ -11,7 +11,11 @@ use Org\Mxchange\CoreFramework\Generic\FrameworkInterface;
  *
  * @author             Roland Haeder <webmaster@shipsimu.org>
  * @version            0.0.0
+<<<<<<< HEAD:framework/main/exceptions/file_directory/class_InvalidResourceException.php
  * @copyright  Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2017 Core Developer Team
+=======
+ * @copyright  Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2016 Core Developer Team
+>>>>>>> Some updates::inc/main/exceptions/file_directory/class_InvalidResourceException.php
  * @license            GNU GPL 3.0 or any newer version
  * @link               http://www.shipsimu.org
  * 

diff --git a/framework/main/exceptions/file_directory/class_PathIsNoDirectoryException.php b/framework/main/exceptions/file_directory/class_PathIsNoDirectoryException.php
index b26387e4612b50a184ebf876c8578f12ef541730..a969b3e34123dbb04625eed3aab2d3f893559221 100644 (file)
--- a/framework/main/exceptions/file_directory/class_PathIsNoDirectoryException.php
+++ b/framework/main/exceptions/file_directory/class_PathIsNoDirectoryException.php
@@ -10,7 +10,11 @@ use Org\Mxchange\CoreFramework\Generic\FrameworkException;
  *
  * @author             Roland Haeder <webmaster@shipsimu.org>
  * @version            0.0.0
+<<<<<<< HEAD:framework/main/exceptions/file_directory/class_PathIsNoDirectoryException.php
  * @copyright  Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2017 Core Developer Team
+=======
+ * @copyright  Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2016 Core Developer Team
+>>>>>>> Some updates::inc/main/exceptions/file_directory/class_PathIsNoDirectoryException.php
  * @license            GNU GPL 3.0 or any newer version
  * @link               http://www.shipsimu.org
  * @deprecated Don't use this anymore

diff --git a/framework/main/exceptions/file_directory/class_PathReadProtectedException.php b/framework/main/exceptions/file_directory/class_PathReadProtectedException.php
index b15a5fc364f02e790ec9491aedee5ad7e1c08ef7..0a50d077a17f4d601218f5c3413f785c37e346f4 100644 (file)
--- a/framework/main/exceptions/file_directory/class_PathReadProtectedException.php
+++ b/framework/main/exceptions/file_directory/class_PathReadProtectedException.php
@@ -10,7 +10,11 @@ use Org\Mxchange\CoreFramework\Generic\FrameworkException;
  *
  * @author             Roland Haeder <webmaster@shipsimu.org>
  * @version            0.0.0
+<<<<<<< HEAD:framework/main/exceptions/file_directory/class_PathReadProtectedException.php
  * @copyright  Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2017 Core Developer Team
+=======
+ * @copyright  Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2016 Core Developer Team
+>>>>>>> Some updates::inc/main/exceptions/file_directory/class_PathReadProtectedException.php
  * @license            GNU GPL 3.0 or any newer version
  * @link               http://www.shipsimu.org
  * @deprecated Don't use this anymore

diff --git a/framework/main/exceptions/file_directory/class_PathWriteProtectedException.php b/framework/main/exceptions/file_directory/class_PathWriteProtectedException.php
index 4e04017fc2bbde7826239afbdae2c66ef97cf2ad..8366a53a3bf7cb470fd02fea86ad6d2985829638 100644 (file)
--- a/framework/main/exceptions/file_directory/class_PathWriteProtectedException.php
+++ b/framework/main/exceptions/file_directory/class_PathWriteProtectedException.php
@@ -14,7 +14,11 @@ use \SplFileInfo;
  *
  * @author             Roland Haeder <webmaster@shipsimu.org>
  * @version            0.0.0
+<<<<<<< HEAD:framework/main/exceptions/file_directory/class_PathWriteProtectedException.php
  * @copyright  Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2017 Core Developer Team
+=======
+ * @copyright  Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2016 Core Developer Team
+>>>>>>> Some updates::inc/main/exceptions/file_directory/class_PathWriteProtectedException.php
  * @license            GNU GPL 3.0 or any newer version
  * @link               http://www.shipsimu.org
  * 

diff --git a/framework/main/exceptions/filter/class_FilterChainException.php b/framework/main/exceptions/filter/class_FilterChainException.php
index f36495d33b41b9d60c8d2fd28e8a2f9ed8019d19..bd335527c15faa45700a19fb36c6cb010a81326f 100644 (file)
--- a/framework/main/exceptions/filter/class_FilterChainException.php
+++ b/framework/main/exceptions/filter/class_FilterChainException.php
@@ -11,7 +11,11 @@ use Org\Mxchange\CoreFramework\Generic\FrameworkException;
  *
  * @author             Roland Haeder <webmaster@shipsimu.org>
  * @version            0.0.0
+<<<<<<< HEAD:framework/main/exceptions/filter/class_FilterChainException.php
  * @copyright  Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2017 Core Developer Team
+=======
+ * @copyright  Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2016 Core Developer Team
+>>>>>>> Some updates::inc/main/exceptions/filter/class_FilterChainException.php
  * @license            GNU GPL 3.0 or any newer version
  * @link               http://www.shipsimu.org
  *

diff --git a/framework/main/exceptions/filter/class_InvalidFilterChainException.php b/framework/main/exceptions/filter/class_InvalidFilterChainException.php
index b117c960cd957c99c3545d5c96e331726a95f065..87d7dcfe68ecf984c3c5fecb37247c2e8662ab67 100644 (file)
--- a/framework/main/exceptions/filter/class_InvalidFilterChainException.php
+++ b/framework/main/exceptions/filter/class_InvalidFilterChainException.php
@@ -10,7 +10,11 @@ use Org\Mxchange\CoreFramework\Generic\FrameworkException;
  *
  * @author             Roland Haeder <webmaster@shipsimu.org>
  * @version            0.0.0
+<<<<<<< HEAD:framework/main/exceptions/filter/class_InvalidFilterChainException.php
  * @copyright  Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2017 Core Developer Team
+=======
+ * @copyright  Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2016 Core Developer Team
+>>>>>>> Some updates::inc/main/exceptions/filter/class_InvalidFilterChainException.php
  * @license            GNU GPL 3.0 or any newer version
  * @link               http://www.shipsimu.org
  * @deprecated Don't use this anymore

diff --git a/framework/main/exceptions/helper/class_FormClosedException.php b/framework/main/exceptions/helper/class_FormClosedException.php
index be2d4b8d8697bdafe045a77b7a7a973bf350a1ff..396ee34dbffad5deacd48b841193b54fcf7a7b17 100644 (file)
--- a/framework/main/exceptions/helper/class_FormClosedException.php
+++ b/framework/main/exceptions/helper/class_FormClosedException.php
@@ -11,7 +11,11 @@ use Org\Mxchange\CoreFramework\Generic\FrameworkException;
  *
  * @author             Roland Haeder <webmaster@shipsimu.org>
  * @version            0.0.0
+<<<<<<< HEAD:framework/main/exceptions/helper/class_FormClosedException.php
  * @copyright  Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2017 Core Developer Team
+=======
+ * @copyright  Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2016 Core Developer Team
+>>>>>>> Some updates::inc/main/exceptions/helper/class_FormClosedException.php
  * @license            GNU GPL 3.0 or any newer version
  * @link               http://www.shipsimu.org
  * @deprecated Don't use this anymore

diff --git a/framework/main/exceptions/helper/class_FormGroupClosedException.php b/framework/main/exceptions/helper/class_FormGroupClosedException.php
index f45c8f1e592b9766446048ad41812d82a82b1a57..3c3dc740c28f96ca7fd6af354162e66d8f09e059 100644 (file)
--- a/framework/main/exceptions/helper/class_FormGroupClosedException.php
+++ b/framework/main/exceptions/helper/class_FormGroupClosedException.php
@@ -10,7 +10,11 @@ use Org\Mxchange\CoreFramework\Generic\FrameworkException;
  *
  * @author             Roland Haeder <webmaster@shipsimu.org>
  * @version            0.0.0
+<<<<<<< HEAD:framework/main/exceptions/helper/class_FormGroupClosedException.php
  * @copyright  Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2017 Core Developer Team
+=======
+ * @copyright  Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2016 Core Developer Team
+>>>>>>> Some updates::inc/main/exceptions/helper/class_FormGroupClosedException.php
  * @license            GNU GPL 3.0 or any newer version
  * @link               http://www.shipsimu.org
  * @deprecated Don't use this anymore

diff --git a/framework/main/exceptions/helper/class_FormOpenedException.php b/framework/main/exceptions/helper/class_FormOpenedException.php
index 7e172479b2adb10cd6f45eea0e75f520cb3e6bb2..6401ec2c29a9f939c241a7afd665c37d00da8528 100644 (file)
--- a/framework/main/exceptions/helper/class_FormOpenedException.php
+++ b/framework/main/exceptions/helper/class_FormOpenedException.php
@@ -12,7 +12,11 @@ use Org\Mxchange\CoreFramework\Helper\BaseHelper;
  *
  * @author             Roland Haeder <webmaster@shipsimu.org>
  * @version            0.0.0
+<<<<<<< HEAD:framework/main/exceptions/helper/class_FormOpenedException.php
  * @copyright  Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2017 Core Developer Team
+=======
+ * @copyright  Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2016 Core Developer Team
+>>>>>>> Some updates::inc/main/exceptions/helper/class_FormOpenedException.php
  * @license            GNU GPL 3.0 or any newer version
  * @link               http://www.shipsimu.org
  * @deprecated Don't use this anymore

diff --git a/framework/main/exceptions/helper/class_HelperGroupAlreadyCreatedException.php b/framework/main/exceptions/helper/class_HelperGroupAlreadyCreatedException.php
index 2c35f5e08149a25e5bfac47f1baaf088a773ecad..6e5a1c69253320e617a4d80c11a82383ed09084d 100644 (file)
--- a/framework/main/exceptions/helper/class_HelperGroupAlreadyCreatedException.php
+++ b/framework/main/exceptions/helper/class_HelperGroupAlreadyCreatedException.php
@@ -10,7 +10,11 @@ use Org\Mxchange\CoreFramework\Generic\FrameworkException;
  *
  * @author             Roland Haeder <webmaster@shipsimu.org>
  * @version            0.0.0
+<<<<<<< HEAD:framework/main/exceptions/helper/class_HelperGroupAlreadyCreatedException.php
  * @copyright  Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2017 Core Developer Team
+=======
+ * @copyright  Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2016 Core Developer Team
+>>>>>>> Some updates::inc/main/exceptions/helper/class_HelperGroupAlreadyCreatedException.php
  * @license            GNU GPL 3.0 or any newer version
  * @link               http://www.shipsimu.org
  * @deprecated Don't use this anymore

diff --git a/framework/main/exceptions/helper/class_HelperNoPreviousOpenedSubGroupException.php b/framework/main/exceptions/helper/class_HelperNoPreviousOpenedSubGroupException.php
index 6da141e504fbb927c6a4e3f23aa1e07c098fdafb..d401eb4c5df605b33905a8e4f46a5deac14f665e 100644 (file)
--- a/framework/main/exceptions/helper/class_HelperNoPreviousOpenedSubGroupException.php
+++ b/framework/main/exceptions/helper/class_HelperNoPreviousOpenedSubGroupException.php
@@ -10,7 +10,11 @@ use Org\Mxchange\CoreFramework\Generic\FrameworkException;
  *
  * @author             Roland Haeder <webmaster@shipsimu.org>
  * @version            0.0.0
+<<<<<<< HEAD:framework/main/exceptions/helper/class_HelperNoPreviousOpenedSubGroupException.php
  * @copyright  Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2017 Core Developer Team
+=======
+ * @copyright  Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2016 Core Developer Team
+>>>>>>> Some updates::inc/main/exceptions/helper/class_HelperNoPreviousOpenedSubGroupException.php
  * @license            GNU GPL 3.0 or any newer version
  * @link               http://www.shipsimu.org
  * @deprecated Don't use this anymore

diff --git a/framework/main/exceptions/helper/class_HelperSubGroupAlreadyCreatedException.php b/framework/main/exceptions/helper/class_HelperSubGroupAlreadyCreatedException.php
index c00875c9994c875e57cda9145cc99f313a9d845f..d44f36026edf053ff21879d8235c1429ffbc79e4 100644 (file)
--- a/framework/main/exceptions/helper/class_HelperSubGroupAlreadyCreatedException.php
+++ b/framework/main/exceptions/helper/class_HelperSubGroupAlreadyCreatedException.php
@@ -10,7 +10,11 @@ use Org\Mxchange\CoreFramework\Generic\FrameworkException;
  *
  * @author             Roland Haeder <webmaster@shipsimu.org>
  * @version            0.0.0
+<<<<<<< HEAD:framework/main/exceptions/helper/class_HelperSubGroupAlreadyCreatedException.php
  * @copyright  Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2017 Core Developer Team
+=======
+ * @copyright  Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2016 Core Developer Team
+>>>>>>> Some updates::inc/main/exceptions/helper/class_HelperSubGroupAlreadyCreatedException.php
  * @license            GNU GPL 3.0 or any newer version
  * @link               http://www.shipsimu.org
  * @deprecated Don't use this anymore

diff --git a/framework/main/exceptions/helper/class_InvalidFormNameException.php b/framework/main/exceptions/helper/class_InvalidFormNameException.php
index 596633738edadf4003a8209f4131d9b925a627d8..c58711d3e33112a3b05f0b10ed439e03bcb196e6 100644 (file)
--- a/framework/main/exceptions/helper/class_InvalidFormNameException.php
+++ b/framework/main/exceptions/helper/class_InvalidFormNameException.php
@@ -11,7 +11,11 @@ use Org\Mxchange\CoreFramework\Helper\BaseHelper;
  *
  * @author             Roland Haeder <webmaster@shipsimu.org>
  * @version            0.0.0
+<<<<<<< HEAD:framework/main/exceptions/helper/class_InvalidFormNameException.php
  * @copyright  Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2017 Core Developer Team
+=======
+ * @copyright  Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2016 Core Developer Team
+>>>>>>> Some updates::inc/main/exceptions/helper/class_InvalidFormNameException.php
  * @license            GNU GPL 3.0 or any newer version
  * @link               http://www.shipsimu.org
  * @deprecated Don't use this anymore

diff --git a/framework/main/exceptions/helper/class_NoGroupOpenedException.php b/framework/main/exceptions/helper/class_NoGroupOpenedException.php
index fd28e2ac6626c819bccad2c5c798c51e999b3f7e..9aa5b8b07cd329d933015c57f96595aa1f525cb2 100644 (file)
--- a/framework/main/exceptions/helper/class_NoGroupOpenedException.php
+++ b/framework/main/exceptions/helper/class_NoGroupOpenedException.php
@@ -10,7 +10,11 @@ use Org\Mxchange\CoreFramework\Generic\FrameworkException;
  *
  * @author             Roland Haeder <webmaster@shipsimu.org>
  * @version            0.0.0
+<<<<<<< HEAD:framework/main/exceptions/helper/class_NoGroupOpenedException.php
  * @copyright  Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2017 Core Developer Team
+=======
+ * @copyright  Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2016 Core Developer Team
+>>>>>>> Some updates::inc/main/exceptions/helper/class_NoGroupOpenedException.php
  * @license            GNU GPL 3.0 or any newer version
  * @link               http://www.shipsimu.org
  * @deprecated Don't use this anymore

diff --git a/framework/main/exceptions/helper/class_UserInstanceMissingException.php b/framework/main/exceptions/helper/class_UserInstanceMissingException.php
index d6e342909de8291a78814746c24ad61b6b819666..aa046bef67200a2c8451de99b35c53ecd00e82ab 100644 (file)
--- a/framework/main/exceptions/helper/class_UserInstanceMissingException.php
+++ b/framework/main/exceptions/helper/class_UserInstanceMissingException.php
@@ -10,7 +10,11 @@ use Org\Mxchange\CoreFramework\Generic\FrameworkException;
  *
  * @author             Roland Haeder <webmaster@shipsimu.org>
  * @version            0.0.0
+<<<<<<< HEAD:framework/main/exceptions/helper/class_UserInstanceMissingException.php
  * @copyright  Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2017 Core Developer Team
+=======
+ * @copyright  Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2016 Core Developer Team
+>>>>>>> Some updates::inc/main/exceptions/helper/class_UserInstanceMissingException.php
  * @license            GNU GPL 3.0 or any newer version
  * @link               http://www.shipsimu.org
  * @deprecated Don't use this anymore

diff --git a/framework/main/exceptions/language/class_InvalidLanguagePathStringException.php b/framework/main/exceptions/language/class_InvalidLanguagePathStringException.php
index edaef0d9080bdc3d07f132769bf5dee294b089bf..69e17809939ed40c55963ec7122af9e20684641a 100644 (file)
--- a/framework/main/exceptions/language/class_InvalidLanguagePathStringException.php
+++ b/framework/main/exceptions/language/class_InvalidLanguagePathStringException.php
@@ -10,7 +10,11 @@ use Org\Mxchange\CoreFramework\Generic\FrameworkException;
  *
  * @author             Roland Haeder <webmaster@shipsimu.org>
  * @version            0.0.0
+<<<<<<< HEAD:framework/main/exceptions/language/class_InvalidLanguagePathStringException.php
  * @copyright  Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2017 Core Developer Team
+=======
+ * @copyright  Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2016 Core Developer Team
+>>>>>>> Some updates::inc/main/exceptions/language/class_InvalidLanguagePathStringException.php
  * @license            GNU GPL 3.0 or any newer version
  * @link               http://www.shipsimu.org
  * @deprecated Don't use this anymore

diff --git a/framework/main/exceptions/language/class_LanguagePathIsNoDirectoryException.php b/framework/main/exceptions/language/class_LanguagePathIsNoDirectoryException.php
index 59aefe4bae125273fcdc2bf064a484a3efddc624..19213d732008550558e289a06eeb9d028959f62e 100644 (file)
--- a/framework/main/exceptions/language/class_LanguagePathIsNoDirectoryException.php
+++ b/framework/main/exceptions/language/class_LanguagePathIsNoDirectoryException.php
@@ -10,7 +10,11 @@ use Org\Mxchange\CoreFramework\Generic\FrameworkException;
  *
  * @author             Roland Haeder <webmaster@shipsimu.org>
  * @version            0.0.0
+<<<<<<< HEAD:framework/main/exceptions/language/class_LanguagePathIsNoDirectoryException.php
  * @copyright  Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2017 Core Developer Team
+=======
+ * @copyright  Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2016 Core Developer Team
+>>>>>>> Some updates::inc/main/exceptions/language/class_LanguagePathIsNoDirectoryException.php
  * @license            GNU GPL 3.0 or any newer version
  * @link               http://www.shipsimu.org
  * @todo               Don't use this anymore

diff --git a/framework/main/exceptions/language/class_LanguagePathReadProtectedException.php b/framework/main/exceptions/language/class_LanguagePathReadProtectedException.php
index cfaaa946e715d628f80aaf2b63c6fc9a5b10fa7b..39759a007107a7d3e5bda5ab7e652816653e495e 100644 (file)
--- a/framework/main/exceptions/language/class_LanguagePathReadProtectedException.php
+++ b/framework/main/exceptions/language/class_LanguagePathReadProtectedException.php
@@ -10,7 +10,11 @@ use Org\Mxchange\CoreFramework\Generic\FrameworkException;
  *
  * @author             Roland Haeder <webmaster@shipsimu.org>
  * @version            0.0.0
+<<<<<<< HEAD:framework/main/exceptions/language/class_LanguagePathReadProtectedException.php
  * @copyright  Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2017 Core Developer Team
+=======
+ * @copyright  Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2016 Core Developer Team
+>>>>>>> Some updates::inc/main/exceptions/language/class_LanguagePathReadProtectedException.php
  * @license            GNU GPL 3.0 or any newer version
  * @link               http://www.shipsimu.org
  * @deprecated Don't use this anymore

diff --git a/framework/main/exceptions/main/class_AssertionException.php b/framework/main/exceptions/main/class_AssertionException.php
index 933c52abbcd29666c5da2a78ea060abf65926d8d..dc337c4ff3430760ca9344198d08db0566e0b9c0 100644 (file)
--- a/framework/main/exceptions/main/class_AssertionException.php
+++ b/framework/main/exceptions/main/class_AssertionException.php
@@ -10,7 +10,11 @@ use Org\Mxchange\CoreFramework\Generic\FrameworkException;
  *
  * @author             Roland Haeder <webmaster@shipsimu.org>
  * @version            0.0.0
+<<<<<<< HEAD:framework/main/exceptions/main/class_AssertionException.php
  * @copyright  Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2017 Core Developer Team
+=======
+ * @copyright  Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2016 Core Developer Team
+>>>>>>> Some updates::inc/main/exceptions/main/class_AssertionException.php
  * @license            GNU GPL 3.0 or any newer version
  * @link               http://www.shipsimu.org
  *

diff --git a/framework/main/exceptions/main/class_ClassMismatchException.php b/framework/main/exceptions/main/class_ClassMismatchException.php
index e69f46214d502e3c47f19bb01dbbc4430a8ba8d1..e24f0f2c73411dbdd33d54e197f954b90da2a73b 100644 (file)
--- a/framework/main/exceptions/main/class_ClassMismatchException.php
+++ b/framework/main/exceptions/main/class_ClassMismatchException.php
@@ -10,7 +10,11 @@ use Org\Mxchange\CoreFramework\Generic\FrameworkException;
  *
  * @author             Roland Haeder <webmaster@shipsimu.org>
  * @version            0.0.0
+<<<<<<< HEAD:framework/main/exceptions/main/class_ClassMismatchException.php
  * @copyright  Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2017 Core Developer Team
+=======
+ * @copyright  Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2016 Core Developer Team
+>>>>>>> Some updates::inc/main/exceptions/main/class_ClassMismatchException.php
  * @license            GNU GPL 3.0 or any newer version
  * @link               http://www.shipsimu.org
  * 

diff --git a/framework/main/exceptions/main/class_DimNotFoundInArrayException.php b/framework/main/exceptions/main/class_DimNotFoundInArrayException.php
index 2be4f6f37777030d31b8db6e3697cfaa4aa6dd5b..2d172421339eb0feefe1ff71dc14a38183b1458c 100644 (file)
--- a/framework/main/exceptions/main/class_DimNotFoundInArrayException.php
+++ b/framework/main/exceptions/main/class_DimNotFoundInArrayException.php
@@ -11,7 +11,11 @@ use Org\Mxchange\CoreFramework\Generic\FrameworkInterface;
  *
  * @author             Roland Haeder <webmaster@shipsimu.org>
  * @version            0.0.0
+<<<<<<< HEAD:framework/main/exceptions/main/class_DimNotFoundInArrayException.php
  * @copyright  Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2017 Core Developer Team
+=======
+ * @copyright  Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2016 Core Developer Team
+>>>>>>> Some updates::inc/main/exceptions/main/class_DimNotFoundInArrayException.php
  * @license            GNU GPL 3.0 or any newer version
  * @link               http://www.shipsimu.org
  * @deprecated Please don't use this anymore

diff --git a/framework/main/exceptions/main/class_FatalErrorException.php b/framework/main/exceptions/main/class_FatalErrorException.php
index 7b139844306ab02f1a55759cce1d4dbe9523d6c8..b2ae4873bbaa9b7595c5cb9bad623d17ccb25ca5 100644 (file)
--- a/framework/main/exceptions/main/class_FatalErrorException.php
+++ b/framework/main/exceptions/main/class_FatalErrorException.php
@@ -10,7 +10,11 @@ use Org\Mxchange\CoreFramework\Generic\FrameworkException;
  *
  * @author             Roland Haeder <webmaster@shipsimu.org>
  * @version            0.0.0
+<<<<<<< HEAD:framework/main/exceptions/main/class_FatalErrorException.php
  * @copyright  Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2017 Core Developer Team
+=======
+ * @copyright  Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2016 Core Developer Team
+>>>>>>> Some updates::inc/main/exceptions/main/class_FatalErrorException.php
  * @license            GNU GPL 3.0 or any newer version
  * @link               http://www.shipsimu.org
  *

diff --git a/framework/main/exceptions/main/class_IndexOutOfBoundsException.php b/framework/main/exceptions/main/class_IndexOutOfBoundsException.php
index 374752835de3ddc0134da19c1834d9a5e44f2992..a72ae8935540711279e30d9d462881a4edea17a8 100644 (file)
--- a/framework/main/exceptions/main/class_IndexOutOfBoundsException.php
+++ b/framework/main/exceptions/main/class_IndexOutOfBoundsException.php
@@ -10,7 +10,11 @@ use Org\Mxchange\CoreFramework\Generic\FrameworkException;
  *
  * @author             Roland Haeder <webmaster@shipsimu.org>
  * @version            0.0.0
+<<<<<<< HEAD:framework/main/exceptions/main/class_IndexOutOfBoundsException.php
  * @copyright  Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2017 Core Developer Team
+=======
+ * @copyright  Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2016 Core Developer Team
+>>>>>>> Some updates::inc/main/exceptions/main/class_IndexOutOfBoundsException.php
  * @license            GNU GPL 3.0 or any newer version
  * @link               http://www.shipsimu.org
  *

diff --git a/framework/main/exceptions/main/class_InvalidArrayCountException.php b/framework/main/exceptions/main/class_InvalidArrayCountException.php
index 1ec609cf1f7f71a39703d8b8e0558c2d3f4c8f57..8d630f0f3ae982fb3d897bbc2dfeca3f41c2e62a 100644 (file)
--- a/framework/main/exceptions/main/class_InvalidArrayCountException.php
+++ b/framework/main/exceptions/main/class_InvalidArrayCountException.php
@@ -10,7 +10,11 @@ use Org\Mxchange\CoreFramework\Generic\FrameworkException;
  *
  * @author             Roland Haeder <webmaster@shipsimu.org>
  * @version            0.0.0
+<<<<<<< HEAD:framework/main/exceptions/main/class_InvalidArrayCountException.php
  * @copyright  Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2017 Core Developer Team
+=======
+ * @copyright  Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2016 Core Developer Team
+>>>>>>> Some updates::inc/main/exceptions/main/class_InvalidArrayCountException.php
  * @license            GNU GPL 3.0 or any newer version
  * @link               http://www.shipsimu.org
  * @deprecated Don't use this anymore

diff --git a/framework/main/exceptions/main/class_InvalidCommandException.php b/framework/main/exceptions/main/class_InvalidCommandException.php
index ca84cd071dd5600d1a9236eeb899c6d6c0284cb8..965e3609064e42e869b13132ca8537bbe57e83d0 100644 (file)
--- a/framework/main/exceptions/main/class_InvalidCommandException.php
+++ b/framework/main/exceptions/main/class_InvalidCommandException.php
@@ -10,7 +10,11 @@ use Org\Mxchange\CoreFramework\Generic\FrameworkException;
  *
  * @author             Roland Haeder <webmaster@shipsimu.org>
  * @version            0.0.0
+<<<<<<< HEAD:framework/main/exceptions/main/class_InvalidCommandException.php
  * @copyright  Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2017 Core Developer Team
+=======
+ * @copyright  Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2016 Core Developer Team
+>>>>>>> Some updates::inc/main/exceptions/main/class_InvalidCommandException.php
  * @license            GNU GPL 3.0 or any newer version
  * @link               http://www.shipsimu.org
  *

diff --git a/framework/main/exceptions/main/class_InvalidInterfaceException.php b/framework/main/exceptions/main/class_InvalidInterfaceException.php
index dc38900e76a5e7746c4e2c33a40a500531bf3946..34c73996888096b82dd64c2efdc4e74c90ffa6b1 100644 (file)
--- a/framework/main/exceptions/main/class_InvalidInterfaceException.php
+++ b/framework/main/exceptions/main/class_InvalidInterfaceException.php
@@ -10,7 +10,11 @@ use Org\Mxchange\CoreFramework\Generic\FrameworkException;
  *
  * @author             Roland Haeder <webmaster@shipsimu.org>
  * @version            0.0.0
+<<<<<<< HEAD:framework/main/exceptions/main/class_InvalidInterfaceException.php
  * @copyright  Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2017 Core Developer Team
+=======
+ * @copyright  Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2016 Core Developer Team
+>>>>>>> Some updates::inc/main/exceptions/main/class_InvalidInterfaceException.php
  * @license            GNU GPL 3.0 or any newer version
  * @link               http://www.shipsimu.org
  * 

diff --git a/framework/main/exceptions/main/class_InvalidObjectException.php b/framework/main/exceptions/main/class_InvalidObjectException.php
index 0f28af78f14583ea50cc739b30ed6e66a6f2f680..cec325b1f018a8d90b124bc07cecd5d4d32bdf72 100644 (file)
--- a/framework/main/exceptions/main/class_InvalidObjectException.php
+++ b/framework/main/exceptions/main/class_InvalidObjectException.php
@@ -11,7 +11,11 @@ use Org\Mxchange\CoreFramework\Generic\FrameworkInterface;
  *
  * @author             Roland Haeder <webmaster@shipsimu.org>
  * @version            0.0.0
+<<<<<<< HEAD:framework/main/exceptions/main/class_InvalidObjectException.php
  * @copyright  Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2017 Core Developer Team
+=======
+ * @copyright  Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2016 Core Developer Team
+>>>>>>> Some updates::inc/main/exceptions/main/class_InvalidObjectException.php
  * @license            GNU GPL 3.0 or any newer version
  * @link               http://www.shipsimu.org
  * @deprecated Don't use this anymore

diff --git a/framework/main/exceptions/main/class_MissingArrayElementsException.php b/framework/main/exceptions/main/class_MissingArrayElementsException.php
index a7b250fd7ca227f2826637db63ff6f0f8515bb2e..93af76c2236b0d47a8b1ceb5c182ec0d8d0af9d3 100644 (file)
--- a/framework/main/exceptions/main/class_MissingArrayElementsException.php
+++ b/framework/main/exceptions/main/class_MissingArrayElementsException.php
@@ -10,7 +10,11 @@ use Org\Mxchange\CoreFramework\Generic\FrameworkException;
  *
  * @author             Roland Haeder <webmaster@shipsimu.org>
  * @version            0.0.0
+<<<<<<< HEAD:framework/main/exceptions/main/class_MissingArrayElementsException.php
  * @copyright  Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2017 Core Developer Team
+=======
+ * @copyright  Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2016 Core Developer Team
+>>>>>>> Some updates::inc/main/exceptions/main/class_MissingArrayElementsException.php
  * @license            GNU GPL 3.0 or any newer version
  * @link               http://www.shipsimu.org
  * 

diff --git a/framework/main/exceptions/main/class_MissingDecimalsThousandsSeparatorException.php b/framework/main/exceptions/main/class_MissingDecimalsThousandsSeparatorException.php
index 74344cb4ff2ad4b5b1c7aac079e376ad1a07506f..915040454a485e3cd416012658c04b4b1c3944dd 100644 (file)
--- a/framework/main/exceptions/main/class_MissingDecimalsThousandsSeparatorException.php
+++ b/framework/main/exceptions/main/class_MissingDecimalsThousandsSeparatorException.php
@@ -10,7 +10,11 @@ use Org\Mxchange\CoreFramework\Generic\FrameworkException;
  *
  * @author             Roland Haeder <webmaster@shipsimu.org>
  * @version            0.0.0
+<<<<<<< HEAD:framework/main/exceptions/main/class_MissingDecimalsThousandsSeparatorException.php
  * @copyright  Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2017 Core Developer Team
+=======
+ * @copyright  Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2016 Core Developer Team
+>>>>>>> Some updates::inc/main/exceptions/main/class_MissingDecimalsThousandsSeparatorException.php
  * @license            GNU GPL 3.0 or any newer version
  * @link               http://www.shipsimu.org
  * @deprecated Don't use this anymore

diff --git a/framework/main/exceptions/main/class_NoClassException.php b/framework/main/exceptions/main/class_NoClassException.php
index 61f275dcc1eade921213e47b9f8cef24ee5f9a8e..c47806e1fc15d1e4f3445525499ee25515254b63 100644 (file)
--- a/framework/main/exceptions/main/class_NoClassException.php
+++ b/framework/main/exceptions/main/class_NoClassException.php
@@ -10,7 +10,11 @@ use Org\Mxchange\CoreFramework\Generic\FrameworkException;
  *
  * @author             Roland Haeder <webmaster@shipsimu.org>
  * @version            0.0.0
+<<<<<<< HEAD:framework/main/exceptions/main/class_NoClassException.php
  * @copyright  Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2017 Core Developer Team
+=======
+ * @copyright  Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2016 Core Developer Team
+>>>>>>> Some updates::inc/main/exceptions/main/class_NoClassException.php
  * @license            GNU GPL 3.0 or any newer version
  * @link               http://www.shipsimu.org
  *

diff --git a/framework/main/exceptions/main/class_NullPointerException.php b/framework/main/exceptions/main/class_NullPointerException.php
index 62b1e3417ebc1b27f3a36257db5a19d65d912157..9f4b0fc5a0c1f12468bc8da4bd91a6c3923c5db8 100644 (file)
--- a/framework/main/exceptions/main/class_NullPointerException.php
+++ b/framework/main/exceptions/main/class_NullPointerException.php
@@ -11,7 +11,11 @@ use Org\Mxchange\CoreFramework\Generic\FrameworkInterface;
  *
  * @author             Roland Haeder <webmaster@shipsimu.org>
  * @version            0.0.0
+<<<<<<< HEAD:framework/main/exceptions/main/class_NullPointerException.php
  * @copyright  Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2017 Core Developer Team
+=======
+ * @copyright  Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2016 Core Developer Team
+>>>>>>> Some updates::inc/main/exceptions/main/class_NullPointerException.php
  * @license            GNU GPL 3.0 or any newer version
  * @link               http://www.shipsimu.org
  * 

diff --git a/framework/main/exceptions/main/class_ResponseHeadersAlreadySentException.php b/framework/main/exceptions/main/class_ResponseHeadersAlreadySentException.php
index b0dfeb53cb36fd0b3f4d6ffef96f6dae473da555..54e80d92c5af926c806bd71d099bdbf01b4814dd 100644 (file)
--- a/framework/main/exceptions/main/class_ResponseHeadersAlreadySentException.php
+++ b/framework/main/exceptions/main/class_ResponseHeadersAlreadySentException.php
@@ -11,7 +11,11 @@ use Org\Mxchange\CoreFramework\Generic\FrameworkInterface;
  *
  * @author             Roland Haeder <webmaster@shipsimu.org>
  * @version            0.0.0
+<<<<<<< HEAD:framework/main/exceptions/main/class_ResponseHeadersAlreadySentException.php
  * @copyright  Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2017 Core Developer Team
+=======
+ * @copyright  Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2016 Core Developer Team
+>>>>>>> Some updates::inc/main/exceptions/main/class_ResponseHeadersAlreadySentException.php
  * @license            GNU GPL 3.0 or any newer version
  * @link               http://www.shipsimu.org
  * 

diff --git a/framework/main/exceptions/main/class_UnsupportedOperationException.php b/framework/main/exceptions/main/class_UnsupportedOperationException.php
index a27c076e245d35cf870296a5634e925b98c61c25..02490bdc4056712271c71bcff4110735ef83f0b7 100644 (file)
--- a/framework/main/exceptions/main/class_UnsupportedOperationException.php
+++ b/framework/main/exceptions/main/class_UnsupportedOperationException.php
@@ -12,7 +12,11 @@ use Org\Mxchange\CoreFramework\Generic\FrameworkInterface;
  *
  * @author             Roland Haeder <webmaster@shipsimu.org>
  * @version            0.0.0
+<<<<<<< HEAD:framework/main/exceptions/main/class_UnsupportedOperationException.php
  * @copyright  Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2017 Core Developer Team
+=======
+ * @copyright  Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2016 Core Developer Team
+>>>>>>> Some updates::inc/main/exceptions/main/class_UnsupportedOperationException.php
  * @license            GNU GPL 3.0 or any newer version
  * @link               http://www.shipsimu.org
  *

diff --git a/framework/main/exceptions/main/class_VariableIsNotSetException.php b/framework/main/exceptions/main/class_VariableIsNotSetException.php
index 9573a843d0c45ade779ce4a5b14b0ad908b05fa0..f0ad6db1026944a18823daed89914ce13063a4e8 100644 (file)
--- a/framework/main/exceptions/main/class_VariableIsNotSetException.php
+++ b/framework/main/exceptions/main/class_VariableIsNotSetException.php
@@ -10,7 +10,11 @@ use Org\Mxchange\CoreFramework\Generic\FrameworkException;
  *
  * @author             Roland Haeder <webmaster@shipsimu.org>
  * @version            0.0.0
+<<<<<<< HEAD:framework/main/exceptions/main/class_VariableIsNotSetException.php
  * @copyright  Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2017 Core Developer Team
+=======
+ * @copyright  Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2016 Core Developer Team
+>>>>>>> Some updates::inc/main/exceptions/main/class_VariableIsNotSetException.php
  * @license            GNU GPL 3.0 or any newer version
  * @link               http://www.shipsimu.org
  * @deprecated Don't use this anymore

diff --git a/framework/main/exceptions/result/class_InvalidDatabaseResultException.php b/framework/main/exceptions/result/class_InvalidDatabaseResultException.php
index 3901ef8fed18bf74a274c70105da5e4f2abb8563..fccf81994b543f62160c904ddf4796edd1066fa4 100644 (file)
--- a/framework/main/exceptions/result/class_InvalidDatabaseResultException.php
+++ b/framework/main/exceptions/result/class_InvalidDatabaseResultException.php
@@ -10,7 +10,11 @@ use Org\Mxchange\CoreFramework\Generic\FrameworkException;
  *
  * @author             Roland Haeder <webmaster@shipsimu.org>
  * @version            0.0.0
+<<<<<<< HEAD:framework/main/exceptions/result/class_InvalidDatabaseResultException.php
  * @copyright  Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2017 Core Developer Team
+=======
+ * @copyright  Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2016 Core Developer Team
+>>>>>>> Some updates::inc/main/exceptions/result/class_InvalidDatabaseResultException.php
  * @license            GNU GPL 3.0 or any newer version
  * @link               http://www.shipsimu.org
  *

diff --git a/framework/main/exceptions/result/class_ResultUpdateException.php b/framework/main/exceptions/result/class_ResultUpdateException.php
index d0e492f186d5dfff5a6b19162ffe248ff7ddb4dd..b46b2887f0d4be46f0a16a008e40c8d2f9e64b81 100644 (file)
--- a/framework/main/exceptions/result/class_ResultUpdateException.php
+++ b/framework/main/exceptions/result/class_ResultUpdateException.php
@@ -11,7 +11,11 @@ use Org\Mxchange\CoreFramework\Result\Update\UpdateableResult;
  *
  * @author             Roland Haeder <webmaster@shipsimu.org>
  * @version            0.0.0
+<<<<<<< HEAD:framework/main/exceptions/result/class_ResultUpdateException.php
  * @copyright  Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2017 Core Developer Team
+=======
+ * @copyright  Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2016 Core Developer Team
+>>>>>>> Some updates::inc/main/exceptions/result/class_ResultUpdateException.php
  * @license            GNU GPL 3.0 or any newer version
  * @link               http://www.shipsimu.org
  *

diff --git a/framework/main/exceptions/socket/class_AbstractSocketException.php b/framework/main/exceptions/socket/class_AbstractSocketException.php
index ff3d610cd5c3453da8982f7e0ca2faa9254e9883..da3b11175dd44dfcce5174387c739e5329729ca1 100644 (file)
--- a/framework/main/exceptions/socket/class_AbstractSocketException.php
+++ b/framework/main/exceptions/socket/class_AbstractSocketException.php
@@ -11,7 +11,11 @@ use Org\Mxchange\CoreFramework\Generic\FrameworkException;
  *
  * @author             Roland Haeder <webmaster@shipsimu.org>
  * @version            0.0.0
+<<<<<<< HEAD:framework/main/exceptions/socket/class_AbstractSocketException.php
  * @copyright  Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2017 Core Developer Team
+=======
+ * @copyright  Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2016 Core Developer Team
+>>>>>>> Some updates::inc/main/exceptions/socket/class_AbstractSocketException.php
  * @license            GNU GPL 3.0 or any newer version
  * @link               http://www.shipsimu.org
  *

diff --git a/framework/main/exceptions/socket/class_InvalidServerSocketException.php b/framework/main/exceptions/socket/class_InvalidServerSocketException.php
index d28e5d10e74f8cb9c43aa6834396254cfdf28981..286e89c77fc6368e184b92c12e28669f8c87b1b3 100644 (file)
--- a/framework/main/exceptions/socket/class_InvalidServerSocketException.php
+++ b/framework/main/exceptions/socket/class_InvalidServerSocketException.php
@@ -7,7 +7,11 @@ namespace Org\Mxchange\CoreFramework\Socket;
  *
  * @author             Roland Haeder <webmaster@shipsimu.org>
  * @version            0.0.0
+<<<<<<< HEAD:framework/main/exceptions/socket/class_InvalidServerSocketException.php
  * @copyright  Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2017 Core Developer Team
+=======
+ * @copyright  Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2016 Core Developer Team
+>>>>>>> Some updates::inc/main/exceptions/socket/class_InvalidServerSocketException.php
  * @license            GNU GPL 3.0 or any newer version
  * @link               http://www.shipsimu.org
  *

diff --git a/framework/main/exceptions/socket/class_InvalidSocketException.php b/framework/main/exceptions/socket/class_InvalidSocketException.php
index c663ea3a09180809681d91a2ebe48bbb82c416c1..65212e0d2a996d4fc6e3b6a247130416dcac25fc 100644 (file)
--- a/framework/main/exceptions/socket/class_InvalidSocketException.php
+++ b/framework/main/exceptions/socket/class_InvalidSocketException.php
@@ -8,7 +8,11 @@ namespace Org\Mxchange\CoreFramework\Socket;
  *
  * @author             Roland Haeder <webmaster@shipsimu.org>
  * @version            0.0.0
+<<<<<<< HEAD:framework/main/exceptions/socket/class_InvalidSocketException.php
  * @copyright  Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2017 Core Developer Team
+=======
+ * @copyright  Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2016 Core Developer Team
+>>>>>>> Some updates::inc/main/exceptions/socket/class_InvalidSocketException.php
  * @license            GNU GPL 3.0 or any newer version
  * @link               http://www.shipsimu.org
  *

diff --git a/framework/main/exceptions/socket/class_NoSocketErrorDetectedException.php b/framework/main/exceptions/socket/class_NoSocketErrorDetectedException.php
index b086bcf4b74f0834e6b16bfcb351b629664255d6..ae9fab9594528c1e7b2bcce42603090a868e7f5e 100644 (file)
--- a/framework/main/exceptions/socket/class_NoSocketErrorDetectedException.php
+++ b/framework/main/exceptions/socket/class_NoSocketErrorDetectedException.php
@@ -9,7 +9,11 @@ namespace Org\Mxchange\CoreFramework\Socket;
  *
  * @author             Roland Haeder <webmaster@shipsimu.org>
  * @version            0.0.0
+<<<<<<< HEAD:framework/main/exceptions/socket/class_NoSocketErrorDetectedException.php
  * @copyright  Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2017 Core Developer Team
+=======
+ * @copyright  Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2016 Core Developer Team
+>>>>>>> Some updates::inc/main/exceptions/socket/class_NoSocketErrorDetectedException.php
  * @license            GNU GPL 3.0 or any newer version
  * @link               http://www.shipsimu.org
  * @todo               Those are logic exceptions and should be rewritten

diff --git a/framework/main/exceptions/socket/class_SocketAlreadyRegisteredException.php b/framework/main/exceptions/socket/class_SocketAlreadyRegisteredException.php
index 0612f581d1a5d5c60b706af4810abb91e0d72c10..d6308eb89aef07d2c41912884f03ddb62e5fbfa2 100644 (file)
--- a/framework/main/exceptions/socket/class_SocketAlreadyRegisteredException.php
+++ b/framework/main/exceptions/socket/class_SocketAlreadyRegisteredException.php
@@ -8,7 +8,11 @@ namespace Org\Mxchange\CoreFramework\Socket;
  *
  * @author             Roland Haeder <webmaster@shipsimu.org>
  * @version            0.0.0
+<<<<<<< HEAD:framework/main/exceptions/socket/class_SocketAlreadyRegisteredException.php
  * @copyright  Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2017 Core Developer Team
+=======
+ * @copyright  Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2016 Core Developer Team
+>>>>>>> Some updates::inc/main/exceptions/socket/class_SocketAlreadyRegisteredException.php
  * @license            GNU GPL 3.0 or any newer version
  * @link               http://www.shipsimu.org
  *

diff --git a/framework/main/exceptions/socket/class_SocketBindingException.php b/framework/main/exceptions/socket/class_SocketBindingException.php
index d1cd271dcfbdd57c4b0a24070d7822a2e4920be1..6383dfa5f99292935e4f283028e7a61c4b145eb4 100644 (file)
--- a/framework/main/exceptions/socket/class_SocketBindingException.php
+++ b/framework/main/exceptions/socket/class_SocketBindingException.php
@@ -6,7 +6,11 @@ namespace Org\Mxchange\CoreFramework\Socket;
  *
  * @author             Roland Haeder <webmaster@shipsimu.org>
  * @version            0.0.0
+<<<<<<< HEAD:framework/main/exceptions/socket/class_SocketBindingException.php
  * @copyright  Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2017 Core Developer Team
+=======
+ * @copyright  Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2016 Core Developer Team
+>>>>>>> Some updates::inc/main/exceptions/socket/class_SocketBindingException.php
  * @license            GNU GPL 3.0 or any newer version
  * @link               http://www.shipsimu.org
  *

diff --git a/framework/main/exceptions/socket/class_SocketConnectionException.php b/framework/main/exceptions/socket/class_SocketConnectionException.php
index 96ead0cb05192f08e2893fe9904df41e124a07c3..9b10453d123815ad833a869ffb9b4aab031f7032 100644 (file)
--- a/framework/main/exceptions/socket/class_SocketConnectionException.php
+++ b/framework/main/exceptions/socket/class_SocketConnectionException.php
@@ -9,7 +9,11 @@ namespace Org\Mxchange\CoreFramework\Socket;
  *
  * @author             Roland Haeder <webmaster@shipsimu.org>
  * @version            0.0.0
+<<<<<<< HEAD:framework/main/exceptions/socket/class_SocketConnectionException.php
  * @copyright  Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2017 Core Developer Team
+=======
+ * @copyright  Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2016 Core Developer Team
+>>>>>>> Some updates::inc/main/exceptions/socket/class_SocketConnectionException.php
  * @license            GNU GPL 3.0 or any newer version
  * @link               http://www.shipsimu.org
  *

diff --git a/framework/main/exceptions/socket/class_SocketCreationException.php b/framework/main/exceptions/socket/class_SocketCreationException.php
index 5735bf2ff481d480208cca29903a7b20cb960a1f..af37c613da9d4236b9f193b34d73ab5baad96dda 100644 (file)
--- a/framework/main/exceptions/socket/class_SocketCreationException.php
+++ b/framework/main/exceptions/socket/class_SocketCreationException.php
@@ -9,7 +9,11 @@ namespace Org\Mxchange\CoreFramework\Socket;
  *
  * @author             Roland Haeder <webmaster@shipsimu.org>
  * @version            0.0.0
+<<<<<<< HEAD:framework/main/exceptions/socket/class_SocketCreationException.php
  * @copyright  Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2017 Core Developer Team
+=======
+ * @copyright  Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2016 Core Developer Team
+>>>>>>> Some updates::inc/main/exceptions/socket/class_SocketCreationException.php
  * @license            GNU GPL 3.0 or any newer version
  * @link               http://www.shipsimu.org
  *

diff --git a/framework/main/exceptions/socket/class_SocketOptionException.php b/framework/main/exceptions/socket/class_SocketOptionException.php
index 54cd20dfbe1acbc7f78b84be6ff99d61306ee887..b701c4e976a2009bed8de32f9a250670dbb84889 100644 (file)
--- a/framework/main/exceptions/socket/class_SocketOptionException.php
+++ b/framework/main/exceptions/socket/class_SocketOptionException.php
@@ -9,7 +9,11 @@ namespace Org\Mxchange\CoreFramework\Socket;
  *
  * @author             Roland Haeder <webmaster@shipsimu.org>
  * @version            0.0.0
+<<<<<<< HEAD:framework/main/exceptions/socket/class_SocketOptionException.php
  * @copyright  Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2017 Core Developer Team
+=======
+ * @copyright  Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2016 Core Developer Team
+>>>>>>> Some updates::inc/main/exceptions/socket/class_SocketOptionException.php
  * @license            GNU GPL 3.0 or any newer version
  * @link               http://www.shipsimu.org
  *

diff --git a/framework/main/exceptions/socket/class_UnsupportedSocketErrorHandlerException.php b/framework/main/exceptions/socket/class_UnsupportedSocketErrorHandlerException.php
index 0c9e7948157b1c6ac68c69ee7c4f3c016d002d84..64d60363d10e157a583610e3bf356e67e53b4214 100644 (file)
--- a/framework/main/exceptions/socket/class_UnsupportedSocketErrorHandlerException.php
+++ b/framework/main/exceptions/socket/class_UnsupportedSocketErrorHandlerException.php
@@ -8,7 +8,11 @@ namespace Org\Mxchange\CoreFramework\Socket;
  *
  * @author             Roland Haeder <webmaster@shipsimu.org>
  * @version            0.0.0
+<<<<<<< HEAD:framework/main/exceptions/socket/class_UnsupportedSocketErrorHandlerException.php
  * @copyright  Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2017 Core Developer Team
+=======
+ * @copyright  Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2016 Core Developer Team
+>>>>>>> Some updates::inc/main/exceptions/socket/class_UnsupportedSocketErrorHandlerException.php
  * @license            GNU GPL 3.0 or any newer version
  * @link               http://www.shipsimu.org
  *

diff --git a/framework/main/exceptions/stacker/class_AlreadyInitializedStackerException.php b/framework/main/exceptions/stacker/class_AlreadyInitializedStackerException.php
index d98ddbe2824c5d405d06bc386358e2beab950998..1edb630cb312cf51bca801e2a69fe734816b571f 100644 (file)
--- a/framework/main/exceptions/stacker/class_AlreadyInitializedStackerException.php
+++ b/framework/main/exceptions/stacker/class_AlreadyInitializedStackerException.php
@@ -10,7 +10,11 @@ use Org\Mxchange\CoreFramework\Generic\FrameworkException;
  *
  * @author             Roland Haeder <webmaster@shipsimu.org>
  * @version            0.0.0
+<<<<<<< HEAD:framework/main/exceptions/stacker/class_AlreadyInitializedStackerException.php
  * @copyright  Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2017 Core Developer Team
+=======
+ * @copyright  Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2016 Core Developer Team
+>>>>>>> Some updates::inc/main/exceptions/stacker/class_AlreadyInitializedStackerException.php
  * @license            GNU GPL 3.0 or any newer version
  * @link               http://www.shipsimu.org
  *

diff --git a/framework/main/exceptions/stacker/class_EmptyStackerException.php b/framework/main/exceptions/stacker/class_EmptyStackerException.php
index 91b53f47728b2ec00c91da9985392c6febc500d2..b1b6e952f84b06e67127f7fdf5c65fb81ccfd1ec 100644 (file)
--- a/framework/main/exceptions/stacker/class_EmptyStackerException.php
+++ b/framework/main/exceptions/stacker/class_EmptyStackerException.php
@@ -10,7 +10,11 @@ use Org\Mxchange\CoreFramework\Generic\FrameworkException;
  *
  * @author             Roland Haeder <webmaster@shipsimu.org>
  * @version            0.0.0
+<<<<<<< HEAD:framework/main/exceptions/stacker/class_EmptyStackerException.php
  * @copyright  Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2017 Core Developer Team
+=======
+ * @copyright  Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2016 Core Developer Team
+>>>>>>> Some updates::inc/main/exceptions/stacker/class_EmptyStackerException.php
  * @license            GNU GPL 3.0 or any newer version
  * @link               http://www.shipsimu.org
  * @deprecated Don't use this anymore

diff --git a/framework/main/exceptions/stacker/class_FullStackerException.php b/framework/main/exceptions/stacker/class_FullStackerException.php
index 1388995b92a8647f47d2b9d34864e953180bba41..00447302c8d3c9cd4e48ec18fb003cdb0d7e2951 100644 (file)
--- a/framework/main/exceptions/stacker/class_FullStackerException.php
+++ b/framework/main/exceptions/stacker/class_FullStackerException.php
@@ -10,7 +10,11 @@ use Org\Mxchange\CoreFramework\Generic\FrameworkException;
  *
  * @author             Roland Haeder <webmaster@shipsimu.org>
  * @version            0.0.0
+<<<<<<< HEAD:framework/main/exceptions/stacker/class_FullStackerException.php
  * @copyright  Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2017 Core Developer Team
+=======
+ * @copyright  Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2016 Core Developer Team
+>>>>>>> Some updates::inc/main/exceptions/stacker/class_FullStackerException.php
  * @license            GNU GPL 3.0 or any newer version
  * @link               http://www.shipsimu.org
  *

diff --git a/framework/main/exceptions/stacker/class_NoStackerException.php b/framework/main/exceptions/stacker/class_NoStackerException.php
index 166edaed66d788c9292b0c28050732e50362fcb0..3863331372a63f6e53e20edf79ebdcb5f36bdc00 100644 (file)
--- a/framework/main/exceptions/stacker/class_NoStackerException.php
+++ b/framework/main/exceptions/stacker/class_NoStackerException.php
@@ -10,7 +10,11 @@ use Org\Mxchange\CoreFramework\Generic\FrameworkException;
  *
  * @author             Roland Haeder <webmaster@shipsimu.org>
  * @version            0.0.0
+<<<<<<< HEAD:framework/main/exceptions/stacker/class_NoStackerException.php
  * @copyright  Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2017 Core Developer Team
+=======
+ * @copyright  Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2016 Core Developer Team
+>>>>>>> Some updates::inc/main/exceptions/stacker/class_NoStackerException.php
  * @license            GNU GPL 3.0 or any newer version
  * @link               http://www.shipsimu.org
  *

diff --git a/framework/main/exceptions/state/class_InvalidStateInstanceException.php b/framework/main/exceptions/state/class_InvalidStateInstanceException.php
index f529843b3901359935d7a1c84c87724793a9a483..69b701ffd4359477033c3e51a947f2b711c9480c 100644 (file)
--- a/framework/main/exceptions/state/class_InvalidStateInstanceException.php
+++ b/framework/main/exceptions/state/class_InvalidStateInstanceException.php
@@ -10,7 +10,11 @@ use Org\Mxchange\CoreFramework\Generic\FrameworkException;
  *
  * @author             Roland Haeder <webmaster@shipsimu.org>
  * @version            0.0.0
+<<<<<<< HEAD:framework/main/exceptions/state/class_InvalidStateInstanceException.php
  * @copyright  Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2017 Core Developer Team
+=======
+ * @copyright  Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2016 Core Developer Team
+>>>>>>> Some updates::inc/main/exceptions/state/class_InvalidStateInstanceException.php
  * @license            GNU GPL 3.0 or any newer version
  * @link               http://www.shipsimu.org
  *

diff --git a/framework/main/exceptions/state/class_UnexpectedStateException.php b/framework/main/exceptions/state/class_UnexpectedStateException.php
index b2af8ba95a8d5d28b1ba0e591e7beeec06b69bef..d64b5bdad77df294d602937ff9f946e960ec42f8 100644 (file)
--- a/framework/main/exceptions/state/class_UnexpectedStateException.php
+++ b/framework/main/exceptions/state/class_UnexpectedStateException.php
@@ -11,7 +11,11 @@ use Org\Mxchange\CoreFramework\State\Stateable;
  *
  * @author             Roland Haeder <webmaster@shipsimu.org>
  * @version            0.0.0
+<<<<<<< HEAD:framework/main/exceptions/state/class_UnexpectedStateException.php
  * @copyright  Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2017 Core Developer Team
+=======
+ * @copyright  Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2016 Core Developer Team
+>>>>>>> Some updates::inc/main/exceptions/state/class_UnexpectedStateException.php
  * @license            GNU GPL 3.0 or any newer version
  * @link               http://www.shipsimu.org
  *

diff --git a/framework/main/exceptions/state/class_UnresolveableStateException.php b/framework/main/exceptions/state/class_UnresolveableStateException.php
index 36b3c0a393ac6c78e4eebf8d9c91a6f6285cc41e..62fa1374ff88654a3da79307f7e3abababe30511 100644 (file)
--- a/framework/main/exceptions/state/class_UnresolveableStateException.php
+++ b/framework/main/exceptions/state/class_UnresolveableStateException.php
@@ -10,7 +10,11 @@ use Org\Mxchange\CoreFramework\Generic\FrameworkException;
  *
  * @author             Roland Haeder <webmaster@shipsimu.org>
  * @version            0.0.0
+<<<<<<< HEAD:framework/main/exceptions/state/class_UnresolveableStateException.php
  * @copyright  Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2017 Core Developer Team
+=======
+ * @copyright  Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2016 Core Developer Team
+>>>>>>> Some updates::inc/main/exceptions/state/class_UnresolveableStateException.php
  * @license            GNU GPL 3.0 or any newer version
  * @link               http://www.shipsimu.org
  *

diff --git a/framework/main/exceptions/template/class_BasePathReadProtectedException.php b/framework/main/exceptions/template/class_BasePathReadProtectedException.php
index 3fb79123fa22b70abe2a751475f89a6577856838..bce750ff58f23fa41d8fa09e865d99b0cbfd97a9 100644 (file)
--- a/framework/main/exceptions/template/class_BasePathReadProtectedException.php
+++ b/framework/main/exceptions/template/class_BasePathReadProtectedException.php
@@ -10,7 +10,11 @@ use Org\Mxchange\CoreFramework\Generic\FrameworkException;
  *
  * @author             Roland Haeder <webmaster@shipsimu.org>
  * @version            0.0.0
+<<<<<<< HEAD:framework/main/exceptions/template/class_BasePathReadProtectedException.php
  * @copyright  Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2017 Core Developer Team
+=======
+ * @copyright  Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2016 Core Developer Team
+>>>>>>> Some updates::inc/main/exceptions/template/class_BasePathReadProtectedException.php
  * @license            GNU GPL 3.0 or any newer version
  * @link               http://www.shipsimu.org
  * @deprecated Don't use this anymore

diff --git a/framework/main/exceptions/template/class_InvalidDirectoryException.php b/framework/main/exceptions/template/class_InvalidDirectoryException.php
index a8931b4e84475637ad37af3035f04c8c59281202..515d64f6697d073fc9e9f6a911bcc44831cc5d08 100644 (file)
--- a/framework/main/exceptions/template/class_InvalidDirectoryException.php
+++ b/framework/main/exceptions/template/class_InvalidDirectoryException.php
@@ -10,7 +10,11 @@ use Org\Mxchange\CoreFramework\Generic\FrameworkException;
  *
  * @author             Roland Haeder <webmaster@shipsimu.org>
  * @version            0.0.0
+<<<<<<< HEAD:framework/main/exceptions/template/class_InvalidDirectoryException.php
  * @copyright  Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2017 Core Developer Team
+=======
+ * @copyright  Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2016 Core Developer Team
+>>>>>>> Some updates::inc/main/exceptions/template/class_BasePathIsNoDirectoryException.php
  * @license            GNU GPL 3.0 or any newer version
  * @link               http://www.shipsimu.org
  * 

diff --git a/framework/main/exceptions/template/class_NoVariableException.php b/framework/main/exceptions/template/class_NoVariableException.php
index 671ee88a984e5b9141094a4e3a14f6ca97f46080..2d3bdb3beb56f664ee0d29a4cf4dee366db48bf0 100644 (file)
--- a/framework/main/exceptions/template/class_NoVariableException.php
+++ b/framework/main/exceptions/template/class_NoVariableException.php
@@ -10,7 +10,11 @@ use Org\Mxchange\CoreFramework\Generic\FrameworkException;
  *
  * @author             Roland Haeder <webmaster@shipsimu.org>
  * @version            0.0.0
+<<<<<<< HEAD:framework/main/exceptions/template/class_NoVariableException.php
  * @copyright  Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2017 Core Developer Team
+=======
+ * @copyright  Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2016 Core Developer Team
+>>>>>>> Some updates::inc/main/exceptions/template/class_NoVariableException.php
  * @license            GNU GPL 3.0 or any newer version
  * @link               http://www.shipsimu.org
  * @deprecated Don't use this anymore

diff --git a/framework/main/exceptions/template/class_UnexpectedTemplateTypeException.php b/framework/main/exceptions/template/class_UnexpectedTemplateTypeException.php
index c0c558cba62b62adbaa5e12bbc8fb692ed06e87b..2572bea881c866e0ad6d98ddae6769b65dc650fc 100644 (file)
--- a/framework/main/exceptions/template/class_UnexpectedTemplateTypeException.php
+++ b/framework/main/exceptions/template/class_UnexpectedTemplateTypeException.php
@@ -10,7 +10,11 @@ use Org\Mxchange\CoreFramework\Generic\FrameworkException;
  *
  * @author             Roland Haeder <webmaster@shipsimu.org>
  * @version            0.0.0
+<<<<<<< HEAD:framework/main/exceptions/template/class_UnexpectedTemplateTypeException.php
  * @copyright  Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2017 Core Developer Team
+=======
+ * @copyright  Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2016 Core Developer Team
+>>>>>>> Some updates::inc/main/exceptions/template/class_UnexpectedTemplateTypeException.php
  * @license            GNU GPL 3.0 or any newer version
  * @link               http://www.shipsimu.org
  * @deprecated Don't use this anymore

diff --git a/framework/main/exceptions/template/class_UnsupportedTemplateEngineException.php b/framework/main/exceptions/template/class_UnsupportedTemplateEngineException.php
index cfc405536b7bfcff35b4a16bd89b9168cd6f2720..b1fbe423aa7884cbb5157e11ebc2f98b4d25cbae 100644 (file)
--- a/framework/main/exceptions/template/class_UnsupportedTemplateEngineException.php
+++ b/framework/main/exceptions/template/class_UnsupportedTemplateEngineException.php
@@ -11,7 +11,11 @@ use Org\Mxchange\CoreFramework\Generic\FrameworkInterface;
  *
  * @author             Roland Haeder <webmaster@shipsimu.org>
  * @version            0.0.0
+<<<<<<< HEAD:framework/main/exceptions/template/class_UnsupportedTemplateEngineException.php
  * @copyright  Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2017 Core Developer Team
+=======
+ * @copyright  Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2016 Core Developer Team
+>>>>>>> Some updates::inc/main/exceptions/template/class_UnsupportedTemplateEngineException.php
  * @license            GNU GPL 3.0 or any newer version
  * @link               http://www.shipsimu.org
  *

diff --git a/framework/main/exceptions/user/class_AccountPasswordMismatchException.php b/framework/main/exceptions/user/class_AccountPasswordMismatchException.php
index 73ac7bd90bb7498d02556e2011562412168f3b4f..65b3a9e8802edeac280677ffe3c63315fbe13ec7 100644 (file)
--- a/framework/main/exceptions/user/class_AccountPasswordMismatchException.php
+++ b/framework/main/exceptions/user/class_AccountPasswordMismatchException.php
@@ -11,7 +11,11 @@ use Org\Mxchange\CoreFramework\Generic\FrameworkException;
  *
  * @author             Roland Haeder <webmaster@shipsimu.org>
  * @version            0.0.0
+<<<<<<< HEAD:framework/main/exceptions/user/class_AccountPasswordMismatchException.php
  * @copyright  Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2017 Core Developer Team
+=======
+ * @copyright  Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2016 Core Developer Team
+>>>>>>> Some updates::inc/main/exceptions/user/class_AccountPasswordMismatchException.php
  * @license            GNU GPL 3.0 or any newer version
  * @link               http://www.shipsimu.org
  *

diff --git a/framework/main/exceptions/user/class_UnexpectedGuestAccountException.php b/framework/main/exceptions/user/class_UnexpectedGuestAccountException.php
index 2525610aebe37067268f4a551b962786698d2f31..bd6f3c2846e686674ae1a2faa43329848415e4b4 100644 (file)
--- a/framework/main/exceptions/user/class_UnexpectedGuestAccountException.php
+++ b/framework/main/exceptions/user/class_UnexpectedGuestAccountException.php
@@ -10,7 +10,11 @@ use Org\Mxchange\CoreFramework\Generic\FrameworkException;
  *
  * @author             Roland Haeder <webmaster@shipsimu.org>
  * @version            0.0.0
+<<<<<<< HEAD:framework/main/exceptions/user/class_UnexpectedGuestAccountException.php
  * @copyright  Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2017 Core Developer Team
+=======
+ * @copyright  Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2016 Core Developer Team
+>>>>>>> Some updates::inc/main/exceptions/user/class_UnexpectedGuestAccountException.php
  * @license            GNU GPL 3.0 or any newer version
  * @link               http://www.shipsimu.org
  *

diff --git a/framework/main/exceptions/user/class_UserEmailMissingException.php b/framework/main/exceptions/user/class_UserEmailMissingException.php
index 38c4cfae873c0b46d8d2a2a32c7111f8718d7c6e..803091887c54f50d02a4425c82cb7913e20ad610 100644 (file)
--- a/framework/main/exceptions/user/class_UserEmailMissingException.php
+++ b/framework/main/exceptions/user/class_UserEmailMissingException.php
@@ -10,7 +10,11 @@ use Org\Mxchange\CoreFramework\Generic\FrameworkException;
  *
  * @author             Roland Haeder <webmaster@shipsimu.org>
  * @version            0.0.0
+<<<<<<< HEAD:framework/main/exceptions/user/class_UserEmailMissingException.php
  * @copyright  Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2017 Core Developer Team
+=======
+ * @copyright  Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2016 Core Developer Team
+>>>>>>> Some updates::inc/main/exceptions/user/class_UserEmailMissingException.php
  * @license            GNU GPL 3.0 or any newer version
  * @link               http://www.shipsimu.org
  *

diff --git a/framework/main/exceptions/user/class_UserNoGuestException.php b/framework/main/exceptions/user/class_UserNoGuestException.php
index aa7198900137f1b7025a5c6c049dc1680812692b..51e2ec01a21f1028833f9d8796fc56c36633a931 100644 (file)
--- a/framework/main/exceptions/user/class_UserNoGuestException.php
+++ b/framework/main/exceptions/user/class_UserNoGuestException.php
@@ -11,7 +11,11 @@ use Org\Mxchange\CoreFramework\Generic\FrameworkException;
  *
  * @author             Roland Haeder <webmaster@shipsimu.org>
  * @version            0.0.0
+<<<<<<< HEAD:framework/main/exceptions/user/class_UserNoGuestException.php
  * @copyright  Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2017 Core Developer Team
+=======
+ * @copyright  Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2016 Core Developer Team
+>>>>>>> Some updates::inc/main/exceptions/user/class_UserNoGuestException.php
  * @license            GNU GPL 3.0 or any newer version
  * @link               http://www.shipsimu.org
  * @todo               Better rename this

diff --git a/framework/main/exceptions/user/class_UserPasswordMismatchException.php b/framework/main/exceptions/user/class_UserPasswordMismatchException.php
index c039a3b4abe2d21d5fc54b79a878f27f9feab7fd..bfb6934a88d3759e22872856b584bb1d3b76e752 100644 (file)
--- a/framework/main/exceptions/user/class_UserPasswordMismatchException.php
+++ b/framework/main/exceptions/user/class_UserPasswordMismatchException.php
@@ -10,7 +10,11 @@ use Org\Mxchange\CoreFramework\Generic\FrameworkException;
  *
  * @author             Roland Haeder <webmaster@shipsimu.org>
  * @version            0.0.0
+<<<<<<< HEAD:framework/main/exceptions/user/class_UserPasswordMismatchException.php
  * @copyright  Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2017 Core Developer Team
+=======
+ * @copyright  Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2016 Core Developer Team
+>>>>>>> Some updates::inc/main/exceptions/user/class_UserPasswordMismatchException.php
  * @license            GNU GPL 3.0 or any newer version
  * @link               http://www.shipsimu.org
  *

diff --git a/framework/main/exceptions/user/class_UsernameMissingException.php b/framework/main/exceptions/user/class_UsernameMissingException.php
index ff0725a98bed30980e83e20e0bef42d7c228b87f..f557c71f7262fc01d70c12a7c749307918faf4a0 100644 (file)
--- a/framework/main/exceptions/user/class_UsernameMissingException.php
+++ b/framework/main/exceptions/user/class_UsernameMissingException.php
@@ -10,7 +10,11 @@ use Org\Mxchange\CoreFramework\Generic\FrameworkException;
  *
  * @author             Roland Haeder <webmaster@shipsimu.org>
  * @version            0.0.0
+<<<<<<< HEAD:framework/main/exceptions/user/class_UsernameMissingException.php
  * @copyright  Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2017 Core Developer Team
+=======
+ * @copyright  Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2016 Core Developer Team
+>>>>>>> Some updates::inc/main/exceptions/user/class_UsernameMissingException.php
  * @license            GNU GPL 3.0 or any newer version
  * @link               http://www.shipsimu.org
  *

diff --git a/framework/main/exceptions/xml/class_InvalidXmlNodeException.php b/framework/main/exceptions/xml/class_InvalidXmlNodeException.php
index fc658552454f07af5ec049effd66218dd7d801ec..e1c11aa5fd34fc006be512799863a70ee2998495 100644 (file)
--- a/framework/main/exceptions/xml/class_InvalidXmlNodeException.php
+++ b/framework/main/exceptions/xml/class_InvalidXmlNodeException.php
@@ -10,7 +10,11 @@ use Org\Mxchange\CoreFramework\Generic\FrameworkException;
  *
  * @author             Roland Haeder <webmaster@shipsimu.org>
  * @version            0.0.0
+<<<<<<< HEAD:framework/main/exceptions/xml/class_InvalidXmlNodeException.php
  * @copyright  Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2017 Core Developer Team
+=======
+ * @copyright  Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2016 Core Developer Team
+>>>>>>> Some updates::inc/main/exceptions/xml/class_InvalidXmlNodeException.php
  * @license            GNU GPL 3.0 or any newer version
  * @link               http://www.shipsimu.org
  *

diff --git a/framework/main/exceptions/xml/class_XmlNodeMismatchException.php b/framework/main/exceptions/xml/class_XmlNodeMismatchException.php
index 00667c11ab2fdfbe796eeecd7938157e7772e8fc..db2e749bf410e02ba566db000b6d0851f1a9907c 100644 (file)
--- a/framework/main/exceptions/xml/class_XmlNodeMismatchException.php
+++ b/framework/main/exceptions/xml/class_XmlNodeMismatchException.php
@@ -10,7 +10,11 @@ use Org\Mxchange\CoreFramework\Generic\FrameworkException;
  *
  * @author             Roland Haeder <webmaster@shipsimu.org>
  * @version            0.0.0
+<<<<<<< HEAD:framework/main/exceptions/xml/class_XmlNodeMismatchException.php
  * @copyright  Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2017 Core Developer Team
+=======
+ * @copyright  Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2016 Core Developer Team
+>>>>>>> Some updates::inc/main/exceptions/xml/class_XmlNodeMismatchException.php
  * @license            GNU GPL 3.0 or any newer version
  * @link               http://www.shipsimu.org
  *

diff --git a/framework/main/exceptions/xml/class_XmlParserException.php b/framework/main/exceptions/xml/class_XmlParserException.php
index fb5cf58424ae39d1d1ef3afbe61b6a028b74f932..a6d86852d0bb622fe009981d385452882f6bd95c 100644 (file)
--- a/framework/main/exceptions/xml/class_XmlParserException.php
+++ b/framework/main/exceptions/xml/class_XmlParserException.php
@@ -10,7 +10,11 @@ use Org\Mxchange\CoreFramework\Generic\FrameworkException;
  *
  * @author             Roland Haeder <webmaster@shipsimu.org>
  * @version            0.0.0
+<<<<<<< HEAD:framework/main/exceptions/xml/class_XmlParserException.php
  * @copyright  Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2017 Core Developer Team
+=======
+ * @copyright  Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2016 Core Developer Team
+>>>>>>> Some updates::inc/main/exceptions/xml/class_XmlParserException.php
  * @license            GNU GPL 3.0 or any newer version
  * @link               http://www.shipsimu.org
  *

diff --git a/framework/main/interfaces/actions/class_PerformableAction.php b/framework/main/interfaces/actions/class_PerformableAction.php
index d60b094bb3e03750468af7359d0272f371e51ac5..9a99d9e0e23a7d9e9ca17154be7457b522954d22 100644 (file)
--- a/framework/main/interfaces/actions/class_PerformableAction.php
+++ b/framework/main/interfaces/actions/class_PerformableAction.php
@@ -12,7 +12,11 @@ use Org\Mxchange\CoreFramework\Response\Responseable;
  *
  * @author             Roland Haeder <webmaster@shipsimu.org>
  * @version            0.0.0
+<<<<<<< HEAD:framework/main/interfaces/actions/class_PerformableAction.php
  * @copyright  Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2017 Core Developer Team
+=======
+ * @copyright  Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2016 Core Developer Team
+>>>>>>> Some updates::inc/main/interfaces/actions/class_PerformableAction.php
  * @license            GNU GPL 3.0 or any newer version
  * @link               http://www.shipsimu.org
  *

diff --git a/framework/main/interfaces/actions/commands/class_Commandable.php b/framework/main/interfaces/actions/commands/class_Commandable.php
index d4c60e2dc117e3af860b7eeaaff8888b8a809aac..b1b099e0a8b90a3bba3b2c035104e392cb388514 100644 (file)
--- a/framework/main/interfaces/actions/commands/class_Commandable.php
+++ b/framework/main/interfaces/actions/commands/class_Commandable.php
@@ -12,7 +12,11 @@ use Org\Mxchange\CoreFramework\Request\Requestable;
  *
  * @author             Roland Haeder <webmaster@shipsimu.org>
  * @version            0.0.0
+<<<<<<< HEAD:framework/main/interfaces/actions/commands/class_Commandable.php
  * @copyright  Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2017 Core Developer Team
+=======
+ * @copyright  Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2016 Core Developer Team
+>>>>>>> Some updates::inc/main/interfaces/actions/commands/class_Commandable.php
  * @license            GNU GPL 3.0 or any newer version
  * @link               http://www.shipsimu.org
  *

diff --git a/framework/main/interfaces/application/class_ManageableApplication.php b/framework/main/interfaces/application/class_ManageableApplication.php
index bf409cba03938f754c0ea35e8f42bc014dc169ec..1f6dcb56c0ac0652da0b8bab9d3366f0c58dcc90 100644 (file)
--- a/framework/main/interfaces/application/class_ManageableApplication.php
+++ b/framework/main/interfaces/application/class_ManageableApplication.php
@@ -16,7 +16,11 @@ use Org\Mxchange\CoreFramework\Template\CompileableTemplate;
  *
  * @author             Roland Haeder <webmaster@shipsimu.org>
  * @version            0.0.0
+<<<<<<< HEAD:framework/main/interfaces/application/class_ManageableApplication.php
  * @copyright  Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2017 Core Developer Team
+=======
+ * @copyright  Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2016 Core Developer Team
+>>>>>>> Some updates::inc/main/interfaces/application/class_ManageableApplication.php
  * @license            GNU GPL 3.0 or any newer version
  * @link               http://www.shipsimu.org
  *

diff --git a/framework/main/interfaces/auth/class_Authorizeable.php b/framework/main/interfaces/auth/class_Authorizeable.php
index 22a777e193d42b36a0b8ed76289443243b2e0d23..8e192acd3c4ca0f7653a3b3bd6c6df54b003110c 100644 (file)
--- a/framework/main/interfaces/auth/class_Authorizeable.php
+++ b/framework/main/interfaces/auth/class_Authorizeable.php
@@ -10,7 +10,11 @@ use Org\Mxchange\CoreFramework\Generic\FrameworkInterface;
  *
  * @author             Roland Haeder <webmaster@shipsimu.org>
  * @version            0.0.0
+<<<<<<< HEAD:framework/main/interfaces/auth/class_Authorizeable.php
  * @copyright  Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2017 Core Developer Team
+=======
+ * @copyright  Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2016 Core Developer Team
+>>>>>>> Some updates::inc/main/interfaces/auth/class_Authorizeable.php
  * @license            GNU GPL 3.0 or any newer version
  * @link               http://www.shipsimu.org
  *

diff --git a/framework/main/interfaces/block/calculatable/class_CalculatableBlock.php b/framework/main/interfaces/block/calculatable/class_CalculatableBlock.php
index b6f076aeb6d7451463af797a33f35a78fb6014ab..5820c38d13407bf05b131ce73045b7b3b4328b01 100644 (file)
--- a/framework/main/interfaces/block/calculatable/class_CalculatableBlock.php
+++ b/framework/main/interfaces/block/calculatable/class_CalculatableBlock.php
@@ -10,7 +10,11 @@ use Org\Mxchange\CoreFramework\Filesystem\Block;
  *
  * @author             Roland Haeder <webmaster@ship-simu.org>
  * @version            0.0.0
+<<<<<<< HEAD:framework/main/interfaces/block/calculatable/class_CalculatableBlock.php
  * @copyright  Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2017 Core Developer Team
+=======
+ * @copyright  Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2016 Core Developer Team
+>>>>>>> Some updates::inc/main/interfaces/block/calculatable/class_CalculatableBlock.php
  * @license            GNU GPL 3.0 or any newer version
  * @link               http://www.ship-simu.org
  *

diff --git a/framework/main/interfaces/block/class_Block.php b/framework/main/interfaces/block/class_Block.php
index 5815f2de150a8134de8ec475b7aecbab7beed36d..b7f88f845d6d89aad85e2baac16bc894fab247f5 100644 (file)
--- a/framework/main/interfaces/block/class_Block.php
+++ b/framework/main/interfaces/block/class_Block.php
@@ -10,7 +10,11 @@ use Org\Mxchange\CoreFramework\Generic\FrameworkInterface;
  *
  * @author             Roland Haeder <webmaster@ship-simu.org>
  * @version            0.0.0
+<<<<<<< HEAD:framework/main/interfaces/block/class_Block.php
  * @copyright  Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2017 Core Developer Team
+=======
+ * @copyright  Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2016 Core Developer Team
+>>>>>>> Some updates::inc/main/interfaces/block/class_Block.php
  * @license            GNU GPL 3.0 or any newer version
  * @link               http://www.ship-simu.org
  *

diff --git a/framework/main/interfaces/cache/class_Cacheable.php b/framework/main/interfaces/cache/class_Cacheable.php
index 2ea48a4766198c9e5ade3b5d3e62c73d92f402e6..d3cc0623ffba4534aee0c481e0ba3c3911d94212 100644 (file)
--- a/framework/main/interfaces/cache/class_Cacheable.php
+++ b/framework/main/interfaces/cache/class_Cacheable.php
@@ -10,7 +10,11 @@ use Org\Mxchange\CoreFramework\Generic\FrameworkInterface;
  *
  * @author             Roland Haeder <webmaster@shipsimu.org>
  * @version            0.0.0
+<<<<<<< HEAD:framework/main/interfaces/cache/class_Cacheable.php
  * @copyright  Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2017 Core Developer Team
+=======
+ * @copyright  Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2016 Core Developer Team
+>>>>>>> Some updates::inc/main/interfaces/cache/class_Cacheable.php
  * @license            GNU GPL 3.0 or any newer version
  * @link               http://www.shipsimu.org
  *

diff --git a/framework/main/interfaces/captcha/class_SolveableCaptcha.php b/framework/main/interfaces/captcha/class_SolveableCaptcha.php
index 5545289cb2a1839929827a5eaead7f01942e5a7e..bb087f12f0b3d31e10a395a017fc561e6a1f9567 100644 (file)
--- a/framework/main/interfaces/captcha/class_SolveableCaptcha.php
+++ b/framework/main/interfaces/captcha/class_SolveableCaptcha.php
@@ -11,7 +11,11 @@ use Org\Mxchange\CoreFramework\Helper\Helper;
  *
  * @author             Roland Haeder <webmaster@shipsimu.org>
  * @version            0.0.0
+<<<<<<< HEAD:framework/main/interfaces/captcha/class_SolveableCaptcha.php
  * @copyright  Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2017 Core Developer Team
+=======
+ * @copyright  Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2016 Core Developer Team
+>>>>>>> Some updates::inc/main/interfaces/captcha/class_SolveableCaptcha.php
  * @license            GNU GPL 3.0 or any newer version
  * @link               http://www.shipsimu.org
  *

diff --git a/framework/main/interfaces/class_ b/framework/main/interfaces/class_
index b7c59130b670dd726c7e26885cb0148bfb8c6dd8..725dee1c6bec7e3fe3f1127400005d89717aa9fa 100644 (file)
--- a/framework/main/interfaces/class_
+++ b/framework/main/interfaces/class_
@@ -10,7 +10,11 @@ use Org\Mxchange\CoreFramework\Generic\FrameworkInterface;
  *
  * @author             Roland Haeder <webmaster@ship-simu.org>
  * @version            0.0.0
+<<<<<<< HEAD:framework/main/interfaces/class_
  * @copyright  Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2017 Core Developer Team
+=======
+ * @copyright  Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2016 Core Developer Team
+>>>>>>> Some updates::inc/main/interfaces/class_
  * @license            GNU GPL 3.0 or any newer version
  * @link               http://www.ship-simu.org
  *

diff --git a/framework/main/interfaces/class_FrameworkInterface.php b/framework/main/interfaces/class_FrameworkInterface.php
index d40ffb35a47bc917550a72db16d118c2bf49ff2c..f1d3725f5ff253651b7c3789a14a486d5a4fdc7d 100644 (file)
--- a/framework/main/interfaces/class_FrameworkInterface.php
+++ b/framework/main/interfaces/class_FrameworkInterface.php
@@ -8,7 +8,11 @@ namespace Org\Mxchange\CoreFramework\Generic;
  *
  * @author             Roland Haeder <webmaster@shipsimu.org>
  * @version            0.0.0
+<<<<<<< HEAD:framework/main/interfaces/class_FrameworkInterface.php
  * @copyright  Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2017 Core Developer Team
+=======
+ * @copyright  Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2016 Core Developer Team
+>>>>>>> Some updates::inc/main/interfaces/class_FrameworkInterface.php
  * @license            GNU GPL 3.0 or any newer version
  * @link               http://www.shipsimu.org
  * @todo               Find a better name for this interface

diff --git a/framework/main/interfaces/client/class_Client.php b/framework/main/interfaces/client/class_Client.php
index 56626d6fc7e5f1cd5000e9c868cf182015e75958..697aa0bd74914b1174da88e018791dfab0ad01cf 100644 (file)
--- a/framework/main/interfaces/client/class_Client.php
+++ b/framework/main/interfaces/client/class_Client.php
@@ -10,7 +10,11 @@ use Org\Mxchange\CoreFramework\Generic\FrameworkInterface;
  *
  * @author             Roland Haeder <webmaster@ship-simu.org>
  * @version            0.0.0
+<<<<<<< HEAD:framework/main/interfaces/client/class_Client.php
  * @copyright  Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2017 Core Developer Team
+=======
+ * @copyright  Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2016 Core Developer Team
+>>>>>>> Some updates::inc/main/interfaces/client/class_Client.php
  * @license            GNU GPL 3.0 or any newer version
  * @link               http://www.ship-simu.org
  *

diff --git a/framework/main/interfaces/compressor/class_Compressor.php b/framework/main/interfaces/compressor/class_Compressor.php
index 1f9270ad5683debe5faa6b702d162877fa10c216..cae3105e5297b9166ff4b9d9d1bfe9c877a6b96c 100644 (file)
--- a/framework/main/interfaces/compressor/class_Compressor.php
+++ b/framework/main/interfaces/compressor/class_Compressor.php
@@ -10,7 +10,11 @@ use Org\Mxchange\CoreFramework\Generic\FrameworkInterface;
  *
  * @author             Roland Haeder <webmaster@shipsimu.org>
  * @version            0.0.0
+<<<<<<< HEAD:framework/main/interfaces/compressor/class_Compressor.php
  * @copyright  Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2017 Core Developer Team
+=======
+ * @copyright  Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2016 Core Developer Team
+>>>>>>> Some updates::inc/main/interfaces/compressor/class_Compressor.php
  * @license            GNU GPL 3.0 or any newer version
  * @link               http://www.shipsimu.org
  *

diff --git a/framework/main/interfaces/controller/class_Controller.php b/framework/main/interfaces/controller/class_Controller.php
index 30239686c68cb7298812d14b68ba2c156ab21e99..8c5c947939b3643412ef252a26832a4d322a12a4 100644 (file)
--- a/framework/main/interfaces/controller/class_Controller.php
+++ b/framework/main/interfaces/controller/class_Controller.php
@@ -12,7 +12,11 @@ use Org\Mxchange\CoreFramework\Response\Responseable;
  *
  * @author             Roland Haeder <webmaster@shipsimu.org>
  * @version            0.0.0
+<<<<<<< HEAD:framework/main/interfaces/controller/class_Controller.php
  * @copyright  Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2017 Core Developer Team
+=======
+ * @copyright  Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2016 Core Developer Team
+>>>>>>> Some updates::inc/main/interfaces/controller/class_Controller.php
  * @license            GNU GPL 3.0 or any newer version
  * @link               http://www.shipsimu.org
  *

diff --git a/framework/main/interfaces/criteria/class_Criteria.php b/framework/main/interfaces/criteria/class_Criteria.php
index ae646cd4ca6369a25b719d01a4782292ac8c82f6..f3bcf61a1978512c12a1eb576b7e53919c33557d 100644 (file)
--- a/framework/main/interfaces/criteria/class_Criteria.php
+++ b/framework/main/interfaces/criteria/class_Criteria.php
@@ -10,7 +10,11 @@ use Org\Mxchange\CoreFramework\Generic\FrameworkInterface;
  *
  * @author             Roland Haeder <webmaster@shipsimu.org>
  * @version            0.0.0
+<<<<<<< HEAD:framework/main/interfaces/criteria/class_Criteria.php
  * @copyright  Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2017 Core Developer Team
+=======
+ * @copyright  Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2016 Core Developer Team
+>>>>>>> Some updates::inc/main/interfaces/criteria/class_Criteria.php
  * @license            GNU GPL 3.0 or any newer version
  * @link               http://www.shipsimu.org
  *

diff --git a/framework/main/interfaces/criteria/extended/class_AddableCriteria.php b/framework/main/interfaces/criteria/extended/class_AddableCriteria.php
index df52c7e1fb1047842d0ebde1b6dfbc649dc5f1d2..d057ceabf2c4d8337bac3ae21f0c7a036ae6460c 100644 (file)
--- a/framework/main/interfaces/criteria/extended/class_AddableCriteria.php
+++ b/framework/main/interfaces/criteria/extended/class_AddableCriteria.php
@@ -11,7 +11,11 @@ use Org\Mxchange\CoreFramework\Generic\FrameworkInterface;
  *
  * @author             Roland Haeder <webmaster@shipsimu.org>
  * @version            0.0.0
+<<<<<<< HEAD:framework/main/interfaces/criteria/extended/class_AddableCriteria.php
  * @copyright  Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2017 Core Developer Team
+=======
+ * @copyright  Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2016 Core Developer Team
+>>>>>>> Some updates::inc/main/interfaces/criteria/extended/class_AddableCriteria.php
  * @license            GNU GPL 3.0 or any newer version
  * @link               http://www.shipsimu.org
  *

diff --git a/framework/main/interfaces/criteria/extended/class_LocalSearchCriteria.php b/framework/main/interfaces/criteria/extended/class_LocalSearchCriteria.php
index 10ee38adf29a12c6175c96782bfb74b8938ff562..cc0b0747490ce16f1e6d90caed8607be270fc714 100644 (file)
--- a/framework/main/interfaces/criteria/extended/class_LocalSearchCriteria.php
+++ b/framework/main/interfaces/criteria/extended/class_LocalSearchCriteria.php
@@ -10,7 +10,11 @@ use Org\Mxchange\CoreFramework\Criteria\Criteria;
  *
  * @author             Roland Haeder <webmaster@shipsimu.org>
  * @version            0.0.0
+<<<<<<< HEAD:framework/main/interfaces/criteria/extended/class_LocalSearchCriteria.php
  * @copyright  Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2017 Core Developer Team
+=======
+ * @copyright  Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2016 Core Developer Team
+>>>>>>> Some updates::inc/main/interfaces/criteria/extended/class_LocalSearchCriteria.php
  * @license            GNU GPL 3.0 or any newer version
  * @link               http://www.shipsimu.org
  *

diff --git a/framework/main/interfaces/criteria/extended/class_LocalUpdateCriteria.php b/framework/main/interfaces/criteria/extended/class_LocalUpdateCriteria.php
index f851ad8377cb393891071d18875f27f708647c14..2657e2a88a2747db6742b597d7428def28a6740c 100644 (file)
--- a/framework/main/interfaces/criteria/extended/class_LocalUpdateCriteria.php
+++ b/framework/main/interfaces/criteria/extended/class_LocalUpdateCriteria.php
@@ -10,7 +10,11 @@ use Org\Mxchange\CoreFramework\Criteria\Criteria;
  *
  * @author             Roland Haeder <webmaster@shipsimu.org>
  * @version            0.0.0
+<<<<<<< HEAD:framework/main/interfaces/criteria/extended/class_LocalUpdateCriteria.php
  * @copyright  Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2017 Core Developer Team
+=======
+ * @copyright  Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2016 Core Developer Team
+>>>>>>> Some updates::inc/main/interfaces/criteria/extended/class_LocalUpdateCriteria.php
  * @license            GNU GPL 3.0 or any newer version
  * @link               http://www.shipsimu.org
  *

diff --git a/framework/main/interfaces/criteria/extended/class_StoreableCriteria.php b/framework/main/interfaces/criteria/extended/class_StoreableCriteria.php
index f183a6add8f9ef0276ee746b3746bdc090180afe..ebc067b78fa1a1bd5cc59857f3a6068e321b8066 100644 (file)
--- a/framework/main/interfaces/criteria/extended/class_StoreableCriteria.php
+++ b/framework/main/interfaces/criteria/extended/class_StoreableCriteria.php
@@ -10,7 +10,11 @@ use Org\Mxchange\CoreFramework\Criteria\Criteria;
  *
  * @author             Roland Haeder <webmaster@shipsimu.org>
  * @version            0.0.0
+<<<<<<< HEAD:framework/main/interfaces/criteria/extended/class_StoreableCriteria.php
  * @copyright  Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2017 Core Developer Team
+=======
+ * @copyright  Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2016 Core Developer Team
+>>>>>>> Some updates::inc/main/interfaces/criteria/extended/class_StoreableCriteria.php
  * @license            GNU GPL 3.0 or any newer version
  * @link               http://www.shipsimu.org
  *

diff --git a/framework/main/interfaces/crypto/class_Cryptable.php b/framework/main/interfaces/crypto/class_Cryptable.php
index 890b0d32f07a61112518bd9506d123392d31a4ab..54e6ce4c16ed09bd068628ffc533a56039b2663a 100644 (file)
--- a/framework/main/interfaces/crypto/class_Cryptable.php
+++ b/framework/main/interfaces/crypto/class_Cryptable.php
@@ -10,7 +10,11 @@ use Org\Mxchange\CoreFramework\Generic\FrameworkInterface;
  *
  * @author             Roland Haeder <webmaster@shipsimu.org>
  * @version            0.0.0
+<<<<<<< HEAD:framework/main/interfaces/crypto/class_Cryptable.php
  * @copyright  Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2017 Core Developer Team
+=======
+ * @copyright  Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2016 Core Developer Team
+>>>>>>> Some updates::inc/main/interfaces/crypto/class_Cryptable.php
  * @license            GNU GPL 3.0 or any newer version
  * @link               http://www.shipsimu.org
  *

diff --git a/framework/main/interfaces/database/backend/class_DatabaseBackend.php b/framework/main/interfaces/database/backend/class_DatabaseBackend.php
index 13f2c61cba412ce95a350b0e8566dd4ee9b01d6d..a354bb1527638fc2f5f0eec958c197c953c83ebd 100644 (file)
--- a/framework/main/interfaces/database/backend/class_DatabaseBackend.php
+++ b/framework/main/interfaces/database/backend/class_DatabaseBackend.php
@@ -16,7 +16,11 @@ use Org\Mxchange\CoreFramework\Database\FrameworkDatabase;
  *
  * @author             Roland Haeder <webmaster@shipsimu.org>
  * @version            0.0.0
+<<<<<<< HEAD:framework/main/interfaces/database/backend/class_DatabaseBackend.php
  * @copyright  Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2017 Core Developer Team
+=======
+ * @copyright  Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2016 Core Developer Team
+>>>>>>> Some updates::inc/main/interfaces/database/backend/class_DatabaseBackend.php
  * @license            GNU GPL 3.0 or any newer version
  * @link               http://www.shipsimu.org
  *

diff --git a/framework/main/interfaces/database/class_DatabaseWrapper.php b/framework/main/interfaces/database/class_DatabaseWrapper.php
index e314256b3b2736e80c1738a66c1e96f8029d7209..401e85fd658db648f5d7567aa313a7e7a2b99cc1 100644 (file)
--- a/framework/main/interfaces/database/class_DatabaseWrapper.php
+++ b/framework/main/interfaces/database/class_DatabaseWrapper.php
@@ -11,7 +11,11 @@ use Org\Mxchange\CoreFramework\Generic\FrameworkInterface;
  *
  * @author             Roland Haeder <webmaster@shipsimu.org>
  * @version            0.0.0
+<<<<<<< HEAD:framework/main/interfaces/database/class_DatabaseWrapper.php
  * @copyright  Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2017 Core Developer Team
+=======
+ * @copyright  Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2016 Core Developer Team
+>>>>>>> Some updates::inc/main/interfaces/database/class_DatabaseWrapper.php
  * @license            GNU GPL 3.0 or any newer version
  * @link               http://www.shipsimu.org
  *

diff --git a/framework/main/interfaces/database/class_FrameworkDatabase.php b/framework/main/interfaces/database/class_FrameworkDatabase.php
index dcf2e2449bef42e570977b7db2f014e09ee66f01..032dd820fcace840ab973d0918522dec3d403f7a 100644 (file)
--- a/framework/main/interfaces/database/class_FrameworkDatabase.php
+++ b/framework/main/interfaces/database/class_FrameworkDatabase.php
@@ -10,7 +10,11 @@ use Org\Mxchange\CoreFramework\Generic\FrameworkInterface;
  *
  * @author             Roland Haeder <webmaster@shipsimu.org>
  * @version            0.0.0
+<<<<<<< HEAD:framework/main/interfaces/database/class_FrameworkDatabase.php
  * @copyright  Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2017 Core Developer Team
+=======
+ * @copyright  Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2016 Core Developer Team
+>>>>>>> Some updates::inc/main/interfaces/database/class_FrameworkDatabase.php
  * @license            GNU GPL 3.0 or any newer version
  * @link               http://www.shipsimu.org
  *

diff --git a/framework/main/interfaces/database/class_Updateable.php b/framework/main/interfaces/database/class_Updateable.php
index 6fd4c1bb36db7eaf14753a8d8cba4e351f7f6aa0..73c093c02f78a79c334ecccfcc351509df5abee0 100644 (file)
--- a/framework/main/interfaces/database/class_Updateable.php
+++ b/framework/main/interfaces/database/class_Updateable.php
@@ -10,7 +10,11 @@ use Org\Mxchange\CoreFramework\Generic\FrameworkInterface;
  *
  * @author             Roland Haeder <webmaster@shipsimu.org>
  * @version            0.0.0
+<<<<<<< HEAD:framework/main/interfaces/database/class_Updateable.php
  * @copyright  Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2017 Core Developer Team
+=======
+ * @copyright  Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2016 Core Developer Team
+>>>>>>> Some updates::inc/main/interfaces/database/class_Updateable.php
  * @license            GNU GPL 3.0 or any newer version
  * @link               http://www.shipsimu.org
  *

diff --git a/framework/main/interfaces/database/middleware/class_DatabaseConnector.php b/framework/main/interfaces/database/middleware/class_DatabaseConnector.php
index 21ca43ff43db90af3fa941989c5a93cdfdda525d..bcc43a3b429e51ce56278d95f6d63a6fd245ebfc 100644 (file)
--- a/framework/main/interfaces/database/middleware/class_DatabaseConnector.php
+++ b/framework/main/interfaces/database/middleware/class_DatabaseConnector.php
@@ -13,7 +13,11 @@ use Org\Mxchange\CoreFramework\Database\FrameworkDatabase;
  *
  * @author             Roland Haeder <webmaster@shipsimu.org>
  * @version            0.0.0
+<<<<<<< HEAD:framework/main/interfaces/database/middleware/class_DatabaseConnector.php
  * @copyright  Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2017 Core Developer Team
+=======
+ * @copyright  Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2016 Core Developer Team
+>>>>>>> Some updates::inc/main/interfaces/database/middleware/class_DatabaseConnector.php
  * @license            GNU GPL 3.0 or any newer version
  * @link               http://www.shipsimu.org
  *

diff --git a/framework/main/interfaces/database/wrapper/class_BookablePointsWrapper.php b/framework/main/interfaces/database/wrapper/class_BookablePointsWrapper.php
index e57a745995e77ac77d5ca3f7281e23c88e55e489..223eab792991734edf865e02ee2a02ac568b5bee 100644 (file)
--- a/framework/main/interfaces/database/wrapper/class_BookablePointsWrapper.php
+++ b/framework/main/interfaces/database/wrapper/class_BookablePointsWrapper.php
@@ -11,7 +11,11 @@ use Org\Mxchange\CoreFramework\Result\Update\UpdateableResult;
  *
  * @author             Roland Haeder <webmaster@shipsimu.org>
  * @version            0.0.0
+<<<<<<< HEAD:framework/main/interfaces/database/wrapper/class_BookablePointsWrapper.php
  * @copyright  Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2017 Core Developer Team
+=======
+ * @copyright  Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2016 Core Developer Team
+>>>>>>> Some updates::inc/main/interfaces/database/wrapper/class_BookablePointsWrapper.php
  * @license            GNU GPL 3.0 or any newer version
  * @link               http://www.shipsimu.org
  *

diff --git a/framework/main/interfaces/database/wrapper/class_ManageableAccountWrapper.php b/framework/main/interfaces/database/wrapper/class_ManageableAccountWrapper.php
index 7c90ca6d469dc09a040f6182486c5e215d7509d0..b39347ab949741943228a032f891a425b1a1757e 100644 (file)
--- a/framework/main/interfaces/database/wrapper/class_ManageableAccountWrapper.php
+++ b/framework/main/interfaces/database/wrapper/class_ManageableAccountWrapper.php
@@ -12,7 +12,11 @@ use Org\Mxchange\CoreFramework\Result\Update\UpdateableResult;
  *
  * @author             Roland Haeder <webmaster@shipsimu.org>
  * @version            0.0.0
+<<<<<<< HEAD:framework/main/interfaces/database/wrapper/class_ManageableAccountWrapper.php
  * @copyright  Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2017 Core Developer Team
+=======
+ * @copyright  Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2016 Core Developer Team
+>>>>>>> Some updates::inc/main/interfaces/database/wrapper/class_ManageableAccountWrapper.php
  * @license            GNU GPL 3.0 or any newer version
  * @link               http://www.shipsimu.org
  *

diff --git a/framework/main/interfaces/debug/class_Debugger.php b/framework/main/interfaces/debug/class_Debugger.php
index 4ce86a659777647ad0e073840e31212afa7b9542..ab90dff428cd7def282aa44ee8a00500eaad8c7c 100644 (file)
--- a/framework/main/interfaces/debug/class_Debugger.php
+++ b/framework/main/interfaces/debug/class_Debugger.php
@@ -10,7 +10,11 @@ use Org\Mxchange\CoreFramework\Generic\FrameworkInterface;
  *
  * @author             Roland Haeder <webmaster@shipsimu.org>
  * @version            0.0.0
+<<<<<<< HEAD:framework/main/interfaces/debug/class_Debugger.php
  * @copyright  Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2017 Core Developer Team
+=======
+ * @copyright  Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2016 Core Developer Team
+>>>>>>> Some updates::inc/main/interfaces/debug/class_Debugger.php
  * @license            GNU GPL 3.0 or any newer version
  * @link               http://www.shipsimu.org
  *

diff --git a/framework/main/interfaces/discovery/class_Discoverable.php b/framework/main/interfaces/discovery/class_Discoverable.php
index 06fe8796e1184c5bbc298e4b57dafdc17cefa6b5..88e8a4fd182fc8ed0243057dfe41579aac85726e 100644 (file)
--- a/framework/main/interfaces/discovery/class_Discoverable.php
+++ b/framework/main/interfaces/discovery/class_Discoverable.php
@@ -12,7 +12,11 @@ use Org\Mxchange\CoreFramework\Request\Requestable;
  *
  * @author             Roland Haeder <webmaster@shipsimu.org>
  * @version            0.0.0
+<<<<<<< HEAD:framework/main/interfaces/discovery/class_Discoverable.php
  * @copyright  Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2017 Core Developer Team
+=======
+ * @copyright  Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2016 Core Developer Team
+>>>>>>> Some updates::inc/main/interfaces/discovery/class_Discoverable.php
  * @license            GNU GPL 3.0 or any newer version
  * @link               http://www.shipsimu.org
  *

diff --git a/framework/main/interfaces/feature/class_Feature.php b/framework/main/interfaces/feature/class_Feature.php
index 42acc3632f210b00e1e95d429ac43ecde91bde35..35a6e7ed121a5a9aecd01bc272841fb60ac2fafb 100644 (file)
--- a/framework/main/interfaces/feature/class_Feature.php
+++ b/framework/main/interfaces/feature/class_Feature.php
@@ -10,7 +10,11 @@ use Org\Mxchange\CoreFramework\Generic\FrameworkInterface;
  *
  * @author             Roland Haeder <webmaster@ship-simu.org>
  * @version            0.0.0
+<<<<<<< HEAD:framework/main/interfaces/feature/class_Feature.php
  * @copyright  Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2017 Core Developer Team
+=======
+ * @copyright  Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2016 Core Developer Team
+>>>>>>> Some updates::inc/main/interfaces/feature/class_Feature.php
  * @license            GNU GPL 3.0 or any newer version
  * @link               http://www.ship-simu.org
  *

diff --git a/framework/main/interfaces/filesystem/class_Filesystem.php b/framework/main/interfaces/filesystem/class_Filesystem.php
index 2a8ed8060f9e3f6bbbed138d9207a400a9136181..72d61d5b3b312a972dbadd147039d43f5988ddc2 100644 (file)
--- a/framework/main/interfaces/filesystem/class_Filesystem.php
+++ b/framework/main/interfaces/filesystem/class_Filesystem.php
@@ -10,7 +10,11 @@ use Org\Mxchange\CoreFramework\Generic\FrameworkInterface;
  *
  * @author             Roland Haeder <webmaster@ship-simu.org>
  * @version            0.0.0
+<<<<<<< HEAD:framework/main/interfaces/filesystem/class_Filesystem.php
  * @copyright  Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2017 Core Developer Team
+=======
+ * @copyright  Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2016 Core Developer Team
+>>>>>>> Some updates::inc/main/interfaces/filesystem/class_Filesystem.php
  * @license            GNU GPL 3.0 or any newer version
  * @link               http://www.ship-simu.org
  *

diff --git a/framework/main/interfaces/filter/class_Filterable.php b/framework/main/interfaces/filter/class_Filterable.php
index 81927529ae8cea5820722e9b52a085400e5e9afa..6954bd7d83b5cac319e9e267ac2bf69bb916d1a7 100644 (file)
--- a/framework/main/interfaces/filter/class_Filterable.php
+++ b/framework/main/interfaces/filter/class_Filterable.php
@@ -12,7 +12,11 @@ use Org\Mxchange\CoreFramework\Response\Responseable;
  *
  * @author             Roland Haeder <webmaster@shipsimu.org>
  * @version            0.0.0
+<<<<<<< HEAD:framework/main/interfaces/filter/class_Filterable.php
  * @copyright  Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2017 Core Developer Team
+=======
+ * @copyright  Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2016 Core Developer Team
+>>>>>>> Some updates::inc/main/interfaces/filter/class_Filterable.php
  * @license            GNU GPL 3.0 or any newer version
  * @link               http://www.shipsimu.org
  *

diff --git a/framework/main/interfaces/handler/class_Handleable.php b/framework/main/interfaces/handler/class_Handleable.php
index da13e865518c38084d9affd5204d451bf508e3c5..e334c4fac2af4221a3eba505bfd51c1bbcccb4ac 100644 (file)
--- a/framework/main/interfaces/handler/class_Handleable.php
+++ b/framework/main/interfaces/handler/class_Handleable.php
@@ -10,7 +10,11 @@ use Org\Mxchange\CoreFramework\Generic\FrameworkInterface;
  *
  * @author             Roland Haeder <webmaster@shipsimu.org>
  * @version            0.0.0
+<<<<<<< HEAD:framework/main/interfaces/handler/class_Handleable.php
  * @copyright  Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2017 Core Developer Team
+=======
+ * @copyright  Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2016 Core Developer Team
+>>>>>>> Some updates::inc/main/interfaces/handler/class_Handleable.php
  * @license            GNU GPL 3.0 or any newer version
  * @link               http://www.shipsimu.org
  *

diff --git a/framework/main/interfaces/handler/class_HandleableDataSet.php b/framework/main/interfaces/handler/class_HandleableDataSet.php
index b2fea4f4117e2e13ad70719722b800e6ca22c3aa..ade59e735f009249867162d1e07e4a5f30f68d35 100644 (file)
--- a/framework/main/interfaces/handler/class_HandleableDataSet.php
+++ b/framework/main/interfaces/handler/class_HandleableDataSet.php
@@ -11,7 +11,11 @@ use Org\Mxchange\CoreFramework\Handler\Handleable;
  *
  * @author             Roland Haeder <webmaster@shipsimu.org>
  * @version            0.0.0
+<<<<<<< HEAD:framework/main/interfaces/handler/class_HandleableDataSet.php
  * @copyright  Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2017 Core Developer Team
+=======
+ * @copyright  Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2016 Core Developer Team
+>>>>>>> Some updates::inc/main/interfaces/handler/class_HandleableDataSet.php
  * @license            GNU GPL 3.0 or any newer version
  * @link               http://www.shipsimu.org
  *

diff --git a/framework/main/interfaces/handler/task/class_HandleableTask.php b/framework/main/interfaces/handler/task/class_HandleableTask.php
index db0c8a02ef6914a452b69df5c8baeed12bcbbd30..b19e5f30ca74f23e64aec288158ca9c272a65f9e 100644 (file)
--- a/framework/main/interfaces/handler/task/class_HandleableTask.php
+++ b/framework/main/interfaces/handler/task/class_HandleableTask.php
@@ -12,7 +12,11 @@ use Org\Mxchange\CoreFramework\Visitor\Visitable;
  *
  * @author             Roland Haeder <webmaster@shipsimu.org>
  * @version            0.0.0
+<<<<<<< HEAD:framework/main/interfaces/handler/task/class_HandleableTask.php
  * @copyright  Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2017 Core Developer Team
+=======
+ * @copyright  Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2016 Core Developer Team
+>>>>>>> Some updates::inc/main/interfaces/handler/task/class_HandleableTask.php
  * @license            GNU GPL 3.0 or any newer version
  * @link               http://www.shipsimu.org
  * @todo               HandleableDataSet looks strange here

diff --git a/framework/main/interfaces/helper/class_Helper.php b/framework/main/interfaces/helper/class_Helper.php
index dea2550ff4ab4bcf2ea5fc4104ce6dff38a8bb43..e6284ad5b5bc966a294418b43f18b8c34603d4e5 100644 (file)
--- a/framework/main/interfaces/helper/class_Helper.php
+++ b/framework/main/interfaces/helper/class_Helper.php
@@ -10,7 +10,11 @@ use Org\Mxchange\CoreFramework\Generic\FrameworkInterface;
  *
  * @author             Roland Haeder <webmaster@shipsimu.org>
  * @version            0.0.0
+<<<<<<< HEAD:framework/main/interfaces/helper/class_Helper.php
  * @copyright  Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2017 Core Developer Team
+=======
+ * @copyright  Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2016 Core Developer Team
+>>>>>>> Some updates::inc/main/interfaces/helper/class_Helper.php
  * @license            GNU GPL 3.0 or any newer version
  * @link               http://www.shipsimu.org
  *

diff --git a/framework/main/interfaces/helper/login/class_HelpableLogin.php b/framework/main/interfaces/helper/login/class_HelpableLogin.php
index c81982b36d687fc46bf841c931d13cc45a13a2c7..95345a297dc01628c291208d9669dc149545b46c 100644 (file)
--- a/framework/main/interfaces/helper/login/class_HelpableLogin.php
+++ b/framework/main/interfaces/helper/login/class_HelpableLogin.php
@@ -11,7 +11,11 @@ use Org\Mxchange\CoreFramework\Response\Responseable;
  *
  * @author             Roland Haeder <webmaster@shipsimu.org>
  * @version            0.0.0
+<<<<<<< HEAD:framework/main/interfaces/helper/login/class_HelpableLogin.php
  * @copyright  Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2017 Core Developer Team
+=======
+ * @copyright  Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2016 Core Developer Team
+>>>>>>> Some updates::inc/main/interfaces/helper/login/class_HelpableLogin.php
  * @license            GNU GPL 3.0 or any newer version
  * @link               http://www.shipsimu.org
  *

diff --git a/framework/main/interfaces/helper/template/class_HelpableTemplate.php b/framework/main/interfaces/helper/template/class_HelpableTemplate.php
index 5122260eed997a4b7d1ba3d646aa679e47994a4a..63848249803768dff632244a1d77a364e63982f6 100644 (file)
--- a/framework/main/interfaces/helper/template/class_HelpableTemplate.php
+++ b/framework/main/interfaces/helper/template/class_HelpableTemplate.php
@@ -10,7 +10,11 @@ use Org\Mxchange\CoreFramework\Helper\Helper;
  *
  * @author             Roland Haeder <webmaster@shipsimu.org>
  * @version            0.0.0
+<<<<<<< HEAD:framework/main/interfaces/helper/template/class_HelpableTemplate.php
  * @copyright  Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2017 Core Developer Team
+=======
+ * @copyright  Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2016 Core Developer Team
+>>>>>>> Some updates::inc/main/interfaces/helper/template/class_HelpableTemplate.php
  * @license            GNU GPL 3.0 or any newer version
  * @link               http://www.shipsimu.org
  *

diff --git a/framework/main/interfaces/index/class_Indexable b/framework/main/interfaces/index/class_Indexable
index 68242260822ca5d87d7cfc6f3c4a63bde103d6f8..ce6f2fb34e6c96d446828163754f2e96e2c34ffe 100644 (file)
--- a/framework/main/interfaces/index/class_Indexable
+++ b/framework/main/interfaces/index/class_Indexable
@@ -10,7 +10,11 @@ use Org\Mxchange\CoreFramework\Index\Indexable;
  *
  * @author             Roland Haeder <webmaster@ship-simu.org>
  * @version            0.0.0
+<<<<<<< HEAD:framework/main/interfaces/index/class_Indexable
  * @copyright  Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2017 Core Developer Team
+=======
+ * @copyright  Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2016 Core Developer Team
+>>>>>>> Some updates::inc/main/interfaces/index/class_Indexable
  * @license            GNU GPL 3.0 or any newer version
  * @link               http://www.ship-simu.org
  *

diff --git a/framework/main/interfaces/index/class_Indexable.php b/framework/main/interfaces/index/class_Indexable.php
index c9263284c5fd15421564fa769f1e2caabe6e3a2c..fdf5aa9362b0ff2366e57f7d3bcfe3754946a7ca 100644 (file)
--- a/framework/main/interfaces/index/class_Indexable.php
+++ b/framework/main/interfaces/index/class_Indexable.php
@@ -10,7 +10,11 @@ use Org\Mxchange\CoreFramework\Generic\FrameworkInterface;
  *
  * @author             Roland Haeder <webmaster@ship-simu.org>
  * @version            0.0.0
+<<<<<<< HEAD:framework/main/interfaces/index/class_Indexable.php
  * @copyright  Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2017 Core Developer Team
+=======
+ * @copyright  Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2016 Core Developer Team
+>>>>>>> Some updates::inc/main/interfaces/index/class_Indexable.php
  * @license            GNU GPL 3.0 or any newer version
  * @link               http://www.ship-simu.org
  *

diff --git a/framework/main/interfaces/index/stack/class_IndexableStack.php b/framework/main/interfaces/index/stack/class_IndexableStack.php
index 6fa47bc3a5c64896d4280fa05e2f8abc39ea26e8..b6051190b317949cfa8c1cad8058f652ab6ce12f 100644 (file)
--- a/framework/main/interfaces/index/stack/class_IndexableStack.php
+++ b/framework/main/interfaces/index/stack/class_IndexableStack.php
@@ -11,7 +11,11 @@ use Org\Mxchange\CoreFramework\Index\Indexable;
  *
  * @author             Roland Haeder <webmaster@ship-simu.org>
  * @version            0.0.0
+<<<<<<< HEAD:framework/main/interfaces/index/stack/class_IndexableStack.php
  * @copyright  Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2017 Core Developer Team
+=======
+ * @copyright  Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2016 Core Developer Team
+>>>>>>> Some updates::inc/main/interfaces/index/stack/class_IndexableStack.php
  * @license            GNU GPL 3.0 or any newer version
  * @link               http://www.ship-simu.org
  *

diff --git a/framework/main/interfaces/io/class_CloseableFile.php b/framework/main/interfaces/io/class_CloseableFile.php
index ebfc1c3c9754b02ba00eb2d40be2e9ff428cfa37..44a02b7ca304f93b505288d9cf92e4f87f9bd1cc 100644 (file)
--- a/framework/main/interfaces/io/class_CloseableFile.php
+++ b/framework/main/interfaces/io/class_CloseableFile.php
@@ -11,7 +11,11 @@ use Org\Mxchange\CoreFramework\Generic\FrameworkInterface;
  *
  * @author             Roland Haeder <webmaster@shipsimu.org>
  * @version            0.0.0
+<<<<<<< HEAD:framework/main/interfaces/io/class_CloseableFile.php
  * @copyright  Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2017 Core Developer Team
+=======
+ * @copyright  Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2016 Core Developer Team
+>>>>>>> Some updates::inc/main/interfaces/io/class_CloseableFile.php
  * @license            GNU GPL 3.0 or any newer version
  * @link               http://www.shipsimu.org
  *

diff --git a/framework/main/interfaces/io/class_FilePointer.php b/framework/main/interfaces/io/class_FilePointer.php
index 124a8b069a29bcaac10167486ab737024251b65f..29e579f1f7caaa9abafb96b299370ed70ddb6176 100644 (file)
--- a/framework/main/interfaces/io/class_FilePointer.php
+++ b/framework/main/interfaces/io/class_FilePointer.php
@@ -10,7 +10,11 @@ use Org\Mxchange\CoreFramework\Generic\FrameworkInterface;
  *
  * @author             Roland Haeder <webmaster@shipsimu.org>
  * @version            0.0.0
+<<<<<<< HEAD:framework/main/interfaces/io/class_FilePointer.php
  * @copyright  Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2017 Core Developer Team
+=======
+ * @copyright  Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2016 Core Developer Team
+>>>>>>> Some updates::inc/main/interfaces/io/class_FilePointer.php
  * @license            GNU GPL 3.0 or any newer version
  * @link               http://www.shipsimu.org
  *

diff --git a/framework/main/interfaces/io/class_Streamable.php b/framework/main/interfaces/io/class_Streamable.php
index 2dea38dc24e5dcc8f989a6e9b37767a2f2e1fbe2..79d6e7bcb2f73b7fb420221786df48c6f666860d 100644 (file)
--- a/framework/main/interfaces/io/class_Streamable.php
+++ b/framework/main/interfaces/io/class_Streamable.php
@@ -10,7 +10,11 @@ use Org\Mxchange\CoreFramework\Generic\FrameworkInterface;
  *
  * @author             Roland Haeder <webmaster@shipsimu.org>
  * @version            0.0.0
+<<<<<<< HEAD:framework/main/interfaces/io/class_Streamable.php
  * @copyright  Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2017 Core Developer Team
+=======
+ * @copyright  Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2016 Core Developer Team
+>>>>>>> Some updates::inc/main/interfaces/io/class_Streamable.php
  * @license            GNU GPL 3.0 or any newer version
  * @link               http://www.shipsimu.org
  *

diff --git a/framework/main/interfaces/io/class_StreamableInput.php b/framework/main/interfaces/io/class_StreamableInput.php
index b3806d638369eb0dfabf0329be8cd4d4e144207a..530acff55f811eb3dbefc4547fe5bfca8e04c898 100644 (file)
--- a/framework/main/interfaces/io/class_StreamableInput.php
+++ b/framework/main/interfaces/io/class_StreamableInput.php
@@ -10,7 +10,11 @@ use Org\Mxchange\CoreFramework\Stream\Streamable;
  *
  * @author             Roland Haeder <webmaster@shipsimu.org>
  * @version            0.0.0
+<<<<<<< HEAD:framework/main/interfaces/io/class_StreamableInput.php
  * @copyright  Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2017 Core Developer Team
+=======
+ * @copyright  Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2016 Core Developer Team
+>>>>>>> Some updates::inc/main/interfaces/io/class_StreamableInput.php
  * @license            GNU GPL 3.0 or any newer version
  * @link               http://www.shipsimu.org
  *

diff --git a/framework/main/interfaces/io/class_StreamableOutput.php b/framework/main/interfaces/io/class_StreamableOutput.php
index f27d344ad0bd0af379f8af1d8fd23c2e84a0bd67..a5efa3addfe98c3e956c7973670bdecc283b5ced 100644 (file)
--- a/framework/main/interfaces/io/class_StreamableOutput.php
+++ b/framework/main/interfaces/io/class_StreamableOutput.php
@@ -10,7 +10,11 @@ use Org\Mxchange\CoreFramework\Stream\Streamable;
  *
  * @author             Roland Haeder <webmaster@shipsimu.org>
  * @version            0.0.0
+<<<<<<< HEAD:framework/main/interfaces/io/class_StreamableOutput.php
  * @copyright  Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2017 Core Developer Team
+=======
+ * @copyright  Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2016 Core Developer Team
+>>>>>>> Some updates::inc/main/interfaces/io/class_StreamableOutput.php
  * @license            GNU GPL 3.0 or any newer version
  * @link               http://www.shipsimu.org
  *

diff --git a/framework/main/interfaces/io/directory/class_FrameworkDirectory.php b/framework/main/interfaces/io/directory/class_FrameworkDirectory.php
index a87ba801f150df614d9cafd7b7e202985028e976..83b2c32d88ae045c0f3b9abaa14ae410f1113eb6 100644 (file)
--- a/framework/main/interfaces/io/directory/class_FrameworkDirectory.php
+++ b/framework/main/interfaces/io/directory/class_FrameworkDirectory.php
@@ -10,7 +10,11 @@ use Org\Mxchange\CoreFramework\Generic\FrameworkInterface;
  *
  * @author             Roland Haeder <webmaster@shipsimu.org>
  * @version            0.0.0
+<<<<<<< HEAD:framework/main/interfaces/io/directory/class_FrameworkDirectory.php
  * @copyright  Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2017 Core Developer Team
+=======
+ * @copyright  Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2016 Core Developer Team
+>>>>>>> Some updates::inc/main/interfaces/io/directory/class_FrameworkDirectory.php
  * @license            GNU GPL 3.0 or any newer version
  * @link               http://www.shipsimu.org
  *

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

diff --git a/framework/main/interfaces/io/file/class_FileOutputStreamer.php b/framework/main/interfaces/io/file/class_FileOutputStreamer.php
index 8b08e882e76eb30c036d9f9481016a00edcb1d7e..9bc30c6e5ece33575a1d7caf5e59ed066c920813 100644 (file)
--- a/framework/main/interfaces/io/file/class_FileOutputStreamer.php
+++ b/framework/main/interfaces/io/file/class_FileOutputStreamer.php
@@ -13,7 +13,11 @@ use \SplFileInfo;
  *
  * @author             Roland Haeder <webmaster@shipsimu.org>
  * @version            0.0.0
+<<<<<<< HEAD:framework/main/interfaces/io/file/class_FileOutputStreamer.php
  * @copyright  Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2017 Core Developer Team
+=======
+ * @copyright  Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2016 Core Developer Team
+>>>>>>> Some updates::inc/main/interfaces/io/file/class_FileOutputStreamer.php
  * @license            GNU GPL 3.0 or any newer version
  * @link               http://www.shipsimu.org
  *

diff --git a/framework/main/interfaces/io/file/csv/class_CsvInputStreamer.php b/framework/main/interfaces/io/file/csv/class_CsvInputStreamer.php
index 8e9885a92ad9d3c9cc1bbaf52ec1e8c7ea6beaad..3de7eacd6c2548fe69dd5a3155207df0876049a1 100644 (file)
--- a/framework/main/interfaces/io/file/csv/class_CsvInputStreamer.php
+++ b/framework/main/interfaces/io/file/csv/class_CsvInputStreamer.php
@@ -10,7 +10,11 @@ use Org\Mxchange\CoreFramework\Stream\Filesystem\FileInputStreamer;
  *
  * @author             Roland Haeder <webmaster@shipsimu.org>
  * @version            0.0.0
+<<<<<<< HEAD:framework/main/interfaces/io/file/csv/class_CsvInputStreamer.php
  * @copyright  Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2017 Core Developer Team
+=======
+ * @copyright  Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2016 Core Developer Team
+>>>>>>> Some updates::inc/main/interfaces/io/file/csv/class_CsvInputStreamer.php
  * @license            GNU GPL 3.0 or any newer version
  * @link               http://www.shipsimu.org
  *

diff --git a/framework/main/interfaces/io/file/handler/class_IoHandler.php b/framework/main/interfaces/io/file/handler/class_IoHandler.php
index d726372b28b8d3f9cb2a102b1e373247626d28b0..8d095b86d2e68d692da7a16cfb2c9840b67ebfb1 100644 (file)
--- a/framework/main/interfaces/io/file/handler/class_IoHandler.php
+++ b/framework/main/interfaces/io/file/handler/class_IoHandler.php
@@ -15,7 +15,11 @@ use \SplFileInfo;
  *
  * @author             Roland Haeder <webmaster@shipsimu.org>
  * @version            0.0.0
+<<<<<<< HEAD:framework/main/interfaces/io/file/handler/class_IoHandler.php
  * @copyright  Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2017 Core Developer Team
+=======
+ * @copyright  Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2016 Core Developer Team
+>>>>>>> Some updates::inc/main/interfaces/io/file/handler/class_IoHandler.php
  * @license            GNU GPL 3.0 or any newer version
  * @link               http://www.shipsimu.org
  *

diff --git a/framework/main/interfaces/io/output/class_OutputStreamer.php b/framework/main/interfaces/io/output/class_OutputStreamer.php
index a98d185cb1ab3f6d2a8f96bda0a07b0409b0ae5b..eb968405c2ffd9c5e44469c7ddaac69ba38de1b6 100644 (file)
--- a/framework/main/interfaces/io/output/class_OutputStreamer.php
+++ b/framework/main/interfaces/io/output/class_OutputStreamer.php
@@ -10,7 +10,11 @@ use Org\Mxchange\CoreFramework\Stream\Output\StreamableOutput;
  *
  * @author             Roland Haeder <webmaster@shipsimu.org>
  * @version            0.0.0
+<<<<<<< HEAD:framework/main/interfaces/io/output/class_OutputStreamer.php
  * @copyright  Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2017 Core Developer Team
+=======
+ * @copyright  Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2016 Core Developer Team
+>>>>>>> Some updates::inc/main/interfaces/io/output/class_OutputStreamer.php
  * @license            GNU GPL 3.0 or any newer version
  * @link               http://www.shipsimu.org
  *

diff --git a/framework/main/interfaces/io/pointer/class_InputPointer.php b/framework/main/interfaces/io/pointer/class_InputPointer.php
index 334ed78cb27d71ccb4a251b4c10f3dce074cd4a7..d5d1ed45ed4ad73f9f43f254ae43f0d8d7cbd183 100644 (file)
--- a/framework/main/interfaces/io/pointer/class_InputPointer.php
+++ b/framework/main/interfaces/io/pointer/class_InputPointer.php
@@ -11,7 +11,11 @@ use Org\Mxchange\CoreFramework\Stream\Input\StreamableInput;
  *
  * @author             Roland Haeder <webmaster@shipsimu.org>
  * @version            0.0.0
+<<<<<<< HEAD:framework/main/interfaces/io/pointer/class_InputPointer.php
  * @copyright  Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2017 Core Developer Team
+=======
+ * @copyright  Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2016 Core Developer Team
+>>>>>>> Some updates::inc/main/interfaces/io/pointer/class_InputPointer.php
  * @license            GNU GPL 3.0 or any newer version
  * @link               http://www.shipsimu.org
  *

diff --git a/framework/main/interfaces/io/pointer/class_OutputPointer.php b/framework/main/interfaces/io/pointer/class_OutputPointer.php
index 403e6625b415644450b53778b35a68c69c22c91c..bda35da8455aeb859d8326381c658465d25cedbc 100644 (file)
--- a/framework/main/interfaces/io/pointer/class_OutputPointer.php
+++ b/framework/main/interfaces/io/pointer/class_OutputPointer.php
@@ -11,7 +11,11 @@ use Org\Mxchange\CoreFramework\Stream\Output\StreamableOutput;
  *
  * @author             Roland Haeder <webmaster@shipsimu.org>
  * @version            0.0.0
+<<<<<<< HEAD:framework/main/interfaces/io/pointer/class_OutputPointer.php
  * @copyright  Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2017 Core Developer Team
+=======
+ * @copyright  Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2016 Core Developer Team
+>>>>>>> Some updates::inc/main/interfaces/io/pointer/class_OutputPointer.php
  * @license            GNU GPL 3.0 or any newer version
  * @link               http://www.shipsimu.org
  *

diff --git a/framework/main/interfaces/io/pointer/io/class_InputOutputPointer.php b/framework/main/interfaces/io/pointer/io/class_InputOutputPointer.php
index 4d361616469f9caf4a8035c9767e69437d6f3a43..ea71870042eda55b73abd3852e8751d2c0804778 100644 (file)
--- a/framework/main/interfaces/io/pointer/io/class_InputOutputPointer.php
+++ b/framework/main/interfaces/io/pointer/io/class_InputOutputPointer.php
@@ -11,7 +11,11 @@ use Org\Mxchange\CoreFramework\Filesystem\Pointer\OutputPointer;
  *
  * @author             Roland Haeder <webmaster@shipsimu.org>
  * @version            0.0.0
+<<<<<<< HEAD:framework/main/interfaces/io/pointer/io/class_InputOutputPointer.php
  * @copyright  Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2017 Core Developer Team
+=======
+ * @copyright  Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2016 Core Developer Team
+>>>>>>> Some updates::inc/main/interfaces/io/pointer/io/class_InputOutputPointer.php
  * @license            GNU GPL 3.0 or any newer version
  * @link               http://www.shipsimu.org
  *

diff --git a/framework/main/interfaces/iterator/file/class_SeekableWritableFileIterator.php b/framework/main/interfaces/iterator/file/class_SeekableWritableFileIterator.php
index d134ff3678255d6bf00fb2cd8151842517b50ad1..ad24331ee319f4e19b2a1b28a40f8bf33ad68e69 100644 (file)
--- a/framework/main/interfaces/iterator/file/class_SeekableWritableFileIterator.php
+++ b/framework/main/interfaces/iterator/file/class_SeekableWritableFileIterator.php
@@ -11,7 +11,11 @@ use \SeekableIterator;
  *
  * @author             Roland Haeder <webmaster@ship-simu.org>
  * @version            0.0.0
+<<<<<<< HEAD:framework/main/interfaces/iterator/file/class_SeekableWritableFileIterator.php
  * @copyright  Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2017 Core Developer Team
+=======
+ * @copyright  Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2016 Core Developer Team
+>>>>>>> Some updates::inc/main/interfaces/iterator/class_SeekableWritableFileIterator.php
  * @license            GNU GPL 3.0 or any newer version
  * @link               http://www.ship-simu.org
  *

diff --git a/framework/main/interfaces/language/class_ManageableLanguage.php b/framework/main/interfaces/language/class_ManageableLanguage.php
index faf9fa2516755e5abd81bf8af08abb696c148c47..8b097d3301da7469e53fde4fa864ba21a0b4178e 100644 (file)
--- a/framework/main/interfaces/language/class_ManageableLanguage.php
+++ b/framework/main/interfaces/language/class_ManageableLanguage.php
@@ -10,7 +10,11 @@ use Org\Mxchange\CoreFramework\Generic\FrameworkInterface;
  *
  * @author             Roland Haeder <webmaster@shipsimu.org>
  * @version            0.0.0
+<<<<<<< HEAD:framework/main/interfaces/language/class_ManageableLanguage.php
  * @copyright  Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2017 Core Developer Team
+=======
+ * @copyright  Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2016 Core Developer Team
+>>>>>>> Some updates::inc/main/interfaces/language/class_ManageableLanguage.php
  * @license            GNU GPL 3.0 or any newer version
  * @link               http://www.shipsimu.org
  *

diff --git a/framework/main/interfaces/lists/class_Listable.php b/framework/main/interfaces/lists/class_Listable.php
index 16f1bd7afc4abeab14bde3c7104898b47d2dfb59..1df8c4de0e9cd2bea031c5619e95ac34eaa8ec14 100644 (file)
--- a/framework/main/interfaces/lists/class_Listable.php
+++ b/framework/main/interfaces/lists/class_Listable.php
@@ -14,7 +14,11 @@ use \IteratorAggregate;
  *
  * @author             Roland Haeder <webmaster@shipsimu.org>
  * @version            0.0.0
+<<<<<<< HEAD:framework/main/interfaces/lists/class_Listable.php
  * @copyright  Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2017 Core Developer Team
+=======
+ * @copyright  Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2016 Core Developer Team
+>>>>>>> Some updates::inc/main/interfaces/lists/class_Listable.php
  * @license            GNU GPL 3.0 or any newer version
  * @link               http://www.shipsimu.org
  *

diff --git a/framework/main/interfaces/login/class_LoginableUser.php b/framework/main/interfaces/login/class_LoginableUser.php
index eb1edccdd7f44128fda222b8676784015b352151..c71df7f5eb1ce030ac7f4c17f08385024196fa17 100644 (file)
--- a/framework/main/interfaces/login/class_LoginableUser.php
+++ b/framework/main/interfaces/login/class_LoginableUser.php
@@ -12,7 +12,11 @@ use Org\Mxchange\CoreFramework\Response\Responseable;
  *
  * @author             Roland Haeder <webmaster@shipsimu.org>
  * @version            0.0.0
+<<<<<<< HEAD:framework/main/interfaces/login/class_LoginableUser.php
  * @copyright  Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2017 Core Developer Team
+=======
+ * @copyright  Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2016 Core Developer Team
+>>>>>>> Some updates::inc/main/interfaces/login/class_LoginableUser.php
  * @license            GNU GPL 3.0 or any newer version
  * @link               http://www.shipsimu.org
  *

diff --git a/framework/main/interfaces/mailer/class_DeliverableMail.php b/framework/main/interfaces/mailer/class_DeliverableMail.php
index b0727de221b7a995ee32a7ac7560b655fda34b85..fe4068188b798431554bbf24b54601fb71a497d4 100644 (file)
--- a/framework/main/interfaces/mailer/class_DeliverableMail.php
+++ b/framework/main/interfaces/mailer/class_DeliverableMail.php
@@ -11,7 +11,11 @@ use Org\Mxchange\CoreFramework\Manager\Login\ManageableMember;
  *
  * @author             Roland Haeder <webmaster@shipsimu.org>
  * @version            0.0.0
+<<<<<<< HEAD:framework/main/interfaces/mailer/class_DeliverableMail.php
  * @copyright  Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2017 Core Developer Team
+=======
+ * @copyright  Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2016 Core Developer Team
+>>>>>>> Some updates::inc/main/interfaces/mailer/class_DeliverableMail.php
  * @license            GNU GPL 3.0 or any newer version
  * @link               http://www.shipsimu.org
  *

diff --git a/framework/main/interfaces/parser/class_Parseable.php b/framework/main/interfaces/parser/class_Parseable.php
index 3f9636ef911129c1e0f7778bea983e755e53df14..305ffab230d39651d8868301d878f16b08afc5b9 100644 (file)
--- a/framework/main/interfaces/parser/class_Parseable.php
+++ b/framework/main/interfaces/parser/class_Parseable.php
@@ -10,7 +10,11 @@ use Org\Mxchange\CoreFramework\Generic\FrameworkInterface;
  *
  * @author             Roland Haeder <webmaster@shipsimu.org>
  * @version            0.0.0
+<<<<<<< HEAD:framework/main/interfaces/parser/class_Parseable.php
  * @copyright  Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2017 Core Developer Team
+=======
+ * @copyright  Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2016 Core Developer Team
+>>>>>>> Some updates::inc/main/interfaces/parser/class_Parseable.php
  * @license            GNU GPL 3.0 or any newer version
  * @link               http://www.shipsimu.org
  *

diff --git a/framework/main/interfaces/points/class_BookablePoints.php b/framework/main/interfaces/points/class_BookablePoints.php
index 0ede25567c71ff3e7fc97a701ad3e529c9607ee3..bfe36a01e89302c8233e984149f1e243a17d56fd 100644 (file)
--- a/framework/main/interfaces/points/class_BookablePoints.php
+++ b/framework/main/interfaces/points/class_BookablePoints.php
@@ -10,7 +10,11 @@ use Org\Mxchange\CoreFramework\Criteria\Add\AddableCriteria;
  *
  * @author             Roland Haeder <webmaster@shipsimu.org>
  * @version            0.0.0
+<<<<<<< HEAD:framework/main/interfaces/points/class_BookablePoints.php
  * @copyright  Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2017 Core Developer Team
+=======
+ * @copyright  Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2016 Core Developer Team
+>>>>>>> Some updates::inc/main/interfaces/points/class_BookablePoints.php
  * @license            GNU GPL 3.0 or any newer version
  * @link               http://www.shipsimu.org
  *

diff --git a/framework/main/interfaces/reader/class_ReadableNews.php b/framework/main/interfaces/reader/class_ReadableNews.php
index c206cff871af68808929739253fa4f018472caf0..ce1d16e07b9c129a0993ec38aa18dbe64f9cdf3c 100644 (file)
--- a/framework/main/interfaces/reader/class_ReadableNews.php
+++ b/framework/main/interfaces/reader/class_ReadableNews.php
@@ -10,7 +10,11 @@ use Org\Mxchange\CoreFramework\Generic\FrameworkInterface;
  *
  * @author             Roland Haeder <webmaster@shipsimu.org>
  * @version            0.0.0
+<<<<<<< HEAD:framework/main/interfaces/reader/class_ReadableNews.php
  * @copyright  Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2017 Core Developer Team
+=======
+ * @copyright  Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2016 Core Developer Team
+>>>>>>> Some updates::inc/main/interfaces/reader/class_ReadableNews.php
  * @license            GNU GPL 3.0 or any newer version
  * @link               http://www.shipsimu.org
  *

diff --git a/framework/main/interfaces/registration/class_UserRegister.php b/framework/main/interfaces/registration/class_UserRegister.php
index 9503525e7c357aaa9931db6a005ad9fea7d6aa05..eda82f6e1b1cad36e256cf4f6727366271b19a8c 100644 (file)
--- a/framework/main/interfaces/registration/class_UserRegister.php
+++ b/framework/main/interfaces/registration/class_UserRegister.php
@@ -10,7 +10,11 @@ use Org\Mxchange\CoreFramework\Criteria\Add\AddableCriteria;
  *
  * @author             Roland Haeder <webmaster@shipsimu.org>
  * @version            0.0.0
+<<<<<<< HEAD:framework/main/interfaces/registration/class_UserRegister.php
  * @copyright  Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2017 Core Developer Team
+=======
+ * @copyright  Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2016 Core Developer Team
+>>>>>>> Some updates::inc/main/interfaces/registration/class_UserRegister.php
  * @license            GNU GPL 3.0 or any newer version
  * @link               http://www.shipsimu.org
  *

diff --git a/framework/main/interfaces/registry/class_Register.php b/framework/main/interfaces/registry/class_Register.php
index 177be13947b24bfb9df002237df4af61a681f90c..4be9dfda7f13990574d6a278c7ca5d84a37a8d1c 100644 (file)
--- a/framework/main/interfaces/registry/class_Register.php
+++ b/framework/main/interfaces/registry/class_Register.php
@@ -10,7 +10,11 @@ use Org\Mxchange\CoreFramework\Generic\FrameworkInterface;
  *
  * @author             Roland Haeder <webmaster@shipsimu.org>
  * @version            0.0.0
+<<<<<<< HEAD:framework/main/interfaces/registry/class_Register.php
  * @copyright  Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2017 Core Developer Team
+=======
+ * @copyright  Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2016 Core Developer Team
+>>>>>>> Some updates::inc/main/interfaces/registry/class_Register.php
  * @license            GNU GPL 3.0 or any newer version
  * @link               http://www.shipsimu.org
  *

diff --git a/framework/main/interfaces/registry/class_Registerable.php b/framework/main/interfaces/registry/class_Registerable.php
index 8106d413a15de116165c9193cb8b64f0be9fd299..ef42c5aa0dbdd58c9b2c6a71bd271cb6cd262cce 100644 (file)
--- a/framework/main/interfaces/registry/class_Registerable.php
+++ b/framework/main/interfaces/registry/class_Registerable.php
@@ -10,7 +10,11 @@ use Org\Mxchange\CoreFramework\Generic\FrameworkInterface;
  *
  * @author             Roland Haeder <webmaster@shipsimu.org>
  * @version            0.0.0
+<<<<<<< HEAD:framework/main/interfaces/registry/class_Registerable.php
  * @copyright  Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2017 Core Developer Team
+=======
+ * @copyright  Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2016 Core Developer Team
+>>>>>>> Some updates::inc/main/interfaces/registry/class_Registerable.php
  * @license            GNU GPL 3.0 or any newer version
  * @link               http://www.shipsimu.org
  *

diff --git a/framework/main/interfaces/request/class_Requestable.php b/framework/main/interfaces/request/class_Requestable.php
index 1f33bcc364539143c1bb8219b54ce14e150725af..755a361097c4c247c3e7a50a787281d4e3ce2159 100644 (file)
--- a/framework/main/interfaces/request/class_Requestable.php
+++ b/framework/main/interfaces/request/class_Requestable.php
@@ -10,7 +10,11 @@ use Org\Mxchange\CoreFramework\Generic\FrameworkInterface;
  *
  * @author             Roland Haeder <webmaster@shipsimu.org>
  * @version            0.0.0
+<<<<<<< HEAD:framework/main/interfaces/request/class_Requestable.php
  * @copyright  Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2017 Core Developer Team
+=======
+ * @copyright  Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2016 Core Developer Team
+>>>>>>> Some updates::inc/main/interfaces/request/class_Requestable.php
  * @license            GNU GPL 3.0 or any newer version
  * @link               http://www.shipsimu.org
  *

diff --git a/framework/main/interfaces/resolver/actions/class_ActionResolver.php b/framework/main/interfaces/resolver/actions/class_ActionResolver.php
index 80f06b9cdfbd9802369de90c6986027f3acc87c3..3af3fe2273df66ae0160fc5fba5b9e53db078da2 100644 (file)
--- a/framework/main/interfaces/resolver/actions/class_ActionResolver.php
+++ b/framework/main/interfaces/resolver/actions/class_ActionResolver.php
@@ -11,7 +11,11 @@ use Org\Mxchange\CoreFramework\Resolver\Resolver;
  *
  * @author             Roland Haeder <webmaster@shipsimu.org>
  * @version            0.0.0
+<<<<<<< HEAD:framework/main/interfaces/resolver/actions/class_ActionResolver.php
  * @copyright  Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2017 Core Developer Team
+=======
+ * @copyright  Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2016 Core Developer Team
+>>>>>>> Some updates::inc/main/interfaces/resolver/actions/class_ActionResolver.php
  * @license            GNU GPL 3.0 or any newer version
  * @link               http://www.shipsimu.org
  *

diff --git a/framework/main/interfaces/resolver/class_Resolver.php b/framework/main/interfaces/resolver/class_Resolver.php
index 711fdc79bcc6180ef5cde6b1551b5250dd8e5385..2e8135cf72df414df1d697acd235f1ae4f1b8741 100644 (file)
--- a/framework/main/interfaces/resolver/class_Resolver.php
+++ b/framework/main/interfaces/resolver/class_Resolver.php
@@ -10,7 +10,11 @@ use Org\Mxchange\CoreFramework\Generic\FrameworkInterface;
  *
  * @author             Roland Haeder <webmaster@shipsimu.org>
  * @version            0.0.0
+<<<<<<< HEAD:framework/main/interfaces/resolver/class_Resolver.php
  * @copyright  Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2017 Core Developer Team
+=======
+ * @copyright  Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2016 Core Developer Team
+>>>>>>> Some updates::inc/main/interfaces/resolver/class_Resolver.php
  * @license            GNU GPL 3.0 or any newer version
  * @link               http://www.shipsimu.org
  *

diff --git a/framework/main/interfaces/resolver/commands/class_CommandResolver.php b/framework/main/interfaces/resolver/commands/class_CommandResolver.php
index 87f56a60a93260665b5d4b5d9a33c101af5a7de1..967b50228ba172719d64ed34c81cead40c3f0de4 100644 (file)
--- a/framework/main/interfaces/resolver/commands/class_CommandResolver.php
+++ b/framework/main/interfaces/resolver/commands/class_CommandResolver.php
@@ -11,7 +11,11 @@ use Org\Mxchange\CoreFramework\Resolver\Resolver;
  *
  * @author             Roland Haeder <webmaster@shipsimu.org>
  * @version            0.0.0
+<<<<<<< HEAD:framework/main/interfaces/resolver/commands/class_CommandResolver.php
  * @copyright  Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2017 Core Developer Team
+=======
+ * @copyright  Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2016 Core Developer Team
+>>>>>>> Some updates::inc/main/interfaces/resolver/commands/class_CommandResolver.php
  * @license            GNU GPL 3.0 or any newer version
  * @link               http://www.shipsimu.org
  *

diff --git a/framework/main/interfaces/resolver/controller/class_ControllerResolver.php b/framework/main/interfaces/resolver/controller/class_ControllerResolver.php
index daac133cb69518314e15994142141f42bbafbb45..99777c04cd81dd98ae9e32fcecc87e460d7a8551 100644 (file)
--- a/framework/main/interfaces/resolver/controller/class_ControllerResolver.php
+++ b/framework/main/interfaces/resolver/controller/class_ControllerResolver.php
@@ -11,7 +11,11 @@ use Org\Mxchange\CoreFramework\Resolver\Resolver;
  *
  * @author             Roland Haeder <webmaster@shipsimu.org>
  * @version            0.0.0
+<<<<<<< HEAD:framework/main/interfaces/resolver/controller/class_ControllerResolver.php
  * @copyright  Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2017 Core Developer Team
+=======
+ * @copyright  Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2016 Core Developer Team
+>>>>>>> Some updates::inc/main/interfaces/resolver/controller/class_ControllerResolver.php
  * @license            GNU GPL 3.0 or any newer version
  * @link               http://www.shipsimu.org
  *

diff --git a/framework/main/interfaces/response/class_Responseable.php b/framework/main/interfaces/response/class_Responseable.php
index a7708eb837b358e0fee91b13cae7c56fa963f3b3..341bf8e8477c8d35e86f73c60a82b960a6fdffb0 100644 (file)
--- a/framework/main/interfaces/response/class_Responseable.php
+++ b/framework/main/interfaces/response/class_Responseable.php
@@ -10,7 +10,11 @@ use Org\Mxchange\CoreFramework\Generic\FrameworkInterface;
  *
  * @author             Roland Haeder <webmaster@shipsimu.org>
  * @version            0.0.0
+<<<<<<< HEAD:framework/main/interfaces/response/class_Responseable.php
  * @copyright  Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2017 Core Developer Team
+=======
+ * @copyright  Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2016 Core Developer Team
+>>>>>>> Some updates::inc/main/interfaces/response/class_Responseable.php
  * @license            GNU GPL 3.0 or any newer version
  * @link               http://www.shipsimu.org
  *

diff --git a/framework/main/interfaces/result/class_SearchableResult.php b/framework/main/interfaces/result/class_SearchableResult.php
index 2daead2c2f53065d3b50323262bc915e9ba64615..186d3d1b25bb1a780eeeb594cb0921db6c24053a 100644 (file)
--- a/framework/main/interfaces/result/class_SearchableResult.php
+++ b/framework/main/interfaces/result/class_SearchableResult.php
@@ -12,7 +12,11 @@ use Org\Mxchange\CoreFramework\Generic\FrameworkInterface;
  *
  * @author             Roland Haeder <webmaster@shipsimu.org>
  * @version            0.0.0
+<<<<<<< HEAD:framework/main/interfaces/result/class_SearchableResult.php
  * @copyright  Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2017 Core Developer Team
+=======
+ * @copyright  Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2016 Core Developer Team
+>>>>>>> Some updates::inc/main/interfaces/result/class_SearchableResult.php
  * @license            GNU GPL 3.0 or any newer version
  * @link               http://www.shipsimu.org
  *

diff --git a/framework/main/interfaces/result/class_UpdateableResult.php b/framework/main/interfaces/result/class_UpdateableResult.php
index 66968da15658e5cdc0072dc52796d24c95d5b443..21c5970b114b48201c7d8c805ec9f0c885270b0a 100644 (file)
--- a/framework/main/interfaces/result/class_UpdateableResult.php
+++ b/framework/main/interfaces/result/class_UpdateableResult.php
@@ -11,7 +11,11 @@ use Org\Mxchange\CoreFramework\Criteria\Local\LocalUpdateCriteria;
  *
  * @author             Roland Haeder <webmaster@shipsimu.org>
  * @version            0.0.0
+<<<<<<< HEAD:framework/main/interfaces/result/class_UpdateableResult.php
  * @copyright  Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2017 Core Developer Team
+=======
+ * @copyright  Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2016 Core Developer Team
+>>>>>>> Some updates::inc/main/interfaces/result/class_UpdateableResult.php
  * @license            GNU GPL 3.0 or any newer version
  * @link               http://www.shipsimu.org
  *

diff --git a/framework/main/interfaces/stacker/class_Stackable.php b/framework/main/interfaces/stacker/class_Stackable.php
index b1e783979c2179e3d0199debaa57a3682b76d7da..8cdb6e7dfaf1b46457c236c711cf06cfc7fef487 100644 (file)
--- a/framework/main/interfaces/stacker/class_Stackable.php
+++ b/framework/main/interfaces/stacker/class_Stackable.php
@@ -10,7 +10,11 @@ use Org\Mxchange\CoreFramework\Generic\FrameworkInterface;
  *
  * @author             Roland Haeder <webmaster@shipsimu.org>
  * @version            0.0.0
+<<<<<<< HEAD:framework/main/interfaces/stacker/class_Stackable.php
  * @copyright  Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2017 Core Developer Team
+=======
+ * @copyright  Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2016 Core Developer Team
+>>>>>>> Some updates::inc/main/interfaces/stacker/class_Stackable.php
  * @license            GNU GPL 3.0 or any newer version
  * @link               http://www.shipsimu.org
  *

diff --git a/framework/main/interfaces/stacker/file/class_StackableFile.php b/framework/main/interfaces/stacker/file/class_StackableFile.php
index c3f9ebc941527b226f60c60c61a2d9b6cbac1ff0..b4526e2193a12d0dd37a46036eebb93527deee2b 100644 (file)
--- a/framework/main/interfaces/stacker/file/class_StackableFile.php
+++ b/framework/main/interfaces/stacker/file/class_StackableFile.php
@@ -10,7 +10,11 @@ use Org\Mxchange\CoreFramework\Stacker\Stackable;
  *
  * @author             Roland Haeder <webmaster@shipsimu.org>
  * @version            0.0.0
+<<<<<<< HEAD:framework/main/interfaces/stacker/file/class_StackableFile.php
  * @copyright  Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2017 Core Developer Team
+=======
+ * @copyright  Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2016 Core Developer Team
+>>>>>>> Some updates::inc/main/interfaces/stacker/file/class_StackableFile.php
  * @license            GNU GPL 3.0 or any newer version
  * @link               http://www.shipsimu.org
  *

diff --git a/framework/main/interfaces/state/class_Stateable.php b/framework/main/interfaces/state/class_Stateable.php
index b3954b9f935c4c48906b0b93f9eaa6ad0b4a33d9..16ab5ae03c3114e549968893651fbfcf5b24d152 100644 (file)
--- a/framework/main/interfaces/state/class_Stateable.php
+++ b/framework/main/interfaces/state/class_Stateable.php
@@ -10,7 +10,11 @@ use Org\Mxchange\CoreFramework\Generic\FrameworkInterface;
  *
  * @author             Roland Haeder <webmaster@shipsimu.org>
  * @version            0.0.0
+<<<<<<< HEAD:framework/main/interfaces/state/class_Stateable.php
  * @copyright  Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2017 Core Developer Team
+=======
+ * @copyright  Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2016 Core Developer Team
+>>>>>>> Some updates::inc/main/interfaces/state/class_Stateable.php
  * @license            GNU GPL 3.0 or any newer version
  * @link               http://www.shipsimu.org
  *

diff --git a/framework/main/interfaces/streams/class_Stream.php b/framework/main/interfaces/streams/class_Stream.php
index 212c2ebaf21288de4b0272c1a606ecdc35e25c66..966eb361a7adf40b5d9ade458911dc41414b02a7 100644 (file)
--- a/framework/main/interfaces/streams/class_Stream.php
+++ b/framework/main/interfaces/streams/class_Stream.php
@@ -10,7 +10,11 @@ use Org\Mxchange\CoreFramework\Generic\FrameworkInterface;
  *
  * @author             Roland Haeder <webmaster@shipsimu.org>
  * @version            0.0.0
+<<<<<<< HEAD:framework/main/interfaces/streams/class_Stream.php
  * @copyright  Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2017 Core Developer Team
+=======
+ * @copyright  Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2016 Core Developer Team
+>>>>>>> Some updates::inc/main/interfaces/streams/class_Stream.php
  * @license            GNU GPL 3.0 or any newer version
  * @link               http://www.shipsimu.org
  *

diff --git a/framework/main/interfaces/streams/crypto/class_EncryptableStream.php b/framework/main/interfaces/streams/crypto/class_EncryptableStream.php
index 7f20dc669e4f3b9f0079bb0bd9aa82ab0993c118..9f95492e414722fbbeb7bb6b53254a2d15fd6eeb 100644 (file)
--- a/framework/main/interfaces/streams/crypto/class_EncryptableStream.php
+++ b/framework/main/interfaces/streams/crypto/class_EncryptableStream.php
@@ -10,7 +10,11 @@ use Org\Mxchange\CoreFramework\Stream\Stream;
  *
  * @author             Roland Haeder <webmaster@shipsimu.org>
  * @version            0.0.0
+<<<<<<< HEAD:framework/main/interfaces/streams/crypto/class_EncryptableStream.php
  * @copyright  Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2017 Core Developer Team
+=======
+ * @copyright  Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2016 Core Developer Team
+>>>>>>> Some updates::inc/main/interfaces/streams/crypto/class_EncryptableStream.php
  * @license            GNU GPL 3.0 or any newer version
  * @link               http://www.shipsimu.org
  *

diff --git a/framework/main/interfaces/streams/input/class_InputStream.php b/framework/main/interfaces/streams/input/class_InputStream.php
index 7f3632d91dc4076cc96976577dd88db5961ec80e..f9677fa22ced320ee567207e4c3fd9c134a0d504 100644 (file)
--- a/framework/main/interfaces/streams/input/class_InputStream.php
+++ b/framework/main/interfaces/streams/input/class_InputStream.php
@@ -10,7 +10,11 @@ use Org\Mxchange\CoreFramework\Stream\Stream;
  *
  * @author             Roland Haeder <webmaster@shipsimu.org>
  * @version            0.0.0
+<<<<<<< HEAD:framework/main/interfaces/streams/input/class_InputStream.php
  * @copyright  Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2017 Core Developer Team
+=======
+ * @copyright  Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2016 Core Developer Team
+>>>>>>> Some updates::inc/main/interfaces/streams/input/class_InputStream.php
  * @license            GNU GPL 3.0 or any newer version
  * @link               http://www.shipsimu.org
  *

diff --git a/framework/main/interfaces/streams/output/class_OutputStream.php b/framework/main/interfaces/streams/output/class_OutputStream.php
index 1cb286f710626d0bd10158d6e2f4f60b945c7acc..dd841f45ce1f64c6301c3c36cc98ad0aa6fdeda5 100644 (file)
--- a/framework/main/interfaces/streams/output/class_OutputStream.php
+++ b/framework/main/interfaces/streams/output/class_OutputStream.php
@@ -10,7 +10,11 @@ use Org\Mxchange\CoreFramework\Stream\Stream;
  *
  * @author             Roland Haeder <webmaster@shipsimu.org>
  * @version            0.0.0
+<<<<<<< HEAD:framework/main/interfaces/streams/output/class_OutputStream.php
  * @copyright  Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2017 Core Developer Team
+=======
+ * @copyright  Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2016 Core Developer Team
+>>>>>>> Some updates::inc/main/interfaces/streams/output/class_OutputStream.php
  * @license            GNU GPL 3.0 or any newer version
  * @link               http://www.shipsimu.org
  *

diff --git a/framework/main/interfaces/tasks/class_Taskable.php b/framework/main/interfaces/tasks/class_Taskable.php
index 9bed5ecaa1ebbc26c65ef64c56c9166224bde9db..4c57b583c03b665b904d0398805f5bbc8f32d58a 100644 (file)
--- a/framework/main/interfaces/tasks/class_Taskable.php
+++ b/framework/main/interfaces/tasks/class_Taskable.php
@@ -11,7 +11,11 @@ use Org\Mxchange\CoreFramework\Visitor\Visitor;
  *
  * @author             Roland Haeder <webmaster@shipsimu.org>
  * @version            0.0.0
+<<<<<<< HEAD:framework/main/interfaces/tasks/class_Taskable.php
  * @copyright  Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2017 Core Developer Team
+=======
+ * @copyright  Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2016 Core Developer Team
+>>>>>>> Some updates::inc/main/interfaces/tasks/class_Taskable.php
  * @license            GNU GPL 3.0 or any newer version
  * @link               http://www.shipsimu.org
  *

diff --git a/framework/main/interfaces/template/class_CompileableTemplate.php b/framework/main/interfaces/template/class_CompileableTemplate.php
index 480a25af022a985fbcdfed0e7d65d78af7aabfd1..761e5619a3b9af3082668e78990d598fba498dc5 100644 (file)
--- a/framework/main/interfaces/template/class_CompileableTemplate.php
+++ b/framework/main/interfaces/template/class_CompileableTemplate.php
@@ -12,7 +12,11 @@ use Org\Mxchange\CoreFramework\Response\Responseable;
  *
  * @author             Roland Haeder <webmaster@shipsimu.org>
  * @version            0.0.0
+<<<<<<< HEAD:framework/main/interfaces/template/class_CompileableTemplate.php
  * @copyright  Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2017 Core Developer Team
+=======
+ * @copyright  Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2016 Core Developer Team
+>>>>>>> Some updates::inc/main/interfaces/template/class_CompileableTemplate.php
  * @license            GNU GPL 3.0 or any newer version
  * @link               http://www.shipsimu.org
  *

diff --git a/framework/main/interfaces/template/view/class_ViewHelper.php b/framework/main/interfaces/template/view/class_ViewHelper.php
index c9b43ab4186c8d0ebadba6d13eb70dab4dc9663c..5123be459a244391328d257c32e1882d7212ba83 100644 (file)
--- a/framework/main/interfaces/template/view/class_ViewHelper.php
+++ b/framework/main/interfaces/template/view/class_ViewHelper.php
@@ -10,7 +10,11 @@ use Org\Mxchange\CoreFramework\Generic\FrameworkInterface;
  *
  * @author             Roland Haeder <webmaster@shipsimu.org>
  * @version            0.0.0
+<<<<<<< HEAD:framework/main/interfaces/template/view/class_ViewHelper.php
  * @copyright  Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2017 Core Developer Team
+=======
+ * @copyright  Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2016 Core Developer Team
+>>>>>>> Some updates::inc/main/interfaces/template/view/class_ViewHelper.php
  * @license            GNU GPL 3.0 or any newer version
  * @link               http://www.shipsimu.org
  *

diff --git a/framework/main/interfaces/user/class_ManageableAccount.php b/framework/main/interfaces/user/class_ManageableAccount.php
index fd61d1adc2573e7bc9b7af92aca350743a4cd17c..d84ec446f07a107e962075456f65ce551a16bada 100644 (file)
--- a/framework/main/interfaces/user/class_ManageableAccount.php
+++ b/framework/main/interfaces/user/class_ManageableAccount.php
@@ -11,7 +11,11 @@ use Org\Mxchange\CoreFramework\Request\Requestable;
  *
  * @author             Roland Haeder <webmaster@shipsimu.org>
  * @version            0.0.0
+<<<<<<< HEAD:framework/main/interfaces/user/class_ManageableAccount.php
  * @copyright  Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2017 Core Developer Team
+=======
+ * @copyright  Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2016 Core Developer Team
+>>>>>>> Some updates::inc/main/interfaces/user/class_ManageableAccount.php
  * @license            GNU GPL 3.0 or any newer version
  * @link               http://www.shipsimu.org
  *

diff --git a/framework/main/interfaces/user/extended/class_ManageableGuest.php b/framework/main/interfaces/user/extended/class_ManageableGuest.php
index 8de61d8242478fd7c30aa4c145ea67a37014ac69..368210916bb8846ef9e55f8b6a1e6bee3a24e760 100644 (file)
--- a/framework/main/interfaces/user/extended/class_ManageableGuest.php
+++ b/framework/main/interfaces/user/extended/class_ManageableGuest.php
@@ -10,7 +10,11 @@ use Org\Mxchange\CoreFramework\User\ManageableAccount;
  *
  * @author             Roland Haeder <webmaster@shipsimu.org>
  * @version            0.0.0
+<<<<<<< HEAD:framework/main/interfaces/user/extended/class_ManageableGuest.php
  * @copyright  Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2017 Core Developer Team
+=======
+ * @copyright  Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2016 Core Developer Team
+>>>>>>> Some updates::inc/main/interfaces/user/extended/class_ManageableGuest.php
  * @license            GNU GPL 3.0 or any newer version
  * @link               http://www.shipsimu.org
  *

diff --git a/framework/main/interfaces/user/extended/class_ManageableMember.php b/framework/main/interfaces/user/extended/class_ManageableMember.php
index c7e247a80c7f316245c9564250251f2cb5d465f2..1eac1454973b56969a700b1bc5d217293aedf090 100644 (file)
--- a/framework/main/interfaces/user/extended/class_ManageableMember.php
+++ b/framework/main/interfaces/user/extended/class_ManageableMember.php
@@ -10,7 +10,11 @@ use Org\Mxchange\CoreFramework\User\ManageableAccount;
  *
  * @author             Roland Haeder <webmaster@shipsimu.org>
  * @version            0.0.0
+<<<<<<< HEAD:framework/main/interfaces/user/extended/class_ManageableMember.php
  * @copyright  Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2017 Core Developer Team
+=======
+ * @copyright  Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2016 Core Developer Team
+>>>>>>> Some updates::inc/main/interfaces/user/extended/class_ManageableMember.php
  * @license            GNU GPL 3.0 or any newer version
  * @link               http://www.shipsimu.org
  *

diff --git a/framework/main/interfaces/visitor/class_Visitable.php b/framework/main/interfaces/visitor/class_Visitable.php
index 5af535613e5bbe0b5e77b5d29b4fc5762575e71c..c90e118adc240612d26ec1afca074c4109e50909 100644 (file)
--- a/framework/main/interfaces/visitor/class_Visitable.php
+++ b/framework/main/interfaces/visitor/class_Visitable.php
@@ -11,7 +11,11 @@ use Org\Mxchange\CoreFramework\Visitor\Visitor;
  *
  * @author             Roland Haeder <webmaster@shipsimu.org>
  * @version            0.0.0
+<<<<<<< HEAD:framework/main/interfaces/visitor/class_Visitable.php
  * @copyright  Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2017 Core Developer Team
+=======
+ * @copyright  Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2016 Core Developer Team
+>>>>>>> Some updates::inc/main/interfaces/visitor/class_Visitable.php
  * @license            GNU GPL 3.0 or any newer version
  * @link               http://www.shipsimu.org
  *

diff --git a/framework/main/interfaces/visitor/class_Visitor.php b/framework/main/interfaces/visitor/class_Visitor.php
index c968f9fa00e262e4a5f4eabe68364c513f32d39c..13b72c996a1844f389fa853ef709fa2365a55689 100644 (file)
--- a/framework/main/interfaces/visitor/class_Visitor.php
+++ b/framework/main/interfaces/visitor/class_Visitor.php
@@ -10,7 +10,11 @@ use Org\Mxchange\CoreFramework\Generic\FrameworkInterface;
  *
  * @author             Roland Haeder <webmaster@shipsimu.org>
  * @version            0.0.0
+<<<<<<< HEAD:framework/main/interfaces/visitor/class_Visitor.php
  * @copyright  Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2017 Core Developer Team
+=======
+ * @copyright  Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2016 Core Developer Team
+>>>>>>> Some updates::inc/main/interfaces/visitor/class_Visitor.php
  * @license            GNU GPL 3.0 or any newer version
  * @link               http://www.shipsimu.org
  *

diff --git a/framework/main/interfaces/visitor/decorator/class_DecoratorVisitor.php b/framework/main/interfaces/visitor/decorator/class_DecoratorVisitor.php
index 3d9617e9091729f5e058fe4c381869039983cc91..9c79170eb4a7955a5a9c5eb29376ccd1b87d74f3 100644 (file)
--- a/framework/main/interfaces/visitor/decorator/class_DecoratorVisitor.php
+++ b/framework/main/interfaces/visitor/decorator/class_DecoratorVisitor.php
@@ -11,7 +11,11 @@ use Org\Mxchange\CoreFramework\Visitor\Visitor;
  *
  * @author             Roland Haeder <webmaster@shipsimu.org>
  * @version            0.0.0
+<<<<<<< HEAD:framework/main/interfaces/visitor/decorator/class_DecoratorVisitor.php
  * @copyright  Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2017 Core Developer Team
+=======
+ * @copyright  Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2016 Core Developer Team
+>>>>>>> Some updates::inc/main/interfaces/visitor/decorator/class_DecoratorVisitor.php
  * @license            GNU GPL 3.0 or any newer version
  * @link               http://www.shipsimu.org
  *

diff --git a/framework/main/interfaces/visitor/tasks/class_TaskVisitor.php b/framework/main/interfaces/visitor/tasks/class_TaskVisitor.php
index 5a6708e2c15d6dfcd88d387018ab7f24ca8d3831..e595f64603222cb891b1f5b07a09007bf49cf9a1 100644 (file)
--- a/framework/main/interfaces/visitor/tasks/class_TaskVisitor.php
+++ b/framework/main/interfaces/visitor/tasks/class_TaskVisitor.php
@@ -11,7 +11,11 @@ use Org\Mxchange\CoreFramework\Visitor\Visitor;
  *
  * @author             Roland Haeder <webmaster@shipsimu.org>
  * @version            0.0.0
+<<<<<<< HEAD:framework/main/interfaces/visitor/tasks/class_TaskVisitor.php
  * @copyright  Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2017 Core Developer Team
+=======
+ * @copyright  Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2016 Core Developer Team
+>>>>>>> Some updates::inc/main/interfaces/visitor/tasks/class_TaskVisitor.php
  * @license            GNU GPL 3.0 or any newer version
  * @link               http://www.shipsimu.org
  *

diff --git a/framework/main/middleware/class_BaseMiddleware.php b/framework/main/middleware/class_BaseMiddleware.php
index 589b887627a1aa97fdcc5ecb46a8d4f30c7150b4..2009af0f29aaf4941b3d6b47efe80228449e6f93 100644 (file)
--- a/framework/main/middleware/class_BaseMiddleware.php
+++ b/framework/main/middleware/class_BaseMiddleware.php
@@ -10,7 +10,11 @@ use Org\Mxchange\CoreFramework\Object\BaseFrameworkSystem;
  *
  * @author             Roland Haeder <webmaster@shipsimu.org>
  * @version            0.0.0
+<<<<<<< HEAD:framework/main/middleware/class_BaseMiddleware.php
  * @copyright  Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2017 Core Developer Team
+=======
+ * @copyright  Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2016 Core Developer Team
+>>>>>>> Some updates::inc/main/middleware/class_BaseMiddleware.php
  * @license            GNU GPL 3.0 or any newer version
  * @link               http://www.shipsimu.org
  * 

diff --git a/framework/main/middleware/compressor/class_CompressorChannel.php b/framework/main/middleware/compressor/class_CompressorChannel.php
index 8ec776d9c935ac8ff3c0d883540d1d0a94867606..622244dce623e59148aec47b399b6ba5d81bc59a 100644 (file)
--- a/framework/main/middleware/compressor/class_CompressorChannel.php
+++ b/framework/main/middleware/compressor/class_CompressorChannel.php
@@ -13,7 +13,11 @@ use Org\Mxchange\CoreFramework\Registry\Registerable;
  *
  * @author             Roland Haeder <webmaster@shipsimu.org>
  * @version            0.0.0
+<<<<<<< HEAD:framework/main/middleware/compressor/class_CompressorChannel.php
  * @copyright  Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2017 Core Developer Team
+=======
+ * @copyright  Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2016 Core Developer Team
+>>>>>>> Some updates::inc/main/middleware/compressor/class_CompressorChannel.php
  * @license            GNU GPL 3.0 or any newer version
  * @link               http://www.shipsimu.org
  *

diff --git a/framework/main/middleware/database/class_DatabaseConnection.php b/framework/main/middleware/database/class_DatabaseConnection.php
index 83b13eb5f9fd1bc71c183939f939c6ce3390f9e6..5754b74530d579a3ae83126b159c6e9d16fc0cc7 100644 (file)
--- a/framework/main/middleware/database/class_DatabaseConnection.php
+++ b/framework/main/middleware/database/class_DatabaseConnection.php
@@ -16,7 +16,11 @@ use Org\Mxchange\CoreFramework\Middleware\Debug\DebugMiddleware;
  *
  * @author             Roland Haeder <webmaster@shipsimu.org>
  * @version            0.0.0
+<<<<<<< HEAD:framework/main/middleware/database/class_DatabaseConnection.php
  * @copyright  Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2017 Core Developer Team
+=======
+ * @copyright  Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2016 Core Developer Team
+>>>>>>> Some updates::inc/main/middleware/database/class_DatabaseConnection.php
  * @license            GNU GPL 3.0 or any newer version
  * @link               http://www.shipsimu.org
  *

diff --git a/framework/main/middleware/debug/class_DebugMiddleware.php b/framework/main/middleware/debug/class_DebugMiddleware.php
index a4855e5dd4c20224296d1aad78e113f4e5bd4204..59dbba4eb9d219147de0f75baa20a778aeefa9d5 100644 (file)
--- a/framework/main/middleware/debug/class_DebugMiddleware.php
+++ b/framework/main/middleware/debug/class_DebugMiddleware.php
@@ -16,7 +16,11 @@ use Org\Mxchange\CoreFramework\Stream\Output\OutputStreamer;
  *
  * @author             Roland Haeder <webmaster@shipsimu.org>
  * @version            0.0.0
+<<<<<<< HEAD:framework/main/middleware/debug/class_DebugMiddleware.php
  * @copyright  Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2017 Core Developer Team
+=======
+ * @copyright  Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2016 Core Developer Team
+>>>>>>> Some updates::inc/main/middleware/debug/class_DebugMiddleware.php
  * @license            GNU GPL 3.0 or any newer version
  * @link               http://www.shipsimu.org
  * @deprecated See LoggerFactory for a more flexible approach

diff --git a/framework/main/middleware/io/class_FileIoHandler.php b/framework/main/middleware/io/class_FileIoHandler.php
index 350151943e97307a1877e024236bc4976c3fab69..02c80344dd2ed7092b81518ffacebbcb38e94286 100644 (file)
--- a/framework/main/middleware/io/class_FileIoHandler.php
+++ b/framework/main/middleware/io/class_FileIoHandler.php
@@ -20,7 +20,11 @@ use \SplFileInfo;
  *
  * @author             Roland Haeder <webmaster@shipsimu.org>
  * @version            0.0.0
+<<<<<<< HEAD:framework/main/middleware/io/class_FileIoHandler.php
  * @copyright  Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2017 Core Developer Team
+=======
+ * @copyright  Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2016 Core Developer Team
+>>>>>>> Some updates::inc/main/middleware/io/class_FileIoHandler.php
  * @license            GNU GPL 3.0 or any newer version
  * @link               http://www.shipsimu.org
  *

diff --git a/framework/main/third_party/api/wernisportal/class_WernisApi.php b/framework/main/third_party/api/wernisportal/class_WernisApi.php
index cb85170a326d0538c4204d1378f25c2f9c6618bc..f217f103c6665dc03860bf76380dd3550619cfdc 100644 (file)
--- a/framework/main/third_party/api/wernisportal/class_WernisApi.php
+++ b/framework/main/third_party/api/wernisportal/class_WernisApi.php
@@ -10,7 +10,11 @@ use Org\Mxchange\CoreFramework\Object\BaseFrameworkSystem;
  *
  * @author             Roland Haeder <webmaster@shipsimu.org>
  * @version            0.0.0
+<<<<<<< HEAD:framework/main/third_party/api/wernisportal/class_WernisApi.php
  * @copyright  Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2017 Core Developer Team
+=======
+ * @copyright  Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2016 Core Developer Team
+>>>>>>> Some updates::inc/main/third_party/api/wernisportal/class_WernisApi.php
  * @license            GNU GPL 3.0 or any newer version
  * @link               http://www.shipsimu.org
  * @todo               Out-dated since 0.6-BETA

diff --git a/inc/config.php b/inc/config.php
new file mode 100644 (file)
index 0000000..5cc93a1
--- /dev/null
+++ b/inc/config.php
@@ -0,0 +1,474 @@
+<?php
+/**
+ * General configuration. Do not touch this file! If you need different settings
+ * create a config-local.php in this directory at and set your changed
+ * configuration entries there.
+ *
+ * @author             Roland Haeder <webmaster@shipsimu.org>
+ * @version            0.0.0
+ * @copyright  Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2016 Core Developer Team
+ * @license            GNU GPL 3.0 or any newer version
+ * @link               http://www.shipsimu.org
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+
+// Load very basic classes, required to bootstrap
+require(ApplicationEntryPoint::detectCorePath() . '/inc/main/interfaces/class_FrameworkInterface.php');
+require(ApplicationEntryPoint::detectCorePath() . '/inc/main/interfaces/registry/class_Registerable.php');
+require(ApplicationEntryPoint::detectCorePath() . '/inc/config/class_FrameworkConfiguration.php');
+
+// Get a new configuration instance
+$cfg = FrameworkConfiguration::getSelfInstance();
+
+// CFG: SERVER-PATH
+$cfg->setConfigEntry('base_path', ApplicationEntryPoint::detectCorePath() . '/');
+
+// CFG: BASE-URL
+$cfg->setConfigEntry('base_url', $cfg->detectBaseUrl());
+
+// CFG: DATABASE-TYPE
+$cfg->setConfigEntry('db_type', 'local');
+
+// CFG: LOCAL-DB-PATH
+$cfg->setConfigEntry('local_db_path', $cfg->getConfigEntry('base_path') . 'db/');
+
+// CFG: TIME-ZONE
+$cfg->setDefaultTimezone('Europe/Berlin');
+
+// CFG: MAGIC-QUOTES-RUNTIME
+$cfg->setMagicQuotesRuntime(FALSE);
+
+// CFG: CLASS-PREFIX
+$cfg->setConfigEntry('class_prefix', 'class_');
+
+// CFG: CLASS-SUFFIX
+$cfg->setConfigEntry('class_suffix', '.php');
+
+// CFG: RAW-TEMPLATE-EXTENSION
+$cfg->setConfigEntry('raw_template_extension', '.tpl');
+
+// CFG: CODE-TEMPLATE-EXTENSION
+$cfg->setConfigEntry('code_template_extension', '.ctp');
+
+// CFG: SELECTOR-PATH
+$cfg->setConfigEntry('selector_path', 'selector');
+
+// CFG: APPLICATION-HELPER-CLASS
+$cfg->setConfigEntry('app_helper_class', 'ApplicationHelper');
+
+// CFG: LAUNCH-METHOD
+$cfg->setConfigEntry('entry_method', 'entryPoint');
+
+// CFG: TEMPLATE-BASE-PATH
+$cfg->setConfigEntry('tpl_base_path', 'templates/');
+
+// CFG: LANGUAGE-BASE-PATH
+$cfg->setConfigEntry('lang_base_path', 'inc/language/');
+
+// CFG: COMPRESSOR-BASE-PATH
+$cfg->setConfigEntry('compressor_base_path', 'inc/main/classes/compressor/');
+
+// CFG: APPLICATION-BASE-PATH
+$cfg->setConfigEntry('application_base_path', 'application/');
+
+// CFG: APPLICATION-PATH
+$cfg->setConfigEntry('application_path', $cfg->getConfigEntry('base_path') . $cfg->getConfigEntry('application_base_path'));
+
+// CFG: COMPILE-OUTPUT-PATH
+$cfg->setConfigEntry('compile_output_path', 'templates/_compiled/');
+
+// CFG: HTML-TEMPLATE-CLASS
+$cfg->setConfigEntry('html_template_class', 'HtmlTemplateEngine');
+
+// CFG: DECO-XML-REWRITER-TEMPLATE-CLASS
+$cfg->setConfigEntry('deco_xml_rewriter_template_class', 'XmlRewriterTemplateDecorator');
+
+// CFG: DEBUG-HTML-CLASS
+$cfg->setConfigEntry('debug_html_class', 'DebugWebOutput');
+
+// CFG: DEBUG-CONSOLE-CLASS
+$cfg->setConfigEntry('debug_console_class', 'DebugConsoleOutput');
+
+// CFG: DEFAULT-LANGUAGE
+$cfg->setConfigEntry('default_lang', 'de'); // A two-char language string: de for german, en for english and so on
+
+// CFG: HTML-TEMPLATE-TYPE
+$cfg->setConfigEntry('html_template_type', 'html');
+
+// CFG: EMAIL-TEMPLATE-TYPE
+$cfg->setConfigEntry('email_template_type', 'emails');
+
+// CFG: CODE-HTML-TEMPLATE-TYPE
+$cfg->setConfigEntry('code_html_template_type', 'code');
+
+// CFG: CODE-CONSOLE-TEMPLATE-TYPE
+$cfg->setConfigEntry('code_console_template_type', 'xml');
+
+// CFG: IMAGE-TEMPLATE-TYPE
+$cfg->setConfigEntry('image_template_type', 'image');
+
+// CFG: MENU-TEMPLATE-TYPE
+$cfg->setConfigEntry('menu_template_type', 'menu');
+
+// CFG: OUTPUT-CLASS
+$cfg->setConfigEntry('output_class', 'WebOutput');
+
+// CFG: LANGUAGE-SYSTEM-CLASS
+$cfg->setConfigEntry('language_system_class', 'LanguageSystem');
+
+// CFG: SELECTOR-TEMPLATE-PREFIX
+$cfg->setConfigEntry('tpl_selector_prefix', 'selector');
+
+// CFG: WEB-CONTENT-TYPE
+$cfg->setConfigEntry('web_content_type', 'text/html');
+
+// CFG: VALID-TEMPLATE-VARIABLE
+$cfg->setConfigEntry('tpl_valid_var', 'content');
+
+// CFG: META-AUTHOR
+$cfg->setConfigEntry('meta_author', 'Your-name-here');
+
+// CFG: META-PUBLISHER
+$cfg->setConfigEntry('meta_publisher', 'Your-name-here');
+
+// CFG: META-KEYWORDS
+$cfg->setConfigEntry('meta_keywords', 'test,test,test');
+
+// CFG: META-DESCRIPTION
+$cfg->setConfigEntry('meta_description', 'A description for your website');
+
+// CFG: SELECTOR-MAIN-TEMPLATE
+$cfg->setConfigEntry('selector_main_tpl', 'selector_main');
+
+// CFG: SELECTOR-APPS-TEMPLATE
+$cfg->setConfigEntry('selector_apps_tpl', 'selector_apps');
+
+// CFG: SELECTOR-NAME
+$cfg->setConfigEntry('selector_name', 'selector');
+
+// CFG: DEFAULT-APPLICATION
+$cfg->setConfigEntry('default_application', 'selector');
+
+// CFG: VERBOSE-LEVEL
+$cfg->setConfigEntry('verbose_level', 0);
+
+// CFG: CACHE-CLASS
+$cfg->setConfigEntry('cache_class', 'MemoryCache');
+
+// CFG: SEARCH-CRITERIA-CLASS
+$cfg->setConfigEntry('search_criteria_class', 'SearchCriteria');
+
+// CFG: DATASET-CRITERIA-CLASS
+$cfg->setConfigEntry('dataset_criteria_class', 'DataSetCriteria');
+
+// CFG: UPDATE-CRITERIA-CLASS
+$cfg->setConfigEntry('update_criteria_class', 'UpdateCriteria');
+
+// CFG: FILE-IO-CLASS
+$cfg->setConfigEntry('file_io_class', 'FileIoHandler');
+
+// CFG: DATABASE-RESULT-CLASS
+$cfg->setConfigEntry('database_result_class', 'CachedDatabaseResult');
+
+// CFG: FILTER-CHAIN-CLASS
+$cfg->setConfigEntry('filter_chain_class', 'FilterChain');
+
+// CFG: FILE-INPUT-CLASS
+$cfg->setConfigEntry('file_input_class', 'FileIoStream');
+
+// CFG: FILE-OUTPUT-CLASS
+$cfg->setConfigEntry('file_output_class', 'FileIoStream');
+
+// CFG: EMAIL-VALIDATOR-FILTER
+$cfg->setConfigEntry('email_validator_filter', 'EmailValidatorFilter');
+
+// CFG: USERNAME-VALIDATOR-FILTER
+$cfg->setConfigEntry('username_validator_filter', 'UserNameValidatorFilter');
+
+// CFG: USERNAME-IS-GUEST-FILTER
+$cfg->setConfigEntry('username_is_guest_filter', 'UserNameIsGuestFilter');
+
+// CFG: PASSWORD-VALIDATOR-FILTER
+$cfg->setConfigEntry('password_validator_filter', 'PasswordValidatorFilter');
+
+// CFG: RULES-ACCEPTED-FILTER
+$cfg->setConfigEntry('rules_accepted_filter', 'RulesAcceptedFilter');
+
+// CFG: USERNAME-VERIFIER-FILTER
+$cfg->setConfigEntry('username_verifier_filter', 'UserNameVerifierFilter');
+
+// CFG: USER-GUEST-VERIFIER-FILTER
+$cfg->setConfigEntry('user_guest_verifier_filter', 'UserGuestVerifierFilter');
+
+// CFG: EMAIL-VERIFIER-FILTER
+$cfg->setConfigEntry('email_verifier_filter', 'EmailVerifierFilter');
+
+// CFG: PASSWORD-VERIFIER-FILTER
+$cfg->setConfigEntry('password_verifier_filter', 'PasswordVerifierFilter');
+
+// CFG: PASSWD-GUEST-VERIFIER-FILTER
+$cfg->setConfigEntry('passwd_guest_verifier_filter', 'PasswordGuestVerifierFilter');
+
+// CFG: EMAIL-CHANGE-FILTER
+$cfg->setConfigEntry('email_change_filter', 'EmailChangeFilter');
+
+// CFG: PASSWORD-CHANGE-FILTER
+$cfg->setConfigEntry('password_change_filter', 'PasswordChangeFilter');
+
+// CFG: ACCOUNT-PASSWORD-FILTER
+$cfg->setConfigEntry('account_password_filter', 'AccountPasswordVerifierFilter');
+
+// CFG: USER-STATUS-FILTER
+$cfg->setConfigEntry('user_status_filter', 'UserStatusVerifierFilter');
+
+// CFG: USER-UNCONFIRMED-FILTER
+$cfg->setConfigEntry('user_unconfirmed_filter', 'UserUnconfirmedVerifierFilter');
+
+// CFG: CRYPTO-CLASS
+$cfg->setConfigEntry('crypto_class', 'CryptoHelper');
+
+// CFG: RNG-CLASS
+$cfg->setConfigEntry('rng_class', 'RandomNumberGenerator');
+
+// CFG: USER-DB-WRAPPER-CLASS
+$cfg->setConfigEntry('user_db_wrapper_class', 'UserDatabaseWrapper');
+
+// CFG: NEWS-DB-WRAPPER-CLASS
+$cfg->setConfigEntry('news_db_wrapper_class', 'NewsDatabaseWrapper');
+
+// CFG: HTML-CMD-RESOLVER-CLASS
+$cfg->setConfigEntry('html_cmd_resolver_class', 'HtmlCommandResolver');
+
+// CFG: HTML-CMD-LOGIN-RESOLVER-CLASS
+$cfg->setConfigEntry('html_cmd_login_resolver_class', 'HtmlCommandResolver');
+
+// CFG: IMAGE-CMD-RESOLVER-CLASS
+$cfg->setConfigEntry('image_cmd_resolver_class', 'ImageCommandResolver');
+
+// CFG: IMAGE-CMD-CODE-CAPTCHA-RESOLVER-CLASS
+$cfg->setConfigEntry('image_cmd_code_captcha_resolver_class', 'ImageCommandResolver');
+
+// CFG: MAILER-CLASS
+$cfg->setConfigEntry('mailer_class', 'DebugMailer');
+
+// CFG: XML-PARSER-CLASS
+$cfg->setConfigEntry('xml_parser_class', 'XmlParser');
+
+// CFG: DECO-COMPACTING-XML-PARSER-CLASS
+$cfg->setConfigEntry('deco_compacting_xml_parser_class', 'XmlCompactorDecorator');
+
+// CFG: MATH-PRIME
+$cfg->setConfigEntry('math_prime', 591623);
+
+// CFG: DATE-KEY
+$cfg->setConfigEntry('date_key', date('d-m-Y (l-F-T)', time()));
+
+// CFG: SALT-LENGTH
+$cfg->setConfigEntry('salt_length', 10);
+
+// CFG: RND-STR-LENGTH
+$cfg->setConfigEntry('rnd_str_length', 128);
+
+// CFG: HASH-EXTRA-MASK
+$cfg->setConfigEntry('hash_extra_mask', "%1s:%2s:%3s"); // 1=salt, 2=extra salt, 3=plain password/string
+
+// CFG: HASH-NORMAL-MASK
+$cfg->setConfigEntry('hash_normal_mask', "%1s:%2s"); // 1=salt, 2=plain password/string
+
+// CFG: IS-SINGLE-SERVER
+$cfg->setConfigEntry('is_single_server', 'Y');
+
+// CFG: POST-REGISTRATION-CLASS
+$cfg->setConfigEntry('post_registration_class', 'LoginAfterRegistrationAction');
+
+// CFG: USER-CLASS
+$cfg->setConfigEntry('user_class', 'Member');
+
+// CFG: GUEST-CLASS
+$cfg->setConfigEntry('guest_class', 'Guest');
+
+// CFG: COOKIE-EXPIRE
+$cfg->setConfigEntry('cookie_expire', (60*60*2)); // Two hours!
+
+// CFG: COOKIE-PATH
+$cfg->setConfigEntry('cookie_path', $cfg->detectScriptPath() . '/');
+
+// CFG: COOKIE-DOMAIN
+$cfg->setConfigEntry('cookie_domain', $cfg->detectDomain()); // Is mostly the same...
+
+// CFG: COOKIE-SSL
+$cfg->setConfigEntry('cookie_ssl', $cfg->isHttpSecured());
+
+// CFG: CRYPT-FIXED-SALT
+$cfg->setConfigEntry('crypt_fixed_salt', 'N');
+
+// CFG: DB-UPDATE-PRIMARY-FORCED
+$cfg->setConfigEntry('db_update_primary_forced', 'Y');
+
+// CFG: GERMAN-DATE-TIME
+$cfg->setConfigEntry('german_date_time', "%3\$s.%2\$s.%1\$s, %4\$s:%5\$s:%6\$s");
+
+// CFG: PRODUCT-INSTALL-MODE
+$cfg->setConfigEntry('product_install_mode', 'debug');
+
+// CFG: DECIMALS
+$cfg->setConfigEntry('decimals', 3);
+
+// CFG: MENU-STACKER-CLASS
+$cfg->setConfigEntry('menu_stacker_class', 'FiLoStacker');
+
+// CFG: STACKER-GENERIC-MAX-SIZE
+$cfg->setConfigEntry('stacker_generic_max_size', 100);
+
+// CFG: STACKER-CURRENT-NODE-MAX-SIZE
+$cfg->setConfigEntry('stacker_current_node_max_size', 20);
+
+// CFG: LOCAL-FILE-DATABASE-CLASS
+$cfg->setConfigEntry('local_file_database_class', 'CachedLocalFileDatabase');
+
+// CFG: COMPRESSOR-CHANNEL-CLASS
+$cfg->setConfigEntry('compressor_channel_class', 'CompressorChannel');
+
+// CFG: DEBUG-HTML-OUTPUT-TIMINGS
+$cfg->setConfigEntry('debug_html_output_timings', 'N');
+
+// CFG: DEBUG-CONSOLE-OUTPUT-TIMINGS
+$cfg->setConfigEntry('debug_console_output_timings', 'Y');
+
+// CFG: PROXY-HOST
+$cfg->setConfigEntry('proxy_host', '');
+
+// CFG: PROXY-PORT
+$cfg->setConfigEntry('proxy_port', '');
+
+// CFG: PROXY-USERNAME
+$cfg->setConfigEntry('proxy_username', '');
+
+// CFG: PROXY-PASSWORD
+$cfg->setConfigEntry('proxy_password', '');
+
+// CFG: PROXY-CONNECT-METHOD
+$cfg->setConfigEntry('proxy_connect_method', 'Y');
+
+// CFG: HOSTNAME-FILE
+$cfg->setConfigEntry('hostname_file', '/etc/hostname');
+
+// CFG: DATABASE-CACHE-ENABLED
+$cfg->setConfigEntry('database_cache_enabled', FALSE);
+
+// CFG: DIRECTORY-CLASS
+$cfg->setConfigEntry('directory_class', 'FrameworkDirectoryPointer');
+
+// CFG: FILE-RAW-INPUT-CLASS
+$cfg->setConfigEntry('file_raw_input_class', 'FrameworkRawFileInputPointer');
+
+// CFG: FILE-RAW-OUTPUT-CLASS
+$cfg->setConfigEntry('file_raw_output_class', 'FrameworkRawFileOutputPointer');
+
+// CFG: FILE-RAW-INPUT-OUTPUT-CLASS
+$cfg->setConfigEntry('file_raw_input_output_class', 'FrameworkFileInputOutputPointer');
+
+// CFG: TEXT-FILE-INPUT-CLASS
+$cfg->setConfigEntry('text_file_input_class', 'FrameworkTextFileInputPointer');
+
+// CFG: CSV-INPUT-FILE-CLASS
+$cfg->setConfigEntry('csv_input_file_class', 'CsvInputFile');
+
+// CFG: FILE-ITERATOR-CLASS
+$cfg->setConfigEntry('file_iterator_class', 'FileIterator');
+
+// CFG: FILE-STACK-PRE-ALLOCATE-ENABLED
+$cfg->setConfigEntry('file_stack_pre_allocate_enabled', 'Y');
+
+// CFG: FILE-STACK-PRE-ALLOCATE-COUNT
+$cfg->setConfigEntry('file_stack_pre_allocate_count', 10000);
+
+// CFG: INDEX-INDEX-CLASS
+$cfg->setConfigEntry('file_stack_index_class', 'FileStackIndex');
+
+// CFG: INDEX-PRE-ALLOCATE-ENABLED
+$cfg->setConfigEntry('index_pre_allocate_enabled', 'Y');
+
+// CFG: INDEX-PRE-ALLOCATE-COUNT
+$cfg->setConfigEntry('index_pre_allocate_count', 10000);
+
+// CFG: STACK-FILE-CLASS
+$cfg->setConfigEntry('stack_file_class', 'StackFile');
+
+// CFG: INDEX-FILE-CLASS
+$cfg->setConfigEntry('index_file_class', 'IndexFile');
+
+// CFG: TASK-HANDLER-CLASS
+$cfg->setConfigEntry('task_handler_class', 'TaskHandler');
+
+// CFG: TASK-LIST-CLASS
+$cfg->setConfigEntry('task_list_class', 'TaskList');
+
+// CFG: LIST-GROUP-CLASS
+$cfg->setConfigEntry('list_group_class', 'ListGroupList');
+
+// CFG: DEFAULT-ITERATOR-CLASS
+$cfg->setConfigEntry('default_iterator_class', 'DefaultIterator');
+
+// CFG: ACTIVE-TASK-VISITOR-CLASS
+$cfg->setConfigEntry('active_task_visitor_class', 'ActiveTaskVisitor');
+
+// CFG: IDLE-TASK-CLASS
+$cfg->setConfigEntry('idle_task_class', 'IdleLoopTask');
+
+// CFG: TASK-IDLE-LOOP-STARTUP-DELAY
+$cfg->setConfigEntry('task_idle_loop_startup_delay', 0);
+
+// CFG: TASK-IDLE-LOOP-INTERVAL-DELAY
+$cfg->setConfigEntry('task_idle_loop_interval_delay', 0);
+
+// CFG: TASK-IDLE-LOOP-MAX-RUNS
+$cfg->setConfigEntry('task_idle_loop_max_runs', 0);
+
+// CFG: IDLE-LOOP-TIME (5 milli seconds)
+$cfg->setConfigEntry('idle_loop_time', 5);
+
+// CFG: SHUTDOWN-TASK-VISITOR-CLASS
+$cfg->setConfigEntry('shutdown_task_visitor_class', 'ShutdownTaskVisitor');
+
+// CFG: DEFAULT-IMAGE-COMMAND
+$cfg->setConfigEntry('default_image_command', 'build');
+
+// CFG: DEFAULT-IMAGE-CONTROLLER
+$cfg->setConfigEntry('default_image_controller', 'build');
+
+// CFG: MENU-TEMPLATE-CLASS
+$cfg->setConfigEntry('menu_template_class', 'MenuTemplateEngine');
+
+// CFG: MENU-TEMPLATE-EXTENSION
+$cfg->setConfigEntry('menu_template_extension', '.xml');
+
+// CFG: FEATURE-FUSE-CLASS
+$cfg->setConfigEntry('feature_fuse_class', 'FuseFeature');
+
+// CFG: TEMP-FILE-PATH
+$cfg->setConfigEntry('temp_file_path', sys_get_temp_dir());
+
+// CFG: IPC-SOCKET-FILE-NAME
+$cfg->setConfigEntry('ipc_socket_file_name', 'php_ipc_socket');
+
+// CFG: EXTENSION-SCRYPT-LOADED (By default scrypt is assumed absent and later tested being there)
+$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
new file mode 100644 (file)
index 0000000..b89791b
--- /dev/null
+++ b/inc/config/class_FrameworkConfiguration.php
@@ -0,0 +1,414 @@
+<?php
+/**
+ * A class for the configuration stuff implemented in a singleton design paddern
+ *
+ * NOTE: We cannot put this in inc/main/ because it would be loaded (again) in
+ * class loader. See inc/loader/class_ClassLoader.php for instance
+ *
+ * @see                        ClassLoader
+ * @author             Roland Haeder <webmaster@shipsimu.org>
+ * @version            0.0.0
+ * @copyright  Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2016 Core Developer Team
+ * @license            GNU GPL 3.0 or any newer version
+ * @link               http://www.shipsimu.org
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+class FrameworkConfiguration implements Registerable {
+       /**
+        * The framework's main configuration array which will be initialized with
+        * hard-coded configuration data and might be overwritten/extended by
+        * config data from the database.
+        */
+       private $config = array();
+
+       /**
+        * The configuration instance itself
+        */
+       private static $configInstance = NULL;
+
+       // Some constants for the configuration system
+       const EXCEPTION_CONFIG_KEY_IS_EMPTY           = 0x130;
+       const EXCEPTION_CONFIG_KEY_WAS_NOT_FOUND      = 0x131;
+       const EXCEPTION_CONFIG_VALUE_TYPE_UNSUPPORTED = 0x132;
+
+       /**
+        * Protected constructor
+        *
+        * @return      void
+        */
+       protected function __construct () {
+               // Empty for now
+       }
+
+       /**
+        * Compatiblity method to return this class' name
+        *
+        * @return      __CLASS__       This class' name
+        */
+       public function __toString () {
+               return get_class($this);
+       }
+
+       /**
+        * Getter for a singleton instance of this class
+        *
+        * @return      $configInstance         A singleton instance of this class
+        */
+       public static final function getSelfInstance () {
+               // is the instance there?
+               if (is_null(self::$configInstance))  {
+                       // Create a config instance
+                       self::$configInstance = new FrameworkConfiguration();
+               } // END - if
+
+               // Return singleton instance
+               return self::$configInstance;
+       }
+
+       /**
+        * Converts dashes to underscores, e.g. useable for configuration entries
+        *
+        * @param       $str    The string with maybe dashes inside
+        * @return      $str    The converted string with no dashed, but underscores
+        */
+       private final function convertDashesToUnderscores ($str) {
+               // Convert them all
+               $str = str_replace('-', '_', $str);
+
+               // Return converted string
+               return $str;
+       }
+
+       /**
+        * Setter for default time zone (must be correct!)
+        *
+        * @param       $zone   The time-zone string (e.g. Europe/Berlin)
+        * @return      void
+        */
+       public final function setDefaultTimezone ($zone) {
+               // Is PHP version 5.1.0 or higher? Older versions are being ignored
+               if (version_compare(phpversion(), '5.1.0', '>=')) {
+                       /*
+                        * Set desired time zone to prevent date() and related functions to
+                        * issue a E_WARNING.
+                        */
+                       date_default_timezone_set($zone);
+               } // END - if
+       }
+
+       /**
+        * Setter for runtime magic quotes
+        *
+        * @param       $enableQuotes   Whether enable magic runtime quotes (should be disabled for security reasons)
+        * @return      void
+        * @todo        This method encapsulates a deprecated PHP function and should be deprecated, too.
+        */
+       public final function setMagicQuotesRuntime ($enableQuotes) {
+               // Is the PHP version < 5.4?
+               if (version_compare(phpversion(), '5.4', '>=')) {
+                       // Then silently skip this part as set_magic_quotes_runtime() is deprecated
+                       return;
+               } // END - if
+
+               // Cast it to boolean
+               $enableQuotes = (boolean) $enableQuotes;
+
+               // Set it
+               set_magic_quotes_runtime($enableQuotes);
+       }
+
+       /**
+        * Checks whether the given configuration key is set
+        *
+        * @param       $configKey      The configuration key we shall check
+        * @return      $isset          Whether the given configuration key is set
+        */
+       public function isConfigurationEntrySet ($configKey) {
+               // Is it set?
+               $isset = isset($this->config[$configKey]);
+
+               // Return the result
+               return $isset;
+       }
+
+       /**
+        * Read a configuration element.
+        *
+        * @param       $configKey              The configuration element
+        * @return      $configValue    The fetched configuration value
+        * @throws      ConfigEntryIsEmptyException             If $configKey is empty
+        * @throws      NoConfigEntryException                  If a configuration element was not found
+        */
+       public function getConfigEntry ($configKey) {
+               // Convert dashes to underscore
+               $configKey = self::convertDashesToUnderscores($configKey);
+
+               // Is a valid configuration key provided?
+               if (empty($configKey)) {
+                       // Entry is empty
+                       throw new ConfigEntryIsEmptyException($this, self::EXCEPTION_CONFIG_KEY_IS_EMPTY);
+               } elseif (!$this->isConfigurationEntrySet($configKey)) {
+                       // Entry was not found!
+                       throw new NoConfigEntryException(array(__CLASS__, $configKey), self::EXCEPTION_CONFIG_KEY_WAS_NOT_FOUND);
+               }
+
+               // Return the requested value
+               return $this->config[$configKey];
+       }
+
+       /**
+        * Set a configuration key
+        *
+        * @param       $configKey      The configuration key we want to add/change
+        * @param       $configValue    The configuration value we want to set
+        * @return      void
+        * @throws      ConfigEntryIsEmptyException                     If $configKey is empty
+        * @throws      ConfigValueTypeUnsupportedException     If $configValue has an unsupported variable type
+        */
+       public final function setConfigEntry ($configKey, $configValue) {
+               // Cast to string
+               $configKey = self::convertDashesToUnderscores($configKey);
+
+               // Is a valid configuration key key provided?
+               if (is_null($configKey)) {
+                       // Configuration key is null
+                       throw new NullPointerException($this, self::EXCEPTION_IS_NULL_POINTER);
+               } elseif ((empty($configKey)) || (!is_string($configKey))) {
+                       // Entry is empty
+                       throw new ConfigEntryIsEmptyException($this, self::EXCEPTION_CONFIG_KEY_IS_EMPTY);
+               } elseif ((is_null($configValue)) || (is_array($configValue)) || (is_object($configValue)) || (is_resource($configValue))) {
+                       // These cannot be set as this is not intended for configuration values, please use FrameworkArrayObject instead.
+                       throw new ConfigValueTypeUnsupportedException(array($this, $configKey, $configValue), self::EXCEPTION_CONFIG_VALUE_TYPE_UNSUPPORTED);
+               }
+
+               // Set the configuration value
+               //* NOISY-DEBUG: */ print(__METHOD__ . ':configEntry=' . $configKey . ',configValue[' . gettype($configValue) . ']=' . $configValue . PHP_EOL);
+               $this->config[$configKey] = $configValue;
+
+               // Resort the array
+               ksort($this->config);
+       }
+
+       /**
+        * Unset a configuration key, the entry must be there or else an
+        * exception is thrown.
+        *
+        * @param       $configKey      Configuration key to unset
+        * @return      void
+        * @throws      NoConfigEntryException  If a configuration element was not found
+        */
+       public final function unsetConfigEntry ($configKey) {
+               // Convert dashes to underscore
+               $configKey = self::convertDashesToUnderscores($configKey);
+
+               // Is the configuration key there?
+               if (!$this->isConfigurationEntrySet($configKey)) {
+                       // Entry was not found!
+                       throw new NoConfigEntryException(array(__CLASS__, $configKey), self::EXCEPTION_CONFIG_KEY_WAS_NOT_FOUND);
+               } // END - if
+
+               // Unset it
+               unset($this->config[$configKey]);
+       }
+
+       /**
+        * Detects the server address (SERVER_ADDR) and set it in configuration
+        *
+        * @return      $serverAddress  The detected server address
+        * @todo        We have to add some more entries from $_SERVER here
+        */
+       public function detectServerAddress () {
+               // Is the entry set?
+               if (!$this->isConfigurationEntrySet('server_addr')) {
+                       // Is it set in $_SERVER?
+                       if (isset($_SERVER['SERVER_ADDR'])) {
+                               // Set it from $_SERVER
+                               $this->setServerAddress($_SERVER['SERVER_ADDR']);
+                       } elseif (class_exists('ConsoleTools')) {
+                               // Run auto-detecting through console tools lib
+                               ConsoleTools::acquireSelfIPAddress();
+                       }
+               } // END - if
+
+               // Now get it from configuration
+               $serverAddress = $this->getServerAddress();
+
+               // Return it
+               return $serverAddress;
+       }
+
+       /**
+        * Setter for SERVER_ADDR
+        *
+        * @param       $serverAddress  New SERVER_ADDR value to set
+        * @return      void
+        */
+       public function setServerAddress ($serverAddress) {
+               $this->setConfigEntry('server_addr', (string) $serverAddress);
+       }
+
+       /**
+        * Getter for SERVER_ADDR
+        *
+        * @return      $serverAddress  New SERVER_ADDR value to set
+        */
+       public function getServerAddress () {
+               return $this->getConfigEntry('server_addr');
+       }
+
+       /**
+        * Detects the HTTPS flag
+        *
+        * @return      $https  The detected HTTPS flag or null if failed
+        */
+       public function detectHttpSecured () {
+               // Default is null
+               $https = NULL;
+
+               // Is HTTPS set?
+               if ($this->isHttpSecured()) {
+                       // Then use it
+                       $https = $_SERVER['HTTPS'];
+               } // END - if
+
+               // Return it
+               return $https;
+       }
+
+       /**
+        * Checks whether HTTPS is set in $_SERVER
+        *
+        * @return $isset       Whether HTTPS is set
+        */
+       public function isHttpSecured () {
+               return (isset($_SERVER['HTTPS']));
+       }
+
+       /**
+        * Dectect and return the base URL for all URLs and forms
+        *
+        * @return      $baseUrl        Detected base URL
+        */
+       public function detectBaseUrl () {
+               // Initialize the URL
+               $baseUrl = 'http';
+
+               // Do we have HTTPS?
+               if ($this->isHttpSecured()) {
+                       // Add the >s< for HTTPS
+                       $baseUrl .= 's';
+               } // END - if
+
+               // Construct the full URL and secure it against CSRF attacks
+               $baseUrl = $baseUrl . '://' . $this->detectDomain() . $this->detectScriptPath();
+
+               // Return the URL
+               return $baseUrl;
+       }
+
+       /**
+        * Detect safely and return the full domain where this script is installed
+        *
+        * @return      $fullDomain             The detected full domain
+        */
+       public function detectDomain () {
+               // Full domain is localnet.invalid by default
+               $fullDomain = 'localnet.invalid';
+
+               // Is the server name there?
+               if (isset($_SERVER['SERVER_NAME'])) {
+                       // Detect the full domain
+                       $fullDomain = htmlentities(strip_tags($_SERVER['SERVER_NAME']), ENT_QUOTES);
+               } // END - if
+
+               // Return it
+               return $fullDomain;
+       }
+
+       /**
+        * Detect safely the script path without trailing slash which is the glue
+        * between "http://your-domain.invalid/" and "script-name.php"
+        *
+        * @return      $scriptPath             The script path extracted from $_SERVER['SCRIPT_NAME']
+        */
+       public function detectScriptPath () {
+               // Default is empty
+               $scriptPath = '';
+
+               // Is the scriptname set?
+               if (isset($_SERVER['SCRIPT_NAME'])) {
+                       // Get dirname from it and replace back-slashes with slashes for lame OSes...
+                       $scriptPath = str_replace("\\", '/', dirname($_SERVER['SCRIPT_NAME']));
+               } // END - if
+
+               // Return it
+               return $scriptPath;
+       }
+
+       /**
+        * Getter for field name
+        *
+        * @param       $fieldName              Field name which we shall get
+        * @return      $fieldValue             Field value from the user
+        * @throws      NullPointerException    If the result instance is null
+        */
+       public final function getField ($fieldName) {
+               // Our super interface "FrameworkInterface" requires this
+               throw new UnsupportedOperationException(array($this, __FUNCTION__), self::EXCEPTION_UNSPPORTED_OPERATION);
+       }
+
+       /**
+        * Checks if given field is set
+        *
+        * @param       $fieldName      Field name to check
+        * @return      $isSet          Whether the given field name is set
+        * @throws      NullPointerException    If the result instance is null
+        */
+       public function isFieldSet ($fieldName) {
+               // Our super interface "FrameworkInterface" requires this
+               throw new UnsupportedOperationException(array($this, __FUNCTION__), self::EXCEPTION_UNSPPORTED_OPERATION);
+       }
+
+       /**
+        * Generates a code for hashes from this class
+        *
+        * @return      $hashCode       The hash code respresenting this class
+        */
+       public function hashCode () {
+               return crc32($this->__toString());
+       }
+
+       /**
+        * Checks whether an object equals this object. You should overwrite this
+        * method to implement own equality checks
+        *
+        * @param       $objectInstance         An instance of a FrameworkInterface object
+        * @return      $equals                         Whether both objects equals
+        */
+       public function equals (FrameworkInterface $objectInstance) {
+               // Now test it
+               $equals = ((
+                       $this->__toString() == $objectInstance->__toString()
+               ) && (
+                       $this->hashCode() == $objectInstance->hashCode()
+               ));
+
+               // Return the result
+               return $equals;
+       }
+}
+
+// [EOF]
+?>

diff --git a/inc/database.php b/inc/database.php
new file mode 100644 (file)
index 0000000..ec973cb
--- /dev/null
+++ b/inc/database.php
@@ -0,0 +1,55 @@
+<?php
+/**
+ * Initializes the database layer
+ *
+ * @author             Roland Haeder <webmaster@shipsimu.org>
+ * @version            0.0.0
+ * @copyright  Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2016 Core Developer Team
+ * @license            GNU GPL 3.0 or any newer version
+ * @link               http://www.shipsimu.org
+ * @deprecated
+ * @todo               Minimize these includes
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+
+// Initialize database layer
+$databaseInstance = NULL;
+
+// Generate FQFN for the database layer
+$fqfn = FrameworkConfiguration::getSelfInstance()->getConfigEntry('base_path') . 'inc/database/lib-' . FrameworkConfiguration::getSelfInstance()->getConfigEntry('db_type') . '.php';
+
+// Load the database layer include
+if (BaseFrameworkSystem::isReadableFile($fqfn)) {
+       // Load the layer
+       require($fqfn);
+} else {
+       // Layer is missing!
+       ApplicationEntryPoint::app_exit(sprintf('[Main:] Database layer is missing! (%s) -&gt; R.I.P.',
+               FrameworkConfiguration::getSelfInstance()->getConfigEntry('db_type')
+       ));
+}
+
+// Clean it up
+unset($fqfn);
+
+// Prepare database instance
+$connectionInstance = DatabaseConnection::createDatabaseConnection(DebugMiddleware::getSelfInstance(), $databaseInstance);
+
+// 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
new file mode 100644 (file)
index 0000000..86b1c38
--- /dev/null
+++ b/inc/database/lib-local.php
@@ -0,0 +1,29 @@
+<?php
+/**
+ * Initializes the local file database class
+ *
+ * @author             Roland Haeder <webmaster@shipsimu.org>
+ * @version            0.0.0
+ * @copyright  Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2016 Core Developer Team
+ * @license            GNU GPL 3.0 or any newer version
+ * @link               http://www.shipsimu.org
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+
+// 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
new file mode 100644 (file)
index 0000000..e235a9e
--- /dev/null
+++ b/inc/includes.php
@@ -0,0 +1,74 @@
+<?php
+/**
+ * Loads more include files by using the generic class loader
+ *
+ * @author             Roland Haeder <webmaster@shipsimu.org>
+ * @version            0.0.0
+ * @copyright  Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2016 Core Developer Team
+ * @license            GNU GPL 3.0 or any newer version
+ * @link               http://www.shipsimu.org
+ * @deprecated
+ * @todo               Minimize these includes
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+
+// Include the class loader function
+require(FrameworkConfiguration::getSelfInstance()->getConfigEntry('base_path') . 'inc/loader/class_ClassLoader.php');
+
+/*
+ * Shall we include additional configs where you can configure some things?
+ * Then load matching config file.
+ */
+ClassLoader::getSelfInstance()->loadExtraConfigs();
+
+// Register auto-load function with the SPL
+// @TODO This makes the core depending on the SPL. But it should be installed anyway.
+spl_autoload_register('ClassLoader::autoLoad');
+
+// Does the user has an application specified?
+// @TODO Find a nicer OOP-ed way for this
+if (!empty($_GET['app'])) {
+       // Set the application from string
+       $application = (string) $_GET['app'];
+} elseif (!empty($_SERVER['argv'][1])) {
+       // Set the application from string
+       $application = (string) $_SERVER['argv'][1];
+       $app = explode('=', trim($application));
+       if ($app[0] == 'app') {
+               // Application is valid!
+               $application = trim($app[1]);
+       } else {
+               // Invalid entry found, first must be "app"!
+               $application = FrameworkConfiguration::getSelfInstance()->getConfigEntry('default_application');
+       }
+} else {
+       // Set the "application selector" application
+       $application = FrameworkConfiguration::getSelfInstance()->getConfigEntry('default_application');
+}
+
+// Secure it, by keeping out tags
+$application = htmlentities(strip_tags($application), ENT_QUOTES);
+
+// Secure it a little more with a reg.exp.
+$application = preg_replace('/([^a-z0-9_-])+/i', '', $application);
+
+// Set the application name for later usage
+FrameworkConfiguration::getSelfInstance()->setConfigEntry('app_name', $application);
+
+// 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
new file mode 100644 (file)
index 0000000..8d6271d
--- /dev/null
+++ b/inc/main/classes/client/http/class_HttpClient.php
@@ -0,0 +1,164 @@
+<?php
+/**
+ * A HTTP client class
+ *
+ * @author             Roland Haeder <webmaster@ship-simu.org>
+ * @version            0.0.0
+ * @copyright  Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2016 Core Developer Team
+ * @license            GNU GPL 3.0 or any newer version
+ * @link               http://www.ship-simu.org
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+class HttpClient extends BaseClient implements Client {
+       // Constants
+       const HTTP_EOL = "\r\n";
+       const HTTP_USER_AGENT = 'HttpClient-Core/1.0';
+
+       /**
+        * Protected constructor
+        *
+        * @return      void
+        */
+       protected function __construct () {
+               // Set default user agent string (to allow other classes to override this)
+               $this->setUserAgent(self::HTTP_USER_AGENT);
+
+               // Call parent constructor
+               parent::__construct(__CLASS__);
+       }
+
+       /**
+        * Creates an instance of this Client class and prepares it for usage
+        *
+        * @param       $socketResource         Resource of a socket (optional)
+        * @return      $clientInstance         An instance of a Client class
+        */
+       public final static function createHttpClient ($socketResouce = FALSE) {
+               // Get a new instance
+               $clientInstance = new HttpClient();
+
+               // Set socket resource
+               $clientInstance->setSocketResource($socketResource);
+
+               // Return the prepared instance
+               return $clientInstance;
+       }
+
+       /**
+        * Checks wether proxy configuration is used
+        *
+        * @return      $isUsed         Wether proxy is used
+        */
+       protected function isProxyUsed () {
+               // Do we have cache?
+               if (!isset($GLOBALS[__METHOD__])) {
+                       // Determine it
+                       $GLOBALS[__METHOD__] = (($this->getConfigInstance()->getConfigEntry('proxy_host') != '') && ($this->getConfigInstance()->getConfigEntry('proxy_port') > 0));
+               } // END - if
+
+               // Return cache
+               return $GLOBALS[__METHOD__];
+       }
+
+       /**
+        * Sets up a proxy tunnel for given hostname and through resource
+        *
+        * @param       $host           Host to connect to
+        * @param       $port           Port number to connect to
+        * @return      $response       Response array
+        */
+       protected function setupProxyTunnel ($host, $port) {
+               // Initialize array
+               $response = array('', '', '');
+
+               // Do the connect
+               $respArray = $this->doConnectRequest($host, $port);
+
+               // Analyze first header line
+               if (((strtolower($respArray[0]) !== 'http/1.0') && (strtolower($respArray[0]) !== 'http/1.1')) || ($respArray[1] != '200')) {
+                       // Response code is not 200
+                       return $response;
+               } // END - if
+
+               // All fine!
+               return $respArray;
+       }
+
+       /**
+        * Sends a raw HTTP request out to given IP/host and port number
+        *
+        * @param       $method                 Request method (GET, POST, HEAD, CONNECT, ...)
+        * @param       $host                   Host to connect to
+        * @param       $port                   Port number to connect to
+        * @return      $responseArray  Array with raw response
+        */
+       private function sendRawHttpRequest ($method, $host, $port, array $header = array()) {
+               // Minimum raw HTTP/1.1 request
+               $rawRequest  = $method . ' ' . $host . ':' . $port . ' HTTP/1.1' . self::HTTP_EOL;
+               $rawRequest .= 'Host: ' . $host . ':' . $port . self::HTTP_EOL;
+
+               // Use login data to proxy? (username at least)
+               if ($this->getConfigInstance()->getConfigEntry('proxy_username') != '') {
+                       // Add it as well
+                       $encodedAuth = base64_encode($this->getConfigInstance()->getConfigEntry('proxy_username') . ':' . $this->getConfigInstance()->getConfigEntry('proxy_password'));
+                       $rawRequest .= 'Proxy-Authorization: Basic ' . $encodedAuth . self::HTTP_EOL;
+               } // END - if
+
+               // Add last new-line
+               $rawRequest .= self::HTTP_EOL;
+               //* DEBUG: */ self::createDebugInstance(__CLASS__)->debugOutput('HTTP-CLIENT[' . __METHOD__ . ':' . __LINE__ . ']: rawRequest=' . $rawRequest);
+
+               // Write request
+               fwrite($this->getSocketResource(), $rawRequest);
+
+               // Got response?
+               if (feof($this->getSocketResource())) {
+                       // No response received
+                       return $response;
+               } // END - if
+
+               // Read the first line
+               $resp = trim(fgets($this->getSocketResource(), 10240));
+
+               // "Explode" the string to an array
+               $responseArray = explode(' ', $resp);
+
+               // And return it
+               return $responseArray;
+       }
+
+       /**
+        * A HTTP/1.1 CONNECT request
+        *
+        * @param       $host   Host to connect to
+        * @param       $port   Port number to connect to
+        * @return      $responseArray  An array with the read response
+        */
+       public function doConnectRequest ($host, $port) {
+               // Prepare extra header(s)
+               $headers = array(
+                       'Proxy-Connection' => 'Keep-Alive'
+               );
+
+               // Prepare raw request
+               $responseArray = $this->sendRawHttpRequest('CONNECT', $host, $port, $headers);
+
+               // 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
new file mode 100644 (file)
index 0000000..2d3ab2a
--- /dev/null
+++ b/inc/main/classes/container/socket/class_SocketContainer.php
@@ -0,0 +1,128 @@
+<?php
+/**
+ * A Socket Container class
+ *
+ * @author             Roland Haeder <webmaster@shipsimu.org>
+ * @version            0.0.0
+ * @copyright  Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2016 Core Developer Team
+ * @license            GNU GPL 3.0 or any newer version
+ * @link               http://www.shipsimu.org
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+class SocketContainer extends BaseContainer implements Registerable {
+       /**
+        * Protected constructor
+        *
+        * @return      void
+        */
+       protected function __construct () {
+               // Call parent constructor
+               parent::__construct(__CLASS__);
+       }
+
+       /**
+        * Creates an instance of this Container class and prepares it for usage
+        *
+        * @param       $socketResource         A valid socket resource
+        * @param       $infoInstance           An instance of a  ShareableInfo class
+        * @param       $packageData            Raw package data
+        * @return      $containerInstance      An instance of this Container class
+        */
+       public static final function createSocketContainer ($socketResource, ShareableInfo $infoInstance = NULL, array $packageData = array()) {
+               // Get a new instance
+               $containerInstance = new SocketContainer();
+
+               // Remove unneeded entries
+               unset($packageData[NetworkPackage::PACKAGE_DATA_CONTENT]);
+               unset($packageData[NetworkPackage::PACKAGE_DATA_HASH]);
+
+               // Debug message
+               //* NOISY-DEBUG: */ self::createDebugInstance(__CLASS__)->debugOutput('SOCKET-CONTAINER[' . __METHOD__ . ':' . __LINE__ . ']:socketResource=' . $socketResource . ',packageData='.print_r($packageData, TRUE));
+
+               // Is the info instance set?
+               if ($infoInstance instanceof ShareableInfo) {
+                       // Get listener/helper from info class
+                       $listenerInstance = $infoInstance->getListenerInstance();
+                       $helperInstance = $infoInstance->getHelperInstance();
+
+                       // Debug message
+                       //* NOISY-DEBUG: */ self::createDebugInstance(__CLASS__)->debugOutput('SOCKET-CONTAINER[' . __METHOD__ . ':' . __LINE__ . ']: listenerInstance[]=' . gettype($listenerInstance));
+
+                       // Is there a listener instance set?
+                       if ($listenerInstance instanceof Listenable) {
+                               // Debug message
+                               //* NOISY-DEBUG: */ self::createDebugInstance(__CLASS__)->debugOutput('SOCKET-CONTAINER[' . __METHOD__ . ':' . __LINE__ . ']: Setting listenerInstance=' . $listenerInstance->__toString() . ' ...');
+
+                               // Set it here for later usage
+                               $containerInstance->setListenerInstance($listenerInstance);
+                       } elseif ($helperInstance instanceof ConnectionHelper) {
+                               // Debug message
+                               //* NOISY-DEBUG: */ self::createDebugInstance(__CLASS__)->debugOutput('SOCKET-CONTAINER[' . __METHOD__ . ':' . __LINE__ . ']: Setting helperInstance=' . $helperInstance->__toString() . ' ...');
+
+                               // Set it here for later usage
+                               $containerInstance->setHelperInstance($helperInstance);
+                       }
+               } // END - if
+
+               // Set the resource ...
+               $containerInstance->setSocketResource($socketResource);
+
+               // ... and package data
+               $containerInstance->setPackageData($packageData);
+
+               // Return the prepared instance
+               return $containerInstance;
+       }
+
+       /**
+        * Checks whether the given Universal Node Locator matches with the one from package data
+        *
+        * @param       $unl            A Universal Node Locator
+        * @return      $matches        Whether $address matches with the one from package data
+        */
+       public final function ifAddressMatches ($unl) {
+               // Get current package data
+               $packageData = $this->getPackageData();
+
+               // Debug message
+               //* NOISY-DEBUG: */ self::createDebugInstance(__CLASS__)->debugOutput('SOCKET-CONTAINER[' . __METHOD__ . ':' . __LINE__ . ']: unl=' . $unl . ',packageData=' . print_r($packageData, TRUE));
+
+               // So, does both match?
+               $matches = ((isset($packageData[NetworkPackage::PACKAGE_DATA_RECIPIENT])) && ($packageData[NetworkPackage::PACKAGE_DATA_RECIPIENT] === $unl));
+
+               // Return result
+               return $matches;
+       }
+
+       /**
+        * Checks whether the given socket matches with stored
+        *
+        * @param       $socketResource         A valid socket resource
+        * @return      $matches                        Whether given socket matches
+        */
+       public final function ifSocketResourceMatches ($socketResource) {
+               // Debug message
+               /* NOISY-DEBUG: */ self::createDebugInstance(__CLASS__)->debugOutput('SOCKET-CONTAINER[' . __METHOD__ . ':' . __LINE__ . ']: socketResource[' . gettype($socketResource) . ']=' .$socketResource . ',storedResource[' . gettype($this->getSocketResource()) . ']=' . $this->getSocketResource());
+
+               // So, does both match?
+               $matches = ((is_resource($socketResource)) && ($socketResource === $this->getSocketResource()));
+
+               // Return result
+               return $matches;
+       }
+}
+
+// [EOF]
+?>

diff --git a/inc/main/classes/database/migration/.htaccess b/inc/main/classes/database/migration/.htaccess
new file mode 100644 (file)
index 0000000..3a42882
--- /dev/null
+++ b/inc/main/classes/database/migration/.htaccess
@@ -0,0 +1 @@
+Deny from all

diff --git a/inc/main/classes/database/migration/class_ b/inc/main/classes/database/migration/class_
new file mode 100644 (file)
index 0000000..963756d
--- /dev/null
+++ b/inc/main/classes/database/migration/class_
@@ -0,0 +1,37 @@
+<?php
+/**
+ * 
+ *
+ * @author             Roland Haeder <webmaster@ship-simu.org>
+ * @version            0.0.0
+ * @copyright  Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2016 Core Developer Team
+ * @license            GNU GPL 3.0 or any newer version
+ * @link               http://www.ship-simu.org
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+class  extends BaseDatabaseMigration implements MigrateableDatabase {
+       /**
+        * Protected constructor
+        *
+        * @return      void
+        */
+       protected function __construct($class = __CLASS__) {
+               // 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
new file mode 100644 (file)
index 0000000..753a629
--- /dev/null
+++ b/inc/main/classes/database/migration/class_BaseDatabaseMigration.php
@@ -0,0 +1,37 @@
+<?php
+/**
+ * A general database migration class
+ *
+ * @author             Roland Haeder <webmaster@ship-simu.org>
+ * @version            0.0.0
+ * @copyright  Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2016 Core Developer Team
+ * @license            GNU GPL 3.0 or any newer version
+ * @link               http://www.ship-simu.org
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+class BaseDatabaseMigration extends BaseFrameworkSystem {
+       /**
+        * Protected constructor
+        *
+        * @return      void
+        */
+       protected function __construct($class = __CLASS__) {
+               // Call parent constructor
+               parent::__construct($class);
+       }
+}
+
+// [EOF]
+?>

diff --git a/inc/main/classes/database/migration/format_upgrade/.htaccess b/inc/main/classes/database/migration/format_upgrade/.htaccess
new file mode 100644 (file)
index 0000000..3a42882
--- /dev/null
+++ b/inc/main/classes/database/migration/format_upgrade/.htaccess
@@ -0,0 +1 @@
+Deny from all

diff --git a/inc/main/classes/database/migration/format_upgrade/class_ b/inc/main/classes/database/migration/format_upgrade/class_
new file mode 100644 (file)
index 0000000..139ee0c
--- /dev/null
+++ b/inc/main/classes/database/migration/format_upgrade/class_
@@ -0,0 +1,37 @@
+<?php
+/**
+ * 
+ *
+ * @author             Roland Haeder <webmaster@ship-simu.org>
+ * @version            0.0.0
+ * @copyright  Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2016 Core Developer Team
+ * @license            GNU GPL 3.0 or any newer version
+ * @link               http://www.ship-simu.org
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+class  extends BaseFormatUpgrade implements UpgradeableDatabaseFormat {
+       /**
+        * Protected constructor
+        *
+        * @return      void
+        */
+       protected function __construct($class = __CLASS__) {
+               // Call parent constructor
+               parent::__construct($class);
+       }
+}
+
+// [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
new file mode 100644 (file)
index 0000000..ebeff25
--- /dev/null
+++ b/inc/main/classes/database/migration/format_upgrade/class_BaseFormatUpgrade.php
@@ -0,0 +1,37 @@
+<?php
+/**
+ * A general format upgrade class
+ *
+ * @author             Roland Haeder <webmaster@ship-simu.org>
+ * @version            0.0.0
+ * @copyright  Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2016 Core Developer Team
+ * @license            GNU GPL 3.0 or any newer version
+ * @link               http://www.ship-simu.org
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+class BaseFormatUpgrade extends BaseDatabaseMigration implements MigrateableDatabase {
+       /**
+        * Protected constructor
+        *
+        * @return      void
+        */
+       protected function __construct($class = __CLASS__) {
+               // Call parent constructor
+               parent::__construct($class);
+       }
+}
+
+// [EOF]
+?>

diff --git a/inc/main/classes/factories/client/class_ClientFactory.php b/inc/main/classes/factories/client/class_ClientFactory.php
new file mode 100644 (file)
index 0000000..4c7c421
--- /dev/null
+++ b/inc/main/classes/factories/client/class_ClientFactory.php
@@ -0,0 +1,71 @@
+<?php
+/**
+ * An object factory for clients
+ *
+ * @author             Roland Haeder <webmaster@shipsimu.org>
+ * @version            0.0.0
+ * @copyright  Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2016 Core Developer Team
+ * @license            GNU GPL 3.0 or any newer version
+ * @link               http://www.shipsimu.org
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+class ClientFactory extends ObjectFactory {
+       /**
+        * Protected constructor
+        *
+        * @return      void
+        */
+       protected function __construct () {
+               // Call parent constructor
+               parent::__construct(__CLASS__);
+       }
+
+       /**
+        * Creates a client object for given protocol. This method uses the
+        * registry pattern to cache those instances.
+        *
+        * @param       $protocolInstance       An instance of a HandleableProtocol class to create a client object for (e.g. 'http' for a HTTP/1.1 client)
+        * @param       $socketResource         A valid socket resource (optional)
+        * @return      $clientInstance         An instance of the requested client
+        */
+       public static final function createClientByProtocolInstance (HandleableProtocol $protocolInstance, $socketResource = FALSE) {
+               // Default is NULL (to initialize variable)
+               $clientInstance = NULL;
+
+               // Generate registry key
+               $registryKey = strtolower($protocolInstance->getProtocolName()) . '_client';
+
+               // Is the key already in registry?
+               if (Registry::getRegistry()->instanceExists($registryKey)) {
+                       // Then use that instance
+                       $clientInstance = Registry::getRegistry()->getInstance($registryKey);
+
+                       // Set socket resource
+                       $clientInstance->setSocketResource($socketResource);
+               } else {
+                       // Generate object instance
+                       $clientInstance = self::createObjectByConfiguredName($registryKey, array($socketResource));
+
+                       // Set it in registry for later re-use
+                       Registry::getRegistry()->addInstance($registryKey, $clientInstance);
+               }
+
+               // 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_
new file mode 100644 (file)
index 0000000..06173e6
--- /dev/null
+++ b/inc/main/classes/handler/raw_data/class_
@@ -0,0 +1,73 @@
+<?php
+/**
+ * A ??? network package handler
+ *
+ * @author             Roland Haeder <webmaster@ship-simu.org>
+ * @version            0.0.0
+ * @copyright  Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2016 Core Developer Team
+ * @license            GNU GPL 3.0 or any newer version
+ * @link               http://www.ship-simu.org
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+class ???NetworkPackageHandler extends BaseNetworkPackageHandler implements Networkable {
+       /**
+        * Protected constructor
+        *
+        * @return      void
+        */
+       protected function __construct () {
+               // Call parent constructor
+               parent::__construct(__CLASS__);
+
+               // Set handler name
+               $this->setHandlerName('!!!');
+       }
+
+       /**
+        * Creates an instance of this class
+        *
+        * @return      $handlerInstance                An instance of a Networkable class
+        */
+       public final static function create???NetworkPackageHandler () {
+               // Get new instance
+               $handlerInstance = new ???NetworkPackageHandler();
+
+               // Return the prepared instance
+               return $handlerInstance;
+       }
+
+       /**
+        * Processes a package from given resource. This is mostly useful for TCP
+        * package handling and is implemented in the TcpListener class
+        *
+        * @param       $resource       A valid resource identifier
+        * @return      void
+        * @throws      InvalidResourceException        If the given resource is invalid
+        * @todo        0%
+        */
+       public function processResourcePackage ($resource) {
+               // Check the resource
+               if (!is_resource($resource)) {
+                       // Throw an exception
+                       throw new InvalidResourceException($this, self::EXCEPTION_INVALID_RESOURCE);
+               } // END - if
+
+               // 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
new file mode 100644 (file)
index 0000000..24f2913
--- /dev/null
+++ b/inc/main/classes/handler/raw_data/class_BaseDataHandler.php
@@ -0,0 +1,197 @@
+<?php
+/**
+ * A general data Handler
+ *
+ * @author             Roland Haeder <webmaster@shipsimu.org>
+ * @version            0.0.0
+ * @copyright  Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2016 Core Developer Team
+ * @license            GNU GPL 3.0 or any newer version
+ * @link               http://www.shipsimu.org
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+abstract class BaseDataHandler extends BaseHandler {
+       /**
+        * Last exception instance from database layer or NULL (default)
+        */
+       private $lastException = NULL;
+
+       /**
+        * Array with search criteria elements
+        */
+       protected $searchData = array();
+
+       /**
+        * Array with all data XML nodes (which hold the actual data) and their values
+        */
+       protected $messageDataElements = array();
+
+       /**
+        * Array for translating message data elements (other node's data mostly)
+        * into configuration elements.
+        */
+       protected $messageToConfig = array();
+
+       /**
+        * Array for copying configuration entries
+        */
+       protected $configCopy = array();
+
+       /**
+        * Protected constructor
+        *
+        * @param       $className      Name of the class
+        * @return      void
+        */
+       protected function __construct ($className) {
+               // Call parent constructor
+               parent::__construct($className);
+
+               // Get a DHT instance
+               $dhtInstance = DhtObjectFactory::createDhtInstance('node');
+
+               // Set it here
+               $this->setDhtInstance($dhtInstance);
+       }
+
+       /**
+        * Getter for search data array
+        *
+        * @return      $searchData             Search data array
+        */
+       public final function getSearchData () {
+               return $this->searchData;
+       }
+
+       /**
+        * Getter for last exception
+        *
+        * @return      $lastException  Last thrown exception
+        */
+       public final function getLastException () {
+               return $this->lastException;
+       }
+
+       /**
+        * Setter for last exception
+        *
+        * @param       $lastException  Last thrown exception
+        * @return      void
+        */
+       public final function setLastException (FrameworkException $exceptionInstance = NULL) {
+               $this->lastException = $exceptionInstance;
+       }
+
+       /**
+        * Prepares a message as answer for given message data for delivery.
+        *
+        * @param       $messageData            An array with all message data
+        * @param       $packageInstance        An instance of a Deliverable instance
+        * @return      void
+        */
+       protected function prepareAnswerMessage (array $messageData, Deliverable $packageInstance) {
+               // Debug message
+               /* NOISY-DEBUG: */ self::createDebugInstance(__CLASS__)->debugOutput('MESSAGE-HANDLER[' . __METHOD__ . ':' . __LINE__ . ']: Going to send an answer message for ' . $this->getHandlerName() . ' ...');
+
+               // Get a helper instance based on this handler's name
+               $helperInstance = ObjectFactory::createObjectByConfiguredName('node_answer_' . $this->getHandlerName() . '_helper_class', array($messageData));
+
+               // Get node instance
+               $nodeInstance = NodeObjectFactory::createNodeInstance();
+
+               // Load descriptor XML
+               $helperInstance->loadDescriptorXml($nodeInstance);
+
+               /*
+                * Set missing (temporary) configuration data, mostly it needs to be
+                * copied from message data array.
+                */
+               $this->initMessageConfigurationData($messageData);
+
+               // Compile any configuration variables
+               $helperInstance->getTemplateInstance()->compileConfigInVariables();
+
+               // Deliver the package
+               $helperInstance->sendPackage($nodeInstance);
+
+               /*
+                * Remove temporary configuration
+                */
+               $this->removeMessageConfigurationData($messageData);
+
+               // Debug message
+               /* NOISY-DEBUG: */ self::createDebugInstance(__CLASS__)->debugOutput('MESSAGE-HANDLER[' . __METHOD__ . ':' . __LINE__ . ']: Answer message has been prepared.');
+       }
+
+       /**
+        * Prepares the next message
+        *
+        * @param       $messageData            An array with all message data
+        * @param       $packageInstance        An instance of a Deliverable instance
+        * @return      void
+        */
+       protected function prepareNextMessage (array $messageData, Deliverable $packageInstance) {
+               // Debug message
+               /* NOISY-DEBUG: */ self::createDebugInstance(__CLASS__)->debugOutput('MESSAGE-HANDLER[' . __METHOD__ . ':' . __LINE__ . ']: Going to send next message ...');
+
+               // Get a helper instance based on this handler's name
+               $helperInstance = ObjectFactory::createObjectByConfiguredName('node_next_' . $this->getHandlerName() . '_helper_class', array($messageData));
+
+               // Get node instance
+               $nodeInstance = NodeObjectFactory::createNodeInstance();
+
+               // Load descriptor XML
+               $helperInstance->loadDescriptorXml($nodeInstance);
+
+               /*
+                * Set missing (temporary) configuration data, mostly it needs to be
+                * copied from message data array.
+                */
+               $this->initMessageConfigurationData($messageData);
+
+               // Compile any configuration variables
+               $helperInstance->getTemplateInstance()->compileConfigInVariables();
+
+               // Deliver the package
+               $helperInstance->sendPackage($nodeInstance);
+
+               /*
+                * Remove temporary configuration
+                */
+               $this->removeMessageConfigurationData($messageData);
+
+               // Debug message
+               /* NOISY-DEBUG: */ self::createDebugInstance(__CLASS__)->debugOutput('MESSAGE-HANDLER[' . __METHOD__ . ':' . __LINE__ . ']: Next message has been prepared.');
+       }
+
+       /**
+        * Initializes configuration data from given message data array
+        *
+        * @param       $messageData    An array with all message data
+        * @return      void
+        */
+       abstract protected function initMessageConfigurationData (array $messageData);
+
+       /**
+        * Removes configuration data with given message data array from global
+        * configuration
+        *
+        * @param       $messageData    An array with all message data
+        * @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_
new file mode 100644 (file)
index 0000000..9323d99
--- /dev/null
+++ b/inc/main/classes/handler/raw_data/network/class_
@@ -0,0 +1,68 @@
+<?php
+/**
+ * A !!! raw data handler
+ *
+ * @author             Roland Haeder <webmaster@shipsimu.org>
+ * @version            0.0.0
+ * @copyright  Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2016 Core Developer Team
+ * @license            GNU GPL 3.0 or any newer version
+ * @link               http://www.shipsimu.org
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+class ???RawDataHandler extends BaseRawDataHandler implements Networkable {
+       /**
+        * Last socket error (default: Success)
+        */
+       private $lastSocketError = 0;
+
+       /**
+        * Protected constructor
+        *
+        * @return      void
+        */
+       protected function __construct () {
+               // Call parent constructor
+               parent::__construct(__CLASS__);
+
+               // Set handler name
+               $this->setHandlerName('|||');
+       }
+
+       /**
+        * Creates an instance of this class
+        *
+        * @return      $handlerInstance        An instance of a Networkable class
+        */
+       public static final function create???RawDataHandler () {
+               // Get new instance
+               $handlerInstance = new ???RawDataHandler();
+
+               // Return the prepared instance
+               return $handlerInstance;
+       }
+
+       /**
+        * Processes raw data from given resource. This is mostly useful for TCP
+        * package handling and is implemented in the ???Listener class
+        *
+        * @param       $resource       A valid socket resource array
+        * @return      void
+        */
+       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
new file mode 100644 (file)
index 0000000..012e15a
--- /dev/null
+++ b/inc/main/classes/handler/raw_data/network/class_BaseRawDataHandler.php
@@ -0,0 +1,183 @@
+<?php
+/**
+ * A general Handler for raw data from sockets
+ *
+ * @author             Roland Haeder <webmaster@shipsimu.org>
+ * @version            0.0.0
+ * @copyright  Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2016 Core Developer Team
+ * @license            GNU GPL 3.0 or any newer version
+ * @link               http://www.shipsimu.org
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+class BaseRawDataHandler extends BaseHandler {
+       // Error codes:
+       // - Socket raw data stream errors
+       const SOCKET_ERROR_UNKNOWN                    = 'unknown_error';              // Unknown error (should not happen)
+       const SOCKET_ERROR_TRANSPORT_ENDPOINT         = 'transport_endpoint';         // Transport endpoint has closed
+       const SOCKET_ERROR_INVALID_BASE64_MODULO      = 'base64_modulo';              // Length is not modulo 4
+       const SOCKET_ERROR_INVALID_BASE64_MESSAGE     = 'base64_message';             // Raw data is not Base64-encoded
+       const SOCKET_ERROR_UNHANDLED                  = 'unhandled_package';          // Unhandled raw data (not bad)
+       const SOCKET_ERROR_CONNECTION_REFUSED         = 'connection_refused';         // The name says it: connection refused
+       const SOCKET_ERROR_CONNECTION_TIMED_OUT       = 'connection_timed_out';       // The name says it: connection attempt has timed-out
+       const SOCKET_ERROR_OPERATION_IN_PROGRESS      = 'operation_in_progress';      // 'Operation now in progress'
+       const SOCKET_ERROR_OPERATION_ALREADY_PROGRESS = 'operation_already_progress'; // 'Operation already in progress'
+       const SOCKET_ERROR_RESOURCE_UNAVAILABLE       = 'resource_unavailable';       // 'Resource temporary unavailable'
+       const SOCKET_ERROR_NO_ROUTE_TO_HOST           = 'no_route_to_host';           // The name says it: no route to host
+       const SOCKET_ERROR_CONNECTION_RESET_BY_PEER   = 'connection_reset_by_peer';   // Connection reset by peer
+       const SOCKET_ERROR_BROKEN_PIPE                = 'broken_pipe';                // Broken pipe
+       const SOCKET_ERROR_PERMISSION_DENIED          = 'permission_denied';          // Permission denied
+       const SOCKET_CONNECTED                        = 'connected';                  // Nothing errorous happens, socket is connected
+
+       // - Package errors
+       const PACKAGE_ERROR_INVALID_DATA       = 'invalid_data';    // Invalid data in package found
+       const PACKAGE_ERROR_INCOMPLETE_DATA    = 'incomplete_data'; // Incomplete data sent (e.g. field is missing)
+       const PACKAGE_ERROR_INVALID_CONTENT    = 'invalid_content'; // Content is invalid (e.g. not well-formed)
+       const PACKAGE_ERROR_RECIPIENT_MISMATCH = 'recipient_error'; // Recipient is not us
+       const PACKAGE_LEVEL_CHECK_OKAY         = 'checked_package'; // Package is fine
+
+       // Package data
+       const PACKAGE_RAW_DATA   = 'raw_data';
+       const PACKAGE_ERROR_CODE = 'error_code';
+
+       // Start/end marker
+       const STREAM_START_MARKER = '[[S]]';
+       const STREAM_END_MARKER   = '[[E]]';
+
+       /**
+        * Stacker for raw data
+        */
+       const STACKER_NAME_RAW_DATA = 'raw_data';
+
+       /**
+        * Error code from socket
+        */
+       private $errorCode = -1;
+
+       /**
+        * Protected constructor
+        *
+        * @param       $className      Name of the class
+        * @return      void
+        */
+       protected function __construct ($className) {
+               // Call parent constructor
+               parent::__construct($className);
+
+               // Set error code to 'unknown'
+               $this->setErrorCode(self::SOCKET_ERROR_UNKNOWN);
+
+               // Init stacker instance for processed raw data
+               $stackInstance = ObjectFactory::createObjectByConfiguredName('node_raw_data_stacker_class');
+
+               // Remember this in this package handler
+               $this->setStackInstance($stackInstance);
+
+               // Init stacker
+               $this->initStack();
+       }
+
+       /**
+        * Initializes the stacker for raw data
+        *
+        * @return      void
+        */
+       protected function initStack () {
+               $this->getStackInstance()->initStack(self::STACKER_NAME_RAW_DATA);
+       }
+
+       /**
+        * Adds given raw data to the raw data stacker
+        *
+        * @param       $rawData        raw data from the socket resource
+        * @return      void
+        */
+       protected function addRawDataToStacker ($rawData) {
+               /*
+                * Add the deocoded data and error code to the stacker so other classes
+                * (e.g. NetworkPackage) can "pop" it from the stacker.
+                */
+               $this->getStackInstance()->pushNamed(self::STACKER_NAME_RAW_DATA, array(
+                       self::PACKAGE_RAW_DATA   => $rawData,
+                       self::PACKAGE_ERROR_CODE => $this->getErrorCode()
+               ));
+       }
+
+       /**
+        * Checks whether raw data is pending for further processing.
+        *
+        * @return      $isPending      Whether raw data is pending
+        */
+       public function isRawDataPending () {
+               // Does the stacker have some entries (not empty)?
+               $isPending = (!$this->getStackInstance()->isStackEmpty(self::STACKER_NAME_RAW_DATA));
+
+               // Return it
+               return $isPending;
+       }
+
+       /**
+        * "Getter" for next raw data from the stacker
+        *
+        * @return      $rawData        Raw data from the stacker
+        */
+       public function getNextRawData () {
+               // "Pop" the raw data from the stacker
+               $rawData = $this->getStackInstance()->popNamed(self::STACKER_NAME_RAW_DATA);
+
+               // And return it
+               return $rawData;
+       }
+
+       /**
+        * Checks whether the 'recipient' field matches our own an universal node
+        * locator.
+        *
+        * @param       $packageData    Raw package data
+        * @return      $matches                Whether it matches
+        * @todo        This method will be moved to a better place
+        */
+       protected function ifRecipientMatchesOwnUniversalNodeLocator (array $packageData) {
+               // Construct own address first
+               $ownAddress = NodeObjectFactory::createNodeInstance()->determineUniversalNodeLocator();
+
+               // Does it match?
+               $matches = ($ownAddress === $packageData[NetworkPackage::PACKAGE_DATA_RECIPIENT]);
+
+               // Return result
+               return $matches;
+       }
+
+       /**
+        * Setter for error code
+        *
+        * @param       $errorCode      The error code we shall set
+        * @return      void
+        */
+       public final function setErrorCode ($errorCode) {
+               $this->errorCode = $errorCode;
+       }
+
+       /**
+        * Getter for error code
+        *
+        * @return      $errorCode      The error code
+        */
+       public final function getErrorCode () {
+               return $this->errorCode;
+       }
+}
+
+// [EOF]
+?>

diff --git a/inc/main/classes/listener/class_ b/inc/main/classes/listener/class_
new file mode 100644 (file)
index 0000000..00c6eb7
--- /dev/null
+++ b/inc/main/classes/listener/class_
@@ -0,0 +1,102 @@
+<?php
+/**
+ * A ??? listener
+ *
+ * @author             Roland Haeder <webmaster@ship-simu.org>
+ * @version            0.0.0
+ * @copyright  Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2016 Core Developer Team
+ * @license            GNU GPL 3.0 or any newer version
+ * @link               http://www.ship-simu.org
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+class ???Listener extends BaseListener implements Listenable {
+       /**
+        * Protected constructor
+        *
+        * @return      void
+        */
+       protected function __construct () {
+               // Call parent constructor
+               parent::__construct(__CLASS__);
+
+               // Set the protocol to !!!
+               $this->setProtocolName('!!!');
+       }
+
+       /**
+        * Creates an instance of this class
+        *
+        * @return      $listenerInstance       An instance a prepared listener class
+        */
+       public final static function create???Listener () {
+               // Get new instance
+               $listenerInstance = new ???Listener();
+
+               // Return the prepared instance
+               return $listenerInstance;
+       }
+
+       /**
+        * Initializes the listener by setting up the required socket server
+        *
+        * @return      void
+        * @todo        0% done
+        */
+       public function initListener() {
+               $this->partialStub('Need to implement this method.');
+       }
+
+       /**
+        * "Listens" for incoming network packages
+        *
+        * @return      void
+        * @todo        0% done
+        */
+       public function doListen() {
+               $this->partialStub('Need to implement this method.');
+       }
+
+       /**
+        * Checks whether the listener would accept the given package data array
+        *
+        * @param       $packageData    Raw package data
+        * @return      $accepts                Whether this listener does accept
+        */
+       public function ifListenerAcceptsPackageData (array $packageData) {
+               $this->partialStub('Need to implement this method.') {
+       }
+
+       /**
+        * Monitors incoming raw data from the handler and transfers it to the
+        * given receiver instance.
+        *
+        * @return      void
+        */
+       public function monitorIncomingRawData () {
+               $this->partialStub('Need to implement this method.') {
+       }
+
+       /**
+        * Getter for connection type
+        *
+        * @return      $connectionType         Connection type for this listener
+        */
+       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
new file mode 100644 (file)
index 0000000..5b17e79
--- /dev/null
+++ b/inc/main/classes/listener/class_BaseListener.php
@@ -0,0 +1,597 @@
+<?php
+/**
+ * A general listener class
+ *
+ * @author             Roland Haeder <webmaster@shipsimu.org>
+ * @version            0.0.0
+ * @copyright  Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2016 Core Developer Team
+ * @license            GNU GPL 3.0 or any newer version
+ * @link               http://www.shipsimu.org
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+class BaseListener extends BaseFrameworkSystem implements Visitable {
+       // Exception code constants
+       const EXCEPTION_INVALID_SOCKET                   = 0xa00;
+       const EXCEPTION_SOCKET_ALREADY_REGISTERED        = 0xa01;
+       const EXCEPTION_SOCKET_CREATION_FAILED           = 0xa02;
+       const EXCEPTION_NO_SOCKET_ERROR                  = 0xa03;
+       const EXCEPTION_CONNECTION_ALREADY_REGISTERED    = 0xa04;
+       const EXCEPTION_UNEXPECTED_PACKAGE_STATUS        = 0xa05;
+       const EXCEPTION_UNSUPPORTED_PACKAGE_CODE_HANDLER = 0xa06;
+       const EXCEPTION_FINAL_CHUNK_VERIFICATION         = 0xa07;
+       const EXCEPTION_INVALID_DATA_CHECKSUM            = 0xa08;
+
+       /**
+        * Address (IP mostly) we shall listen on
+        */
+       private $listenAddress = '0.0.0.0'; // This is the default and listens on all interfaces
+
+       /**
+        * Port we shall listen on (or wait for incoming data)
+        */
+       private $listenPort = 0; // This port MUST be changed by your application
+
+       /**
+        * Whether we are in blocking or non-blocking mode (default: non-blocking
+        */
+       private $blockingMode = FALSE;
+
+       /**
+        * A peer pool instance
+        */
+       private $poolInstance = NULL;
+
+       /**
+        * Protected constructor
+        *
+        * @param       $className      Name of the class
+        * @return      void
+        */
+       protected function __construct ($className) {
+               // Call parent constructor
+               parent::__construct($className);
+       }
+
+       /**
+        * Checks whether the given socket resource is a server socket
+        *
+        * @param       $socketResource         A valid socket resource
+        * @return      $isServerSocket         Whether the socket resource is a server socket
+        */
+       protected function isServerSocketResource ($socketResource) {
+               // Check it
+               $isServerSocket = ((is_resource($socketResource)) && (!@socket_getpeername($socketResource, $peerName)));
+
+               // We need to clear the error here if it is a resource
+               if ($isServerSocket === TRUE) {
+                       // Clear the error
+                       //* DEBUG: */ self::createDebugInstance(__CLASS__)->debugOutput('socketResource[]=' . gettype($socketResource));
+                       socket_clear_error($socketResource);
+               } // END - if
+
+               // Check peer name, it must be empty
+               $isServerSocket = (($isServerSocket) && (empty($peerName)));
+
+               // Return result
+               return $isServerSocket;
+       }
+
+       /**
+        * Setter for listen address
+        *
+        * @param       $listenAddress  The address this listener should listen on
+        * @return      void
+        */
+       protected final function setListenAddress ($listenAddress) {
+               $this->listenAddress = (string) $listenAddress;
+       }
+
+       /**
+        * Getter for listen address
+        *
+        * @return      $listenAddress  The address this listener should listen on
+        */
+       public final function getListenAddress () {
+               return $this->listenAddress;
+       }
+
+       /**
+        * Setter for listen port
+        *
+        * @param       $listenPort             The port this listener should listen on
+        * @return      void
+        */
+       protected final function setListenPort ($listenPort) {
+               $this->listenPort = (int) $listenPort;
+       }
+
+       /**
+        * Getter for listen port
+        *
+        * @return      $listenPort             The port this listener should listen on
+        */
+       public final function getListenPort () {
+               return $this->listenPort;
+       }
+
+       /**
+        * "Setter" to set listen address from configuration entry
+        *
+        * @param       $configEntry    The configuration entry holding our listen address
+        * @return      void
+        */
+       public final function setListenAddressByConfiguration ($configEntry) {
+               $this->setListenAddress($this->getConfigInstance()->getConfigEntry($configEntry));
+       }
+
+       /**
+        * "Setter" to set listen port from configuration entry
+        *
+        * @param       $configEntry    The configuration entry holding our listen port
+        * @return      void
+        */
+       public final function setListenPortByConfiguration ($configEntry) {
+               $this->setListenPort($this->getConfigInstance()->getConfigEntry($configEntry));
+       }
+
+       /**
+        * Setter for blocking-mode
+        *
+        * @param       $blockingMode   Whether blocking-mode is disabled (default) or enabled
+        * @return      void
+        */
+       protected final function setBlockingMode ($blockingMode) {
+               $this->blockingMode = (boolean) $blockingMode;
+       }
+
+       /**
+        * Checks whether blocking-mode is enabled or disabled
+        *
+        * @return      $blockingMode   Whether blocking mode is disabled or enabled
+        */
+       public final function isBlockingModeEnabled () {
+               return $this->blockingMode;
+       }
+
+       /**
+        * Setter for peer pool instance
+        *
+        * @param       $poolInstance   The peer pool instance we shall set
+        * @return      void
+        */
+       protected final function setPoolInstance (PoolablePeer $poolInstance) {
+               $this->poolInstance = $poolInstance;
+       }
+
+       /**
+        * Getter for peer pool instance
+        *
+        * @return      $poolInstance   The peer pool instance we shall set
+        */
+       public final function getPoolInstance () {
+               return $this->poolInstance;
+       }
+
+       /**
+        * Getter for connection type
+        *
+        * @return      $connectionType         Connection type for this listener
+        */
+       public final function getConnectionType () {
+               // Wrap the real getter
+               return $this->getProtocolName();
+       }
+
+       /**
+        * Registeres the given socket resource for "this" listener instance. This
+        * will be done in a seperate class to allow package writers to use it
+        * again.
+        *
+        * @param       $socketResource         A valid server socket resource
+        * @return      void
+        * @throws      InvalidServerSocketException            If the given resource is no server socket
+        * @throws      SocketAlreadyRegisteredException        If the given resource is already registered
+        */
+       protected function registerServerSocketResource ($socketResource) {
+               // First check if it is valid
+               if (!$this->isServerSocketResource($socketResource)) {
+                       // No server socket
+                       throw new InvalidServerSocketException(array($this, $socketResource), self::EXCEPTION_INVALID_SOCKET);
+               } elseif ($this->isServerSocketRegistered($socketResource)) {
+                       // Already registered
+                       throw new SocketAlreadyRegisteredException($this, self::EXCEPTION_SOCKET_ALREADY_REGISTERED);
+               }
+
+               // Get a socket registry instance (singleton)
+               $registryInstance = SocketRegistryFactory::createSocketRegistryInstance();
+
+               // Get a connection info instance
+               $infoInstance = ConnectionInfoFactory::createConnectionInfoInstance($this->getProtocolName(), 'listener');
+
+               // Will the info instance with listener data
+               $infoInstance->fillWithListenerInformation($this);
+
+               // Register the socket
+               $registryInstance->registerSocket($infoInstance, $socketResource);
+
+               // And set it here
+               $this->setSocketResource($socketResource);
+       }
+
+       /**
+        * Checks whether given socket resource is registered in socket registry
+        *
+        * @param       $socketResource         A valid server socket resource
+        * @return      $isRegistered           Whether given server socket is registered
+        */
+       protected function isServerSocketRegistered ($socketResource) {
+               // Get a socket registry instance (singleton)
+               $registryInstance = SocketRegistryFactory::createSocketRegistryInstance();
+
+               // Get a connection info instance
+               $infoInstance = ConnectionInfoFactory::createConnectionInfoInstance($this->getProtocolName(), 'listener');
+
+               // Will the info instance with listener data
+               $infoInstance->fillWithListenerInformation($this);
+
+               // Check it
+               $isRegistered = $registryInstance->isSocketRegistered($infoInstance, $socketResource);
+
+               // Return result
+               return $isRegistered;
+       }
+
+       /**
+        * Accepts the visitor to process the visit "request"
+        *
+        * @param       $visitorInstance        An instance of a Visitor class
+        * @return      void
+        */
+       public function accept (Visitor $visitorInstance) {
+               // Debug message
+               //* DEBUG: */ self::createDebugInstance(__CLASS__)->debugOutput(strtoupper($this->getProtocolName()) . '-LISTENER[' . __METHOD__ . ':' . __LINE__ . ']: ' . $visitorInstance->__toString() . ' has visited ' . $this->__toString() . ' - CALLED!');
+
+               // Visit this listener
+               $visitorInstance->visitListener($this);
+
+               // Visit the pool if set
+               if ($this->getPoolInstance() instanceof Poolable) {
+                       $this->getPoolInstance()->accept($visitorInstance);
+               } // END - if
+
+               // Debug message
+               //* DEBUG: */ self::createDebugInstance(__CLASS__)->debugOutput(strtoupper($this->getProtocolName()) . '-LISTENER[' . __METHOD__ . ':' . __LINE__ . ']: ' . $visitorInstance->__toString() . ' has visited ' . $this->__toString() . ' - EXIT!');
+       }
+
+       /**
+        * Monitors incoming raw data from the handler and transfers it to the
+        * given receiver instance. This method should not be called, please call
+        * the decorator's version instead to separator node/client traffic.
+        *
+        * @return      void
+        * @throws      UnsupportedOperatorException    If this method is called by a mistake
+        */
+       public function monitorIncomingRawData () {
+               throw new UnsupportedOperationException(array($this, __FUNCTION__), self::EXCEPTION_UNSPPORTED_OPERATION);
+       }
+
+       /**
+        * Constructs a callable method name from given socket error code. If the
+        * method is not found, a generic one is used.
+        *
+        * @param       $errorCode              Error code from socket_last_error()
+        * @return      $handlerName    Call-back method name for the error handler
+        * @throws      UnsupportedSocketErrorHandlerException If the error handler is not implemented
+        */
+       protected function getSocketErrorHandlerFromCode ($errorCode) {
+               // Create a name from translated error code
+               $handlerName = 'socketError' . self::convertToClassName($this->translateSocketErrorCodeToName($errorCode)) . 'Handler';
+
+               // Is the call-back method there?
+               if (!method_exists($this, $handlerName)) {
+                       // Please implement this
+                       throw new UnsupportedSocketErrorHandlerException(array($this, $handlerName, $errorCode), BaseConnectionHelper::EXCEPTION_UNSUPPORTED_ERROR_HANDLER);
+               } // END - if
+
+               // Return it
+               return $handlerName;
+       }
+
+       /**
+        * Translates socket error codes into our own internal names which can be
+        * used for call-backs.
+        *
+        * @param       $errorCode      The error code from socket_last_error() to be translated
+        * @return      $errorName      The translated name (all lower-case, with underlines)
+        */
+       public function translateSocketErrorCodeToName ($errorCode) {
+               // Nothing bad happened by default
+               $errorName = BaseRawDataHandler::SOCKET_CONNECTED;
+
+               // Is the code a number, then we have to change it
+               switch ($errorCode) {
+                       case 0: // Silently ignored, the socket is connected
+                               break;
+
+                       case 11:  // "Resource temporary unavailable"
+                               $errorName = BaseRawDataHandler::SOCKET_ERROR_RESOURCE_UNAVAILABLE;
+                               break;
+
+                       case 13:  // "Permission denied"
+                               $errorName = BaseRawDataHandler::SOCKET_ERROR_PERMISSION_DENIED;
+                               break;
+
+                       case 32:  // "Broken pipe"
+                               $errorName = BaseRawDataHandler::SOCKET_ERROR_BROKEN_PIPE;
+                               break;
+
+                       case 104: // "Connection reset by peer"
+                               $errorName = BaseRawDataHandler::SOCKET_ERROR_CONNECTION_RESET_BY_PEER;
+                               break;
+
+                       case 107: // "Transport end-point not connected"
+                       case 134: // On some (?) systems for 'transport end-point not connected'
+                               // @TODO On some systems it is 134, on some 107?
+                               $errorName = BaseRawDataHandler::SOCKET_ERROR_TRANSPORT_ENDPOINT;
+                               break;
+
+                       case 110: // "Connection timed out"
+                               $errorName = BaseRawDataHandler::SOCKET_ERROR_CONNECTION_TIMED_OUT;
+                               break;
+
+                       case 111: // "Connection refused"
+                               $errorName = BaseRawDataHandler::SOCKET_ERROR_CONNECTION_REFUSED;
+                               break;
+
+                       case 113: // "No route to host"
+                               $errorName = BaseRawDataHandler::SOCKET_ERROR_NO_ROUTE_TO_HOST;
+                               break;
+
+                       case 114: // "Operation already in progress"
+                               $errorName = BaseRawDataHandler::SOCKET_ERROR_OPERATION_ALREADY_PROGRESS;
+                               break;
+
+                       case 115: // "Operation now in progress"
+                               $errorName = BaseRawDataHandler::SOCKET_ERROR_OPERATION_IN_PROGRESS;
+                               break;
+
+                       default: // Everything else <> 0
+                               // Unhandled error code detected, so first debug it because we may want to handle it like the others
+                               self::createDebugInstance(__CLASS__)->debugOutput('BASE-HUB[' . __METHOD__ . ':' . __LINE__ . '] UNKNOWN ERROR CODE = ' . $errorCode . ', MESSAGE = ' . socket_strerror($errorCode));
+
+                               // Change it only in this class
+                               $errorName = BaseRawDataHandler::SOCKET_ERROR_UNKNOWN;
+                               break;
+               }
+
+               // Return translated name
+               return $errorName;
+       }
+
+       /**
+        * Shuts down a given socket resource. This method does only ease calling
+        * the right visitor.
+        *
+        * @param       $socketResource         A valid socket resource
+        * @return      void
+        */
+       public function shutdownSocket ($socketResource) {
+               // Debug message
+               self::createDebugInstance(__CLASS__)->debugOutput('HUB-SYSTEM: Shutting down socket resource ' . $socketResource . ' with state ' . $this->getPrintableState() . ' ...');
+
+               // Set socket resource
+               $this->setSocketResource($socketResource);
+
+               // Get a visitor instance
+               $visitorInstance = ObjectFactory::createObjectByConfiguredName('shutdown_socket_visitor_class');
+
+               // Debug output
+               self::createDebugInstance(__CLASS__)->debugOutput('HUB-SYSTEM:' . $this->__toString() . ': visitorInstance=' . $visitorInstance->__toString());
+
+               // Call the visitor
+               $this->accept($visitorInstance);
+       }
+
+       /**
+        * Half-shuts down a given socket resource. This method does only ease calling
+        * an other visitor than shutdownSocket() does.
+        *
+        * @param       $socketResource         A valid socket resource
+        * @return      void
+        */
+       public function halfShutdownSocket ($socketResource) {
+               // Debug message
+               self::createDebugInstance(__CLASS__)->debugOutput('HUB-SYSTEM: Half-shutting down socket resource ' . $socketResource . ' with state ' . $this->getPrintableState() . ' ...');
+
+               // Set socket resource
+               $this->setSocketResource($socketResource);
+
+               // Get a visitor instance
+               $visitorInstance = ObjectFactory::createObjectByConfiguredName('half_shutdown_socket_visitor_class');
+
+               // Debug output
+               self::createDebugInstance(__CLASS__)->debugOutput('HUB-SYSTEM:' . $this->__toString() . ': visitorInstance=' . $visitorInstance->__toString());
+
+               // Call the visitor
+               $this->accept($visitorInstance);
+       }
+
+       // ************************************************************************
+       //                 Socket error handler call-back methods
+       // ************************************************************************
+
+       /**
+        * Handles socket error 'permission denied', but does not clear it for
+        * later debugging purposes.
+        *
+        * @param       $socketResource         A valid socket resource
+        * @param       $socketData                     A valid socket data array (0 = IP/file name, 1 = port)
+        * @return      void
+        * @throws      SocketBindingException  The socket could not be bind to
+        */
+       protected function socketErrorPermissionDeniedHandler ($socketResource, array $socketData) {
+               // Get socket error code for verification
+               $socketError = socket_last_error($socketResource);
+
+               // Get error message
+               $errorMessage = socket_strerror($socketError);
+
+               // Shutdown this socket
+               $this->shutdownSocket($socketResource);
+
+               // Throw it again
+               throw new SocketBindingException(array($this, $socketData, $socketResource, $socketError, $errorMessage), BaseListener::EXCEPTION_INVALID_SOCKET);
+       }
+
+       /**
+        * "Listens" for incoming network packages
+        *
+        * @param       $peerSuffix             Suffix for peer name (e.g. :0 for TCP(/UDP?) connections)
+        * @return      void
+        * @throws      InvalidSocketException  If an invalid socket resource has been found
+        */
+       protected function doListenSocketSelect ($peerSuffix) {
+               // Check on all instances
+               assert($this->getPoolInstance() instanceof Poolable);
+               assert(is_resource($this->getSocketResource()));
+
+               // Get all readers
+               $readers = $this->getPoolInstance()->getAllSingleSockets();
+               $writers = array();
+               $excepts = array();
+
+               // Check if we have some peers left
+               $left = socket_select(
+                       $readers,
+                       $writers,
+                       $excepts,
+                       0,
+                       150
+               );
+
+               // Some new peers found?
+               if ($left < 1) {
+                       // Debug message
+                       //* EXTREME-NOISY-DEBUG: */ self::createDebugInstance(__CLASS__)->debugOutput('TCP-LISTENER[' . __METHOD__ . ':' . __LINE__ . ']: left=' . $left . ',serverSocket=' . $this->getSocketResource() . ',readers=' . print_r($readers, TRUE));
+
+                       // Nothing new found
+                       return;
+               } // END - if
+
+               // Debug message
+               //* NOISY-DEBUG: */ self::createDebugInstance(__CLASS__)->debugOutput('TCP-LISTENER[' . __METHOD__ . ':' . __LINE__ . ']: serverSocket=' . $this->getSocketResource() . ',readers=' . print_r($readers, TRUE));
+
+               // Do we have changed peers?
+               if (in_array($this->getSocketResource(), $readers)) {
+                       /*
+                        * Then accept it, if this socket is set to non-blocking IO and the
+                        * connection is NOT sending any data, socket_read() may throw
+                        * error 11 (Resource temporary unavailable). This really nasty
+                        * because if you have blocking IO socket_read() will wait and wait
+                        * and wait ...
+                        */
+                       $newSocket = socket_accept($this->getSocketResource());
+
+                       // Debug message
+                       //* NOISY-DEBUG: */ self::createDebugInstance(__CLASS__)->debugOutput('TCP-LISTENER[' . __METHOD__ . ':' . __LINE__ . ']: newSocket=' . $newSocket . ',serverSocket=' .$this->getSocketResource());
+
+                       // Array for timeout settings
+                       $options  = array(
+                               // Seconds
+                               'sec'  => $this->getConfigInstance()->getConfigEntry('tcp_socket_accept_wait_sec'),
+                               // Milliseconds
+                               'usec' => $this->getConfigInstance()->getConfigEntry('tcp_socket_accept_wait_usec')
+                       );
+
+                       // Set timeout to configured seconds
+                       // @TODO Does this work on Windozer boxes???
+                       if (!socket_set_option($newSocket, SOL_SOCKET, SO_RCVTIMEO, $options)) {
+                               // Handle this socket error with a faked recipientData array
+                               $this->handleSocketError(__METHOD__, __LINE__, $newSocket, array('0.0.0.0', '0'));
+                       } // END - if
+
+                       // Output result (only for debugging!)
+                       /*
+                       $option = socket_get_option($newSocket, SOL_SOCKET, SO_RCVTIMEO);
+                       self::createDebugInstance(__CLASS__)->debugOutput('SO_RCVTIMEO[' . gettype($option) . ']=' . print_r($option, TRUE));
+                       */
+
+                       // Enable SO_OOBINLINE
+                       if (!socket_set_option($newSocket, SOL_SOCKET, SO_OOBINLINE ,1)) {
+                               // Handle this socket error with a faked recipientData array
+                               $this->handleSocketError(__METHOD__, __LINE__, $newSocket, array('0.0.0.0', '0'));
+                       } // END - if
+
+                       // Set non-blocking
+                       if (!socket_set_nonblock($newSocket)) {
+                               // Handle this socket error with a faked recipientData array
+                               $this->handleSocketError(__METHOD__, __LINE__, $newSocket, array('0.0.0.0', '0'));
+                       } // END - if
+
+                       // Add it to the peers
+                       $this->getPoolInstance()->addPeer($newSocket, BaseConnectionHelper::CONNECTION_TYPE_INCOMING);
+
+                       // Get peer name
+                       if (!socket_getpeername($newSocket, $peerName)) {
+                               // Handle this socket error with a faked recipientData array
+                               $this->handleSocketError(__METHOD__, __LINE__, $newSocket, array('0.0.0.0', '0'));
+                       } // END - if
+
+                       // Get node instance
+                       $nodeInstance = NodeObjectFactory::createNodeInstance();
+
+                       // Create a faked package data array
+                       $packageData = array(
+                               NetworkPackage::PACKAGE_DATA_SENDER    => $peerName . $peerSuffix,
+                               NetworkPackage::PACKAGE_DATA_RECIPIENT => $nodeInstance->getSessionId(),
+                               NetworkPackage::PACKAGE_DATA_STATUS    => NetworkPackage::PACKAGE_STATUS_FAKED
+                       );
+
+                       // Get a connection info instance
+                       $infoInstance = ConnectionInfoFactory::createConnectionInfoInstance($this->getProtocolName(), 'listener');
+
+                       // Will the info instance with listener data
+                       $infoInstance->fillWithListenerInformation($this);
+
+                       // Get a socket registry
+                       $registryInstance = SocketRegistryFactory::createSocketRegistryInstance();
+
+                       // Register the socket with the registry and with the faked array
+                       $registryInstance->registerSocket($infoInstance, $newSocket, $packageData);
+               } // END - if
+
+               // Do we have to rewind?
+               if (!$this->getIteratorInstance()->valid()) {
+                       // Rewind the list
+                       $this->getIteratorInstance()->rewind();
+               } // END - if
+
+               // Get the current value
+               $currentSocket = $this->getIteratorInstance()->current();
+
+               // Handle it here, if not main server socket
+               //* NOISY-DEBUG: */ self::createDebugInstance(__CLASS__)->debugOutput('TCP-LISTENER[' . __METHOD__ . ':' . __LINE__ . ']: currentSocket=' . $currentSocket[BasePool::SOCKET_ARRAY_RESOURCE] . ',type=' . $currentSocket[BasePool::SOCKET_ARRAY_CONN_TYPE] . ',serverSocket=' . $this->getSocketResource());
+               if (($currentSocket[BasePool::SOCKET_ARRAY_CONN_TYPE] != BaseConnectionHelper::CONNECTION_TYPE_SERVER) && ($currentSocket[BasePool::SOCKET_ARRAY_RESOURCE] != $this->getSocketResource())) {
+                       // ... or else it will raise warnings like 'Transport endpoint is not connected'
+                       $this->getHandlerInstance()->processRawDataFromResource($currentSocket);
+               } // END - if
+
+               // 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
new file mode 100644 (file)
index 0000000..ae66a5c
--- /dev/null
+++ b/inc/main/classes/listener/class_BaseListenerDecorator.php
@@ -0,0 +1,153 @@
+<?php
+/**
+ * A general decorator for listeners to communicate to hubs
+ *
+ * @author             Roland Haeder <webmaster@shipsimu.org>
+ * @version            0.0.0
+ * @copyright  Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2016 Core Developer Team
+ * @license            GNU GPL 3.0 or any newer version
+ * @link               http://www.shipsimu.org
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+class BaseListenerDecorator extends BaseDecorator implements Visitable {
+       /**
+        * Listener type
+        */
+       private $listenerType = 'invalid';
+
+       /**
+        * Protected constructor
+        *
+        * @param       $className      Name of the class
+        * @return      void
+        */
+       protected function __construct ($className) {
+               // Call parent constructor
+               parent::__construct($className);
+       }
+
+       /**
+        * Getter for listen address
+        *
+        * @return      $listenAddress  The address this listener should listen on
+        */
+       public final function getListenAddress () {
+               return $this->getListenerInstance()->getListenAddress();
+       }
+
+       /**
+        * Getter for listen port
+        *
+        * @return      $listenPort             The port this listener should listen on
+        */
+       public final function getListenPort () {
+               return $this->getListenerInstance()->getListenPort();
+       }
+
+       /**
+        * Getter for connection type
+        *
+        * @return      $connectionType         Connection type for this listener
+        */
+       public final function getConnectionType () {
+               return $this->getListenerInstance()->getConnectionType();
+       }
+
+       /**
+        * Accepts the visitor to process the visit "request"
+        *
+        * @param       $visitorInstance        An instance of a Visitor class
+        * @return      void
+        */
+       public function accept (Visitor $visitorInstance) {
+               // Visit this decorator
+               $visitorInstance->visitDecorator($this);
+
+               // Visit the covered class
+               $visitorInstance->visitListener($this->getListenerInstance());
+       }
+
+       /**
+        * Getter for listener type.
+        *
+        * @return      $listenerType   The listener's type (hub/peer)
+        */
+       public final function getListenerType () {
+               return $this->listenerType;
+       }
+
+       /**
+        * Setter for listener type.
+        *
+        * @param       $listenerType   The listener's type (hub/peer)
+        * @return      void
+        */
+       protected final function setListenerType ($listenerType) {
+               $this->listenerType = $listenerType;
+       }
+
+       /**
+        * Getter for peer pool instance
+        *
+        * @return      $poolInstance   A peer pool instance
+        */
+       public final function getPoolInstance () {
+               return $this->getListenerInstance()->getPoolInstance();
+       }
+
+       /**
+        * Monitors incoming raw data from the handler and transfers it to the
+        * given receiver instance.
+        *
+        * @return      void
+        */
+       public function monitorIncomingRawData () {
+               // Get the handler instance
+               $handlerInstance = $this->getListenerInstance()->getHandlerInstance();
+
+               /*
+                * Does the deocorated listener (or even a decorator again) have a
+                * handler assigned? Remember that a handler will hold all incoming raw
+                * data and not a listener.
+                */
+               if (!$handlerInstance instanceof Networkable) {
+                       // Skip this silently for now. Later on, this will become mandatory!
+                       //* NOISY-DEBUG: */ self::createDebugInstance(__CLASS__)->debugOutput('No handler assigned to this listener decorator. this=' . $this->__toString() . ', listenerInstance=' . $this->getListenerInstance()->__toString());
+                       return;
+               } // END - if
+
+               // Does the handler have some decoded data pending?
+               if (!$handlerInstance->isRawDataPending()) {
+                       // No data is pending so skip further code silently
+                       return;
+               } // END - if
+
+               // Get receiver (network package) instance
+               $receiverInstance = NetworkPackageFactory::createNetworkPackageInstance();
+
+               /*
+                * There is some decoded data waiting. The receiver instance is an
+                * abstract network package (which can be received and sent out) so
+                * handle the decoded data over. At this moment it is not needed to
+                * know if the decoded data origins from a TCP or UDP connection so it
+                * can just be passed over to the network package receiver.
+                */
+               //* 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
new file mode 100644 (file)
index 0000000..65b9403
--- /dev/null
+++ b/inc/main/classes/listener/socket/class_SocketFileListener.php
@@ -0,0 +1,219 @@
+<?php
+/**
+ * A file-based socket listener
+ *
+ * @author             Roland Haeder <webmaster@ship-simu.org>
+ * @version            0.0.0
+ * @copyright  Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2016 Core Developer Team
+ * @license            GNU GPL 3.0 or any newer version
+ * @link               http://www.ship-simu.org
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+class SocketFileListener extends BaseListener implements Listenable {
+       /**
+        * Protected constructor
+        *
+        * @return      void
+        */
+       protected function __construct () {
+               // Call parent constructor
+               parent::__construct(__CLASS__);
+
+               // Set the protocol to file
+               $this->setProtocolName('file');
+       }
+
+       /**
+        * Creates an instance of this class
+        *
+        * @return      $listenerInstance       An instance a prepared listener class
+        */
+       public final static function createSocketFileListener () {
+               // Get new instance
+               $listenerInstance = new SocketFileListener();
+
+               // Return the prepared instance
+               return $listenerInstance;
+       }
+
+       /**
+        * Initializes the listener by setting up the required socket server
+        *
+        * @return      void
+        */
+       public function initListener() {
+               // Init socket
+               $mainSocket = socket_create(AF_UNIX, SOCK_STREAM, 0);
+
+               // Is the socket resource valid?
+               if (!is_resource($mainSocket)) {
+                       // Something bad happened
+                       throw new InvalidSocketException(array($this, $mainSocket), BaseListener::EXCEPTION_INVALID_SOCKET);
+               } // END - if
+
+               // Get socket error code for verification
+               $socketError = socket_last_error($mainSocket);
+
+               // Check if there was an error else
+               if ($socketError > 0) {
+                       // Handle this socket error with a faked recipientData array
+                       $this->handleSocketError(__METHOD__, __LINE__, $mainSocket, array('null', '0'));
+               } // END - if
+
+               // Create file name
+               $socketFile = self::createTempPathForFile($this->getConfigInstance()->getConfigEntry('ipc_socket_file_name'));
+
+               // Debug message
+               self::createDebugInstance(__CLASS__)->debugOutput('SOCKET-FILE-LISTENER[' . __METHOD__ . ':' . __LINE__ . ']: socketFile=' . $socketFile . ' ...');
+
+               // File name must not be empty
+               assert(!empty($socketFile));
+
+               // Is the file there?
+               if ((self::isReachableFilePath($socketFile)) && (file_exists($socketFile))) {
+                       // Old socket found
+                       self::createDebugInstance(__CLASS__)->debugOutput('SOCKET-FILE-LISTENER[' . __METHOD__ . ':' . __LINE__ . ']: WARNING: Old socket at ' . $socketFile . ' found. Will not start.');
+
+                       // Shutdown this socket
+                       $this->shutdownSocket($mainSocket);
+
+                       // Quit here
+                       exit;
+               } // END - if
+
+               // Debug message
+               self::createDebugInstance(__CLASS__)->debugOutput('SOCKET-FILE-LISTENER[' . __METHOD__ . ':' . __LINE__ . ']: Binding to ' . $socketFile . ' ...');
+
+               // Try to bind to it
+               if (!socket_bind($mainSocket, $socketFile)) {
+                       // Handle error here
+                       $this->handleSocketError(__METHOD__, __LINE__, $mainSocket, array($socketFile, '0'));
+                       /*
+                       // Get socket error code for verification
+                       $socketError = socket_last_error($mainSocket);
+
+                       // Get error message
+                       $errorMessage = socket_strerror($socketError);
+
+                       // Shutdown this socket
+                       $this->shutdownSocket($mainSocket);
+
+                       // And throw again
+                       throw new InvalidSocketException(array($this, $mainSocket, $socketError, $errorMessage), BaseListener::EXCEPTION_INVALID_SOCKET);
+                       */
+               } // END - if
+
+               // Start listen for connections
+               self::createDebugInstance(__CLASS__)->debugOutput('SOCKET-FILE-LISTENER[' . __METHOD__ . ':' . __LINE__ . ']: Listening for connections.');
+               if (!socket_listen($mainSocket)) {
+                       // Handle this socket error with a faked recipientData array
+                       $this->handleSocketError(__METHOD__, __LINE__, $mainSocket, array($socketFile, '0'));
+                       /*
+                       // Get socket error code for verification
+                       $socketError = socket_last_error($mainSocket);
+
+                       // Get error message
+                       $errorMessage = socket_strerror($socketError);
+
+                       // Shutdown this socket
+                       $this->shutdownSocket($mainSocket);
+
+                       // And throw again
+                       throw new InvalidSocketException(array($this, $mainSocket, $socketError, $errorMessage), BaseListener::EXCEPTION_INVALID_SOCKET);
+                       */
+               } // END - if
+
+               // Now, we want non-blocking mode
+               self::createDebugInstance(__CLASS__)->debugOutput('SOCKET-FILE-LISTENER[' . __METHOD__ . ':' . __LINE__ . ']: Setting non-blocking mode.');
+               if (!socket_set_nonblock($mainSocket)) {
+                       // Handle this socket error with a faked recipientData array
+                       $this->handleSocketError(__METHOD__, __LINE__, $mainSocket, array($socketFile, '0'));
+                       /*
+                       // Get socket error code for verification
+                       $socketError = socket_last_error($mainSocket);
+
+                       // Get error message
+                       $errorMessage = socket_strerror($socketError);
+
+                       // Shutdown this socket
+                       $this->shutdownSocket($mainSocket);
+
+                       // And throw again
+                       throw new InvalidSocketException(array($this, $mainSocket, $socketError, $errorMessage), BaseListener::EXCEPTION_INVALID_SOCKET);
+                       */
+               } // END - if
+
+               // Set the main socket
+               $this->registerServerSocketResource($mainSocket);
+
+               // Initialize the peer pool instance
+               $poolInstance = ObjectFactory::createObjectByConfiguredName('application_pool_class', array($this));
+
+               // Add main socket
+               $poolInstance->addPeer($mainSocket, BaseConnectionHelper::CONNECTION_TYPE_SERVER);
+
+               // And add it to this listener
+               $this->setPoolInstance($poolInstance);
+
+               // Initialize iterator for listening on packages
+               $iteratorInstance = ObjectFactory::createObjectByConfiguredName('socket_listen_iterator_class', array($poolInstance->getPoolEntriesInstance()));
+
+               // Rewind it and remember it in this class
+               $iteratorInstance->rewind();
+               $this->setIteratorInstance($iteratorInstance);
+
+               // Initialize the raw data handler
+               $handlerInstance = ObjectFactory::createObjectByConfiguredName('socket_raw_data_handler_class');
+
+               // Set it in this class
+               $this->setHandlerInstance($handlerInstance);
+
+               // Output message
+               self::createDebugInstance(__CLASS__)->debugOutput('SOCKET-FILE-LISTENER[' . __METHOD__ . ':' . __LINE__ . ']: Socket listener now ready on socket ' . $socketFile . ' for service.');
+       }
+
+       /**
+        * "Listens" for incoming network packages
+        *
+        * @return      void
+        */
+       public function doListen() {
+               // Call super method
+               $this->doListenSocketSelect('');
+       }
+
+       /**
+        * Checks whether the listener would accept the given package data array
+        *
+        * @param       $packageData    Raw package data
+        * @return      $accepts                Whether this listener does accept
+        */
+       public function ifListenerAcceptsPackageData (array $packageData) {
+               $this->partialStub('Need to implement this method.');
+       }
+
+       /**
+        * Monitors incoming raw data from the handler and transfers it to the
+        * given receiver instance.
+        *
+        * @return      void
+        */
+       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
new file mode 100644 (file)
index 0000000..e03980b
--- /dev/null
+++ b/inc/main/classes/listener/socket/decorator/class_SocketFileListenerDecorator.php
@@ -0,0 +1,97 @@
+<?php
+/**
+ * A decorator for the SocketFileListener to communicate to hubs
+ *
+ * @author             Roland Haeder <webmaster@shipsimu.org>
+ * @version            0.0.0
+ * @copyright  Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2016 Core Developer Team
+ * @license            GNU GPL 3.0 or any newer version
+ * @link               http://www.shipsimu.org
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+class SocketFileListenerDecorator extends BaseListenerDecorator implements Listenable {
+       /**
+        * Protected constructor
+        *
+        * @return      void
+        */
+       protected function __construct () {
+               // Call parent constructor
+               parent::__construct(__CLASS__);
+
+               // Set listener type and protocol name
+               $this->setListenerType('hub');
+               $this->setProtocolName('tcp');
+       }
+
+       /**
+        * Creates an instance of this class
+        *
+        * @param       $listenerInstance       A Listener instance
+        * @return      $decoratorInstance      An instance a prepared listener decorator class
+        */
+       public static final function createSocketFileListenerDecorator (Listenable $listenerInstance) {
+               // Get new instance
+               $decoratorInstance = new SocketFileListenerDecorator();
+
+               // Set the application instance
+               $decoratorInstance->setListenerInstance($listenerInstance);
+
+               // Return the prepared instance
+               return $decoratorInstance;
+       }
+
+       /**
+        * Initializes the listener by setting up the required socket server
+        *
+        * @return      void
+        */
+       public function initListener () {
+               $this->partialStub('WARNING: This method should not be called.');
+       }
+
+       /**
+        * "Listens" for incoming network packages
+        *
+        * @return      void
+        */
+       public function doListen () {
+               // Handle generic TCP package
+               $this->getListenerInstance()->doListen();
+
+               // Handle hub TCP package
+               $this->partialStub('Need to handle hub TCP package.');
+       }
+
+       /**
+        * Checks whether the listener would accept the given package data array
+        *
+        * @param       $packageData    Raw package data
+        * @return      $accepts                Whether this listener does accept
+        */
+       public function ifListenerAcceptsPackageData (array $packageData) {
+               // Get a tags instance
+               $tagsInstance = PackageTagsFactory::createPackageTagsInstance();
+
+               // So is the package accepted with this listener?
+               $accepts = $tagsInstance->ifPackageDataIsAcceptedByListener($packageData, $this);
+
+               // Return the result
+               return $accepts;
+       }
+}
+
+// [EOF]
+?>

diff --git a/inc/main/classes/resolver/class_ b/inc/main/classes/resolver/class_
new file mode 100644 (file)
index 0000000..0813fe5
--- /dev/null
+++ b/inc/main/classes/resolver/class_
@@ -0,0 +1,577 @@
+<?php
+/**
+ * A ??? resolver
+ * @TODO Clean up this template
+ *
+ * @author             Roland Haeder <webmaster@ship-simu.org>
+ * @version            0.0.0
+ * @copyright  Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2016 Core Developer Team
+ * @license            GNU GPL 3.0 or any newer version
+ * @link               http://www.ship-simu.org
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+class ???Resolver extends BaseResolver implements Resolver {
+       /**
+        * Protected constructor
+        *
+        * @return      void
+        */
+       protected function __construct () {
+               // Call parent constructor
+               parent::__construct(__CLASS__);
+
+               // Set prefix to '???'
+               $this->setClassPrefix('???');
+       }
+
+       /**
+        * Creates an instance of a Html action resolver with a given default action
+        *
+        * @param       $!!!Name                                The default action we shall execute
+        * @param       $appInstance                    An instance of a manageable application helper class
+        * @return      $resolverInstance               The prepared action resolver instance
+        * @throws      EmptyVariableException  Thrown if default action is not set
+        * @throws      Invalid|||Exception     Thrown if default action is invalid
+        */
+       public static final function create???Resolver ($!!!Name, ManageableApplication $appInstance) {
+               // Create the new instance
+               $resolverInstance = new ???Resolver();
+
+               // Is the variable $!!!Name set and the action is valid?
+               if (empty($!!!Name)) {
+                       // Then thrown an exception here
+                       throw new EmptyVariableException(array($resolverInstance, 'default|||'), self::EXCEPTION_UNEXPECTED_EMPTY_STRING);
+               } elseif ($resolverInstance->is|||Valid($!!!Name) === FALSE) {
+                       // Invalid action found
+                       throw new Invalid|||Exception(array($resolverInstance, $!!!Name), self::EXCEPTION_INVALID_ACTION);
+               }
+
+               // Set the application instance
+               $resolverInstance->setApplicationInstance($appInstance);
+
+               // Return the prepared instance
+               return $resolverInstance;
+       }
+
+       /**
+        * Returns an action instance for a given request class or null if
+        * it was not found
+        *
+        * @param       $requestInstance        An instance of a request class
+        * @return      $!!!Instance    An instance of the resolved action
+        * @throws      Invalid|||Exception                             Thrown if $!!!Name is
+        *                                                                                              invalid
+        * @throws      Invalid|||InstanceException             Thrown if $!!!Instance
+        *                                                                                              is an invalid instance
+        */
+       public function resolve|||ByRequest (Requestable $requestInstance) {
+               // Init variables
+               $!!!Name = '';
+               $!!!Instance = null;
+
+               // This goes fine so let's resolve the action
+               $!!!Name = $requestInstance->getRequestElement('action');
+
+               // Is the action empty? Then fall back to default action
+               if (empty($!!!Name)) $!!!Name = $this->getConfigInstance()->getConfigEntry('default_action');
+
+               // Check if action is valid
+               if ($this->is|||Valid($!!!Name) === FALSE) {
+                       // This action is invalid!
+                       throw new Invalid|||Exception(array($this, $!!!Name), self::EXCEPTION_INVALID_ACTION);
+               } // END - if
+
+               // Get the action
+               $!!!Instance = $this->load|||();
+
+               // And validate it
+               if ((!is_object($!!!Instance)) || (!$!!!Instance instanceof |||able)) {
+                       // This action has an invalid instance!
+                       throw new Invalid|||InstanceException(array($this, $!!!Name), self::EXCEPTION_INVALID_ACTION);
+               } // END - if
+
+               // Set last action
+               $this->setResolvedInstance($!!!Instance);
+
+               // Return the resolved action instance
+               return $!!!Instance;
+       }
+
+       /**
+        * Resolves the action by its direct name and returns an instance of its class
+        *
+        * @return      $!!!Instance            An instance of the action class
+        * @throws      Invalid|||Exception     Thrown if $!!!Name is invalid
+        */
+       public function resolve||| () {
+               // Initiate the instance variable
+               $!!!Instance = null;
+
+               // Get action name
+               $!!!Name = $this->get|||Name();
+
+               // Is the action empty? Then fall back to default action
+               if (empty($!!!Name)) {
+                       $!!!Name = $this->getConfigInstance()->getConfigEntry('default_action');
+               } // END - if
+
+               // Check if action is valid
+               if ($this->is|||Valid($!!!Name) === FALSE) {
+                       // This action is invalid!
+                       throw new Invalid|||Exception(array($this, $!!!Name), self::EXCEPTION_INVALID_ACTION);
+               } // END - if
+
+               // Get the action
+               $!!!Instance = $this->load|||();
+
+               // Return the instance
+               return $!!!Instance;
+       }
+}
+
+// [EOF]
+?>
+<?php
+/**
+ * A ??? resolver
+ *
+ * @author             Roland Haeder <webmaster@ship-simu.org>
+ * @version            0.0.0
+ * @copyright  Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2016 Core Developer Team
+ * @license            GNU GPL 3.0 or any newer version
+ * @link               http://www.ship-simu.org
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+class ???Resolver extends BaseResolver implements Resolver {
+       /**
+        * Protected constructor
+        *
+        * @return      void
+        */
+       protected function __construct () {
+               // Call parent constructor
+               parent::__construct(__CLASS__);
+
+               // Set prefix to '???'
+               $this->setClassPrefix('???');
+       }
+
+       /**
+        * Creates an instance of a Html action resolver with a given default action
+        *
+        * @param       $!!!Name                                The default action we shall execute
+        * @param       $appInstance                    An instance of a manageable application helper class
+        * @return      $resolverInstance               The prepared action resolver instance
+        * @throws      EmptyVariableException  Thrown if default action is not set
+        * @throws      Invalid|||Exception     Thrown if default action is invalid
+        */
+       public static final function create???Resolver ($!!!Name, ManageableApplication $appInstance) {
+               // Create the new instance
+               $resolverInstance = new ???Resolver();
+
+               // Is the variable $!!!Name set and the action is valid?
+               if (empty($!!!Name)) {
+                       // Then thrown an exception here
+                       throw new EmptyVariableException(array($resolverInstance, 'default|||'), self::EXCEPTION_UNEXPECTED_EMPTY_STRING);
+               } elseif ($resolverInstance->is|||Valid($!!!Name) === FALSE) {
+                       // Invalid action found
+                       throw new Invalid|||Exception(array($resolverInstance, $!!!Name), self::EXCEPTION_INVALID_ACTION);
+               }
+
+               // Set the application instance
+               $resolverInstance->setApplicationInstance($appInstance);
+
+               // Return the prepared instance
+               return $resolverInstance;
+       }
+
+       /**
+        * Returns an action instance for a given request class or null if
+        * it was not found
+        *
+        * @param       $requestInstance        An instance of a request class
+        * @return      $!!!Instance    An instance of the resolved action
+        * @throws      Invalid|||Exception                             Thrown if $!!!Name is
+        *                                                                                              invalid
+        * @throws      Invalid|||InstanceException             Thrown if $!!!Instance
+        *                                                                                              is an invalid instance
+        */
+       public function resolve|||ByRequest (Requestable $requestInstance) {
+               // Init variables
+               $!!!Name = '';
+               $!!!Instance = null;
+
+               // This goes fine so let's resolve the action
+               $!!!Name = $requestInstance->getRequestElement('action');
+
+               // Is the action empty? Then fall back to default action
+               if (empty($!!!Name)) $!!!Name = $this->getConfigInstance()->getConfigEntry('default_action');
+
+               // Check if action is valid
+               if ($this->is|||Valid($!!!Name) === FALSE) {
+                       // This action is invalid!
+                       throw new Invalid|||Exception(array($this, $!!!Name), self::EXCEPTION_INVALID_ACTION);
+               } // END - if
+
+               // Get the action
+               $!!!Instance = $this->load|||();
+
+               // And validate it
+               if ((!is_object($!!!Instance)) || (!$!!!Instance instanceof |||able)) {
+                       // This action has an invalid instance!
+                       throw new Invalid|||InstanceException(array($this, $!!!Name), self::EXCEPTION_INVALID_ACTION);
+               } // END - if
+
+               // Set last action
+               $this->setResolvedInstance($!!!Instance);
+
+               // Return the resolved action instance
+               return $!!!Instance;
+       }
+
+       /**
+        * Resolves the action by its direct name and returns an instance of its class
+        *
+        * @return      $!!!Instance            An instance of the action class
+        * @throws      Invalid|||Exception     Thrown if $!!!Name is invalid
+        */
+       public function resolve||| () {
+               // Initiate the instance variable
+               $!!!Instance = null;
+
+               // Get action name
+               $!!!Name = $this->get|||Name();
+
+               // Is the action empty? Then fall back to default action
+               if (empty($!!!Name)) {
+                       $!!!Name = $this->getConfigInstance()->getConfigEntry('default_action');
+               } // END - if
+
+               // Check if action is valid
+               if ($this->is|||Valid($!!!Name) === FALSE) {
+                       // This action is invalid!
+                       throw new Invalid|||Exception(array($this, $!!!Name), self::EXCEPTION_INVALID_ACTION);
+               } // END - if
+
+               // Get the action
+               $!!!Instance = $this->load|||();
+
+               // Return the instance
+               return $!!!Instance;
+       }
+}
+
+// [EOF]
+?>
+<?php
+/**
+ * A ??? resolver
+ *
+ * @author             Roland Haeder <webmaster@ship-simu.org>
+ * @version            0.0.0
+ * @copyright  Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2016 Core Developer Team
+ * @license            GNU GPL 3.0 or any newer version
+ * @link               http://www.ship-simu.org
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+class ???Resolver extends BaseResolver implements Resolver {
+       /**
+        * Protected constructor
+        *
+        * @return      void
+        */
+       protected function __construct () {
+               // Call parent constructor
+               parent::__construct(__CLASS__);
+
+               // Set prefix to '???'
+               $this->setClassPrefix('???');
+       }
+
+       /**
+        * Creates an instance of a Html action resolver with a given default action
+        *
+        * @param       $!!!Name                                The default action we shall execute
+        * @param       $appInstance                    An instance of a manageable application helper class
+        * @return      $resolverInstance               The prepared action resolver instance
+        * @throws      EmptyVariableException  Thrown if default action is not set
+        * @throws      Invalid|||Exception     Thrown if default action is invalid
+        */
+       public static final function create???Resolver ($!!!Name, ManageableApplication $appInstance) {
+               // Create the new instance
+               $resolverInstance = new ???Resolver();
+
+               // Is the variable $!!!Name set and the action is valid?
+               if (empty($!!!Name)) {
+                       // Then thrown an exception here
+                       throw new EmptyVariableException(array($resolverInstance, 'default|||'), self::EXCEPTION_UNEXPECTED_EMPTY_STRING);
+               } elseif ($resolverInstance->is|||Valid($!!!Name) === FALSE) {
+                       // Invalid action found
+                       throw new Invalid|||Exception(array($resolverInstance, $!!!Name), self::EXCEPTION_INVALID_ACTION);
+               }
+
+               // Set the application instance
+               $resolverInstance->setApplicationInstance($appInstance);
+
+               // Return the prepared instance
+               return $resolverInstance;
+       }
+
+       /**
+        * Returns an action instance for a given request class or null if
+        * it was not found
+        *
+        * @param       $requestInstance        An instance of a request class
+        * @return      $!!!Instance    An instance of the resolved action
+        * @throws      Invalid|||Exception                             Thrown if $!!!Name is
+        *                                                                                              invalid
+        * @throws      Invalid|||InstanceException             Thrown if $!!!Instance
+        *                                                                                              is an invalid instance
+        */
+       public function resolve|||ByRequest (Requestable $requestInstance) {
+               // Init variables
+               $!!!Name = '';
+               $!!!Instance = null;
+
+               // This goes fine so let's resolve the action
+               $!!!Name = $requestInstance->getRequestElement('action');
+
+               // Is the action empty? Then fall back to default action
+               if (empty($!!!Name)) $!!!Name = $this->getConfigInstance()->getConfigEntry('default_action');
+
+               // Check if action is valid
+               if ($this->is|||Valid($!!!Name) === FALSE) {
+                       // This action is invalid!
+                       throw new Invalid|||Exception(array($this, $!!!Name), self::EXCEPTION_INVALID_ACTION);
+               } // END - if
+
+               // Get the action
+               $!!!Instance = $this->load|||();
+
+               // And validate it
+               if ((!is_object($!!!Instance)) || (!$!!!Instance instanceof |||able)) {
+                       // This action has an invalid instance!
+                       throw new Invalid|||InstanceException(array($this, $!!!Name), self::EXCEPTION_INVALID_ACTION);
+               } // END - if
+
+               // Set last action
+               $this->setResolvedInstance($!!!Instance);
+
+               // Return the resolved action instance
+               return $!!!Instance;
+       }
+
+       /**
+        * Resolves the action by its direct name and returns an instance of its class
+        *
+        * @return      $!!!Instance            An instance of the action class
+        * @throws      Invalid|||Exception     Thrown if $!!!Name is invalid
+        */
+       public function resolve||| () {
+               // Initiate the instance variable
+               $!!!Instance = null;
+
+               // Get action name
+               $!!!Name = $this->get|||Name();
+
+               // Is the action empty? Then fall back to default action
+               if (empty($!!!Name)) {
+                       $!!!Name = $this->getConfigInstance()->getConfigEntry('default_action');
+               } // END - if
+
+               // Check if action is valid
+               if ($this->is|||Valid($!!!Name) === FALSE) {
+                       // This action is invalid!
+                       throw new Invalid|||Exception(array($this, $!!!Name), self::EXCEPTION_INVALID_ACTION);
+               } // END - if
+
+               // Get the action
+               $!!!Instance = $this->load|||();
+
+               // Return the instance
+               return $!!!Instance;
+       }
+}
+
+// [EOF]
+?>
+<?php
+/**
+ * A ??? resolver
+ *
+ * @author             Roland Haeder <webmaster@ship-simu.org>
+ * @version            0.0.0
+ * @copyright  Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2016 Core Developer Team
+ * @license            GNU GPL 3.0 or any newer version
+ * @link               http://www.ship-simu.org
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+class ???Resolver extends BaseResolver implements Resolver {
+       /**
+        * Protected constructor
+        *
+        * @return      void
+        */
+       protected function __construct () {
+               // Call parent constructor
+               parent::__construct(__CLASS__);
+
+               // Set prefix to '???'
+               $this->setClassPrefix('???');
+       }
+
+       /**
+        * Creates an instance of a ??? 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
new file mode 100644 (file)
index 0000000..891f32f
--- /dev/null
+++ b/inc/main/classes/visitor/tasks/class_ActiveTaskVisitor.php
@@ -0,0 +1,104 @@
+<?php
+/**
+ * An ActiveTask visitor
+ *
+ * @author             Roland Haeder <webmaster@shipsimu.org>
+ * @version            0.0.0
+ * @copyright  Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2016 Core Developer Team
+ * @license            GNU GPL 3.0 or any newer version
+ * @link               http://www.shipsimu.org
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+class ActiveTaskVisitor extends BaseVisitor implements TaskVisitor, PoolVisitor, ListenerVisitor, DecoratorVisitor {
+       /**
+        * Protected constructor
+        *
+        * @return      void
+        */
+       protected function __construct () {
+               // Call parent constructor
+               parent::__construct(__CLASS__);
+
+               // Set visitor mode
+               $this->setVisitorMode('task');
+       }
+
+       /**
+        * Creates an instance of this class
+        *
+        * @return      $visitorInstance        An instance a Visitorable class
+        */
+       public static final function createActiveTaskVisitor () {
+               // Get new instance
+               $visitorInstance = new ActiveTaskVisitor();
+
+               // Return the prepared instance
+               return $visitorInstance;
+       }
+
+       /**
+        * Visits the given task instance
+        *
+        * @param       $taskInstance   A Taskable instance
+        * @return      void
+        */
+       public function visitTask (Taskable $taskInstance) {
+               // Execute the task from this visitor
+               //* DEBUG: */ self::createDebugInstance(__CLASS__)->debugOutput('[' . __METHOD__ . ':' . __LINE__ . ' ]: Visiting task ' . $taskInstance->__toString() . ' - CALLED!');
+               $taskInstance->executeTask();
+               //* DEBUG: */ self::createDebugInstance(__CLASS__)->debugOutput('[' . __METHOD__ . ':' . __LINE__ . ' ]: Visiting task ' . $taskInstance->__toString() . ' - EXIT!');
+       }
+
+       /**
+        * Pool visitor method for active tasks
+        *
+        * @param       $poolInstance   A Poolable instance
+        * @return      void
+        */
+       public function visitPool (Poolable $poolInstance) {
+               /**
+                * We don't need to visit a pool as an active task because a pool can
+                * never become a task. Instead e.g. by a listener pool we should visit
+                * all listeners one by one
+                */
+       }
+
+       /**
+        * Visits the given listener instance
+        *
+        * @param       $listenerInstance       A Listenable instance
+        * @return      void
+        */
+       public function visitListener (Listenable $listenerInstance) {
+               // Do "listen" here
+               //* DEBUG: */ self::createDebugInstance(__CLASS__)->debugOutput('[' . __METHOD__ . ':' . __LINE__ . ' ]: Visiting ' . $listenerInstance->__toString() . ' - CALLED!');
+               $listenerInstance->doListen();
+               //* DEBUG: */ self::createDebugInstance(__CLASS__)->debugOutput('[' . __METHOD__ . ':' . __LINE__ . ' ]: Visiting ' . $listenerInstance->__toString() . ' - FINISH');
+       }
+
+       /**
+        * Visits the given decorator instance
+        *
+        * @param       $decoratorInstance      A decorator instance
+        * @return      void
+        */
+       public function visitDecorator (BaseDecorator $decoratorInstance) {
+               // 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
new file mode 100644 (file)
index 0000000..7bfbc5b
--- /dev/null
+++ b/inc/main/classes/visitor/tasks/class_ShutdownTaskVisitor.php
@@ -0,0 +1,97 @@
+<?php
+/**
+ * An ShutdownTask visitor
+ *
+ * @author             Roland Haeder <webmaster@shipsimu.org>
+ * @version            0.0.0
+ * @copyright  Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2016 Core Developer Team
+ * @license            GNU GPL 3.0 or any newer version
+ * @link               http://www.shipsimu.org
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+class ShutdownTaskVisitor extends BaseVisitor implements TaskVisitor, PoolVisitor, ListenerVisitor, DecoratorVisitor {
+       /**
+        * Protected constructor
+        *
+        * @return      void
+        */
+       protected function __construct () {
+               // Call parent constructor
+               parent::__construct(__CLASS__);
+
+               // Set visitor mode
+               $this->setVisitorMode('task');
+       }
+
+       /**
+        * Creates an instance of this class
+        *
+        * @return      $visitorInstance                An instance a Visitorable class
+        */
+       public static final function createShutdownTaskVisitor () {
+               // Get new instance
+               $visitorInstance = new ShutdownTaskVisitor();
+
+               // Return the prepared instance
+               return $visitorInstance;
+       }
+
+       /**
+        * Visits the given task instance
+        *
+        * @param       $taskInstance   A Taskable instance
+        * @return      void
+        */
+       public function visitTask (Taskable $taskInstance) {
+               // Shutdown the task instance
+               $taskInstance->doShutdown();
+       }
+
+       /**
+        * Pool visitor method for active tasks
+        *
+        * @param       $poolInstance   A Poolable instance
+        * @return      void
+        */
+       public function visitPool (Poolable $poolInstance) {
+               // Shutdown the pool instance
+               $poolInstance->doShutdown();
+       }
+
+       /**
+        * Visits the given listener instance
+        *
+        * @param       $listenerInstance       A Listenable instance
+        * @return      void
+        */
+       public function visitListener (Listenable $listenerInstance) {
+               // Shutdown the listener instance
+               $listenerInstance->doShutdown();
+       }
+
+       /**
+        * Visits the given decorator instance
+        *
+        * @param       $decoratorInstance      A decorator instance
+        * @return      void
+        */
+       public function visitDecorator (BaseDecorator $decoratorInstance) {
+               // 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
new file mode 100644 (file)
index 0000000..bbddc17
--- /dev/null
+++ b/inc/main/exceptions/config/class_ConfigEntryIsEmptyException.php
@@ -0,0 +1,45 @@
+<?php
+/**
+ * An exception thrown when a configuration entry is empty
+ *
+ * @author             Roland Haeder <webmaster@shipsimu.org>
+ * @version            0.0.0
+ * @copyright  Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2016 Core Developer Team
+ * @license            GNU GPL 3.0 or any newer version
+ * @link               http://www.shipsimu.org
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+class ConfigEntryIsEmptyException extends FrameworkException {
+       /**
+        * The constructor
+        *
+        * @param       $class  Class throwing this exception
+        * @param       $code   Code number for the exception
+        * @return      void
+        */
+       public function __construct (FrameworkConfiguration $class, $code) {
+               // Add a message around the missing class
+               $message = sprintf('[%s:%d] Empty configuration entry provided.',
+                       $class->__toString(),
+                       $this->getLine()
+               );
+
+               // 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
new file mode 100644 (file)
index 0000000..af89d42
--- /dev/null
+++ b/inc/main/exceptions/database/local_file/class_SavePathIsEmptyException.php
@@ -0,0 +1,45 @@
+<?php
+/**
+ * An exception thrown when the save path string is empty
+ *
+ * @author             Roland Haeder <webmaster@shipsimu.org>
+ * @version            0.0.0
+ * @copyright  Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2016 Core Developer Team
+ * @license            GNU GPL 3.0 or any newer version
+ * @link               http://www.shipsimu.org
+ * 
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+class SavePathIsEmptyException extends DatabaseException {
+       /**
+        * The constructor
+        *
+        * @param       $class  Class throwing this exception
+        * @param       $code   Code number for the exception
+        * @return      void
+        */
+       public function __construct (FrameworkInterface $class, $code) {
+               // Add a message around the missing class
+               $message = sprintf('[%s:%d] Save path is empty.',
+                       $class->__toString(),
+                       $this->getLine()
+               );
+
+               // 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
new file mode 100644 (file)
index 0000000..6703a10
--- /dev/null
+++ b/inc/main/exceptions/file_directory/class_FileIsEmptyException.php
@@ -0,0 +1,39 @@
+<?php
+/**
+ * An exception thrown when a file name is empty or NULL.
+ *
+ * @author             Roland Haeder <webmaster@shipsimu.org>
+ * @version            0.0.0
+ * @copyright  Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2016 Core Developer Team
+ * @license            GNU GPL 3.0 or any newer version
+ * @link               http://www.shipsimu.org
+ * 
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+class FileIsEmptyException extends FrameworkException {
+       /**
+        * The constructor
+        *
+        * @param       $fqfn   Ignored
+        * @param       $code   Code number for the exception
+        * @return      void
+        */
+       public function __construct ($fqfn, $code) {
+               // 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
new file mode 100644 (file)
index 0000000..54838d6
--- /dev/null
+++ b/inc/main/exceptions/file_directory/class_PathIsEmptyException.php
@@ -0,0 +1,45 @@
+<?php
+/**
+ * An exception thrown when the path string is empty
+ *
+ * @author             Roland Haeder <webmaster@shipsimu.org>
+ * @version            0.0.0
+ * @copyright  Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2016 Core Developer Team
+ * @license            GNU GPL 3.0 or any newer version
+ * @link               http://www.shipsimu.org
+ * 
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+class PathIsEmptyException extends FrameworkException {
+       /**
+        * The constructor
+        *
+        * @param       $class  Class throwing this exception
+        * @param       $code   Code number for the exception
+        * @return      void
+        */
+       public function __construct (FrameworkInterface $class, $code) {
+               // Add a message around the missing class
+               $message = sprintf('[%s:%d] Directory path is empty.',
+                       $class->__toString(),
+                       $this->getLine()
+               );
+
+               // 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
new file mode 100644 (file)
index 0000000..87aac8c
--- /dev/null
+++ b/inc/main/exceptions/language/class_LanguagePathIsEmptyException.php
@@ -0,0 +1,45 @@
+<?php
+/**
+ * An exception thrown when the language path string is empty
+ *
+ * @author             Roland Haeder <webmaster@shipsimu.org>
+ * @version            0.0.0
+ * @copyright  Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2016 Core Developer Team
+ * @license            GNU GPL 3.0 or any newer version
+ * @link               http://www.shipsimu.org
+ * 
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+class LanguagePathIsEmptyException extends FrameworkException {
+       /**
+        * The constructor
+        *
+        * @param       $class  Class throwing this exception
+        * @param       $code   Code number for the exception
+        * @return      void
+        */
+       public function __construct (FrameworkInterface $class, $code) {
+               // Add a message around the missing class
+               $message = sprintf('[%s:%d] Language base path is empty.',
+                       $class->__toString(),
+                       $this->getLine()
+               );
+
+               // 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
new file mode 100644 (file)
index 0000000..f35021a
--- /dev/null
+++ b/inc/main/exceptions/main/class_InvalidCommandInstanceException.php
@@ -0,0 +1,46 @@
+<?php
+/**
+ * This exception is thrown when a command instance is invalid
+ *
+ * @author             Roland Haeder <webmaster@shipsimu.org>
+ * @version            0.0.0
+ * @copyright  Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2016 Core Developer Team
+ * @license            GNU GPL 3.0 or any newer version
+ * @link               http://www.shipsimu.org
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+class InvalidCommandInstanceException extends FrameworkException {
+       /**
+        * The constructor
+        *
+        * @param       $message        Message from the exception
+        * @param       $code           Code number for the exception
+        * @return      void
+        */
+       public function __construct (array $msgArray, $code) {
+               // Add a message around the missing class
+               $message = sprintf('[%s:%d] Invalid command %s detected.',
+                       $msgArray[0]->__toString(),
+                       $this->getLine(),
+                       $msgArray[1]
+               );
+
+               // 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
new file mode 100644 (file)
index 0000000..b06ae95
--- /dev/null
+++ b/inc/main/exceptions/main/class_MissingMethodException.php
@@ -0,0 +1,51 @@
+<?php
+/**
+ * An exception thrown when a method is missing, this exception is used in
+ * guest/user login classes and thrown when a factory method is absend. I think
+ * we should still give it a try to rewrite these classes and again mark this
+ * method as deprecated because we have a more flexible ObjectFactory class.
+ *
+ * @author             Roland Haeder <webmaster@shipsimu.org>
+ * @version            0.0.0
+ * @copyright  Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2016 Core Developer Team
+ * @license            GNU GPL 3.0 or any newer version
+ * @link               http://www.shipsimu.org
+ * @todo               Try to rewrite user/guest login classes and mark this exception as deprecated
+ * @deprecated Please do no longer use this exception
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+class MissingMethodException extends FrameworkException {
+       /**
+        * The constructor
+        *
+        * @param       $classArray             Array holding the exception data
+        * @param       $code                   Code number for the exception
+        * @return      void
+        */
+       public function __construct (array $classArray, $code) {
+               // Add a message around the missing class
+               $message = sprintf('[%s:%d] This class has no method <u>%s()</u>.',
+                       $classArray[0]->__toString(),
+                       $this->getLine(),
+                       $classArray[1]
+               );
+
+               // 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
new file mode 100644 (file)
index 0000000..fd9207b
--- /dev/null
+++ b/inc/main/exceptions/socket/class_NoSocketRegisteredException.php
@@ -0,0 +1,44 @@
+<?php
+/**
+ * This exception is thrown when the requested socket is not thrown
+ *
+ * @author             Roland Haeder <webmaster@shipsimu.org>
+ * @version            0.0.0
+ * @copyright  Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2016 Core Developer Team
+ * @license            GNU GPL 3.0 or any newer version
+ * @link               http://www.shipsimu.org
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+class NoSocketRegisteredException extends AbstractSocketException {
+       /**
+        * A Constructor for this exception
+        *
+        * @param       $protocolInstance       An instance of a HandleableProtocol class
+        * @param       $code                           Error code
+        * @return      void
+        */
+       public function __construct (HandleableProtocol $protocolInstance, $code) {
+               // Construct the message
+               $message = sprintf('[%s:] Requested socket is not yet registered.',
+                       $protocolInstance->__toString()
+               );
+
+               // 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
new file mode 100644 (file)
index 0000000..9cdb27b
--- /dev/null
+++ b/inc/main/exceptions/socket/class_SocketShutdownException.php
@@ -0,0 +1,51 @@
+<?php
+/**
+ * This exception is thrown if the socket cannot be shut down is not error 107
+ * which is "Transport endpoint not connected".
+ *
+ * @author             Roland Haeder <webmaster@shipsimu.org>
+ * @version            0.0.0
+ * @copyright  Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2016 Core Developer Team
+ * @license            GNU GPL 3.0 or any newer version
+ * @link               http://www.shipsimu.org
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+class SocketShutdownException extends AbstractSocketException {
+       /**
+        * A Constructor for this exception
+        *
+        * @param       $helperInstance         An instance of a ConnectionHelper class
+        * @param       $code                           Error code
+        * @return      void
+        */
+       public function __construct (ConnectionHelper $helperInstance, $code) {
+               // Get socket resource
+               $socketResource = $helperInstance->getSocketResource();
+
+               // Construct the message
+               $message = sprintf('[%s:] Socket %s cannot be shutdown down. errNo=%s, errStr=%s',
+                       $helperInstance->__toString(),
+                       $socketResource,
+                       socket_last_error($socketResource),
+                       socket_strerror(socket_last_error($socketResource))
+               );
+
+               // 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
new file mode 100644 (file)
index 0000000..3aa8778
--- /dev/null
+++ b/inc/main/exceptions/template/class_BasePathIsEmptyException.php
@@ -0,0 +1,45 @@
+<?php
+/**
+ * An exception thrown when the base path is empty
+ *
+ * @author             Roland Haeder <webmaster@shipsimu.org>
+ * @version            0.0.0
+ * @copyright  Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2016 Core Developer Team
+ * @license            GNU GPL 3.0 or any newer version
+ * @link               http://www.shipsimu.org
+ * 
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+class BasePathIsEmptyException extends FrameworkException {
+       /**
+        * The constructor
+        *
+        * @param       $class  Class throwing this exception
+        * @param       $code   Code number for the exception
+        * @return      void
+        */
+       public function __construct (FrameworkInterface $class, $code) {
+               // Add a message around the missing class
+               $message = sprintf('[%s:%d] Template path is empty.',
+                       $class->__toString(),
+                       $this->getLine()
+               );
+
+               // 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
new file mode 100644 (file)
index 0000000..ec97d1d
--- /dev/null
+++ b/inc/main/exceptions/template/class_InvalidBasePathStringException.php
@@ -0,0 +1,46 @@
+<?php
+/**
+ * An exception thrown hen the base path string is invalid
+ *
+ * @author             Roland Haeder <webmaster@shipsimu.org>
+ * @version            0.0.0
+ * @copyright  Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2016 Core Developer Team
+ * @license            GNU GPL 3.0 or any newer version
+ * @link               http://www.shipsimu.org
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+class InvalidBasePathStringException extends FrameworkException {
+       /**
+        * The constructor
+        *
+        * @param       $classArray             Array holding exception data
+        * @param       $code                   Code number for the exception
+        * @return      void
+        */
+       public function __construct (array $classArray, $code) {
+               // Add a message around the missing class
+               $message = sprintf('[%s:%d] %s is not a string with a base path.',
+                       $classArray[0]->__toString(),
+                       $this->getLine(),
+                       $classArray[1]
+               );
+
+               // Call parent constructor
+               parent::__construct($message, $code);
+       }
+}
+
+// [EOF]
+?>

diff --git a/inc/main/interfaces/database/migration/.htaccess b/inc/main/interfaces/database/migration/.htaccess
new file mode 100644 (file)
index 0000000..3a42882
--- /dev/null
+++ b/inc/main/interfaces/database/migration/.htaccess
@@ -0,0 +1 @@
+Deny from all

diff --git a/inc/main/interfaces/database/migration/class_MigrateableDatabase.php b/inc/main/interfaces/database/migration/class_MigrateableDatabase.php
new file mode 100644 (file)
index 0000000..4a84d17
--- /dev/null
+++ b/inc/main/interfaces/database/migration/class_MigrateableDatabase.php
@@ -0,0 +1,28 @@
+<?php
+/**
+ * A database migration interface
+ *
+ * @author             Roland Haeder <webmaster@shipsimu.org>
+ * @version            0.0.0
+ * @copyright  Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2016 Core Developer Team
+ * @license            GNU GPL 3.0 or any newer version
+ * @link               http://www.shipsimu.org
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+interface MigrateableDatabase extends FrameworkDatabase {
+}
+
+// [EOF]
+?>

diff --git a/inc/main/interfaces/database/migration/format_upgrade/.htaccess b/inc/main/interfaces/database/migration/format_upgrade/.htaccess
new file mode 100644 (file)
index 0000000..3a42882
--- /dev/null
+++ b/inc/main/interfaces/database/migration/format_upgrade/.htaccess
@@ -0,0 +1 @@
+Deny from all

diff --git a/inc/main/interfaces/database/migration/format_upgrade/class_UpgradeableDatabaseFormat.php b/inc/main/interfaces/database/migration/format_upgrade/class_UpgradeableDatabaseFormat.php
new file mode 100644 (file)
index 0000000..574bc04
--- /dev/null
+++ b/inc/main/interfaces/database/migration/format_upgrade/class_UpgradeableDatabaseFormat.php
@@ -0,0 +1,28 @@
+<?php
+/**
+ * An interface for database format upgrade classes
+ *
+ * @author             Roland Haeder <webmaster@shipsimu.org>
+ * @version            0.0.0
+ * @copyright  Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2016 Core Developer Team
+ * @license            GNU GPL 3.0 or any newer version
+ * @link               http://www.shipsimu.org
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+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
new file mode 100644 (file)
index 0000000..d35b62d
--- /dev/null
+++ b/inc/main/interfaces/handler/protocol/class_HandleableProtocol.php
@@ -0,0 +1,58 @@
+<?php
+/**
+ * An interface for protocol handlers
+ *
+ * @author             Roland Haeder <webmaster@shipsimu.org>
+ * @version            0.0.0
+ * @copyright  Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2016 Core Developer Team
+ * @license            GNU GPL 3.0 or any newer version
+ * @link               http://www.shipsimu.org
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+interface HandleableProtocol extends Handleable {
+       /**
+        * Getter for port number to satify HandleableProtocol
+        *
+        * @return      $port   The port number
+        */
+       function getPort ();
+
+       /**
+        * Getter for protocol name
+        *
+        * @return      $protocol       Name of used protocol
+        */
+       function getProtocolName ();
+
+       /**
+        * Validates given 'recipient' if it is a valid UNL. This means that the UNL
+        * can be parsed by the protocol handler.
+        *
+        * @param       $packageData    Valid raw package data
+        * @return      $isValid                Whether the UNL can be validated
+        */
+       function isValidUniversalNodeLocatorByPackageData (array $packageData);
+
+       /**
+        * If the found UNL (address) matches own external or internal address
+        *
+        * @param       $unl            UNL to test
+        * @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
new file mode 100644 (file)
index 0000000..def265b
--- /dev/null
+++ b/inc/main/interfaces/listener/class_Listenable.php
@@ -0,0 +1,85 @@
+<?php
+/**
+ * An interface for listeners
+ *
+ * @author             Roland Haeder <webmaster@shipsimu.org>
+ * @version            0.0.0
+ * @copyright  Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2016 Core Developer Team
+ * @license            GNU GPL 3.0 or any newer version
+ * @link               http://www.shipsimu.org
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+interface Listenable extends FrameworkInterface {
+       /**
+        * Initializes the listener by setting up the required socket server
+        *
+        * @return      void
+        */
+       function initListener();
+
+       /**
+        * "Listens" for incoming network packages
+        *
+        * @return      void
+        */
+       function doListen();
+
+       /**
+        * Checks whether the listener would accept the given package data array
+        *
+        * @param       $packageData    Raw package data
+        * @return      $accepts                Whether this listener does accept
+        */
+       function ifListenerAcceptsPackageData (array $packageData);
+
+       /**
+        * Monitors incoming raw data from the handler and transfers it to the
+        * given receiver instance.
+        *
+        * @return      void
+        */
+       function monitorIncomingRawData ();
+
+       /**
+        * Getter for listen address
+        *
+        * @return      $listenAddress  The address this listener should listen on
+        */
+       function getListenAddress ();
+
+       /**
+        * Getter for listen port
+        *
+        * @return      $listenPort             The port this listener should listen on
+        */
+       function getListenPort ();
+
+       /**
+        * Getter for connection type
+        *
+        * @return      $connectionType         Connection type for this listener
+        */
+       function getConnectionType ();
+
+       /**
+        * Getter for peer pool instance
+        *
+        * @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
new file mode 100644 (file)
index 0000000..fc90e4e
--- /dev/null
+++ b/inc/main/interfaces/registry/socket/class_RegisterableSocket.php
@@ -0,0 +1,64 @@
+<?php
+/**
+ * A class for registerable socket classes
+ *
+ * @author             Roland Haeder <webmaster@shipsimu.org>
+ * @version            0.0.0
+ * @copyright  Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2016 Core Developer Team
+ * @license            GNU GPL 3.0 or any newer version
+ * @link               http://www.shipsimu.org
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+interface RegisterableSocket extends Registerable {
+       /**
+        * Checks whether given socket resource is registered. If $socketResource is
+        * FALSE only the instance will be checked.
+        *
+        * @param       $infoInstance           An instance of a ShareableInfo class
+        * @param       $socketResource         A valid socket resource
+        * @return      $isRegistered           Whether the given socket resource is registered
+        */
+       function isSocketRegistered (ShareableInfo $infoInstance, $socketResource);
+
+       /**
+        * Registeres given socket for listener or throws an exception if it is already registered
+        *
+        * @param       $infoInstance   An instance of a ShareableInfo class
+        * @param       $socketResource         A valid socket resource
+        * @return      void
+        * @throws      SocketAlreadyRegisteredException        If the given socket is already registered
+        */
+       function registerSocket (ShareableInfo $infoInstance, $socketResource);
+
+       /**
+        * Getter for given listener's socket resource
+        *
+        * @param       $listenerInstance       An instance of a Listenable class
+        * @return      $socketResource         A valid socket resource
+        * @throws      NoSocketRegisteredException             If the requested socket is not registered
+        */
+       function getRegisteredSocketResource (Listenable $listenerInstance);
+
+       /**
+        * "Getter" for info instance from given package data
+        *
+        * @param       $packageData    Raw package data
+        * @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
new file mode 100644 (file)
index 0000000..dee63b8
--- /dev/null
+++ b/inc/main/interfaces/resolver/state/class_StateResolver.php
@@ -0,0 +1,46 @@
+<?php
+/**
+ * An instance for state resolver classes
+ *
+ * @author             Roland Haeder <webmaster@shipsimu.org>
+ * @version            0.0.0
+ * @copyright  Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2016 Core Developer Team
+ * @license            GNU GPL 3.0 or any newer version
+ * @link               http://www.shipsimu.org
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+interface StateResolver extends Resolver {
+       /**
+        * Returns an state instance for a given package raw data and socket resource
+        *
+        * @param       $helperInstance         An instance of a ConnectionHelper class
+        * @param       $packageData            Raw package data
+        * @param       $socketResource         A valid socket resource
+        * @return      $stateInstance          An instance of the resolved state
+        */
+       static function resolveStateByPackage (ConnectionHelper $helperInstance, array $packageData, $socketResource);
+
+       /**
+        * Checks whether the given state is valid
+        *
+        * @param       $stateName      The default state we shall execute
+        * @return      $isValid        Whether the given state is valid
+        * @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
new file mode 100644 (file)
index 0000000..36a1541
--- /dev/null
+++ b/inc/main/interfaces/visitor/listener/class_ListenerVisitor.php
@@ -0,0 +1,35 @@
+<?php
+/**
+ * An interface for the visitor implementation for listeners
+ *
+ * @author             Roland Haeder <webmaster@shipsimu.org>
+ * @version            0.0.0
+ * @copyright  Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2016 Core Developer Team
+ * @license            GNU GPL 3.0 or any newer version
+ * @link               http://www.shipsimu.org
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+interface ListenerVisitor extends Visitor {
+       /**
+        * Visits the given listener instance
+        *
+        * @param       $listenerInstance       A Listenable instance
+        * @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
new file mode 100644 (file)
index 0000000..bc746ac
--- /dev/null
+++ b/inc/main/interfaces/visitor/pool/class_PoolVisitor.php
@@ -0,0 +1,35 @@
+<?php
+/**
+ * An interface for the visitor implementation for pools
+ *
+ * @author             Roland Haeder <webmaster@shipsimu.org>
+ * @version            0.0.0
+ * @copyright  Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2016 Core Developer Team
+ * @license            GNU GPL 3.0 or any newer version
+ * @link               http://www.shipsimu.org
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+interface PoolVisitor extends Visitor {
+       /**
+        * Visits the given pool instance
+        *
+        * @param       $poolInstance   A Poolable instance
+        * @return      void
+        */
+       function visitPool (Poolable $poolInstance);
+}
+
+// [EOF]
+?>

diff --git a/inc/selector.php b/inc/selector.php
new file mode 100644 (file)
index 0000000..3c402b4
--- /dev/null
+++ b/inc/selector.php
@@ -0,0 +1,83 @@
+<?php
+/**
+ * The application selector main include file
+ *
+ * @author             Roland Haeder <webmaster@shipsimu.org>
+ * @version            0.0.0
+ * @copyright  Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2016 Core Developer Team
+ * @license            GNU GPL 3.0 or any newer version
+ * @link               http://www.shipsimu.org
+ * @deprecated
+ * @todo               Minimize these includes
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+
+// Try to load these includes in the given order
+$configAppIncludes = array(
+       'class_' . FrameworkConfiguration::getSelfInstance()->getConfigEntry('app_helper_class'), // The ApplicationHelper class
+       'debug',                // Some debugging stuff
+       'exceptions',   // The application's own exception handler
+       'loader',               // The application's class loader
+       'config',               // The application's own configuration
+       'config-local', // Local configuration file (optional)
+       'data',                 // Application data
+       'init',                 // The application initializer
+       'starter',              // The application starter (calls entryPoint(), etc.)
+);
+
+// Cache base path/file here
+$basePathFile = FrameworkConfiguration::getSelfInstance()->getConfigEntry('application_path') . FrameworkConfiguration::getSelfInstance()->getConfigEntry('app_name');
+
+// Is the directory there?
+if (!is_dir($basePathFile)) {
+       // Not found.
+       trigger_error('Application ' . FrameworkConfiguration::getSelfInstance()->getConfigEntry('app_name') . ' not found.');
+       exit;
+} // END - if
+
+// Load them all (try only)
+foreach ($configAppIncludes as $appInc) {
+       // Skip starter in test mode
+       if (($appInc == 'starter') && (defined('TEST'))) {
+               // Skip it here
+               continue;
+       } // END - if
+
+       // Generate a FQFN for the helper class
+       $appFqFn = $basePathFile . '/' . $appInc . '.php';
+
+       // Does the include file exists?
+       if (BaseFrameworkSystem::isReadableFile($appFqFn)) {
+               // Load it
+               //* DEBUG: */ print basename(__FILE__)."[".__LINE__."]: Loading ".basename($appFqFn)." - START\n";
+               require($appFqFn);
+               //* DEBUG: */ print basename(__FILE__)."[".__LINE__."]: Loading ".basename($appFqFn)." - END\n";
+       } elseif (FrameworkConfiguration::getSelfInstance()->getConfigEntry('verbose_level') > 0) {
+               // File is missing
+               trigger_error(sprintf('Cannot load application script %s.php! File is missing or read-protected.',
+                       $appInc
+               ));
+               exit;
+       }
+}
+
+// Remove variables from namespace, which we don't need
+unset($appInc);
+unset($configAppIncludes);
+unset($appFqFn);
+unset($basePathFile);
+
+// [EOF]
+?>