Add error creation method with dictionary parameter

defagos · Apr 8, 2014 · 5381b4b · 5381b4b
1 parent 99e7856
commit 5381b4b
Show file tree

Hide file tree

Showing 2 changed files with 19 additions and 5 deletions.
diff --git a/CoconutKit/Sources/Core/HLSError.h b/CoconutKit/Sources/Core/HLSError.h
@@ -7,17 +7,19 @@
 //
 
 /**
- * Lightweight abstract subclass of HLSError providing a convenient way to create errors and to define and access
- * their properties.
+ * Lightweight subclass of HLSError providing a convenient way to create errors and to define and access their 
+ * properties.
  *
  * This class enforces the link between accessor methods and underlying userInfo dictionary keys. This is not
  * required, as explained in the documentation:
  *   http://developer.apple.com/library/ios/#documentation/Cocoa/Conceptual/ErrorHandlingCocoa/ErrorHandling/ErrorHandling.html
  *
- * Designated initializer: -initWithDomain:Code:
+ * Designated initializer: -initWithDomain:code:userInfo:
  */
 @interface HLSError : NSError
 
++ (id)errorWithDomain:(NSString *)domain code:(NSInteger)code userInfo:(NSDictionary *)userInfo;
+
 /**
  * Instantiate an error with some code within a domain. The error is created with no information, use the mutators below to 
  * add the information you need
@@ -30,6 +32,8 @@
  */
 + (id)errorWithDomain:(NSString *)domain code:(NSInteger)code localizedDescription:(NSString *)localizedDescription;
 
+- (id)initWithDomain:(NSString *)domain code:(NSInteger)code userInfo:(NSDictionary *)userInfo;
+
 /**
  * Initialize an error with some code within a domain. The error is created with no information, use the mutators below to
  * add the information you need

diff --git a/CoconutKit/Sources/Core/HLSError.m b/CoconutKit/Sources/Core/HLSError.m
@@ -26,6 +26,11 @@ @implementation HLSError
 
 #pragma mark Class methods
 
++ (id)errorWithDomain:(NSString *)domain code:(NSInteger)code userInfo:(NSDictionary *)userInfo
+{
+    return [[[[self class] alloc] initWithDomain:domain code:code userInfo:userInfo] autorelease];
+}
+
 + (id)errorWithDomain:(NSString *)domain code:(NSInteger)code
 {
     return [[[[self class] alloc] initWithDomain:domain code:code] autorelease];
@@ -40,14 +45,19 @@ + (id)errorWithDomain:(NSString *)domain code:(NSInteger)code localizedDescripti
 
 #pragma mark Object creation and destruction
 
-- (id)initWithDomain:(NSString *)domain code:(NSInteger)code
+- (id)initWithDomain:(NSString *)domain code:(NSInteger)code userInfo:(NSDictionary *)userInfo
 {
     if ((self = [super initWithDomain:domain code:code userInfo:nil /* not used */])) {
-        self.internalUserInfo = [NSDictionary dictionary];
+        self.internalUserInfo = userInfo ?: [NSDictionary dictionary];
     }
     return self;
 }
 
+- (id)initWithDomain:(NSString *)domain code:(NSInteger)code
+{
+    return [self initWithDomain:domain code:code userInfo:nil];
+}
+
 - (void)dealloc
 {
     self.internalUserInfo = nil;