Continued:

- added namespace to class config entries
- added "import" of LanguageSystem
- added "import" of BaseTask (and in class template, too)
- added "import" of Visitable
- added "import" of ManageableGuest
- added "import" of BaseIndex, Indexable and IndexableStack
- added "import" of CalculatableBlock
- and no "we", better neutral words

Signed-off-by: Roland Häder <roland@mxchange.org>

diff --git a/framework/config.php b/framework/config.php
index 2d9cd8e77dfdf197ab14cde10d1ae1428a347793..c0afdd57133bfdb9bf062eee3b42b41c352f48e0 100644 (file)
--- a/framework/config.php
+++ b/framework/config.php
@@ -128,7 +128,7 @@ $cfg->setConfigEntry('menu_template_type', 'menu');
 $cfg->setConfigEntry('output_class', 'CoreFramework\Output\WebOutput');
 
 // CFG: LANGUAGE-SYSTEM-CLASS
-$cfg->setConfigEntry('language_system_class', 'LanguageSystem');
+$cfg->setConfigEntry('language_system_class', 'CoreFramework\Localization\LanguageSystem');
 
 // CFG: SELECTOR-TEMPLATE-PREFIX
 $cfg->setConfigEntry('tpl_selector_prefix', 'selector');
@@ -251,16 +251,16 @@ $cfg->setConfigEntry('user_db_wrapper_class', 'CoreFramework\Wrapper\Database\Us
 $cfg->setConfigEntry('news_db_wrapper_class', 'CoreFramework\Wrapper\Database\News\NewsDatabaseWrapper');
 
 // CFG: HTML-CMD-RESOLVER-CLASS
-$cfg->setConfigEntry('html_cmd_resolver_class', 'HtmlCommandResolver');
+$cfg->setConfigEntry('html_cmd_resolver_class', 'CoreFramework\Resolver\Command\HtmlCommandResolver');
 
 // CFG: HTML-CMD-LOGIN-RESOLVER-CLASS
-$cfg->setConfigEntry('html_cmd_login_resolver_class', 'HtmlCommandResolver');
+$cfg->setConfigEntry('html_cmd_login_resolver_class', 'CoreFramework\Resolver\Command\HtmlCommandResolver');
 
 // CFG: IMAGE-CMD-RESOLVER-CLASS
-$cfg->setConfigEntry('image_cmd_resolver_class', 'ImageCommandResolver');
+$cfg->setConfigEntry('image_cmd_resolver_class', 'CoreFramework\Resolver\Command\ImageCommandResolver');
 
 // CFG: IMAGE-CMD-CODE-CAPTCHA-RESOLVER-CLASS
-$cfg->setConfigEntry('image_cmd_code_captcha_resolver_class', 'ImageCommandResolver');
+$cfg->setConfigEntry('image_cmd_code_captcha_resolver_class', 'CoreFramework\Resolver\Command\ImageCommandResolver');
 
 // CFG: MAILER-CLASS
 $cfg->setConfigEntry('mailer_class', 'CoreFramework\Mailer\Debug\DebugMailer');
@@ -299,7 +299,7 @@ $cfg->setConfigEntry('post_registration_class', 'CoreFramework\Action\PostRegist
 $cfg->setConfigEntry('user_class', 'CoreFramework\User\Login\Member');
 
 // CFG: GUEST-CLASS
-$cfg->setConfigEntry('guest_class', 'Guest');
+$cfg->setConfigEntry('guest_class', 'CoreFramework\User\Guest\Guest');
 
 // CFG: COOKIE-EXPIRE
 $cfg->setConfigEntry('cookie_expire', (60*60*2)); // Two hours!
@@ -398,7 +398,7 @@ $cfg->setConfigEntry('file_stack_pre_allocate_enabled', 'Y');
 $cfg->setConfigEntry('file_stack_pre_allocate_count', 10000);
 
 // CFG: INDEX-INDEX-CLASS
-$cfg->setConfigEntry('file_stack_index_class', 'FileStackIndex');
+$cfg->setConfigEntry('file_stack_index_class', 'CoreFramework\Index\Stack\FileStackIndex');
 
 // CFG: INDEX-PRE-ALLOCATE-ENABLED
 $cfg->setConfigEntry('index_pre_allocate_enabled', 'Y');
@@ -410,7 +410,7 @@ $cfg->setConfigEntry('index_pre_allocate_count', 10000);
 $cfg->setConfigEntry('stack_file_class', 'CoreFramework\Filesystem\Stack\StackFile');
 
 // CFG: INDEX-FILE-CLASS
-$cfg->setConfigEntry('index_file_class', 'IndexFile');
+$cfg->setConfigEntry('index_file_class', 'CoreFramework\Filesystem\Index\IndexFile');
 
 // CFG: TASK-HANDLER-CLASS
 $cfg->setConfigEntry('task_handler_class', 'CoreFramework\Handler\Task\TaskHandler');
@@ -419,7 +419,7 @@ $cfg->setConfigEntry('task_handler_class', 'CoreFramework\Handler\Task\TaskHandl
 $cfg->setConfigEntry('task_list_class', 'CoreFramework\Lists\Task\TaskList');
 
 // CFG: LIST-GROUP-CLASS
-$cfg->setConfigEntry('list_group_class', 'ListGroupList');
+$cfg->setConfigEntry('list_group_class', 'CoreFramework\Lists\Group\ListGroupList');
 
 // CFG: DEFAULT-ITERATOR-CLASS
 $cfg->setConfigEntry('default_iterator_class', 'DefaultIterator');
@@ -428,7 +428,7 @@ $cfg->setConfigEntry('default_iterator_class', 'DefaultIterator');
 $cfg->setConfigEntry('active_task_visitor_class', 'ActiveTaskVisitor');
 
 // CFG: IDLE-TASK-CLASS
-$cfg->setConfigEntry('idle_task_class', 'IdleLoopTask');
+$cfg->setConfigEntry('idle_task_class', 'CoreFramework\Task\IdleLoop\IdleLoopTask');
 
 // CFG: TASK-IDLE-LOOP-STARTUP-DELAY
 $cfg->setConfigEntry('task_idle_loop_startup_delay', 0);

diff --git a/framework/main/classes/class_BaseFrameworkSystem.php b/framework/main/classes/class_BaseFrameworkSystem.php
index b15d4362cd84ca4edce01cb589586ccb4be348c9..6424b78859e7dfbc912a0dca94596bf41ccb910a 100644 (file)
--- a/framework/main/classes/class_BaseFrameworkSystem.php
+++ b/framework/main/classes/class_BaseFrameworkSystem.php
@@ -19,6 +19,7 @@ use CoreFramework\Filesystem\FrameworkDirectory;
 use CoreFramework\Generic\FrameworkInterface;
 use CoreFramework\Generic\NullPointerException;
 use CoreFramework\Handler\Stream\IoHandler;
+use CoreFramework\Index\Indexable;
 use CoreFramework\Listener\Listenable;
 use CoreFramework\Lists\Listable;
 use CoreFramework\Loader\ClassLoader;

diff --git a/framework/main/classes/factories/index/class_FileStackIndexFactory.php b/framework/main/classes/factories/index/class_FileStackIndexFactory.php
index 612bf52be1e36908648bb6857ac4534d194b4d95..f4594997c1ae8c5d3a194ec16fa4f681ad25908d 100644 (file)
--- a/framework/main/classes/factories/index/class_FileStackIndexFactory.php
+++ b/framework/main/classes/factories/index/class_FileStackIndexFactory.php
@@ -5,6 +5,7 @@ namespace CoreFramework\Factory\Filesystem\Stack;
 // Import framework stuff
 use CoreFramework\Factory\ObjectFactory;
 use CoreFramework\Registry\Registry;
+use CoreFramework\Stack\Index\IndexableStack;
 
 /**
  * A factory class for file-based stack indexes

diff --git a/framework/main/classes/file_directories/binary/class_BaseBinaryFile.php b/framework/main/classes/file_directories/binary/class_BaseBinaryFile.php
index f89e0aaf90205628f2d2d8897f019458b6174527..fc4140cdb3796689b172bc2df7c5a3b7fb8b82fc 100644 (file)
--- a/framework/main/classes/file_directories/binary/class_BaseBinaryFile.php
+++ b/framework/main/classes/file_directories/binary/class_BaseBinaryFile.php
@@ -5,6 +5,7 @@ namespace CoreFramework\Filesystem\File;
 // Import framework stuff
 use CoreFramework\Factory\ObjectFactory;
 use CoreFramework\Filesystem\Block;
+use CoreFramework\Filesystem\Block\CalculatableBlock;
 
 /**
  * A general binary file class

diff --git a/framework/main/classes/handler/tasks/class_TaskHandler.php b/framework/main/classes/handler/tasks/class_TaskHandler.php
index 82a664fe38c19997eea533bb79ef2d4488d1e3d1..b0fd94443fbd957133d0a68e47c5c66d454563c8 100644 (file)
--- a/framework/main/classes/handler/tasks/class_TaskHandler.php
+++ b/framework/main/classes/handler/tasks/class_TaskHandler.php
@@ -8,6 +8,7 @@ use CoreFramework\Handler\BaseHandler;
 use CoreFramework\Lists\Listable;
 use CoreFramework\Registry\Registerable;
 use CoreFramework\Task\Taskable;
+use CoreFramework\Visitor\Visitable;
 
 /**
  * A Task handler
@@ -220,7 +221,7 @@ class TaskHandler extends BaseHandler implements Registerable, HandleableTask {
         * Registers a task with a task handler.
         *
         * @param       $taskName               A task name to register the task on
-        * @param       $taskInstance   The instance we should register as a task
+        * @param       $taskInstance   The instance that should be registered as a task
         * @return      void
         */
        public function registerTask ($taskName, Visitable $taskInstance) {

diff --git a/framework/main/classes/index/class_ b/framework/main/classes/index/class_
index b74ed32a4cfc753fffae58588159b039a91070a9..374cb97725c9e406738c36b2f87b616b6e934365 100644 (file)
--- a/framework/main/classes/index/class_
+++ b/framework/main/classes/index/class_
@@ -1,4 +1,11 @@
 <?php
+// Own namespace
+namespace CoreFramework\Index\!!!;
+
+// Import framework stuff
+use CoreFramework\Index\BaseIndex;
+use CoreFramework\Index\Indexable;
+
 /**
  * A ??? index class
  *

diff --git a/framework/main/classes/index/file_stack/class_FileStackIndex.php b/framework/main/classes/index/file_stack/class_FileStackIndex.php
index b1e04a96802caba90351158f71142e837b793eab..fc09d574ae0c0e46f8498780e143fea8f59691ab 100644 (file)
--- a/framework/main/classes/index/file_stack/class_FileStackIndex.php
+++ b/framework/main/classes/index/file_stack/class_FileStackIndex.php
@@ -3,7 +3,10 @@
 namespace CoreFramework\Index\Stack;
 
 // Import framework stuff
+use CoreFramework\Index\BaseIndex;
+use CoreFramework\Index\Indexable;
 use CoreFramework\Registry\Registerable;
+use CoreFramework\Stack\Index\IndexableStack;
 
 /**
  * A FileStack index class

diff --git a/framework/main/classes/listener/class_BaseListener.php b/framework/main/classes/listener/class_BaseListener.php
index f7340cb059c11f616351adf36b3dfb2352ad2bf8..ae98d5bd4c2b7737c3aab74fc6597a931c9a5f96 100644 (file)
--- a/framework/main/classes/listener/class_BaseListener.php
+++ b/framework/main/classes/listener/class_BaseListener.php
@@ -6,6 +6,7 @@ namespace CoreFramework\Listener;
 use CoreFramework\Factory\ObjectFactory;
 use CoreFramework\Object\BaseFrameworkSystem;
 use CoreFramework\Pool\Poolable;
+use CoreFramework\Visitor\Visitable;
 use CoreFramework\Visitor\Visitor;
 
 /**

diff --git a/framework/main/classes/listener/class_BaseListenerDecorator.php b/framework/main/classes/listener/class_BaseListenerDecorator.php
index 2f7200a9cf70074a4adda81ddb437110d5884a21..b2f73a61f9a601a20cb6dd2b10abbb2d65a925c0 100644 (file)
--- a/framework/main/classes/listener/class_BaseListenerDecorator.php
+++ b/framework/main/classes/listener/class_BaseListenerDecorator.php
@@ -4,6 +4,7 @@ namespace CoreFramework\Listener;
 
 // Import framework stuff
 use CoreFramework\Generic\BaseDecorator;
+use CoreFramework\Visitor\Visitable;
 use CoreFramework\Visitor\Visitor;
 
 /**

diff --git a/framework/main/classes/lists/class_BaseList.php b/framework/main/classes/lists/class_BaseList.php
index eadf742ea56040f1fb511594b0099066ea69be48..3703aecc6bb6ff8e03a21b6ab65687cfb24619e7 100644 (file)
--- a/framework/main/classes/lists/class_BaseList.php
+++ b/framework/main/classes/lists/class_BaseList.php
@@ -6,6 +6,7 @@ namespace CoreFramework\Lists;
 use CoreFramework\Factory\ObjectFactory;
 use CoreFramework\Generic\FrameworkInterface;
 use CoreFramework\Object\BaseFrameworkSystem;
+use CoreFramework\Visitor\Visitable;
 
 // Import SPL stuff
 use \IteratorAggregate;

diff --git a/framework/main/classes/stacker/file/fifo/class_FiFoFileStack.php b/framework/main/classes/stacker/file/fifo/class_FiFoFileStack.php
index e036b052d108a8d26f6eb81886ddeb2c0bb91d00..2e380b2d3d8d89d14f53dc9462cf27e1bb27752b 100644 (file)
--- a/framework/main/classes/stacker/file/fifo/class_FiFoFileStack.php
+++ b/framework/main/classes/stacker/file/fifo/class_FiFoFileStack.php
@@ -3,6 +3,7 @@
 namespace CoreFramework\Stack\Filesystem;
 
 // Import framework stuff
+use CoreFramework\Filesystem\Block\CalculatableBlock;
 use CoreFramework\Registry\Registerable;
 
 /**

diff --git a/framework/main/classes/tasks/class_ b/framework/main/classes/tasks/class_
index 07a8296d23efa09a964f028a043b5038c87f2fec..05efd215d141de244e5bc5c93ba6d62319493cf0 100644 (file)
--- a/framework/main/classes/tasks/class_
+++ b/framework/main/classes/tasks/class_
@@ -1,4 +1,13 @@
 <?php
+// Own namespace
+namespace CoreFramework\Task\___;
+
+// Import framework stuff
+use CoreFramework\Task\BaseTask;
+use CoreFramework\Task\Taskable;
+use CoreFramework\Visitor\Visitable;
+use CoreFramework\Visitor\Visitor;
+
 /**
  * A ??? task for !!!
  *

diff --git a/framework/main/classes/tasks/idle/class_IdleLoopTask.php b/framework/main/classes/tasks/idle/class_IdleLoopTask.php
index 00aecdcd3f64986aea47a70d9a433cfb394cf054..4ebef1d5b44c168dcc13860f396e4b04a98ed445 100644 (file)
--- a/framework/main/classes/tasks/idle/class_IdleLoopTask.php
+++ b/framework/main/classes/tasks/idle/class_IdleLoopTask.php
@@ -3,7 +3,9 @@
 namespace CoreFramework\Task\IdleLoop;
 
 // Import Framework stuff
+use CoreFramework\Task\BaseTask;
 use CoreFramework\Task\Taskable;
+use CoreFramework\Visitor\Visitable;
 use CoreFramework\Visitor\Visitor;
 
 /**

diff --git a/framework/main/classes/user/guest/class_Guest.php b/framework/main/classes/user/guest/class_Guest.php
index 1b6fe579a5cf627a9ac8529cc41dd6abb9414858..ac73f177c52d21fd5c51911e40d1c04801ed072d 100644 (file)
--- a/framework/main/classes/user/guest/class_Guest.php
+++ b/framework/main/classes/user/guest/class_Guest.php
@@ -3,6 +3,7 @@
 namespace CoreFramework\User\Guest;
 
 // Import framework stuff
+use CoreFramework\Manager\Guest\ManageableGuest;
 use CoreFramework\Registry\Registerable;
 use CoreFramework\Request\Requestable;
 use CoreFramework\User\BaseUser;

diff --git a/framework/main/interfaces/handler/task/class_HandleableTask.php b/framework/main/interfaces/handler/task/class_HandleableTask.php
index d043c7dffe883c5cf011419b31390014aa00f0cb..06104f77b2e9598006d66130e5be2908a6c79273 100644 (file)
--- a/framework/main/interfaces/handler/task/class_HandleableTask.php
+++ b/framework/main/interfaces/handler/task/class_HandleableTask.php
@@ -5,6 +5,7 @@ namespace CoreFramework\Handler\Task;
 // Import framework stuff
 use CoreFramework\Handler\DataSet\HandleableDataSet;
 use CoreFramework\Task\Taskable;
+use CoreFramework\Visitor\Visitable;
 
 /**
  * A HandleableTask interface

diff --git a/framework/main/interfaces/index/class_Indexable b/framework/main/interfaces/index/class_Indexable
index d07544c24e587b8336b468b526396892211b6d99..2d253242636a9e264853898ca072ca4b67819f80 100644 (file)
--- a/framework/main/interfaces/index/class_Indexable
+++ b/framework/main/interfaces/index/class_Indexable
@@ -1,4 +1,10 @@
 <?php
+// Own namespace
+namespace CoreFramework\Index\!!!;
+
+// Import framework stuff
+use CoreFramework\Index\Indexable;
+
 /**
  * An interface for Indexable classes
  *

diff --git a/framework/main/interfaces/index/stack/class_IndexableStack.php b/framework/main/interfaces/index/stack/class_IndexableStack.php
index 8ed6b26d3851c4237ceffb6a388aaa315c2eaf57..daab0a1326d00033c818f9c47459da282884f5ab 100644 (file)
--- a/framework/main/interfaces/index/stack/class_IndexableStack.php
+++ b/framework/main/interfaces/index/stack/class_IndexableStack.php
@@ -2,6 +2,10 @@
 // Own namespace
 namespace CoreFramework\Stack\Index;
 
+// Import framework stuff
+use CoreFramework\Filesystem\Block\CalculatableBlock;
+use CoreFramework\Index\Indexable;
+
 /**
  * An interface for Indexable stack classes
  *

diff --git a/framework/main/interfaces/lists/class_Listable.php b/framework/main/interfaces/lists/class_Listable.php
index 251474505041d5bac3e0cbe633f7be0410a64cc0..13da64ce8a80c4240fcc0a42fe5f308ae0d76bfb 100644 (file)
--- a/framework/main/interfaces/lists/class_Listable.php
+++ b/framework/main/interfaces/lists/class_Listable.php
@@ -4,6 +4,7 @@ namespace CoreFramework\Lists;
 
 // Import framework stuff
 use CoreFramework\Generic\FrameworkInterface;
+use CoreFramework\Visitor\Visitable;
 
 // Import SPL stuff
 use \IteratorAggregate;

diff --git a/index.php b/index.php
index 3ba9290f823a382fa3c6d47cebf42227d0f9913e..e058edadaccafcfcb3990887031456c133a816d1 100644 (file)
--- a/index.php
+++ b/index.php
@@ -6,6 +6,7 @@ namespace CoreFramework\EntryPoint;
 use CoreFramework\Configuration\FrameworkConfiguration;
 use CoreFramework\Factory\ObjectFactory;
 use CoreFramework\Helper\Application\ApplicationHelper;
+use CoreFramework\Localization\LanguageSystem;
 use CoreFramework\Loader\ClassLoader;
 use CoreFramework\Generic\FrameworkException;