X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=application%2Fselector%2Floader.php;h=a6b49bbfe180f51b9669d82d0937080b0418e956;hb=1655bfb47ca0dd174e374d70d1aaad4293346379;hp=aafbd380a732c2fba4820823debe8ca72d0b4043;hpb=11c0ba60cb6c044928f41e93cc98d214b1d8ad7c;p=shipsimu.git

diff --git a/application/selector/loader.php b/application/selector/loader.php
index aafbd38..a6b49bb 100644
--- a/application/selector/loader.php
+++ b/application/selector/loader.php
@@ -3,9 +3,9 @@
  * The application's class loader
  * @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, 2009 Ship-Simu Developer Team
  * @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
@@ -21,21 +21,14 @@
  * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
-// Is the application instance set?
-if (!isset($application)) {
-	// We need this!
-	ApplicationEntryPoint::app_die("[Main:] Interne Variable <strong>application</strong> nicht gefunden!");
-}
+// Get config instance
+$cfg = FrameworkConfiguration::getInstance();
 
 // Load all classes
-ClassLoader::getInstance()->loadClasses(sprintf("%s/%s/", FrameworkConfiguration::getInstance()->readConfig('application_path'), $application));
-
-// Include all classes
-ClassLoader::getInstance()->includeAllClasses();
+ClassLoader::getInstance()->scanClassPath(sprintf("%s/%s/", $cfg->getConfigEntry('application_path'), $cfg->getConfigEntry('app_name')));
 
 // Clean up the global namespace
 unset($lowerClasses);
-unset($class);
 
 // [EOF]
 ?>