X-Git-Url: https://git.mxchange.org/?p=core.git;a=blobdiff_plain;f=inc%2Floader%2Fclass_ClassLoader.php;h=34fd3c3cfd1e64fce72775dbe1ab7db95055843e;hp=b6094879ebab7c5d1cb0d2dcfb662c2c50d414c9;hb=4a14d6dfbeca8d1d7b60b68cd23e108667c5a4b5;hpb=0cd57c3885f00ad77fc599e53ed2f2d5e7ac267f

diff --git a/inc/loader/class_ClassLoader.php b/inc/loader/class_ClassLoader.php
index b6094879..34fd3c3c 100644
--- a/inc/loader/class_ClassLoader.php
+++ b/inc/loader/class_ClassLoader.php
@@ -4,7 +4,7 @@
  *
  * @author		Roland Haeder <webmaster@ship-simu.org>
  * @version		0.0.0
- * @copyright	Copyright (c) 2007, 2008 Roland Haeder, 2009 Core Developer Team
+ * @copyright	Copyright (c) 2007, 2008 Roland Haeder, 2009, 2010 Core Developer Team
  * @license		GNU GPL 3.0 or any newer version
  * @link		http://www.ship-simu.org
  *
@@ -135,13 +135,13 @@ class ClassLoader {
 
 		// Construct the FQFN for the cache
 		if (!defined('DEVELOPER')) {
-			$this->listCacheFQFN  = $this->configInstance->readConfig('local_db_path') . "list-" . $this->configInstance->readConfig('app_name') . ".cache";
-			$this->classCacheFQFN = $this->configInstance->readConfig('local_db_path') . "class-" . $this->configInstance->readConfig('app_name') . ".cache";
+			$this->listCacheFQFN  = $this->configInstance->getConfigEntry('local_db_path') . "list-" . $this->configInstance->getConfigEntry('app_name') . ".cache";
+			$this->classCacheFQFN = $this->configInstance->getConfigEntry('local_db_path') . "class-" . $this->configInstance->getConfigEntry('app_name') . ".cache";
 		} // END - if
 
 		// Set suffix and prefix from configuration
-		$this->suffix = $configInstance->readConfig('class_suffix');
-		$this->prefix = $configInstance->readConfig('class_prefix');
+		$this->suffix = $configInstance->getConfigEntry('class_suffix');
+		$this->prefix = $configInstance->getConfigEntry('class_prefix');
 
 		// Set own instance
 		self::$selfInstance = $this;
@@ -228,23 +228,6 @@ class ClassLoader {
 		} // END - if
 	}
 
-	/**
-	 * Fall-back method. Please replace loadClasses() with scanClassPath() !
-	 *
-	 * @param	$basePath		The relative base path to 'base_path' constant for all classes
-	 * @param	$ignoreList		An optional list (array forced) of directory and file names which shall be ignored
-	 * @return	void
-	 * @deprecated
-	 * @todo	Rewrite your apps to scanClassPath()
-	 */
-	public function loadClasses ($basePath, array $ignoreList = array() ) {
-		// This outputs an ugly message because you need to change to scanClassPath
-		print __METHOD__." is deprecated. Use scanClassPath() to make this warning go away.<br />\n";
-
-		// Call our new method
-		$this->scanClassPath($basePath, $ignoreList);
-	}
-
 	/**
 	 * Scans recursively a local path for class files which must have a prefix and a suffix as given by $this->suffix and $this->prefix
 	 *
@@ -315,7 +298,7 @@ class ClassLoader {
 		$this->prefix = 'config-';
 
 		// Set base directory
-		$basePath = $this->configInstance->readConfig('base_path') . 'inc/config/';
+		$basePath = $this->configInstance->getConfigEntry('base_path') . 'inc/config/';
 
 		// Load all classes from the config directory
 		$this->scanClassPath($basePath);