X-Git-Url: https://git.mxchange.org/?p=shipsimu.git;a=blobdiff_plain;f=application%2Fselector%2Fclass_ApplicationHelper.php;h=4f455f340f2795fa268535f6a42b6f7da533cc01;hp=d51ca02ce0454f75e5f1cd1a0973c7d2961ee6c9;hb=d7e9271b83d842289ab6e06d547f89d52e0c8446;hpb=8ff12f905898b0c2b7ff8124c9749ad6fb9c44f3

diff --git a/application/selector/class_ApplicationHelper.php b/application/selector/class_ApplicationHelper.php
index d51ca02..4f455f3 100644
--- a/application/selector/class_ApplicationHelper.php
+++ b/application/selector/class_ApplicationHelper.php
@@ -20,11 +20,10 @@
  * Please remember that this include file is being loaded *before* the class
  * loader is loading classes from "exceptions", "interfaces" and "main"!
  *
- * @author		Roland Haeder <webmaster@ship-simu.org>
- * @version		0.0.0
- * @copyright	Copyright (c) 2007, 2008 Roland Haeder, this is free software
+ * @author		Roland Haeder <webmaster@shipsimu.org>
+ * @version		0.0
+ * @copyright	Copyright (c) 2007 - 2008 Roland Haeder, 2009 - 2012 Ship-Simu 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
@@ -37,61 +36,52 @@
  * 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 <http://www.gnu.org/licenses/>.
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-class ApplicationHelper extends BaseFrameworkSystem implements ManageableApplication {
+class ApplicationHelper extends BaseFrameworkSystem implements ManageableApplication, Registerable {
 	/**
 	 * The version number of this application
 	 */
-	private $appVersion = "";
+	private $appVersion = '';
 
 	/**
 	 * The human-readable name for this application
 	 */
-	private $appName = "";
+	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
-	 */
-	private $masterTemplate = "";
+	private $shortName = '';
 
 	/**
 	 * An instance of this class
 	 */
-	private static $thisInstance = null;
+	private static $selfInstance = NULL;
 
 	/**
-	 * Protected constructor
+	 * Private constructor
 	 *
 	 * @return	void
 	 */
 	protected function __construct () {
 		// Call parent constructor
 		parent::__construct(__CLASS__);
-
-		// Tidy up a little
-		$this->removeSystemArray();
-		$this->removeNumberFormaters();
 	}
 
 	/**
 	 * Getter for an instance of this class
 	 *
-	 * @return	$thisInstance		An instance of this class
+	 * @return	$selfInstance	An instance of this class
 	 */
-	public final static function getInstance () {
+	public static final function getSelfInstance () {
 		// Is the instance there?
-		if (is_null(self::$thisInstance)) {
-			self::$thisInstance = new ApplicationHelper();
-		}
+		if (is_null(self::$selfInstance)) {
+			self::$selfInstance = new ApplicationHelper();
+		} // END - if
 
 		// Return the instance
-		return self::$thisInstance;
+		return self::$selfInstance;
 	}
 
 	/**
@@ -102,7 +92,6 @@ class ApplicationHelper extends BaseFrameworkSystem implements ManageableApplica
 	public final function getAppVersion () {
 		return $this->appVersion;
 	}
-
 	/**
 	 * Setter for the version number
 	 *
@@ -111,8 +100,7 @@ class ApplicationHelper extends BaseFrameworkSystem implements ManageableApplica
 	 */
 	public final function setAppVersion ($appVersion) {
 		// Cast and set it
-		$appVersion = (string) $appVersion;
-		$this->appVersion = $appVersion;
+		$this->appVersion = (string) $appVersion;
 	}
 
 	/**
@@ -132,8 +120,7 @@ class ApplicationHelper extends BaseFrameworkSystem implements ManageableApplica
 	 */
 	public final function setAppName ($appName) {
 		// Cast and set it
-		$appName = (string) $appName;
-		$this->appName = $appName;
+		$this->appName = (string) $appName;;
 	}
 
 	/**
@@ -153,40 +140,63 @@ class ApplicationHelper extends BaseFrameworkSystem implements ManageableApplica
 	 */
 	public final function setAppShortName ($shortName) {
 		// Cast and set it
-		$shortName = (string) $shortName;
-		$this->shortName = $shortName;
-	}
-
-	/**
-	 * Getter for master template name
-	 *
-	 * @return	$masterTemplate		Name of the master template
-	 */
-	public final function getMasterTemplate () {
-		return $this->masterTemplate;
+		$this->shortName = (string) $shortName;
 	}
 
 	/**
-	 * Launcher for the application selector
+	 * Launches the application
 	 *
 	 * @return	void
-	 * @see		ApplicationSelector
 	 */
 	public final function entryPoint () {
-		// Get a prepared instance of ApplicationSelector
-		$selInstance = ApplicationSelector::createApplicationSelector(LanguageSystem::getInstance(), FileIoHandler::getInstance());
+		// Set this application in registry
+		Registry::getRegistry()->addInstance('app', $this);
 
-		// Remove the ignore list from the object
-		$selInstance->removeDirIgnoreList();
+		// Default response is console
+		$response = self::getResponseTypeFromSystem();
+		$responseType = self::getResponseTypeFromSystem();
 
-		// Next load all templates for the respective short app names
-		$selInstance->loadApplicationTemplates();
+		// Create a new request object
+		$requestInstance = ObjectFactory::createObjectByName($this->convertToClassName($response) . 'Request');
 
-		// Then load the selector's own template
-		$selInstance->loadSelectorTemplate();
+		// Remember request instance here
+		$this->setRequestInstance($requestInstance);
 
-		// Insert all application templates
-		$selInstance->insertApplicationTemplates();
+		// 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 response instance here
+		$this->setResponseInstance($responseInstance);
+
+		// Get the parameter from the request
+		$commandName = $requestInstance->getRequestElement('command');
+
+		// If it is null then get default command
+		if (is_null($commandName)) {
+			// Get default command
+			$commandName = $responseInstance->getDefaultCommand();
+
+			// Set it in request
+			$requestInstance->setRequestElement('command', $commandName);
+		} // END - if
+
+		// Get a controller resolver
+		$resolverClass = $this->convertToClassName($this->getAppShortName() . '_' . $responseType . '_controller_resolver');
+		$resolverInstance = ObjectFactory::createObjectByName($resolverClass, array($commandName, $this));
+
+		// Get a controller instance as well
+		$this->setControllerInstance($resolverInstance->resolveController());
+
+		// Launch the main routine here
+		$this->getControllerInstance()->handleRequest($requestInstance, $responseInstance);
 	}
 
 	/**
@@ -197,18 +207,19 @@ class ApplicationHelper extends BaseFrameworkSystem implements ManageableApplica
 	 * @return	void
 	 */
 	public function handleFatalMessages (array $messageList) {
-		die("<pre>".print_r($messageList, true)."</pre>");
+		// Walk through all messages
+		foreach ($messageList as $message) {
+			exit(__METHOD__ . ':MSG:' . $message);
+		} // END - foreach
 	}
 
 	/**
-	 * Assigns application-depending data
+	 * Builds the master template's name
 	 *
-	 * @param	$templateInstance	An instance of a template engine
-	 * @return	void
+	 * @return	$masterTemplateName		Name of the master template
 	 */
-	public function assignExtraTemplateData (CompileableTemplate $templateInstance) {
-		// Assign charset
-		$templateInstance->assignConfigVariable('header_charset');
+	public function buildMasterTemplateName () {
+		return 'node_main';
 	}
 }