From 80e03f879a6221f754ffb36660445bfe2087c95a Mon Sep 17 00:00:00 2001
From: =?utf8?q?Roland=20H=C3=A4der?= <roland@mxchange.org>
Date: Tue, 15 Mar 2011 20:11:04 +0000
Subject: [PATCH] Class template for template engines updated

---
 inc/classes/main/template/class_ | 39 ++++++++++++--------------------
 1 file changed, 14 insertions(+), 25 deletions(-)

diff --git a/inc/classes/main/template/class_ b/inc/classes/main/template/class_
index 0a26f17e..27155809 100644
--- a/inc/classes/main/template/class_
+++ b/inc/classes/main/template/class_
@@ -35,8 +35,8 @@ class ???TemplateEngine extends BaseTemplateEngine implements CompileableTemplat
 	/**
 	 * Creates an instance of the class TemplateEngine and prepares it for usage
 	 *
-	 * @param	$appInstance	A manageable application
-	 * @return	$tplInstance	An instance of TemplateEngine
+	 * @param	$appInstance		A manageable application
+	 * @return	$templateInstance	An instance of TemplateEngine
 	 * @throws	BasePathIsEmptyException		If the provided $templateBasePath is empty
 	 * @throws	InvalidBasePathStringException	If $templateBasePath is no string
 	 * @throws	BasePathIsNoDirectoryException	If $templateBasePath is no
@@ -44,51 +44,40 @@ class ???TemplateEngine extends BaseTemplateEngine implements CompileableTemplat
 	 * @throws	BasePathReadProtectedException	If $templateBasePath is
 	 *											read-protected
 	 */
-	public final static function create???TemplateEngine (ManageableApplication $appInstance) {
+	public final static function create???TemplateEngine (ManageableApplication $applicationInstance) {
 		// Get a new instance
-		$tplInstance = new ???TemplateEngine();
-
-		// Get language and file I/O instances from application
-		$langInstance = $appInstance->getLanguageInstance();
-		$ioInstance = $appInstance->getFileIoInstance();
+		$templateInstance = new ???TemplateEngine();
 
 		// Determine base path
-		$templateBasePath = $tplInstance->getConfigInstance()->getConfigEntry('application_base_path') . $appInstance->getRequestInstance()->getRequestElement('app') . '/';
+		$templateBasePath = $templateInstance->getConfigInstance()->getConfigEntry('application_base_path') . $applicationInstance->getRequestInstance()->getRequestElement('app') . '/';
 
 		// Is the base path valid?
 		if (empty($templateBasePath)) {
 			// Base path is empty
-			throw new BasePathIsEmptyException($tplInstance, self::EXCEPTION_UNEXPECTED_EMPTY_STRING);
+			throw new BasePathIsEmptyException($templateInstance, self::EXCEPTION_UNEXPECTED_EMPTY_STRING);
 		} elseif (!is_string($templateBasePath)) {
 			// Is not a string
-			throw new InvalidBasePathStringException(array($tplInstance, $templateBasePath), self::EXCEPTION_INVALID_STRING);
+			throw new InvalidBasePathStringException(array($templateInstance, $templateBasePath), self::EXCEPTION_INVALID_STRING);
 		} elseif (!is_dir($templateBasePath)) {
 			// Is not a path
-			throw new BasePathIsNoDirectoryException(array($tplInstance, $templateBasePath), self::EXCEPTION_INVALID_PATH_NAME);
+			throw new BasePathIsNoDirectoryException(array($templateInstance, $templateBasePath), self::EXCEPTION_INVALID_PATH_NAME);
 		} elseif (!is_readable($templateBasePath)) {
 			// Is not readable
-			throw new BasePathReadProtectedException(array($tplInstance, $templateBasePath), self::EXCEPTION_READ_PROTECED_PATH);
+			throw new BasePathReadProtectedException(array($templateInstance, $templateBasePath), self::EXCEPTION_READ_PROTECED_PATH);
 		}
 
-		// Get configuration instance
-		$configInstance = FrameworkConfiguration::getInstance();
-
 		// Set the base path
-		$tplInstance->setTemplateBasePath($templateBasePath);
-
-		// Set the language and IO instances
-		$tplInstance->setLanguageInstance($langInstance);
-		$tplInstance->setFileIoInstance($ioInstance);
+		$templateInstance->setTemplateBasePath($templateBasePath);
 
 		// Set template extensions
-		$tplInstance->setRawTemplateExtension($configInstance->getConfigEntry('raw_template_extension'));
-		$tplInstance->setCodeTemplateExtension($configInstance->getConfigEntry('code_template_extension'));
+		$templateInstance->setRawTemplateExtension($templateInstance->getConfigInstance()->getConfigEntry('raw_template_extension'));
+		$templateInstance->setCodeTemplateExtension($templateInstance->getConfigInstance()->getConfigEntry('code_template_extension'));
 
 		// Absolute output path for compiled templates
-		$tplInstance->setCompileOutputPath($configInstance->getConfigEntry('base_path') . $configInstance->getConfigEntry('compile_output_path'));
+		$templateInstance->setCompileOutputPath($templateInstance->getConfigInstance()->getConfigEntry('base_path') . $templateInstance->getConfigInstance()->getConfigEntry('compile_output_path'));
 
 		// Return the prepared instance
-		return $tplInstance;
+		return $templateInstance;
 	}
 }
 
-- 
2.30.2