X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=application%2Fselector%2Fclass_ApplicationSelector.php;h=071da88440a24b8a69b6c2369f5b59836ba8cdfc;hb=7a44bb20ca579fb79bba71d65f5f7a834665f80f;hp=651b2a4c359a68ed9d62f0ec9f8c5ef2852bd715;hpb=ba9c65f936c374390a63226533172121b9ae3f45;p=shipsimu.git diff --git a/application/selector/class_ApplicationSelector.php b/application/selector/class_ApplicationSelector.php index 651b2a4..071da88 100644 --- a/application/selector/class_ApplicationSelector.php +++ b/application/selector/class_ApplicationSelector.php @@ -2,12 +2,9 @@ /** * The application selector class. * - * Please remember that this include file is being loaded *before* the class - * loader is loading classes from "exceptions", "interfaces" and "main"! - * * @author Roland Haeder * @version 0.0.0 - * @copyright Copyright(c) 2007, 2008 Roland Haeder, this is free software + * @copyright Copyright (c) 2007, 2008 Roland Haeder, this is free software * @license GNU GPL 3.0 or any newer version * @link http://www.ship-simu.org * @@ -35,11 +32,6 @@ class ApplicationSelector extends BaseFrameworkSystem { */ private $loadedTemplates = null; - /** - * The application selector's own template engine handler - */ - private $selectorTplEngine = null; - /** * A list of items we shall ignore while reading from directories */ @@ -59,12 +51,6 @@ class ApplicationSelector extends BaseFrameworkSystem { // Call parent constructor parent::__construct(__CLASS__); - // Set description - $this->setObjectDescription("Applikationswechsler"); - - // Create unique ID number - $this->generateUniqueId(); - // Remove system array and thousand seperator $this->removeSystemArray(); $this->removeNumberFormaters(); @@ -77,9 +63,9 @@ class ApplicationSelector extends BaseFrameworkSystem { /** * Create a prepared instance of ApplicationSelector * - * @param $langInstance The language sub-system: LanguageSystem - * @param $fileIOInstance The file I/O instance - * @return $selInstance An instance of ApplicationSelector + * @param $langInstance The language sub-system: LanguageSystem + * @param $fileIOInstance The file I/O instance + * @return $selInstance An instance of ApplicationSelector */ public final static function createApplicationSelector (ManageableLanguage $langInstance, FileIoHandler $fileIOInstance) { // Get a new instance @@ -115,43 +101,24 @@ class ApplicationSelector extends BaseFrameworkSystem { } /** - * Load the init.php script of an application and append the application + * Load the data.php script of an application and append the application * instance to $foundApps * - * @param $initScript The FQFN of init.php - * @param $appName The application's Uni* name + * @param $appData The FQFN of data.php + * @param $appName The application's Uni* name * @return void */ - private function loadInitScript ($initScript, $appName) { + private function loadApplicationData ($appData, $appName) { // Is it a file and readable? - if ((is_file($initScript)) && (is_readable($initScript))) { + if ((is_file($appData)) && (is_readable($appData))) { // Then include it - include ($initScript); + include ($appData); // Add the current instance to the list $this->foundApps->append($app); - } // END - if ((is_file(... } - /** - * Setter for the selector's template engine instance - * - * @param $tplEngine An instance of TemplateEngine - */ - private final function setSelectorTemplateEngine (CompileableTemplate $tplEngine) { - $this->selectorTplEngine = $tplEngine; - } - - /** - * Getter for the selector's template engine instance - * - * @return $selectTplEngine The selector's template engine - */ - private final function getSelectorTemplateEngine () { - return $this->selectorTplEngine; - } - /** * Getter for the $loadedTemplates array object * @@ -163,7 +130,7 @@ class ApplicationSelector extends BaseFrameworkSystem { } /** - * Method for compatiblity with prepareTemplateEngine() + * Method for compatiblity with prepareTemplateInstance() * * @return $shortName This selector's short name */ @@ -180,8 +147,7 @@ class ApplicationSelector extends BaseFrameworkSystem { */ public function addDirIgnoreList ($ignoreItem) { // Cast and add it - $ignoreItem = (string) $ignoreItem; - $this->dirIgnoreList[] = $ignoreItem; + $this->dirIgnoreList[] = (string) $ignoreItem; } /** @@ -192,10 +158,7 @@ class ApplicationSelector extends BaseFrameworkSystem { */ public function readApplicationDirectory () { // Generate the base path for all applications - $appBasePath = sprintf("%s%s/", - PATH, - $this->getConfigInstance()->readConfig('application_path') - ); + $appBasePath = $this->getConfigInstance()->readConfig('application_path'); // Add the selector path to the ignore list $this->addDirIgnoreList($this->getConfigInstance()->readConfig('selector_path')); @@ -203,10 +166,6 @@ class ApplicationSelector extends BaseFrameworkSystem { // Get a directory pointer for the application path $dirInstance = FrameworkDirectoryPointer::createFrameworkDirectoryPointer($appBasePath); - // Backup and remove the 'app' from global name space - /*$appBackup = $app; - unset($app);*/ - // Read all directories&files except some parts while ($appName = $dirInstance->readDirectoryExcept($this->dirIgnoreList)) { // Generate FQFN for the application name (or better directory name) @@ -214,22 +173,17 @@ class ApplicationSelector extends BaseFrameworkSystem { // Is this a readable directory? (files will be ignored silently) if ((is_dir($fqfn)) && (is_readable($fqfn))) { - // Then get the init.php script for analyzing - $initScript = sprintf("%s/init%s", $fqfn, $this->getConfigInstance()->readConfig('php_extension')); + // Then get the data.php script for analyzing + $appData = sprintf("%s/data.php", $fqfn); - // Load the application's init.php script and append the + // Load the application's data.php script and append the // application to the ArrayObject - $this->loadInitScript($initScript, $appName); - - } // END - if ((is_dir(... - + $this->loadApplicationData($appData, $appName); + } // END - if } // END - while // Close directory pointer $dirInstance->closeDirectory(); - - // Restore old 'app' from backup - //$app = $appBackup; } /** @@ -244,17 +198,17 @@ class ApplicationSelector extends BaseFrameworkSystem { $appInstance = $idx->current(); // Prepare the template engine for the current template - $tplEngine = $this->prepareTemplateEngine($appInstance); + $templateInstance = $this->prepareTemplateInstance($appInstance); // Try to load the web template - $tplEngine->loadWebTemplate(sprintf("%s_%s", + $templateInstance->loadWebTemplate(sprintf("%s_%s", $this->getConfigInstance()->readConfig('tpl_selector_prefix'), strtolower($appInstance->getAppShortName()) )); // Remember this template and the application for later usage $this->loadedTemplates->append(array( - 'template_class' => $tplEngine, + 'template_class' => $templateInstance, 'app_instance' => $appInstance )); } @@ -280,13 +234,13 @@ class ApplicationSelector extends BaseFrameworkSystem { */ public function loadSelectorTemplate () { // Prepare the template engine - $tplEngine = $this->prepareTemplateEngine($this); + $templateInstance = $this->prepareTemplateInstance($this); // Load the selector's template - $tplEngine->loadCodeTemplate($this->getConfigInstance()->readConfig('selector_main_tpl')); + $templateInstance->loadCodeTemplate($this->getConfigInstance()->readConfig('selector_main_tpl')); - // Now store it in the class - $this->setSelectorTemplateEngine($tplEngine); + // Now store it in the class, we need this later on final compilation of available applications + $this->setTemplateInstance($templateInstance); } /** @@ -299,13 +253,14 @@ class ApplicationSelector extends BaseFrameworkSystem { * unexpected count of elements * @throws MissingArrayElementsException If $curr is missing expected * array elements + * @todo Finish handling all applications here */ public function insertApplicationTemplates () { // First prepare the instance - $tplEngine = $this->prepareTemplateEngine($this); + $templateInstance = $this->prepareTemplateInstance($this); // Load template which shall later hold all application templates - $tplEngine->loadCodeTemplate($this->getConfigInstance()->readConfig('selector_apps_tpl')); + $templateInstance->loadCodeTemplate($this->getConfigInstance()->readConfig('selector_apps_tpl')); // Add all loaded application templates together $dummy = ""; @@ -327,8 +282,9 @@ class ApplicationSelector extends BaseFrameworkSystem { // Expected entries missing throw new MissingArrayElementsException(array($this, "curr", array("template_class", "app_instance")), self::EXCEPTION_ARRAY_ELEMENTS_MISSING); } - die("
".print_r($curr, true)."
"); + // Debug output + die(__METHOD__."()
".print_r($curr, true)."
"); } // END - for } }