X-Git-Url: https://git.mxchange.org/?p=shipsimu.git;a=blobdiff_plain;f=application%2Fship-simu%2Floader.php;h=c0786aaadbc13529efd3fa750cbc09d3d1b1b160;hp=e44ed0fb407c3f737d3e24e126575471dba89da6;hb=d3ac3088a75edd47f1b2a6f635fe2116129ecfd5;hpb=2a157996efd680b87b0a84cc95b91619ea6e81d9

diff --git a/application/ship-simu/loader.php b/application/ship-simu/loader.php
index e44ed0f..c0786aa 100644
--- a/application/ship-simu/loader.php
+++ b/application/ship-simu/loader.php
@@ -4,9 +4,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, 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
@@ -19,49 +19,21 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ * 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::getSelfInstance();
 
 // Load all classes for the application
-foreach ($lowerClasses as $class) {
-	// Try to load the application classes
-	try {
-		ClassLoader::getInstance()->loadClasses(sprintf("%s/%s/%s", FrameworkConfiguration::getInstance()->readConfig("application_path"), $application, $class));
-	} catch (PathIsNoDirectoryException $e) {
-		ApplicationEntryPoint::app_die(sprintf("[Main:] Kann Applikationsklassen im Pfad <strong>%s</strong> nicht laden. Grund: <strong>%s</strong>",
-			$class,
-			$e->getMessage()
-		));
-	} catch (PathIsEmptyException $e) {
-		ApplicationEntryPoint::app_die(sprintf("[Main:] Kann Applikationsklassen im Pfad <strong>%s</strong> nicht laden. Grund: <strong>%s</strong>",
-			$class,
-			$e->getMessage()
-		));
-	} catch (PathReadProtectedException $e) {
-		ApplicationEntryPoint::app_die(sprintf("[Main:] Kann Applikationsklassen im Pfad <strong>%s</strong> nicht laden. Grund: <strong>%s</strong>",
-			$class,
-			$e->getMessage()
-		));
-	} catch (DirPointerNotOpenedException $e) {
-		ApplicationEntryPoint::app_die(sprintf("[Main:] Kann Applikationsklassen im Pfad <strong>%s</strong> nicht laden. Grund: <strong>%s</strong>",
-			$class,
-			$e->getMessage()
-		));
-	}
-}
-
-// Include all classes
-ClassLoader::getInstance()->includeAllClasses();
+foreach ($lowerClasses as $className) {
+	// Load the application classes
+	ClassLoader::getSelfInstance()->scanClassPath(sprintf("%s/%s/%s", $cfg->getConfigEntry('application_path'), $cfg->getConfigEntry('app_name'), $className));
+} // END - if
 
 // Clean up the global namespace
 unset($lowerClasses);
-unset($class);
+unset($className);
 
 // [EOF]
 ?>