From: Roland Häder <roland@mxchange.org>
Date: Sun, 30 Aug 2009 22:18:39 +0000 (+0000)
Subject: Stub calles added, instance variable renamed
X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=4b77adf26e258ee7fb318778d9c2d9b8b93f27f0;p=shipsimu.git

Stub calles added, instance variable renamed
---

diff --git a/application/ship-simu/main/commands/web/government/class_WebGovernmentFailedStartupCommand.php b/application/ship-simu/main/commands/web/government/class_WebGovernmentFailedStartupCommand.php
index 31d56b3..753edcd 100644
--- a/application/ship-simu/main/commands/web/government/class_WebGovernmentFailedStartupCommand.php
+++ b/application/ship-simu/main/commands/web/government/class_WebGovernmentFailedStartupCommand.php
@@ -114,6 +114,12 @@ class WebGovernmentFailedStartupCommand extends BaseCommand implements Commandab
 		// *every* command has a navigation system and that is want we don't want.
 		$menuInstance = ObjectFactory::createObjectByConfiguredName('government_failed_area_menu_class', array($appInstance));
 
+		// Render the menu
+		$menuInstance->renderMenu();
+
+		// Transfer it to the template engine instance
+		$menuInstance->transferToTemplateEngine();
+
 		// ... and all variables. This should be merged together in a pattern
 		// to make things easier. A cache mechanism should be added between
 		// these two calls to cache compiled templates.
diff --git a/application/ship-simu/main/commands/web/government/class_WebGovernmentFailedTrainingCommand.php b/application/ship-simu/main/commands/web/government/class_WebGovernmentFailedTrainingCommand.php
index 8942067..1feecb1 100644
--- a/application/ship-simu/main/commands/web/government/class_WebGovernmentFailedTrainingCommand.php
+++ b/application/ship-simu/main/commands/web/government/class_WebGovernmentFailedTrainingCommand.php
@@ -114,6 +114,12 @@ class WebGovernmentFailedTrainingCommand extends BaseCommand implements Commanda
 		// *every* command has a navigation system and that is want we don't want.
 		$menuInstance = ObjectFactory::createObjectByConfiguredName('government_failed_area_menu_class', array($appInstance));
 
+		// Render the menu
+		$menuInstance->renderMenu();
+
+		// Transfer it to the template engine instance
+		$menuInstance->transferToTemplateEngine();
+
 		// ... and all variables. This should be merged together in a pattern
 		// to make things easier. A cache mechanism should be added between
 		// these two calls to cache compiled templates.
diff --git a/index.php b/index.php
index f717dd4..d534a47 100644
--- a/index.php
+++ b/index.php
@@ -87,13 +87,13 @@ final class ApplicationEntryPoint {
 
 		// Get some instances
 		$tpl = FrameworkConfiguration::getInstance()->getConfigEntry('template_class');
-		$lang = LanguageSystem::getInstance();
+		$languageInstance = LanguageSystem::getInstance();
 
 		// Get response instance
 		$responseInstance = ApplicationHelper::getInstance()->getResponseInstance();
 
 		// Is the template engine loaded?
-		if ((class_exists($tpl)) && (is_object($lang))) {
+		if ((class_exists($tpl)) && (is_object($languageInstance))) {
 			// Use the template engine for putting out (nicer look) the message
 			try {
 				// Get the template instance from our object factory
@@ -133,7 +133,7 @@ final class ApplicationEntryPoint {
 			$templateInstance->assignVariable('backtrace', $backtrace);
 			$templateInstance->assignVariable('total_includes', ClassLoader::getInstance()->getTotal());
 			$templateInstance->assignVariable('total_objects', ObjectFactory::getTotal());
-			$templateInstance->assignVariable('title', $lang->getMessage('emergency_exit_title'));
+			$templateInstance->assignVariable('title', $languageInstance->getMessage('emergency_exit_title'));
 
 			// Load the template
 			$templateInstance->loadCodeTemplate('emergency_exit');