X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=inc%2Fclasses.php;h=8a1801583fc0abfb37e4f83b24026db7fdbfb639;hb=83692301545794ba8015243e9d8863a8ed521403;hp=ac3940a4e7cbcce9793b2583ef237895d4d8c2b6;hpb=95ca9381b8f43a13263d2e2e35eceac426a6df78;p=core.git

diff --git a/inc/classes.php b/inc/classes.php
index ac3940a4..8a180158 100644
--- a/inc/classes.php
+++ b/inc/classes.php
@@ -2,12 +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, 2008 Roland Haeder, 2009 - 2011 Core Developer Team
+ * @copyright	Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2014 Core Developer Team
  * @license		GNU GPL 3.0 or any newer version
  * @deprecated
- * @todo		We should minimize these includes
+ * @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
@@ -23,26 +23,8 @@
  * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
-// Lower framework classes
-$lowerClasses = array(
-	'exceptions', // Exceptions
-	'interfaces', // Interfaces
-	'main',       // General main classes
-	'middleware'  // The middleware
-);
-
-// Cache loader instance
-$loaderInstance = ClassLoader::getInstance();
-
-// Load all classes
-foreach ($lowerClasses as $className) {
-	// Try to load the framework classes
-	$loaderInstance->scanClassPath('inc/classes/' . $className . '/');
-} // END - foreach
-
-// 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 //////