State pattern added, hub continued (sorry, I let it lay around uncommitted for long...

[hub.git] / application / hub / class_ApplicationHelper.php

diff --git a/application/hub/class_ApplicationHelper.php b/application/hub/class_ApplicationHelper.php
index 7a78ebb171f6fbfacac525ec72a36152f79af8d8..053a4b1113452576ea58b9fe55040df4de6215b9 100644 (file)
--- a/application/hub/class_ApplicationHelper.php
+++ b/application/hub/class_ApplicationHelper.php
@@ -22,7 +22,7 @@
  *
  * @author             Roland Haeder <webmaster@ship-simu.org>
  * @version            0.0
- * @copyright  Copyright (c) 2007 - 2008 Roland Haeder, 2009 Hub Developer Team
+ * @copyright  Copyright (c) 2007 - 2008 Roland Haeder, 2009, 2010 Hub Developer Team
  * @license            GNU GPL 3.0 or any newer version
  *
  * This program is free software: you can redistribute it and/or modify
@@ -67,10 +67,6 @@ class ApplicationHelper extends BaseFrameworkSystem implements ManageableApplica
        protected function __construct () {
                // Call parent constructor
                parent::__construct(__CLASS__);
-
-               // Tidy up a little
-               $this->removeSystemArray();
-               $this->removeNumberFormaters();
        }
 
        /**
@@ -194,7 +190,7 @@ class ApplicationHelper extends BaseFrameworkSystem implements ManageableApplica
                $resolverInstance = ObjectFactory::createObjectByName($resolverClass, array($commandName, $this));
 
                // Get a controller instance as well
-               $this->controllerInstance = $resolverInstance->resolveController();
+               $this->setControllerInstance($resolverInstance->resolveController());
 
                // Get the registry
                $registryInstance = Registry::getRegistry();
@@ -202,39 +198,15 @@ class ApplicationHelper extends BaseFrameworkSystem implements ManageableApplica
                // Set this application
                $registryInstance->addInstance('app', $this);
 
-               // Handle the request
-               $this->controllerInstance->handleRequest($requestInstance, $responseInstance);
-               die("STOP\n");
-
-               // ----------------------- Bootstrapping phase ------------------------
-               // Try to bootstrap the node and pass the request instance to it for
-               // extra arguments which mostly override config entries or enable special
-               // features within the hub (none is ready at this development stage)
-               $this->debugOutput('BOOTSTRAP: Beginning with bootstrap...');
-               $nodeInstance->doBootstrapping();
-               $this->debugOutput('BOOTSTRAP: Bootstrap finished.');
-
-               // ----------------------- Init all query queues ----------------------
-               // After the bootstrap is done we need to initialize the queues which
-               // will help us to communicate between the "tasks" a hub needs to do.
-               $nodeInstance->initQueues();
-
-               // -------------------------- Hub activation --------------------------
-               // Activates the hub by doing some final preparation steps and setting
-               // the attribute $hubIsActive to true
-               $nodeInstance->activateHub();
-
-               // ----------------------------- Main loop ----------------------------
-               // This is the main loop. Queried calls should come back here very fast
-               // so the whole application runs on nice speed. This while-loop goes
-               // until the hub is no longer active.
-               while ($nodeInstance->isHubActive()) {
-               } // END - while
+               // Launch the hub main routine here
+               $this->getControllerInstance()->handleRequest($requestInstance, $responseInstance);
 
                // -------------------------- Shutdown phase --------------------------
                // Shutting down the hub by saying "good bye" to all connected clients
                // and other hubs, flushing all queues and caches.
-               $nodeInstance->doShutdown();
+               $this->debugOutput('MAIN: Shutdown in progress, main loop exited.');
+               $this->getControllerInstance()->executeShutdownFilters($requestInstance, $responseInstance);
+               $this->debugOutput('MAIN: Shutdown completed. (This is the last line.)');
        }
 
        /**
@@ -247,7 +219,7 @@ class ApplicationHelper extends BaseFrameworkSystem implements ManageableApplica
        public function handleFatalMessages (array $messageList) {
                // Walk through all messages
                foreach ($messageList as $message) {
-                       die("MSG:" . $message);
+                       die('MSG:' . $message);
                }
        }