X-Git-Url: https://git.mxchange.org/?p=core.git;a=blobdiff_plain;f=inc%2Fclasses.php;h=b80779e492244cc9aa0f3c686d841a1b0b800427;hp=b139dcfd1c0c277ad82f5fb29fbdb53a8ea86709;hb=202f8c1c1d46d1292918b7110547952446a53391;hpb=b4b611a490a624ea38b44020fc63a1ac2f57fec3

diff --git a/inc/classes.php b/inc/classes.php
index b139dcfd..b80779e4 100644
--- a/inc/classes.php
+++ b/inc/classes.php
@@ -2,10 +2,12 @@
 /**
  * Load required framework classes first
  *
- * @author		Roland Haeder <webmaster@ship-simu.org>
+ * @author		Roland Haeder <webmaster@shipsimu.org>
  * @version		0.0
- * @copyright	Copyright (c) 2007 - 2009 Roland Haeder, this is free software
+ * @copyright	Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2013 Core Developer Team
  * @license		GNU GPL 3.0 or any newer version
+ * @deprecated
+ * @todo		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
@@ -21,41 +23,8 @@
  * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
-// Lower framework classes
-$lowerClasses = array(
-	0 => "exceptions", // Exceptions
-	1 => "interfaces", // Interfaces
-	2 => "main",       // General main classes
-	3 => "middleware"  // The middleware
-);
-
-// Load all classes
-foreach ($lowerClasses as $className) {
-	// Try to load the framework classes
-	try {
-		ClassLoader::getInstance()->scanClassPath(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
-		));
-	}
-}
-
-// Clean up the global namespace
-unset($lowerClasses[3]); // Applications shall not have any middleware
-unset($className);
+// Scan for all framework classes, exceptions and interfaces
+ClassLoader::scanFrameworkClasses();
 
 ////// Until here the framework classes are loaded //////