X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=inc%2Fclasses%2Fmain%2Ftemplate%2Fclass_;h=ac2a8b22c85e1687296c5302c2d613ae70bb739c;hb=042dcb70532105f09afca4282979ec9f574be338;hp=702ea8fe8cafe3cbae361507cbb6eb360fcd50a3;hpb=4c3ef4749d3f2f2e06c50e674c1b7481faeb2d42;p=core.git

diff --git a/inc/classes/main/template/class_ b/inc/classes/main/template/class_
index 702ea8fe..ac2a8b22 100644
--- a/inc/classes/main/template/class_
+++ b/inc/classes/main/template/class_
@@ -4,7 +4,7 @@
  *
  * @author		Roland Haeder <webmaster@ship-simu.org>
  * @version		0.0.0
- * @copyright	Copyright (c) 2007, 2008 Roland Haeder, 2009 Core Developer Team
+ * @copyright	Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2012 Core Developer Team
  * @license		GNU GPL 3.0 or any newer version
  * @link		http://www.ship-simu.org
  *
@@ -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	$applicationInstance	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;
 	}
 }