New building 'advanced research lab' added, floor-list added to buildings, menu XML...

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

diff --git a/application/selector/class_ApplicationSelector.php b/application/selector/class_ApplicationSelector.php
index ee637f7d1a68705cca9aa2cf7e6642b6007c5e20..ca1f053523e52b9b6e912495e273f085ae9d8cff 100644 (file)
--- a/application/selector/class_ApplicationSelector.php
+++ b/application/selector/class_ApplicationSelector.php
@@ -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();
@@ -208,7 +204,7 @@ class ApplicationSelector extends BaseFrameworkSystem {
 
                        // Remember this template and the application for later usage
                        $this->loadedTemplates->append(array(
-                               'template_class'   => $templateInstance,
+                               'web_template_class'   => $templateInstance,
                                'app_instance' => $appInstance
                        ));
                }
@@ -274,7 +270,7 @@ class ApplicationSelector extends BaseFrameworkSystem {
                        } 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']))) {
+                       } 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);
                        }