Static method getInstance() conflicts with getInstance() in class BaseRegistry,

[core.git] / inc / classes.php

diff --git a/inc/classes.php b/inc/classes.php
index b139dcfd1c0c277ad82f5fb29fbdb53a8ea86709..6084add1e799e8ab0ba2b4b8e857a35f6bd2f74e 100644 (file)
--- 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 - 2011 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,20 @@
 
 // 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
 );
 
+// Cache loader instance
+$loaderInstance = ClassLoader::getSelfInstance();
+
 // 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
-               ));
-       }
-}
+       $loaderInstance->scanClassPath('inc/classes/' . $className . '/');
+} // END - foreach
 
 // Clean up the global namespace
 unset($lowerClasses[3]); // Applications shall not have any middleware