From 7681d3abfaeb704f7d584e44e96cfa1a6575842e Mon Sep 17 00:00:00 2001
From: coderkun <coderkun@localhost>
Date: Sun, 22 Sep 2013 21:39:53 +0200
Subject: [PATCH] correct namespaces

---
 core/Agent.inc  |  6 +++---
 core/Driver.inc | 10 +++++-----
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/core/Agent.inc b/core/Agent.inc
index 07bece26..00ec1a90 100644
--- a/core/Agent.inc
+++ b/core/Agent.inc
@@ -398,7 +398,7 @@
 		{
 			try {
 				// Load Agent
-				BottomlevelAgent::load($agentName);
+				\nre\agents\BottomlevelAgent::load($agentName);
 				
 				// Construct Agent
 				$this->subAgents[] = call_user_func_array(
@@ -468,7 +468,7 @@
 			return array(
 				'name'		=>	strtolower($agentName),
 				'response'	=>	$response,
-				'object'	=>	BottomlevelAgent::factory(
+				'object'	=>	\nre\agents\BottomlevelAgent::factory(
 					$agentName,
 					$this->request,
 					$response,
@@ -548,7 +548,7 @@
 			
 			try {
 				// Load Agenten
-				BottomlevelAgent::load($agentName);
+				\nre\agents\BottomlevelAgent::load($agentName);
 			
 				// Construct Agent
 				$subAgent = $this->newSubAgent($agentName);
diff --git a/core/Driver.inc b/core/Driver.inc
index aa3096a6..bf9084d1 100644
--- a/core/Driver.inc
+++ b/core/Driver.inc
@@ -42,11 +42,11 @@
 				// Validate class
 				ClassLoader::check($className, get_class());
 			}
-			catch(ClassNotValidException $e) {
-				throw new DriverNotValidException($e->getClassName());
+			catch(\nre\exceptions\ClassNotValidException $e) {
+				throw new \nre\exceptions\DriverNotValidException($e->getClassName());
 			}
-			catch(ClassNotFoundException $e) {
-				throw new DriverNotFoundException($e->getClassName());
+			catch(\nre\exceptions\ClassNotFoundException $e) {
+				throw new \nre\exceptions\DriverNotFoundException($e->getClassName());
 			}
 		}
 		
@@ -75,7 +75,7 @@
 		 */
 		private static function getClassName($driverName)
 		{
-			$className = \nre\core\ClassLoader::concatClassNames($driverName, \nre\core\ClassLoader::stripNamespace(get_class()));
+			$className = ClassLoader::concatClassNames($driverName, ClassLoader::stripNamespace(get_class()));
 			
 			
 			return "\\nre\\drivers\\$className";