X-Git-Url: https://git.mxchange.org/?p=core.git;a=blobdiff_plain;f=inc%2Fclasses.php;h=d42d77972e1ed7644cf128af5500e764c7c6b107;hp=980d71b2ff00eccf071085eca44b3269ab1a2928;hb=84e2207412d3c6ea9f940a83b2cdd4503509808a;hpb=361e6320e50a8bb1a3ccb675388b8042361669ae

diff --git a/inc/classes.php b/inc/classes.php
index 980d71b2..d42d7797 100644
--- a/inc/classes.php
+++ b/inc/classes.php
@@ -4,8 +4,10 @@
  *
  * @author		Roland Haeder <webmaster@ship-simu.org>
  * @version		0.0
- * @copyright	Copyright (c) 2007 - 2009 Roland Haeder, this is free software
+ * @copyright	Copyright (c) 2007, 2008 Roland Haeder, 2009, 2010 Core Developer Team
  * @license		GNU GPL 3.0 or any newer version
+ * @deprecated
+ * @todo		We should minimize these includes
  *
  * 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
@@ -23,35 +25,17 @@
 
 // Lower framework classes
 $lowerClasses = array(
-	0 => "exceptions", // Exceptions
-	1 => "interfaces", // Interfaces
-	2 => "main",       // General main classes
-	3 => "middleware"  // The middleware
+	'exceptions', // Exceptions
+	'interfaces', // Interfaces
+	'main',       // General main classes
+	'middleware'  // The middleware
 );
 
 // Load all classes
 foreach ($lowerClasses as $className) {
 	// Try to load the framework classes
-	try {
-		ClassLoader::getInstance()->loadClasses(sprintf("inc/classes/%s/", $className));
-	} catch (PathIsNoDirectoryException $e) {
-		ApplicationEntryPoint::app_die(sprintf("[Main:] Could not load framework classes from path <span class=\"exception_data\">%s</span> for the follwing reason: <span class=\"exception_reason\">%s</span>",
-			$className
-		));
-	} catch (PathIsEmptyException $e) {
-		ApplicationEntryPoint::app_die(sprintf("[Main:] Could not load framework classes from path <span class=\"exception_data\">%s</span> for the follwing reason: <span class=\"exception_reason\">%s</span>",
-			$className
-		));
-	} catch (PathReadProtectedException $e) {
-		ApplicationEntryPoint::app_die(sprintf("[Main:] Could not load framework classes from path <span class=\"exception_data\">%s</span> for the follwing reason: <span class=\"exception_reason\">%s</span>",
-			$className
-		));
-	} catch (DirPointerNotOpenedException $e) {
-		ApplicationEntryPoint::app_die(sprintf("[Main:] Could not load framework classes from path <span class=\"exception_data\">%s</span> for the follwing reason: <span class=\"exception_reason\">%s</span>",
-			$className
-		));
-	}
-}
+	ClassLoader::getInstance()->scanClassPath('inc/classes/' . $className . '/');
+} // END - foreach
 
 // Clean up the global namespace
 unset($lowerClasses[3]); // Applications shall not have any middleware