Application helper class rewritten, buildMasterTemplateName() method added, Manageabl...

diff --git a/application/selector/class_ApplicationHelper.php b/application/selector/class_ApplicationHelper.php
index 005c1e650e694d76d12ab368006fd33d800cbb57..1fd3e76a15ceff8c551d21b0d4f00bc44b244717 100644 (file)
--- a/application/selector/class_ApplicationHelper.php
+++ b/application/selector/class_ApplicationHelper.php
@@ -51,14 +51,14 @@ class ApplicationHelper extends BaseApplication implements ManageableApplication
        private $appName = "";
 
        /**
-        * The short uni*-like name of this application
+        * The short uni*-like name for this application
         */
        private $shortName = "";
 
        /**
-        * Name of the master template
+        * An instance of a controller
         */
-       private $masterTemplate = "";
+       private $controllerInstance = null;
 
        /**
         * An instance of this class
@@ -93,7 +93,7 @@ class ApplicationHelper extends BaseApplication implements ManageableApplication
        /**
         * Getter for the version number
         *
-        * @return      $appVersion     The application's version number
+        * @return      $appVersion             The application's version number
         */
        public final function getAppVersion () {
                return $this->appVersion;
@@ -102,7 +102,7 @@ class ApplicationHelper extends BaseApplication implements ManageableApplication
        /**
         * Setter for the version number
         *
-        * @param       $appVersion     The application's version number
+        * @param       $appVersion             The application's version number
         * @return      void
         */
        public final function setAppVersion ($appVersion) {
@@ -154,35 +154,63 @@ class ApplicationHelper extends BaseApplication implements ManageableApplication
        }
 
        /**
-        * Getter for master template name
+        * Builds the master template's name
         *
-        * @return      $masterTemplate         Name of the master template
+        * @return      $masterTemplateName             Name of the master template
         */
-       public final function getMasterTemplate () {
-               return $this->masterTemplate;
+       public function buildMasterTemplateName () {
+               // Get short name and add suffix
+               $masterTemplateName = $this->getAppShortName() . "_main";
+
+               // Return it
+               return $masterTemplateName;
        }
 
        /**
-        * Launcher for the application selector
+        * Launches the admin area
         *
         * @return      void
-        * @see         ApplicationSelector
         */
        public final function entryPoint () {
-               // Get a prepared instance of ApplicationSelector
-               $selInstance = ApplicationSelector::createApplicationSelector(LanguageSystem::getInstance(), FileIoHandler::getInstance());
+               // Create a new request object
+               $requestInstance = ObjectFactory::createObjectByName('HttpRequest');
+
+               // Default response is HTTP (HTML page) and type is "Web"
+               $response = "http";
+               $responseType = "web";
+
+               // Do we have another response?
+               if ($requestInstance->isRequestElementSet('request')) {
+                       // Then use it
+                       $response = strtolower($requestInstance->getRequestElement('request'));
+                       $responseType = $response;
+               } // END - if
+
+               // ... and a new response object
+               $responseClass = sprintf("%sResponse", $this->convertToClassName($response));
+               $responseInstance = ObjectFactory::createObjectByName($responseClass, array($this));
+
+               // Remember both in this application
+               $this->setRequestInstance($requestInstance);
+               $this->setResponseInstance($responseInstance);
+
+               // Get the parameter from the request
+               $commandName = $requestInstance->getRequestElement('page');
 
-               // Remove the ignore list from the object
-               $selInstance->removeDirIgnoreList();
+               // If it is null then get default command
+               if (is_null($commandName)) {
+                       $commandName = $responseInstance->getDefaultCommand();
+               } // END - if
 
-               // Next load all templates for the respective short app names
-               $selInstance->loadApplicationTemplates();
+               // Get a resolver
+               $resolverClass = sprintf("%sControllerResolver", $this->convertToClassName($responseType));
+               $resolverInstance = ObjectFactory::createObjectByName($resolverClass, array($commandName, $this));
 
-               // Then load the selector's own template
-               $selInstance->loadSelectorTemplate();
+               // Get a controller instance as well
+               $this->controllerInstance = $resolverInstance->resolveController();
 
-               // Insert all application templates
-               $selInstance->insertApplicationTemplates();
+               // Handle the request
+               $this->controllerInstance->handleRequest($requestInstance, $responseInstance);
        }
 
        /**
@@ -193,7 +221,10 @@ class ApplicationHelper extends BaseApplication implements ManageableApplication
         * @return      void
         */
        public function handleFatalMessages (array $messageList) {
-               die("<pre>".print_r($messageList, true)."</pre>");
+               // Walk through all messages
+               foreach ($messageList as $message) {
+                       print("MSG:".$message."<br />\n");
+               } // END - if
        }
 
        /**

diff --git a/application/ship-simu/class_ApplicationHelper.php b/application/ship-simu/class_ApplicationHelper.php
index bd51594e8f25c0684726dd54cf9c9180881cecc8..1fd3e76a15ceff8c551d21b0d4f00bc44b244717 100644 (file)
--- a/application/ship-simu/class_ApplicationHelper.php
+++ b/application/ship-simu/class_ApplicationHelper.php
@@ -55,11 +55,6 @@ class ApplicationHelper extends BaseApplication implements ManageableApplication
         */
        private $shortName = "";
 
-       /**
-        * The name of the master template
-        */
-       private $masterTemplate = "shipsimu_main";
-
        /**
         * An instance of a controller
         */
@@ -159,16 +154,20 @@ class ApplicationHelper extends BaseApplication implements ManageableApplication
        }
 
        /**
-        * Getter for master template name
+        * Builds the master template's name
         *
-        * @return      $masterTemplate         Name of the master template
+        * @return      $masterTemplateName             Name of the master template
         */
-       public final function getMasterTemplate () {
-               return $this->masterTemplate;
+       public function buildMasterTemplateName () {
+               // Get short name and add suffix
+               $masterTemplateName = $this->getAppShortName() . "_main";
+
+               // Return it
+               return $masterTemplateName;
        }
 
        /**
-        * Launches the ship-simulator game
+        * Launches the admin area
         *
         * @return      void
         */
@@ -188,7 +187,8 @@ class ApplicationHelper extends BaseApplication implements ManageableApplication
                } // END - if
 
                // ... and a new response object
-               $responseInstance = ObjectFactory::createObjectByName(ucfirst($response)."Response", array($this));
+               $responseClass = sprintf("%sResponse", $this->convertToClassName($response));
+               $responseInstance = ObjectFactory::createObjectByName($responseClass, array($this));
 
                // Remember both in this application
                $this->setRequestInstance($requestInstance);
@@ -203,7 +203,8 @@ class ApplicationHelper extends BaseApplication implements ManageableApplication
                } // END - if
 
                // Get a resolver
-               $resolverInstance = ObjectFactory::createObjectByName(ucfirst($responseType)."ControllerResolver", array($commandName, $this));
+               $resolverClass = sprintf("%sControllerResolver", $this->convertToClassName($responseType));
+               $resolverInstance = ObjectFactory::createObjectByName($resolverClass, array($commandName, $this));
 
                // Get a controller instance as well
                $this->controllerInstance = $resolverInstance->resolveController();