Link to creating new company relinked to generic company page

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

diff --git a/application/selector/class_ApplicationSelector.php b/application/selector/class_ApplicationSelector.php
index 03e03ef1dc96e973479da6fced3aa35aacd92df4..0e9070a95c283d83e1422418519baeee0d242976 100644 (file)
--- a/application/selector/class_ApplicationSelector.php
+++ b/application/selector/class_ApplicationSelector.php
@@ -7,9 +7,9 @@
  *
  * @author             Roland Haeder <webmaster@ship-simu.org>
  * @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
+ * @link               http://www.ship-simu.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
@@ -46,11 +46,12 @@ class ApplicationSelector extends BaseFrameworkSystem {
        private $dirIgnoreList = array(
                ".",
                "..",
-               ".htaccess"
+               ".htaccess",
+               ".svn"
        );
 
        /**
-        * The private constructor. No direct instances can be created from this.
+        * The protected constructor. No direct instances can be created from this.
         *
         * @return      void
         */
@@ -62,7 +63,7 @@ class ApplicationSelector extends BaseFrameworkSystem {
                $this->setObjectDescription("Applikationswechsler");
 
                // Create unique ID number
-               $this->createUniqueID();
+               $this->generateUniqueId();
 
                // Remove system array and thousand seperator
                $this->removeSystemArray();
@@ -101,7 +102,7 @@ class ApplicationSelector extends BaseFrameworkSystem {
         * @return      void
         */
        private function initializeAppsList () {
-               $this->foundApps = new FrameworkArrayObject();
+               $this->foundApps = new FrameworkArrayObject("FakedFoundApplications");
        }
 
        /**
@@ -110,7 +111,7 @@ class ApplicationSelector extends BaseFrameworkSystem {
         * @return      void
         */
        private function initializeTemplatesList () {
-               $this->loadedTemplates = new FrameworkArrayObject();
+               $this->loadedTemplates = new FrameworkArrayObject("FakedLoadedTemplates");
        }
 
        /**
@@ -120,10 +121,6 @@ class ApplicationSelector extends BaseFrameworkSystem {
         * @param               $initScript     The FQFN of init.php
         * @param               $appName                The application's Uni* name
         * @return      void
-        * @throws      AppVarIsNotSetException If 'app' is not set
-        * @throws      NullPointerException    If 'app' is null
-        * @throws      NoObjectException               If 'app' is not an object
-        * @throws      MissingMethodException  If a required method is missing
         */
        private function loadInitScript ($initScript, $appName) {
                // Is it a file and readable?
@@ -131,21 +128,6 @@ class ApplicationSelector extends BaseFrameworkSystem {
                        // Then include it
                        include ($initScript);
 
-                       // We now should have $app re-defined!
-                       if (!isset($app)) {
-                               // This application shall not be loaded
-                               return;
-                       } elseif (is_null($app)) {
-                               // The class instance is null
-                               throw new NullPointerException($this, self::EXCEPTION_IS_NULL_POINTER);
-                       } elseif (!is_object($app)) {
-                               // Not an object
-                               throw new NoObjectException($app, self::EXCEPTION_IS_NO_OBJECT);
-                       } elseif (!method_exists($app, $this->getConfigInstance()->readConfig('entry_method'))) {
-                               // Method not found!
-                               throw new MissingMethodException(array($app, $this->getConfigInstance()->readConfig('entry_method')), self::EXCEPTION_MISSING_METHOD);
-                       }
-
                        // Add the current instance to the list
                        $this->foundApps->append($app);
 
@@ -272,7 +254,7 @@ class ApplicationSelector extends BaseFrameworkSystem {
 
                        // Remember this template and the application for later usage
                        $this->loadedTemplates->append(array(
-                               'tpl_engine'   => $tplEngine,
+                               'template_class'   => $tplEngine,
                                'app_instance' => $appInstance
                        ));
                }
@@ -314,9 +296,9 @@ class ApplicationSelector extends BaseFrameworkSystem {
         * @throws      NullPointerException            If $curr is null
         * @throws      NoArrayException                        If $curr is not an array
         * @throws      InvalidArrayCountException      If $curr contains an
-        *                                                                      unexpected count of elements
+        *                                                                              unexpected count of elements
         * @throws      MissingArrayElementsException   If $curr is missing expected
-        *                                                                      array elements
+        *                                                                                      array elements
         */
        public function insertApplicationTemplates () {
                // First prepare the instance
@@ -341,9 +323,9 @@ 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['tpl_engine']) || (!isset($curr['app_instance']))) {
+                       } elseif (!isset($curr['template_class']) || (!isset($curr['app_instance']))) {
                                // Expected entries missing
-                               throw new MissingArrayElementsException(array($this, "curr", array('tpl_engine', 'app_instance')), self::EXCEPTION_ARRAY_ELEMENTS_MISSING);
+                               throw new MissingArrayElementsException(array($this, "curr", array("template_class", "app_instance")), self::EXCEPTION_ARRAY_ELEMENTS_MISSING);
                        }
                        die("<pre>".print_r($curr, true)."</pre>");