From 2e970c64c922f4653e0e74d60f2229b37aa9c33e Mon Sep 17 00:00:00 2001 From: =?utf8?q?Roland=20H=C3=A4der?= Date: Wed, 11 Mar 2009 15:07:54 +0000 Subject: [PATCH] Minor refactured --- .../main/factories/objects/class_ObjectFactory.php | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/inc/classes/main/factories/objects/class_ObjectFactory.php b/inc/classes/main/factories/objects/class_ObjectFactory.php index 7fe99550..71b7b939 100644 --- a/inc/classes/main/factories/objects/class_ObjectFactory.php +++ b/inc/classes/main/factories/objects/class_ObjectFactory.php @@ -49,17 +49,14 @@ class ObjectFactory extends BaseFactory { * @throws EmptyVariableException If a variable is empty unexpectly */ public final static function createObjectByName ($className, array $args=array()) { + // First get an instance of this factory + $factoryInstance = new ObjectFactory(); + // Is the class name valid and is the class there? if (empty($className)) { - // First get an instance of this factory - $factoryInstance = new ObjectFactory(); - // Throw an exception here throw new EmptyVariableException(array($factoryInstance, 'className'), self::EXCEPTION_UNEXPECTED_EMPTY_STRING); } elseif (!class_exists($className)) { - // First get an instance of this factory - $factoryInstance = new ObjectFactory(); - // Then throw an exception throw new ClassNotFoundException(array($factoryInstance, $className), self::EXCEPTION_CLASS_NOT_FOUND); } -- 2.30.2