From: Roland Haeder <roland@mxchange.org>
Date: Thu, 23 Feb 2017 20:07:04 +0000 (+0100)
Subject: Continued:
X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=8808154c3ecabfea60a3dcf96bdab5c62a46816f;p=core.git

Continued:
- added noisy trace message
- added "import" for Registerable

Signed-off-by: Roland Häder <roland@mxchange.org>
---

diff --git a/inc/loader/class_ClassLoader.php b/inc/loader/class_ClassLoader.php
index 7dd6d63e..ed5b7825 100644
--- a/inc/loader/class_ClassLoader.php
+++ b/inc/loader/class_ClassLoader.php
@@ -279,7 +279,7 @@ class ClassLoader {
 	 */
 	public static function autoLoad ($className) {
 		// Try to include this class
-		self::getSelfInstance()->includeClass($className);
+		self::getSelfInstance()->loadClassFile($className);
 	}
 
 	/**
@@ -412,7 +412,10 @@ class ClassLoader {
 	 * @param	$className	The class that shall be loaded
 	 * @return	void
 	 */
-	public function includeClass ($className) {
+	private function loadClassFile ($className) {
+		// Trace message
+		/* NOISY-DEBUG: */ printf('[%s:%d] className=%s - CALLED!' . PHP_EOL, __METHOD__, __LINE__, $className);
+
 		// The class name should contain at least 2 back-slashes, so split at them
 		$classNameParts = explode("\\", $className);
 
diff --git a/inc/main/classes/container/socket/class_SocketContainer.php b/inc/main/classes/container/socket/class_SocketContainer.php
index 087f2c58..936874e9 100644
--- a/inc/main/classes/container/socket/class_SocketContainer.php
+++ b/inc/main/classes/container/socket/class_SocketContainer.php
@@ -2,6 +2,9 @@
 // Own namespace
 namespace CoreFramework\Container\Socket;
 
+// Import framework stuff
+use CoreFramework\Registry\Registerable;
+
 /**
  * A Socket Container class
  *
diff --git a/inc/main/classes/controller/class_BaseController.php b/inc/main/classes/controller/class_BaseController.php
index fcf97fce..abaace75 100644
--- a/inc/main/classes/controller/class_BaseController.php
+++ b/inc/main/classes/controller/class_BaseController.php
@@ -6,6 +6,7 @@ namespace CoreFramework\Controller;
 use CoreFramework\Factory\ObjectFactory;
 use CoreFramework\Object\BaseFrameworkSystem;
 use CoreFramework\Registry\Generic\Registry;
+use CoreFramework\Registry\Registerable;
 
 /**
  * A generic controller class. You should extend this base class if you want to
diff --git a/inc/main/classes/handler/tasks/class_TaskHandler.php b/inc/main/classes/handler/tasks/class_TaskHandler.php
index e44f40d2..b87a8f60 100644
--- a/inc/main/classes/handler/tasks/class_TaskHandler.php
+++ b/inc/main/classes/handler/tasks/class_TaskHandler.php
@@ -4,6 +4,7 @@ namespace CoreFramework\Handler\Task;
 
 // Import framework stuff
 use CoreFramework\Factory\ObjectFactory;
+use CoreFramework\Registry\Registerable;
 
 /**
  * A Task handler
diff --git a/inc/main/classes/images/class_BaseImage.php b/inc/main/classes/images/class_BaseImage.php
index 15ee4963..da592594 100644
--- a/inc/main/classes/images/class_BaseImage.php
+++ b/inc/main/classes/images/class_BaseImage.php
@@ -4,6 +4,7 @@ namespace CoreFramework\Image;
 
 // Import framework stuff
 use CoreFramework\Object\BaseFrameworkSystem;
+use CoreFramework\Registry\Registerable;
 
 /**
  * A general image class
diff --git a/inc/main/classes/points/class_UserPoints.php b/inc/main/classes/points/class_UserPoints.php
index 54424e1e..ce28dabb 100644
--- a/inc/main/classes/points/class_UserPoints.php
+++ b/inc/main/classes/points/class_UserPoints.php
@@ -5,6 +5,7 @@ namespace CoreFramework\User\Point;
 // Import framework stuff
 use CoreFramework\Factory\ObjectFactory;
 use CoreFramework\Object\BaseFrameworkSystem;
+use CoreFramework\Registry\Registerable;
 
 /**
  * A class for handling user points which can be real or Internet currency
diff --git a/inc/main/middleware/compressor/class_CompressorChannel.php b/inc/main/middleware/compressor/class_CompressorChannel.php
index 1e5cdbc9..726969a8 100644
--- a/inc/main/middleware/compressor/class_CompressorChannel.php
+++ b/inc/main/middleware/compressor/class_CompressorChannel.php
@@ -5,6 +5,7 @@ namespace CoreFramework\Channel\Compressor;
 // Import framework stuff
 use CoreFramework\Factory\ObjectFactory;
 use CoreFramework\Middleware\BaseMiddleware;
+use CoreFramework\Registry\Registerable;
 
 /**
  * Middleware class for selecting the right compressor channel
diff --git a/inc/main/middleware/debug/class_DebugMiddleware.php b/inc/main/middleware/debug/class_DebugMiddleware.php
index 81948737..eca786cd 100644
--- a/inc/main/middleware/debug/class_DebugMiddleware.php
+++ b/inc/main/middleware/debug/class_DebugMiddleware.php
@@ -5,6 +5,7 @@ namespace CoreFramework\Middleware\Debug;
 // Import framework stuff
 use CoreFramework\Factory\ObjectFactory;
 use CoreFramework\Middleware\BaseMiddleware;
+use CoreFramework\Registry\Registerable;
 
 /**
  * The middlware debug output system. A *real* or concrete output class shall