From 0977558fc4c885b488fddd7e8dcb77decce4f3a5 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Roland=20H=C3=A4der?= Date: Sat, 2 Feb 2013 00:18:35 +0000 Subject: [PATCH] Renamed filter (no self_announcement, just plain announcement) --- .gitattributes | 1 + application/hub/config.php | 16 ++--- .../factories/dht/class_DhtObjectFactory.php | 2 +- ...class_NodeActivationAnnouncementFilter.php | 68 +++++++++++++++++++ ...s_NodeActivationSelfAnnouncementFilter.php | 67 +----------------- .../hub/main/nodes/list/class_HubListNode.php | 2 +- .../main/nodes/master/class_HubMasterNode.php | 2 +- .../nodes/regular/class_HubRegularNode.php | 2 +- application/hub/main/tasks/apt-proxy/class_ | 2 +- .../apt-proxy/class_AptProxyListenerTask.php | 3 +- application/hub/main/tasks/chat/class_ | 2 +- .../chat/class_ChatTelnetListenerTask.php | 3 +- application/hub/main/tasks/class_ | 2 +- application/hub/main/tasks/cruncher/class_ | 2 +- .../class_CruncherKeyProducerTask.php | 3 +- .../class_CruncherTestUnitProducerTask.php | 3 +- .../class_CruncherWorkUnitFetcherTask.php | 3 +- .../main/tasks/idle/class_IdleLoopTask.php | 2 +- .../class_NetworkPackageReaderTask.php | 2 +- .../class_NetworkPackageWriterTask.php | 2 +- .../class_NodeAnnouncementTask.php | 2 +- .../chunks/class_NodeChunkAssemblerTask.php | 2 +- application/hub/main/tasks/node/class_Node | 2 +- .../decoder/class_NodePackageDecoderTask.php | 3 +- .../node/dht/class_NodeDhtBootstrapTask.php | 3 +- .../tasks/node/dht/class_NodeDhtQueryTask.php | 3 +- .../listener/class_NodeSocketListenerTask.php | 2 +- .../tasks/node/ping/class_NodePingTask.php | 2 +- .../class_NodeSelfConnectTask.php | 2 +- .../node/update/class_NodeUpdateCheckTask.php | 2 +- docs/TODOs.txt | 43 ++++++------ 31 files changed, 124 insertions(+), 131 deletions(-) create mode 100644 application/hub/main/filter/activation/node/class_NodeActivationAnnouncementFilter.php diff --git a/.gitattributes b/.gitattributes index aff2770db..c45b21074 100644 --- a/.gitattributes +++ b/.gitattributes @@ -276,6 +276,7 @@ application/hub/main/factories/tags/class_PackageTagsFactory.php svneol=native#t application/hub/main/filter/.htaccess -text svneol=unset#text/plain application/hub/main/filter/activation/.htaccess -text svneol=unset#text/plain application/hub/main/filter/activation/node/.htaccess svneol=native#text/plain +application/hub/main/filter/activation/node/class_NodeActivationAnnouncementFilter.php svneol=native#text/plain application/hub/main/filter/activation/node/class_NodeActivationSelfAnnouncementFilter.php svneol=native#text/plain application/hub/main/filter/apt-proxy/.htaccess svneol=native#text/plain application/hub/main/filter/apt-proxy/class_AptProxyInitializationFilter.php svneol=native#text/plain diff --git a/application/hub/config.php b/application/hub/config.php index 3649a7492..d79f9f1ad 100644 --- a/application/hub/config.php +++ b/application/hub/config.php @@ -156,8 +156,8 @@ $cfg->setConfigEntry('node_initializer_filter', 'NodeInitializationFilter'); // CFG: NODE-ACTIVATION-TASK-HANDLER-INITIALIZER-FILTER $cfg->setConfigEntry('node_activation_task_handler_initializer_filter', 'NodeTaskHandlerInitializerFilter'); -// CFG: NODE-ACTIVATION-SELF-ANNOUNCEMENT-TASK-FILTER -$cfg->setConfigEntry('node_activation_self_announcement_task_filter', 'NodeActivationSelfAnnouncementFilter'); +// CFG: NODE-ACTIVATION-ANNOUNCEMENT-TASK-FILTER +$cfg->setConfigEntry('node_activation_announcement_task_filter', 'NodeActivationAnnouncementFilter'); // CFG: NODE-WELCOME-TEASER-FILTER $cfg->setConfigEntry('node_welcome_teaser_filter', 'NodeWelcomeTeaserFilter'); @@ -441,14 +441,14 @@ $cfg->setConfigEntry('task_self_connect_interval_delay', 1000*60*30); // CFG: TASK-SELF-CONNECT-MAX-RUNS $cfg->setConfigEntry('task_self_connect_max_runs', 0); -// CFG: TASK-SELF-ANNOUNCEMENT-STARTUP-DELAY -$cfg->setConfigEntry('task_self_announcement_startup_delay', 10000); +// CFG: TASK-ANNOUNCEMENT-STARTUP-DELAY +$cfg->setConfigEntry('task_announcement_startup_delay', 10000); -// CFG: TASK-SELF-ANNOUNCEMENT-INTERVAL-DELAY -$cfg->setConfigEntry('task_self_announcement_interval_delay', 1000); +// CFG: TASK-ANNOUNCEMENT-INTERVAL-DELAY +$cfg->setConfigEntry('task_announcement_interval_delay', 1000); -// CFG: TASK-SELF-ANNOUNCEMENT-MAX-RUNS -$cfg->setConfigEntry('task_self_announcement_max_runs', 1); +// CFG: TASK-ANNOUNCEMENT-MAX-RUNS +$cfg->setConfigEntry('task_announcement_max_runs', 1); // CFG: TASK-UPDATE-CHECK-STARTUP-DELAY $cfg->setConfigEntry('task_update_check_startup_delay', 1000*60*60*6); diff --git a/application/hub/main/factories/dht/class_DhtObjectFactory.php b/application/hub/main/factories/dht/class_DhtObjectFactory.php index 535e85889..c4009be2c 100644 --- a/application/hub/main/factories/dht/class_DhtObjectFactory.php +++ b/application/hub/main/factories/dht/class_DhtObjectFactory.php @@ -35,7 +35,7 @@ class DhtObjectFactory extends ObjectFactory { /** * Returns a singleton (registry-based) DHT object instance * - * @param $nodeInstance An instance of a NodeHelper class + * @param $nodeInstance An instance of a NodeHelper class * @return $dhtInstance An instance of a DHT object class */ public static final function createDhtObjectInstance (NodeHelper $nodeInstance) { diff --git a/application/hub/main/filter/activation/node/class_NodeActivationAnnouncementFilter.php b/application/hub/main/filter/activation/node/class_NodeActivationAnnouncementFilter.php new file mode 100644 index 000000000..564f85b54 --- /dev/null +++ b/application/hub/main/filter/activation/node/class_NodeActivationAnnouncementFilter.php @@ -0,0 +1,68 @@ + + * @version 0.0.0 + * @copyright Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2012 Hub Developer Team + * @license GNU GPL 3.0 or any newer version + * @link http://www.ship-simu.org + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ +class NodeActivationAnnouncementFilter extends BaseNodeFilter implements Filterable { + /** + * Protected constructor + * + * @return void + */ + protected function __construct () { + // Call parent constructor + parent::__construct(__CLASS__); + } + + /** + * Creates an instance of this filter class + * + * @return $filterInstance An instance of this filter class + */ + public static final function createNodeActivationAnnouncementFilter () { + // Get a new instance + $filterInstance = new NodeActivationAnnouncementFilter(); + + // Return the instance + return $filterInstance; + } + + /** + * Executes the filter with given request and response objects + * + * @param $requestInstance An instance of a class with an Requestable interface + * @param $responseInstance An instance of a class with an Responseable interface + * @return void + */ + public function execute (Requestable $requestInstance, Responseable $responseInstance) { + // Get task handler instance + $handlerInstance = Registry::getRegistry()->getInstance('task'); + + // Prepare a self-test task for the listeners + $taskInstance = ObjectFactory::createObjectByConfiguredName('node_announcement_task_class'); + + // Register it + $handlerInstance->registerTask('announcement', $taskInstance); + } +} + +// [EOF] +?> diff --git a/application/hub/main/filter/activation/node/class_NodeActivationSelfAnnouncementFilter.php b/application/hub/main/filter/activation/node/class_NodeActivationSelfAnnouncementFilter.php index a272daa25..f551ef47b 100644 --- a/application/hub/main/filter/activation/node/class_NodeActivationSelfAnnouncementFilter.php +++ b/application/hub/main/filter/activation/node/class_NodeActivationSelfAnnouncementFilter.php @@ -1,68 +1,3 @@ - * @version 0.0.0 - * @copyright Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2012 Hub Developer Team - * @license GNU GPL 3.0 or any newer version - * @link http://www.ship-simu.org - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ -class NodeActivationSelfAnnouncementFilter extends BaseNodeFilter implements Filterable { - /** - * Protected constructor - * - * @return void - */ - protected function __construct () { - // Call parent constructor - parent::__construct(__CLASS__); - } - - /** - * Creates an instance of this filter class - * - * @return $filterInstance An instance of this filter class - */ - public static final function createNodeActivationSelfAnnouncementFilter () { - // Get a new instance - $filterInstance = new NodeActivationSelfAnnouncementFilter(); - - // Return the instance - return $filterInstance; - } - - /** - * Executes the filter with given request and response objects - * - * @param $requestInstance An instance of a class with an Requestable interface - * @param $responseInstance An instance of a class with an Responseable interface - * @return void - */ - public function execute (Requestable $requestInstance, Responseable $responseInstance) { - // Get task handler instance - $handlerInstance = Registry::getRegistry()->getInstance('task'); - - // Prepare a self-test task for the listeners - $taskInstance = ObjectFactory::createObjectByConfiguredName('node_announcement_task_class'); - - // Register it - $handlerInstance->registerTask('self_announcement', $taskInstance); - } -} - -// [EOF] +// @DEPRECATED ?> diff --git a/application/hub/main/nodes/list/class_HubListNode.php b/application/hub/main/nodes/list/class_HubListNode.php index 010c49734..cd0e7fa66 100644 --- a/application/hub/main/nodes/list/class_HubListNode.php +++ b/application/hub/main/nodes/list/class_HubListNode.php @@ -74,7 +74,7 @@ class HubListNode extends BaseHubNode implements NodeHelper, Registerable { $controllerInstance = $applicationInstance->getControllerInstance(); // Self-announcement task - $controllerInstance->addActivationFilter(ObjectFactory::createObjectByConfiguredName('node_activation_self_announcement_task_filter')); + $controllerInstance->addActivationFilter(ObjectFactory::createObjectByConfiguredName('node_activation_announcement_task_filter')); // @TODO Add some filters here $this->partialStub('Add some filters here.'); diff --git a/application/hub/main/nodes/master/class_HubMasterNode.php b/application/hub/main/nodes/master/class_HubMasterNode.php index 23124cc7e..2f3f2261a 100644 --- a/application/hub/main/nodes/master/class_HubMasterNode.php +++ b/application/hub/main/nodes/master/class_HubMasterNode.php @@ -78,7 +78,7 @@ class HubMasterNode extends BaseHubNode implements NodeHelper, Registerable { $controllerInstance = $applicationInstance->getControllerInstance(); // Self-announcement task - $controllerInstance->addActivationFilter(ObjectFactory::createObjectByConfiguredName('node_activation_self_announcement_task_filter')); + $controllerInstance->addActivationFilter(ObjectFactory::createObjectByConfiguredName('node_activation_announcement_task_filter')); // @TODO Add some filters here $this->partialStub('Add some filters here.'); diff --git a/application/hub/main/nodes/regular/class_HubRegularNode.php b/application/hub/main/nodes/regular/class_HubRegularNode.php index 13c99aa60..fca019aad 100644 --- a/application/hub/main/nodes/regular/class_HubRegularNode.php +++ b/application/hub/main/nodes/regular/class_HubRegularNode.php @@ -74,7 +74,7 @@ class HubRegularNode extends BaseHubNode implements NodeHelper, Registerable { $controllerInstance = $applicationInstance->getControllerInstance(); // Self-announcement task - $controllerInstance->addActivationFilter(ObjectFactory::createObjectByConfiguredName('node_activation_self_announcement_task_filter')); + $controllerInstance->addActivationFilter(ObjectFactory::createObjectByConfiguredName('node_activation_announcement_task_filter')); // @TODO Add some filters here $this->partialStub('Add some filters here.'); diff --git a/application/hub/main/tasks/apt-proxy/class_ b/application/hub/main/tasks/apt-proxy/class_ index 7246337c1..19f7134ca 100644 --- a/application/hub/main/tasks/apt-proxy/class_ +++ b/application/hub/main/tasks/apt-proxy/class_ @@ -46,7 +46,7 @@ class AptProxy???Task extends BaseTask implements Taskable, Visitable { } /** - * Accepts the visitor to process the visit "request" + * Accepts the visitor to process the visitor * * @param $visitorInstance An instance of a Visitor class * @return void diff --git a/application/hub/main/tasks/apt-proxy/class_AptProxyListenerTask.php b/application/hub/main/tasks/apt-proxy/class_AptProxyListenerTask.php index 5d49f2c88..695dce0bf 100644 --- a/application/hub/main/tasks/apt-proxy/class_AptProxyListenerTask.php +++ b/application/hub/main/tasks/apt-proxy/class_AptProxyListenerTask.php @@ -46,11 +46,10 @@ class AptProxyListenerTask extends BaseTask implements Taskable, Visitable { } /** - * Accepts the visitor to process the visit "request" + * Accepts the visitor to process the visitor * * @param $visitorInstance An instance of a Visitor class * @return void - * @todo Maybe visit some sub-objects */ public function accept (Visitor $visitorInstance) { // Visit this task diff --git a/application/hub/main/tasks/chat/class_ b/application/hub/main/tasks/chat/class_ index 4877bb668..462ea82fc 100644 --- a/application/hub/main/tasks/chat/class_ +++ b/application/hub/main/tasks/chat/class_ @@ -46,7 +46,7 @@ class Chat???Task extends BaseTask implements Taskable, Visitable { } /** - * Accepts the visitor to process the visit "request" + * Accepts the visitor to process the visitor * * @param $visitorInstance An instance of a Visitor class * @return void diff --git a/application/hub/main/tasks/chat/class_ChatTelnetListenerTask.php b/application/hub/main/tasks/chat/class_ChatTelnetListenerTask.php index f33e33d7a..d29f835f2 100644 --- a/application/hub/main/tasks/chat/class_ChatTelnetListenerTask.php +++ b/application/hub/main/tasks/chat/class_ChatTelnetListenerTask.php @@ -46,11 +46,10 @@ class ChatTelnetListenerTask extends BaseTask implements Taskable, Visitable { } /** - * Accepts the visitor to process the visit "request" + * Accepts the visitor to process the visitor * * @param $visitorInstance An instance of a Visitor class * @return void - * @todo Maybe visit some sub-objects */ public function accept (Visitor $visitorInstance) { // Visit this task diff --git a/application/hub/main/tasks/class_ b/application/hub/main/tasks/class_ index 5d09faf03..ac7a6707f 100644 --- a/application/hub/main/tasks/class_ +++ b/application/hub/main/tasks/class_ @@ -46,7 +46,7 @@ class !!!???Task extends BaseTask implements Taskable, Visitable { } /** - * Accepts the visitor to process the visit "request" + * Accepts the visitor to process the visitor * * @param $visitorInstance An instance of a Visitor class * @return void diff --git a/application/hub/main/tasks/cruncher/class_ b/application/hub/main/tasks/cruncher/class_ index 14e300980..11bc3579d 100644 --- a/application/hub/main/tasks/cruncher/class_ +++ b/application/hub/main/tasks/cruncher/class_ @@ -46,7 +46,7 @@ class Cruncher???Task extends BaseTask implements Taskable, Visitable { } /** - * Accepts the visitor to process the visit "request" + * Accepts the visitor to process the visitor * * @param $visitorInstance An instance of a Visitor class * @return void diff --git a/application/hub/main/tasks/cruncher/class_CruncherKeyProducerTask.php b/application/hub/main/tasks/cruncher/class_CruncherKeyProducerTask.php index 550f3b518..92277d739 100644 --- a/application/hub/main/tasks/cruncher/class_CruncherKeyProducerTask.php +++ b/application/hub/main/tasks/cruncher/class_CruncherKeyProducerTask.php @@ -46,11 +46,10 @@ class CruncherKeyProducerTask extends BaseTask implements Taskable, Visitable { } /** - * Accepts the visitor to process the visit "request" + * Accepts the visitor to process the visitor * * @param $visitorInstance An instance of a Visitor class * @return void - * @todo Maybe visit some sub-objects */ public function accept (Visitor $visitorInstance) { // Visit this task diff --git a/application/hub/main/tasks/cruncher/class_CruncherTestUnitProducerTask.php b/application/hub/main/tasks/cruncher/class_CruncherTestUnitProducerTask.php index 41dedf414..1f712b7b3 100644 --- a/application/hub/main/tasks/cruncher/class_CruncherTestUnitProducerTask.php +++ b/application/hub/main/tasks/cruncher/class_CruncherTestUnitProducerTask.php @@ -46,11 +46,10 @@ class CruncherTestUnitProducerTask extends BaseTask implements Taskable, Visitab } /** - * Accepts the visitor to process the visit "request" + * Accepts the visitor to process the visitor * * @param $visitorInstance An instance of a Visitor class * @return void - * @todo Maybe visit some sub-objects */ public function accept (Visitor $visitorInstance) { // Visit this task diff --git a/application/hub/main/tasks/cruncher/class_CruncherWorkUnitFetcherTask.php b/application/hub/main/tasks/cruncher/class_CruncherWorkUnitFetcherTask.php index 126fe0ecd..c2559e656 100644 --- a/application/hub/main/tasks/cruncher/class_CruncherWorkUnitFetcherTask.php +++ b/application/hub/main/tasks/cruncher/class_CruncherWorkUnitFetcherTask.php @@ -47,11 +47,10 @@ class CruncherWorkUnitFetcherTask extends BaseTask implements Taskable, Visitabl } /** - * Accepts the visitor to process the visit "request" + * Accepts the visitor to process the visitor * * @param $visitorInstance An instance of a Visitor class * @return void - * @todo Maybe visit some sub-objects */ public function accept (Visitor $visitorInstance) { // Visit this task diff --git a/application/hub/main/tasks/idle/class_IdleLoopTask.php b/application/hub/main/tasks/idle/class_IdleLoopTask.php index ceaa7b454..acb9dba1f 100644 --- a/application/hub/main/tasks/idle/class_IdleLoopTask.php +++ b/application/hub/main/tasks/idle/class_IdleLoopTask.php @@ -46,7 +46,7 @@ class IdleLoopTask extends BaseTask implements Taskable, Visitable { } /** - * Accepts the visitor to process the visit "request" + * Accepts the visitor to process the visitor * * @param $visitorInstance An instance of a Visitor class * @return void diff --git a/application/hub/main/tasks/network/class_NetworkPackageReaderTask.php b/application/hub/main/tasks/network/class_NetworkPackageReaderTask.php index 4a9537d5b..6a008d070 100644 --- a/application/hub/main/tasks/network/class_NetworkPackageReaderTask.php +++ b/application/hub/main/tasks/network/class_NetworkPackageReaderTask.php @@ -56,7 +56,7 @@ class NetworkPackageReaderTask extends BaseTask implements Taskable, Visitable { } /** - * Accepts the visitor to process the visit "request" + * Accepts the visitor to process the visitor * * @param $visitorInstance An instance of a Visitor class * @return void diff --git a/application/hub/main/tasks/network/class_NetworkPackageWriterTask.php b/application/hub/main/tasks/network/class_NetworkPackageWriterTask.php index f56cda660..ef9a70ef4 100644 --- a/application/hub/main/tasks/network/class_NetworkPackageWriterTask.php +++ b/application/hub/main/tasks/network/class_NetworkPackageWriterTask.php @@ -52,7 +52,7 @@ class NetworkPackageWriterTask extends BaseTask implements Taskable, Visitable { } /** - * Accepts the visitor to process the visit "request" + * Accepts the visitor to process the visitor * * @param $visitorInstance An instance of a Visitor class * @return void diff --git a/application/hub/main/tasks/node/announcement/class_NodeAnnouncementTask.php b/application/hub/main/tasks/node/announcement/class_NodeAnnouncementTask.php index 2d0e1e3d6..9b4fd13ab 100644 --- a/application/hub/main/tasks/node/announcement/class_NodeAnnouncementTask.php +++ b/application/hub/main/tasks/node/announcement/class_NodeAnnouncementTask.php @@ -46,7 +46,7 @@ class NodeAnnouncementTask extends BaseTask implements Taskable, Visitable { } /** - * Accepts the visitor to process the visit "request" + * Accepts the visitor to process the visitor * * @param $visitorInstance An instance of a Visitor class * @return void diff --git a/application/hub/main/tasks/node/chunks/class_NodeChunkAssemblerTask.php b/application/hub/main/tasks/node/chunks/class_NodeChunkAssemblerTask.php index 5a6a09630..2220c2b9b 100644 --- a/application/hub/main/tasks/node/chunks/class_NodeChunkAssemblerTask.php +++ b/application/hub/main/tasks/node/chunks/class_NodeChunkAssemblerTask.php @@ -52,7 +52,7 @@ class NodeChunkAssemblerTask extends BaseTask implements Taskable, Visitable { } /** - * Accepts the visitor to process the visit "request" + * Accepts the visitor to process the visitor * * @param $visitorInstance An instance of a Visitor class * @return void diff --git a/application/hub/main/tasks/node/class_Node b/application/hub/main/tasks/node/class_Node index 154e8f436..3c79af08e 100644 --- a/application/hub/main/tasks/node/class_Node +++ b/application/hub/main/tasks/node/class_Node @@ -46,7 +46,7 @@ class Node???Task extends BaseTask implements Taskable, Visitable { } /** - * Accepts the visitor to process the visit "request" + * Accepts the visitor to process the visitor * * @param $visitorInstance An instance of a Visitor class * @return void diff --git a/application/hub/main/tasks/node/decoder/class_NodePackageDecoderTask.php b/application/hub/main/tasks/node/decoder/class_NodePackageDecoderTask.php index 4896a4943..44f717e5e 100644 --- a/application/hub/main/tasks/node/decoder/class_NodePackageDecoderTask.php +++ b/application/hub/main/tasks/node/decoder/class_NodePackageDecoderTask.php @@ -58,11 +58,10 @@ class NodePackageDecoderTask extends BaseTask implements Taskable, Visitable { } /** - * Accepts the visitor to process the visit "request" + * Accepts the visitor to process the visitor * * @param $visitorInstance An instance of a Visitor class * @return void - * @todo Maybe visit some sub-objects */ public function accept (Visitor $visitorInstance) { // Visit this task diff --git a/application/hub/main/tasks/node/dht/class_NodeDhtBootstrapTask.php b/application/hub/main/tasks/node/dht/class_NodeDhtBootstrapTask.php index 25348ba84..cf22768d4 100644 --- a/application/hub/main/tasks/node/dht/class_NodeDhtBootstrapTask.php +++ b/application/hub/main/tasks/node/dht/class_NodeDhtBootstrapTask.php @@ -46,11 +46,10 @@ class NodeDhtBootstrapTask extends BaseTask implements Taskable, Visitable { } /** - * Accepts the visitor to process the visit "request" + * Accepts the visitor to process the visitor * * @param $visitorInstance An instance of a Visitor class * @return void - * @todo Maybe visit some sub-objects */ public function accept (Visitor $visitorInstance) { // Visit this task diff --git a/application/hub/main/tasks/node/dht/class_NodeDhtQueryTask.php b/application/hub/main/tasks/node/dht/class_NodeDhtQueryTask.php index 0281d8663..1baa4d659 100644 --- a/application/hub/main/tasks/node/dht/class_NodeDhtQueryTask.php +++ b/application/hub/main/tasks/node/dht/class_NodeDhtQueryTask.php @@ -46,11 +46,10 @@ class NodeDhtQueryTask extends BaseTask implements Taskable, Visitable { } /** - * Accepts the visitor to process the visit "request" + * Accepts the visitor to process the visitor * * @param $visitorInstance An instance of a Visitor class * @return void - * @todo Maybe visit some sub-objects */ public function accept (Visitor $visitorInstance) { // Visit this task diff --git a/application/hub/main/tasks/node/listener/class_NodeSocketListenerTask.php b/application/hub/main/tasks/node/listener/class_NodeSocketListenerTask.php index e158f7216..fe4274ac5 100644 --- a/application/hub/main/tasks/node/listener/class_NodeSocketListenerTask.php +++ b/application/hub/main/tasks/node/listener/class_NodeSocketListenerTask.php @@ -46,7 +46,7 @@ class NodeSocketListenerTask extends BaseTask implements Taskable, Visitable { } /** - * Accepts the visitor to process the visit "request" + * Accepts the visitor to process the visitor * * @param $visitorInstance An instance of a Visitor class * @return void diff --git a/application/hub/main/tasks/node/ping/class_NodePingTask.php b/application/hub/main/tasks/node/ping/class_NodePingTask.php index de132749b..1403c0246 100644 --- a/application/hub/main/tasks/node/ping/class_NodePingTask.php +++ b/application/hub/main/tasks/node/ping/class_NodePingTask.php @@ -56,7 +56,7 @@ class NodePingTask extends BaseTask implements Taskable, Visitable { } /** - * Accepts the visitor to process the visit "request" + * Accepts the visitor to process the visitor * * @param $visitorInstance An instance of a Visitor class * @return void diff --git a/application/hub/main/tasks/node/self_connect/class_NodeSelfConnectTask.php b/application/hub/main/tasks/node/self_connect/class_NodeSelfConnectTask.php index 2b7a32976..721fff353 100644 --- a/application/hub/main/tasks/node/self_connect/class_NodeSelfConnectTask.php +++ b/application/hub/main/tasks/node/self_connect/class_NodeSelfConnectTask.php @@ -46,7 +46,7 @@ class NodeSelfConnectTask extends BaseTask implements Taskable, Visitable { } /** - * Accepts the visitor to process the visit "request" + * Accepts the visitor to process the visitor * * @param $visitorInstance An instance of a Visitor class * @return void diff --git a/application/hub/main/tasks/node/update/class_NodeUpdateCheckTask.php b/application/hub/main/tasks/node/update/class_NodeUpdateCheckTask.php index 39d3f1883..0567aeed5 100644 --- a/application/hub/main/tasks/node/update/class_NodeUpdateCheckTask.php +++ b/application/hub/main/tasks/node/update/class_NodeUpdateCheckTask.php @@ -46,7 +46,7 @@ class NodeUpdateCheckTask extends BaseTask implements Taskable, Visitable { } /** - * Accepts the visitor to process the visit "request" + * Accepts the visitor to process the visitor * * @param $visitorInstance An instance of a Visitor class * @return void diff --git a/docs/TODOs.txt b/docs/TODOs.txt index 21f68377a..68f8358a1 100644 --- a/docs/TODOs.txt +++ b/docs/TODOs.txt @@ -1,7 +1,7 @@ ### WARNING: THIS FILE IS AUTO-GENERATED BY ./todo-builder.sh ### ### DO NOT EDIT THIS FILE. ### -./application/hub/config.php:655:// @TODO This and the next value is very static again -./application/hub/config.php:719:// @TODO This is very static, rewrite it to more flexible +./application/hub/config.php:661:// @TODO This and the next value is very static again +./application/hub/config.php:725:// @TODO This is very static, rewrite it to more flexible ./application/hub/interfaces/apt-proxy/class_AptProxy.php:10: * @todo We need to find a better name for this interface ./application/hub/interfaces/chat/class_Chatter.php:10: * @todo We need to find a better name for this interface ./application/hub/interfaces/cruncher/class_CruncherHelper.php:10: * @todo We need to find a better name for this interface @@ -50,7 +50,6 @@ ./application/hub/main/filter/node/class_NodeInitializationFilter.php:87: // @TODO Can we rewrite this to app_exit() ? ./application/hub/main/filter/node/class_NodePhpRequirementsFilter.php:55: * @todo Add more test and try to add an extra message to the thrown exception ./application/hub/main/filter/node/class_NodeWelcomeTeaserFilter.php:55: * @todo Handle over the $responseInstance to outputConsoleTeaser() -./application/hub/main/filter/shutdown/node/class_NodeShutdownDeinitQueuesFilter.php:55: * @todo 0% done ./application/hub/main/filter/shutdown/node/class_NodeShutdownFlushNodeListFilter.php:55: * @todo 0% done ./application/hub/main/filter/shutdown/node/class_NodeShutdownTaskHandlerFilter.php:55: * @todo 0% done ./application/hub/main/filter/task/apt-proxy/class_AptProxyTaskHandlerInitializerFilter.php:55: * @todo 5% done @@ -97,25 +96,21 @@ ./application/hub/main/lists/class_BaseList.php:276: // @TODO Extend this somehow? ./application/hub/main/lists/groups/class_ListGroupList.php:61: * @todo 0% done ./application/hub/main/lists/query/local/class_LocalQueryList.php:68: * @todo 0% done -./application/hub/main/nodes/boot/class_HubBootNode.php:102: * @todo Unfinished method -./application/hub/main/nodes/boot/class_HubBootNode.php:122: // @TODO Add some filters here +./application/hub/main/nodes/boot/class_HubBootNode.php:110: // @TODO Add some filters here ./application/hub/main/nodes/boot/class_HubBootNode.php:58: * @todo add some more special bootstrap things for this boot node ./application/hub/main/nodes/class_BaseHubNode.php:109: * @todo Make this code more generic and move it to CryptoHelper or -./application/hub/main/nodes/class_BaseHubNode.php:458: * @todo Try to make this method more generic so we can move it in BaseFrameworkSystem -./application/hub/main/nodes/class_BaseHubNode.php:498: * @todo Change the first if() block to check for a specific state -./application/hub/main/nodes/class_BaseHubNode.php:691: * @todo Add checking if this node has been announced to the sender node -./application/hub/main/nodes/class_BaseHubNode.php:711: * @todo Add checking if this node has been announced to the sender node -./application/hub/main/nodes/class_BaseHubNode.php:775: * @todo Find more to do here -./application/hub/main/nodes/class_BaseHubNode.php:788: * @todo Handle thrown exception +./application/hub/main/nodes/class_BaseHubNode.php:433: * @todo Try to make this method more generic so we can move it in BaseFrameworkSystem +./application/hub/main/nodes/class_BaseHubNode.php:473: * @todo Change the first if() block to check for a specific state +./application/hub/main/nodes/class_BaseHubNode.php:666: * @todo Add checking if this node has been announced to the sender node +./application/hub/main/nodes/class_BaseHubNode.php:686: * @todo Add checking if this node has been announced to the sender node +./application/hub/main/nodes/class_BaseHubNode.php:750: * @todo Find more to do here +./application/hub/main/nodes/class_BaseHubNode.php:763: * @todo Handle thrown exception ./application/hub/main/nodes/list/class_HubListNode.php:58: * @todo Implement more bootstrap steps -./application/hub/main/nodes/list/class_HubListNode.php:68: * @todo Unfinished method -./application/hub/main/nodes/list/class_HubListNode.php:91: // @TODO Add some filters here +./application/hub/main/nodes/list/class_HubListNode.php:79: // @TODO Add some filters here ./application/hub/main/nodes/master/class_HubMasterNode.php:58: * @todo Implement this method -./application/hub/main/nodes/master/class_HubMasterNode.php:72: * @todo Unfinished method -./application/hub/main/nodes/master/class_HubMasterNode.php:95: // @TODO Add some filters here +./application/hub/main/nodes/master/class_HubMasterNode.php:83: // @TODO Add some filters here ./application/hub/main/nodes/regular/class_HubRegularNode.php:58: * @todo Implement this method -./application/hub/main/nodes/regular/class_HubRegularNode.php:68: * @todo Unfinished method -./application/hub/main/nodes/regular/class_HubRegularNode.php:91: // @TODO Add some filters here +./application/hub/main/nodes/regular/class_HubRegularNode.php:79: // @TODO Add some filters here ./application/hub/main/package/class_NetworkPackage.php:1087: * @todo Implement verification of all sent tags here? ./application/hub/main/package/class_NetworkPackage.php:23: * @todo Needs to add functionality for handling the object's type ./application/hub/main/package/class_NetworkPackage.php:308: // @TODO crc32() is very weak, but it needs to be fast @@ -149,16 +144,16 @@ ./application/hub/main/tasks/cruncher/class_CruncherWorkUnitFetcherTask.php:54: * @todo Maybe visit some sub-objects ./application/hub/main/tasks/network/class_NetworkPackageReaderTask.php:63: * @todo Also visit some sub-objects? ./application/hub/main/tasks/network/class_NetworkPackageWriterTask.php:59: * @todo Also visit some sub-objects? -./application/hub/main/tasks/node/announcement/class_NodeAnnouncementTask.php:53: * @todo 0% ./application/hub/main/tasks/node/chunks/class_NodeChunkAssemblerTask.php:59: * @todo Also visit some sub-objects? ./application/hub/main/tasks/node/decoder/class_NodePackageDecoderTask.php:65: * @todo Maybe visit some sub-objects +./application/hub/main/tasks/node/dht/class_NodeDhtBootstrapTask.php:53: * @todo Maybe visit some sub-objects +./application/hub/main/tasks/node/dht/class_NodeDhtBootstrapTask.php:64: * @todo 0% done ./application/hub/main/tasks/node/dht/class_NodeDhtQueryTask.php:53: * @todo Maybe visit some sub-objects -./application/hub/main/tasks/node/dht/class_NodeDhtQueryTask.php:64: * @todo 0% +./application/hub/main/tasks/node/dht/class_NodeDhtQueryTask.php:64: * @todo 0% done ./application/hub/main/tasks/node/listener/class_NodeSocketListenerTask.php:63: // @TODO Do we need to visit this task? $visitorInstance->visitTask($this); ./application/hub/main/tasks/node/listener/class_NodeSocketListenerTask.php:70: * @todo 0% done ./application/hub/main/tasks/node/ping/class_NodePingTask.php:63: * @todo Also visit some sub-objects? ./application/hub/main/tasks/node/ping/class_NodePingTask.php:74: * @todo 0% done -./application/hub/main/tasks/node/self_connect/class_NodeSelfConnectTask.php:53: * @todo 0% ./application/hub/main/tasks/node/update/class_NodeUpdateCheckTask.php:53: * @todo 0% ./application/hub/main/template/announcement/class_XmlAnnouncementTemplateEngine.php:10: * @todo This template engine does not make use of setTemplateType() ./application/hub/main/template/answer/announcement/class_XmlAnnouncementAnswerTemplateEngine.php:10: * @todo This template engine does not make use of setTemplateType() @@ -287,18 +282,20 @@ ./inc/database.php:11: * @todo Minimize these includes ./inc/database.php:51:// @TODO Rewrite this ./inc/includes.php:11: * @todo Minimize these includes -./inc/includes.php:35:// @TODO This makes the core depending on the SPL. But it should be installed anyway. -./inc/includes.php:39:// @TODO Find a nicer OOP-ed way for this +./inc/includes.php:37:// @TODO This makes the core depending on the SPL. But it should be installed anyway. +./inc/includes.php:41:// @TODO Find a nicer OOP-ed way for this ./inc/loader/class_ClassLoader.php:273: /* @todo: Do not die here. */ ./inc/output.php:11: * @todo Minimize these includes ./inc/selector.php:11: * @todo Minimize these includes -./index.php:57: * @todo This method is old code and needs heavy rewrite and should be moved to ApplicationHelper +./index.php:43: * @todo This method is old code and needs heavy rewrite and should be moved to ApplicationHelper ### ### DEPRECATION FOLLOWS: ### ### ./application/hub/exceptions/hub/class_HubAlreadyAnnouncedException.php:2:// @DEPRECATED ./application/hub/interfaces/dht/class_Dht.php:2:// @DEPRECATED ./application/hub/interfaces/nodes/class_NodeHelper.php:2:// @DEPRECATED ./application/hub/main/database/wrapper/node/class_NodeListDatabaseWrapper.php:2:// @DEPRECATED +./application/hub/main/filter/bootstrap/node/class_NodeBootstrapInitQueuesFilter.php:2:// @DEPRECATED ./application/hub/main/filter/bootstrap/node/class_NodeBootstrapRestoreNodeListFilter.php:2:// @DEPRECATED +./application/hub/main/filter/shutdown/node/class_NodeShutdownDeinitQueuesFilter.php:2:// @DEPRECATED ./application/hub/main/handler/message-types/class_NodeMessageAnnouncementHandler.php:2:// @DEPRECATED ./application/hub/main/helper/hub/announcement/class_HubDescriptorHelper.php:2:// @DEPRECATED ./application/hub/main/nodes/class_BaseHubNode.php:56: * @deprecated -- 2.39.5