From c372f05c7f3c30fbc55128aee1335f3e643103da Mon Sep 17 00:00:00 2001 From: Roland Haeder Date: Sun, 26 Feb 2017 21:34:28 +0100 Subject: [PATCH] Continued: - expanded class config entry with namespace - added "import" of BaseVisitor, Visitor and TaskVisitor, PoolVisitor - added "import" of Taskable MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit Signed-off-by: Roland Häder --- framework/config.php | 2 +- framework/main/classes/class_BaseFrameworkSystem.php | 1 + framework/main/classes/handler/tasks/class_TaskHandler.php | 1 + framework/main/classes/listener/class_BaseListener.php | 1 + .../main/classes/listener/class_BaseListenerDecorator.php | 3 +++ framework/main/classes/tasks/idle/class_IdleLoopTask.php | 4 ++++ .../main/classes/visitor/tasks/class_ActiveTaskVisitor.php | 6 ++++++ .../classes/visitor/tasks/class_ShutdownTaskVisitor.php | 6 ++++++ .../main/interfaces/handler/task/class_HandleableTask.php | 1 + framework/main/interfaces/tasks/class_Taskable.php | 1 + framework/main/interfaces/visitor/class_Visitable.php | 1 + .../interfaces/visitor/decorator/class_DecoratorVisitor.php | 3 +++ .../interfaces/visitor/listener/class_ListenerVisitor.php | 3 +++ .../main/interfaces/visitor/pool/class_PoolVisitor.php | 3 +++ .../main/interfaces/visitor/tasks/class_TaskVisitor.php | 4 ++++ 15 files changed, 39 insertions(+), 1 deletion(-) diff --git a/framework/config.php b/framework/config.php index 20e6744b..c7265271 100644 --- a/framework/config.php +++ b/framework/config.php @@ -443,7 +443,7 @@ $cfg->setConfigEntry('task_idle_loop_max_runs', 0); $cfg->setConfigEntry('idle_loop_time', 5); // CFG: SHUTDOWN-TASK-VISITOR-CLASS -$cfg->setConfigEntry('shutdown_task_visitor_class', 'ShutdownTaskVisitor'); +$cfg->setConfigEntry('shutdown_task_visitor_class', 'CoreFramework\Visitor\Task\Shutdown\ShutdownTaskVisitor'); // CFG: DEFAULT-IMAGE-COMMAND $cfg->setConfigEntry('default_image_command', 'build'); diff --git a/framework/main/classes/class_BaseFrameworkSystem.php b/framework/main/classes/class_BaseFrameworkSystem.php index ba156fff..24822399 100644 --- a/framework/main/classes/class_BaseFrameworkSystem.php +++ b/framework/main/classes/class_BaseFrameworkSystem.php @@ -34,6 +34,7 @@ use CoreFramework\Response\Responseable; use CoreFramework\Stream\Output\OutputStreamer; use CoreFramework\Template\CompileableTemplate; use CoreFramework\User\ManageableAccount; +use CoreFramework\Visitor\Visitor; use CoreFramework\Wrapper\Database\DatabaseWrapper; // Import SPL stuff diff --git a/framework/main/classes/handler/tasks/class_TaskHandler.php b/framework/main/classes/handler/tasks/class_TaskHandler.php index 9d8eb330..82a664fe 100644 --- a/framework/main/classes/handler/tasks/class_TaskHandler.php +++ b/framework/main/classes/handler/tasks/class_TaskHandler.php @@ -7,6 +7,7 @@ use CoreFramework\Factory\ObjectFactory; use CoreFramework\Handler\BaseHandler; use CoreFramework\Lists\Listable; use CoreFramework\Registry\Registerable; +use CoreFramework\Task\Taskable; /** * A Task handler diff --git a/framework/main/classes/listener/class_BaseListener.php b/framework/main/classes/listener/class_BaseListener.php index ff89553e..46f7d5d6 100644 --- a/framework/main/classes/listener/class_BaseListener.php +++ b/framework/main/classes/listener/class_BaseListener.php @@ -5,6 +5,7 @@ namespace CoreFramework\Listener; // Import framework stuff use CoreFramework\Factory\ObjectFactory; use CoreFramework\Object\BaseFrameworkSystem; +use CoreFramework\Visitor\Visitor; /** * A general listener class diff --git a/framework/main/classes/listener/class_BaseListenerDecorator.php b/framework/main/classes/listener/class_BaseListenerDecorator.php index 93108652..5e3c959b 100644 --- a/framework/main/classes/listener/class_BaseListenerDecorator.php +++ b/framework/main/classes/listener/class_BaseListenerDecorator.php @@ -2,6 +2,9 @@ // Own namespace namespace CoreFramework\Listener; +// Import framework stuff +use CoreFramework\Visitor\Visitor; + /** * A general decorator for listeners to communicate to hubs * diff --git a/framework/main/classes/tasks/idle/class_IdleLoopTask.php b/framework/main/classes/tasks/idle/class_IdleLoopTask.php index a8bba354..00aecdcd 100644 --- a/framework/main/classes/tasks/idle/class_IdleLoopTask.php +++ b/framework/main/classes/tasks/idle/class_IdleLoopTask.php @@ -2,6 +2,10 @@ // Own namespace namespace CoreFramework\Task\IdleLoop; +// Import Framework stuff +use CoreFramework\Task\Taskable; +use CoreFramework\Visitor\Visitor; + /** * A IdleLoop task * diff --git a/framework/main/classes/visitor/tasks/class_ActiveTaskVisitor.php b/framework/main/classes/visitor/tasks/class_ActiveTaskVisitor.php index 5ef8686a..d4f6d9f5 100644 --- a/framework/main/classes/visitor/tasks/class_ActiveTaskVisitor.php +++ b/framework/main/classes/visitor/tasks/class_ActiveTaskVisitor.php @@ -2,6 +2,12 @@ // Own namespace namespace CoreFramework\Visitor\Task\Active; +// Import framework stuff +use CoreFramework\Task\Taskable; +use CoreFramework\Visitor\BaseVisitor; +use CoreFramework\Visitor\Pool\PoolVisitor; +use CoreFramework\Visitor\Task\TaskVisitor; + /** * An ActiveTask visitor * diff --git a/framework/main/classes/visitor/tasks/class_ShutdownTaskVisitor.php b/framework/main/classes/visitor/tasks/class_ShutdownTaskVisitor.php index 01d1b6b2..bb329f90 100644 --- a/framework/main/classes/visitor/tasks/class_ShutdownTaskVisitor.php +++ b/framework/main/classes/visitor/tasks/class_ShutdownTaskVisitor.php @@ -2,6 +2,12 @@ // Own namespace namespace CoreFramework\Visitor\Task\Shutdown; +// Import framework stuff +use CoreFramework\Task\Taskable; +use CoreFramework\Visitor\BaseVisitor; +use CoreFramework\Visitor\Pool\PoolVisitor; +use CoreFramework\Visitor\Task\TaskVisitor; + /** * An ShutdownTask visitor * diff --git a/framework/main/interfaces/handler/task/class_HandleableTask.php b/framework/main/interfaces/handler/task/class_HandleableTask.php index b42d53fb..d043c7df 100644 --- a/framework/main/interfaces/handler/task/class_HandleableTask.php +++ b/framework/main/interfaces/handler/task/class_HandleableTask.php @@ -4,6 +4,7 @@ namespace CoreFramework\Handler\Task; // Import framework stuff use CoreFramework\Handler\DataSet\HandleableDataSet; +use CoreFramework\Task\Taskable; /** * A HandleableTask interface diff --git a/framework/main/interfaces/tasks/class_Taskable.php b/framework/main/interfaces/tasks/class_Taskable.php index 07260579..2b0513dd 100644 --- a/framework/main/interfaces/tasks/class_Taskable.php +++ b/framework/main/interfaces/tasks/class_Taskable.php @@ -4,6 +4,7 @@ namespace CoreFramework\Task; // Import framework stuff use CoreFramework\Generic\FrameworkInterface; +use CoreFramework\Visitor\Visitor; /** * An interface for tasks diff --git a/framework/main/interfaces/visitor/class_Visitable.php b/framework/main/interfaces/visitor/class_Visitable.php index 816913a8..53fd4cd8 100644 --- a/framework/main/interfaces/visitor/class_Visitable.php +++ b/framework/main/interfaces/visitor/class_Visitable.php @@ -4,6 +4,7 @@ namespace CoreFramework\Visitor; // Import framework stuff use CoreFramework\Generic\FrameworkInterface; +use CoreFramework\Visitor\Visitor; /** * An interface for a visitable class that 'accepts' visitors diff --git a/framework/main/interfaces/visitor/decorator/class_DecoratorVisitor.php b/framework/main/interfaces/visitor/decorator/class_DecoratorVisitor.php index 8b7cab4c..033d013f 100644 --- a/framework/main/interfaces/visitor/decorator/class_DecoratorVisitor.php +++ b/framework/main/interfaces/visitor/decorator/class_DecoratorVisitor.php @@ -2,6 +2,9 @@ // Own namespace namespace CoreFramework\Visitor\Decorator; +// Import framework stuff +use CoreFramework\Visitor\Visitor; + /** * An interface for the visitor implementation for decorators * diff --git a/framework/main/interfaces/visitor/listener/class_ListenerVisitor.php b/framework/main/interfaces/visitor/listener/class_ListenerVisitor.php index 03a4adce..979e69c5 100644 --- a/framework/main/interfaces/visitor/listener/class_ListenerVisitor.php +++ b/framework/main/interfaces/visitor/listener/class_ListenerVisitor.php @@ -2,6 +2,9 @@ // Own namespace namespace CoreFramework\Visitor\Listener; +// Import framework stuff +use CoreFramework\Visitor\Visitor; + /** * An interface for the visitor implementation for listeners * diff --git a/framework/main/interfaces/visitor/pool/class_PoolVisitor.php b/framework/main/interfaces/visitor/pool/class_PoolVisitor.php index 6a63a766..a3bc173b 100644 --- a/framework/main/interfaces/visitor/pool/class_PoolVisitor.php +++ b/framework/main/interfaces/visitor/pool/class_PoolVisitor.php @@ -2,6 +2,9 @@ // Own namespace namespace CoreFramework\Visitor\Pool; +// Import framework stuff +use CoreFramework\Visitor\Visitor; + /** * An interface for the visitor implementation for pools * diff --git a/framework/main/interfaces/visitor/tasks/class_TaskVisitor.php b/framework/main/interfaces/visitor/tasks/class_TaskVisitor.php index 8012b9aa..3acb342b 100644 --- a/framework/main/interfaces/visitor/tasks/class_TaskVisitor.php +++ b/framework/main/interfaces/visitor/tasks/class_TaskVisitor.php @@ -2,6 +2,10 @@ // Own namespace namespace CoreFramework\Visitor\Task; +// Import framework stuff +use CoreFramework\Task\Taskable; +use CoreFramework\Visitor\Visitor; + /** * An interface for the visitor implementation for tasks * -- 2.30.2