Class/method doc-tags fixed

[shipsimu.git] / application / ship-simu / class_ApplicationHelper.php

diff --git a/application/ship-simu/class_ApplicationHelper.php b/application/ship-simu/class_ApplicationHelper.php
index ef2de33ecda7290a372b2d818506f42b2282ff5f..32bd7649120547a880d2563198ed87353a850153 100644 (file)
--- a/application/ship-simu/class_ApplicationHelper.php
+++ b/application/ship-simu/class_ApplicationHelper.php
@@ -69,6 +69,7 @@ class ApplicationHelper extends BaseFrameworkSystem implements ManageableApplica
         * An instance of this class
         */
        private static $thisInstance = null;
+
        /**
         * Protected constructor
         *
@@ -185,24 +186,25 @@ class ApplicationHelper extends BaseFrameworkSystem implements ManageableApplica
                $requestInstance = ObjectFactory::createObjectByName('HttpRequest');
 
                // ... and a new response object
-               $responseInstance = HttpResponse::createHttpResponse($this);
+               $responseInstance = ObjectFactory::createObjectByName('HttpResponse', array($this));
 
-               // Get command parameter
-               $commandPara = $this->getConfigInstance()->readConfig('command_parameter');
+               // Remember both in this application
+               $this->setRequestInstance($requestInstance);
+               $this->setResponseInstance($responseInstance);
 
                // Get the parameter from the request
-               $commandName = $requestInstance->getRequestElement($commandPara);
+               $commandName = $requestInstance->getRequestElement('page');
 
                // If it is null then get default command
                if (is_null($commandName)) {
                        $commandName = $this->getConfigInstance()->readConfig('default_command');
-               }
+               } // END - if
 
                // Get a resolver
                $resolverInstance = WebControllerResolver::createWebControllerResolver($commandName, $this);
 
                // Get a controller instance as well
-               $this->controllerInstance = $resolverInstance->resolveCommandController();
+               $this->controllerInstance = $resolverInstance->resolveController();
 
                // Handle the request
                $this->controllerInstance->handleRequest($requestInstance, $responseInstance);