Proper naming + 'core' updated.

[shipsimu.git] / application / selector / class_ApplicationSelector.php

diff --git a/application/selector/class_ApplicationSelector.php b/application/selector/class_ApplicationSelector.php
index b0aca0648fb1bc1129a4c0f7eb6ff70f598ff957..f8e080a254b6eb64fb58714d9e94f37db7fa2dd6 100644 (file)
--- a/application/selector/class_ApplicationSelector.php
+++ b/application/selector/class_ApplicationSelector.php
@@ -2,11 +2,11 @@
 /**
  * The application selector class.
  *
- * @author             Roland Haeder <webmaster@ship-simu.org>
+ * @author             Roland Haeder <webmaster@shipsimu.org>
  * @version            0.0.0
  * @copyright  Copyright (c) 2007, 2008 Roland Haeder, 2009 Ship-Simu Developer Team
  * @license            GNU GPL 3.0 or any newer version
- * @link               http://www.ship-simu.org
+ * @link               http://www.shipsimu.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
@@ -51,10 +51,6 @@ class ApplicationSelector extends BaseFrameworkSystem {
                // Call parent constructor
                parent::__construct(__CLASS__);
 
-               // Remove system array and thousand seperator
-               $this->removeSystemArray();
-               $this->removeNumberFormaters();
-
                // Initialize the array lists
                $this->initializeAppsList();
                $this->initializeTemplatesList();
@@ -135,7 +131,7 @@ class ApplicationSelector extends BaseFrameworkSystem {
         * @return      $shortName      This selector's short name
         */
        public function getAppShortName() {
-               $shortName = $this->getConfigInstance()->readConfig('selector_path');
+               $shortName = $this->getConfigInstance()->getConfigEntry('selector_path');
                return $shortName;
        }
 
@@ -158,10 +154,10 @@ class ApplicationSelector extends BaseFrameworkSystem {
         */
        public function readApplicationDirectory () {
                // Generate the base path for all applications
-               $appBasePath = $this->getConfigInstance()->readConfig('application_path');
+               $appBasePath = $this->getConfigInstance()->getConfigEntry('application_path');
 
                // Add the selector path to the ignore list
-               $this->addDirIgnoreList($this->getConfigInstance()->readConfig('selector_path'));
+               $this->addDirIgnoreList($this->getConfigInstance()->getConfigEntry('selector_path'));
 
                // Get a directory pointer for the application path
                $dirInstance = FrameworkDirectoryPointer::createFrameworkDirectoryPointer($appBasePath);
@@ -193,22 +189,22 @@ class ApplicationSelector extends BaseFrameworkSystem {
         */
        public function loadApplicationTemplates () {
                // Iterate through all applications
-               for ($idx = $this->foundApps->getIterator(); $idx->valid(); $idx->next()) {
+               for ($iteratorInstance = $this->foundApps->getIterator(); $iteratorInstance->valid(); $iteratorInstance->next()) {
                        // Get current application
-                       $appInstance = $idx->current();
+                       $appInstance = $iteratorInstance->current();
 
                        // Prepare the template engine for the current template
                        $templateInstance = $this->prepareTemplateInstance($appInstance);
 
                        // Try to load the web template
-                       $templateInstance->loadWebTemplate(sprintf("%s_%s",
-                               $this->getConfigInstance()->readConfig('tpl_selector_prefix'),
+                       $templateInstance->loadWebTemplate(sprintf('%s_%s',
+                               $this->getConfigInstance()->getConfigEntry('tpl_selector_prefix'),
                                strtolower($appInstance->getAppShortName())
                        ));
 
                        // Remember this template and the application for later usage
                        $this->loadedTemplates->append(array(
-                               'template_class'   => $templateInstance,
+                               'web_template_class'   => $templateInstance,
                                'app_instance' => $appInstance
                        ));
                }
@@ -237,7 +233,7 @@ class ApplicationSelector extends BaseFrameworkSystem {
                $templateInstance = $this->prepareTemplateInstance($this);
 
                // Load the selector's template
-               $templateInstance->loadCodeTemplate($this->getConfigInstance()->readConfig('selector_main_tpl'));
+               $templateInstance->loadCodeTemplate($this->getConfigInstance()->getConfigEntry('selector_main_tpl'));
 
                // Now store it in the class, we need this later on final compilation of available applications
                $this->setTemplateInstance($templateInstance);
@@ -259,13 +255,13 @@ class ApplicationSelector extends BaseFrameworkSystem {
                $templateInstance = $this->prepareTemplateInstance($this);
 
                // Load template which shall later hold all application templates
-               $templateInstance->loadCodeTemplate($this->getConfigInstance()->readConfig('selector_apps_tpl'));
+               $templateInstance->loadCodeTemplate($this->getConfigInstance()->getConfigEntry('selector_apps_tpl'));
 
                // Add all loaded application templates together
-               $dummy = "";
-               for ($idx = $this->getLoadedTemplates()->getIterator(); $idx->valid(); $idx->next()) {
+               $dummy = '';
+               for ($iteratorInstance = $this->getLoadedTemplates()->getIterator(); $iteratorInstance->valid(); $iteratorInstance->next()) {
                        // Get current item from array object
-                       $curr = $idx->current();
+                       $curr = $iteratorInstance->current();
 
                        // Do some sanity checks on the loaded item
                        if (!is_array($curr)) {
@@ -273,14 +269,14 @@ class ApplicationSelector extends BaseFrameworkSystem {
                                throw new NoArrayException($curr, self::EXCEPTION_IS_NO_ARRAY);
                        } elseif (count($curr) != 2) {
                                // Not expected count of entries
-                               throw new InvalidArrayCountException(array($this, "curr", count($curr), 2), self::EXCEPTION_ARRAY_HAS_INVALID_COUNT);
-                       } elseif (!isset($curr['template_class']) || (!isset($curr['app_instance']))) {
+                               throw new InvalidArrayCountException(array($this, 'curr', count($curr), 2), self::EXCEPTION_ARRAY_HAS_INVALID_COUNT);
+                       } elseif (!isset($curr['web_template_class']) || (!isset($curr['app_instance']))) {
                                // Expected entries missing
-                               throw new MissingArrayElementsException(array($this, "curr", array("template_class", "app_instance")), self::EXCEPTION_ARRAY_ELEMENTS_MISSING);
+                               throw new MissingArrayElementsException(array($this, 'curr', array('template_class', 'app_instance')), self::EXCEPTION_ARRAY_ELEMENTS_MISSING);
                        }
 
                        // Debug output
-                       die(__METHOD__."()<pre>".print_r($curr, true)."</pre>");
+                       die(__METHOD__.'()<pre>'.print_r($curr, true).'</pre>');
                } // END - for
        }
 }