Tweak formatting and apply formatter.

Source/Component/Collection/TyphoonArgumentInjectedAsCollection.m

@@ -10,7 +10,6 @@
 ////////////////////////////////////////////////////////////////////////////////
 
 #import "TyphoonArgumentInjectedAsCollection.h"
-#import "TyphoonTypeDescriptor.h"
 #import "TyphoonIntrospectionUtils.h"
 #import "TyphoonDefinition.h"
 #import "TyphoonTypeConvertedCollectionValue.h"

Source/Component/Collection/TyphoonByReferenceCollectionValue.h

@@ -14,9 +14,9 @@
 #import <Foundation/Foundation.h>
 #import "TyphoonCollectionValue.h"
 
-@interface TyphoonByReferenceCollectionValue : NSObject<TyphoonCollectionValue>
+@interface TyphoonByReferenceCollectionValue : NSObject <TyphoonCollectionValue>
 
-@property (nonatomic, strong, readonly) NSString* componentName;
+@property(nonatomic, strong, readonly) NSString* componentName;
 
 - (id)initWithComponentName:(NSString*)componentName;
 

Source/Component/Collection/TyphoonTypeConvertedCollectionValue.h

@@ -13,10 +13,10 @@
 #import "TyphoonCollectionValue.h"
 
 
-@interface TyphoonTypeConvertedCollectionValue : NSObject<TyphoonCollectionValue>
+@interface TyphoonTypeConvertedCollectionValue : NSObject <TyphoonCollectionValue>
 
-@property (nonatomic, strong, readonly) NSString* textValue;
-@property (nonatomic, strong, readonly) Class requiredType;
+@property(nonatomic, strong, readonly) NSString* textValue;
+@property(nonatomic, strong, readonly) Class requiredType;
 
 - (id)initWithTextValue:(NSString*)textValue requiredType:(Class)requiredType;
 

Source/Component/Initializer/Collection/TyphoonParameterInjectedAsCollection.h

@@ -16,10 +16,10 @@
 
 @interface TyphoonParameterInjectedAsCollection : TyphoonArgumentInjectedAsCollection <TyphoonInjectedParameter>
 
-@property (nonatomic, readonly) TyphoonParameterInjectionType type;
-@property (nonatomic, readonly) NSUInteger index;
+@property(nonatomic, readonly) TyphoonParameterInjectionType type;
+@property(nonatomic, readonly) NSUInteger index;
 
-@property (nonatomic, readonly) TyphoonCollectionType collectionType;
+@property(nonatomic, readonly) TyphoonCollectionType collectionType;
 
 - (id)initWithParameterIndex:(NSUInteger)index requiredType:(Class)requiredType;
 

Source/Component/Initializer/Collection/TyphoonParameterInjectedAsCollection.m

@@ -11,11 +11,12 @@
 
 #import "TyphoonParameterInjectedAsCollection.h"
 
-@implementation TyphoonParameterInjectedAsCollection {
+@implementation TyphoonParameterInjectedAsCollection
+{
     Class _requiredType;
 }
 
--(id)initWithParameterIndex:(NSUInteger)index requiredType:(Class)requiredType
+- (id)initWithParameterIndex:(NSUInteger)index requiredType:(Class)requiredType
 {
     self = [super init];
     if (self)
@@ -28,16 +29,17 @@ -(id)initWithParameterIndex:(NSUInteger)index requiredType:(Class)requiredType
 
 - (TyphoonParameterInjectionType)type
 {
-  return TyphoonParameterInjectionTypeAsCollection;
+    return TyphoonParameterInjectionTypeAsCollection;
 }
 
--(void)setInitializer:(TyphoonInitializer *)initializer
+- (void)setInitializer:(TyphoonInitializer*)initializer
 {
-  // No-op.
+    // No-op.
 }
 
--(TyphoonCollectionType)collectionType {
-
+- (TyphoonCollectionType)collectionType
+{
+
     Class clazz = _requiredType;
     if (clazz == nil)
     {
@@ -63,9 +65,9 @@ -(TyphoonCollectionType)collectionType {
     {
         return TyphoonCollectionTypeNSSet;
     }
-    
+
     [NSException raise:NSInvalidArgumentException format:@"Required collection type '%@' is neither an NSSet nor NSArray.",
-     NSStringFromClass(clazz)];
+                                                         NSStringFromClass(clazz)];
     return 0;
 }
 

Source/Component/Initializer/TyphoonInitializer.h

@@ -11,6 +11,7 @@
 
 
 #import <Foundation/Foundation.h>
+
 @class TyphoonDefinition;
 @class TyphoonParameterInjectedAsCollection;
 
@@ -70,13 +71,12 @@ typedef enum
 - (void)injectParameterAtIndex:(NSUInteger)index1 withDefinition:(TyphoonDefinition*)definition;
 
 - (void)injectParameterAtIndex:(NSUInteger)index
-                asCollection:(void (^)(TyphoonParameterInjectedAsCollection*))collectionValues
-                requiredType:(id)requiredType;
-
-- (void)injectParameterNamed:(NSString *)name
-                asCollection:(void (^)(TyphoonParameterInjectedAsCollection*))collectionValues
-                requiredType:(id)requiredType;
+        asCollection:(void (^)(TyphoonParameterInjectedAsCollection*))collectionValues
+        requiredType:(id)requiredType;
 
+- (void)injectParameterNamed:(NSString*)name
+        asCollection:(void (^)(TyphoonParameterInjectedAsCollection*))collectionValues
+        requiredType:(id)requiredType;
 
 
 @end

Source/Component/Initializer/TyphoonInitializer.m

@@ -61,7 +61,7 @@ - (void)injectParameterNamed:(NSString*)name withReference:(NSString*)reference
 
 - (void)injectParameterAtIndex:(NSUInteger)index withReference:(NSString*)reference
 {
-    if (index != NSIntegerMax && index < [_parameterNames count])
+    if (index != NSIntegerMax &&index < [_parameterNames count])
     {
         [_injectedParameters addObject:[[TyphoonParameterInjectedByReference alloc] initWithParameterIndex:index reference:reference]];
     }
@@ -72,14 +72,14 @@ - (void)injectParameterNamed:(NSString*)name withValueAsText:(NSString*)text req
     [self injectParameterAtIndex:[self indexOfParameter:name] withValueAsText:text requiredTypeOrNil:classOrProtocol];
 }
 
-- (void)injectParameterNamed:(NSString *)name asCollection:(void (^)(TyphoonParameterInjectedAsCollection *))collectionValues requiredType:(id)requiredType
+- (void)injectParameterNamed:(NSString*)name asCollection:(void (^)(TyphoonParameterInjectedAsCollection*))collectionValues requiredType:(id)requiredType
 {
     [self injectParameterAtIndex:[self indexOfParameter:name] asCollection:collectionValues requiredType:requiredType];
 }
 
 - (void)injectParameterAtIndex:(NSUInteger)index withValueAsText:(NSString*)text requiredTypeOrNil:(id)requiredClass
 {
-    if (index != NSIntegerMax && index < [_parameterNames count])
+    if (index != NSIntegerMax &&index < [_parameterNames count])
     {
         TyphoonParameterInjectedWithStringRepresentation* parameterInjectedByValue =
                 [[TyphoonParameterInjectedWithStringRepresentation alloc] initWithIndex:index value:text requiredTypeOrNil:requiredClass];
@@ -111,7 +111,7 @@ - (void)injectWithValueAsText:(NSString*)text requiredTypeOrNil:(id)requiredType
 
 - (void)injectParameterAtIndex:(NSUInteger)index withObject:(id)value
 {
-    if (index != NSIntegerMax && index < [_parameterNames count])
+    if (index != NSIntegerMax &&index < [_parameterNames count])
     {
         [_injectedParameters addObject:[[TyphoonParameterInjectedWithObjectInstance alloc] initWithParameterIndex:index value:value]];
     }
@@ -127,7 +127,7 @@ - (void)injectWithObject:(id)value
     [self injectParameterAtIndex:[_injectedParameters count] withObject:value];
 }
 
-- (void)injectWithCollection:(void (^)(TyphoonParameterInjectedAsCollection *))collectionValues requiredType:(id)requiredType
+- (void)injectWithCollection:(void (^)(TyphoonParameterInjectedAsCollection*))collectionValues requiredType:(id)requiredType
 {
     [self injectParameterAtIndex:[_injectedParameters count] asCollection:collectionValues requiredType:requiredType];
 }
@@ -140,20 +140,21 @@ - (void)injectParameterAtIndex:(NSUInteger)index1 withDefinition:(TyphoonDefinit
     [self injectParameterAtIndex:index1 withReference:definition.key];
 }
 
--(void)injectParameterAtIndex:(NSUInteger)index
-                 asCollection:(void (^)(TyphoonParameterInjectedAsCollection *))collectionValues
-                 requiredType:(id)requiredType {
-
-    TyphoonParameterInjectedAsCollection *parameterInjectedAsCollection =
-    [[TyphoonParameterInjectedAsCollection alloc] initWithParameterIndex:index requiredType:requiredType];
-
+- (void)injectParameterAtIndex:(NSUInteger)index
+        asCollection:(void (^)(TyphoonParameterInjectedAsCollection*))collectionValues
+        requiredType:(id)requiredType
+{
+
+    TyphoonParameterInjectedAsCollection* parameterInjectedAsCollection =
+            [[TyphoonParameterInjectedAsCollection alloc] initWithParameterIndex:index requiredType:requiredType];
+
     if (collectionValues)
     {
         __unsafe_unretained TyphoonParameterInjectedAsCollection* weakParameterInjectedAsCollection = parameterInjectedAsCollection;
         collectionValues(weakParameterInjectedAsCollection);
     }
-    
-    if (index != NSIntegerMax && index < [_parameterNames count])
+
+    if (index != NSIntegerMax &&index < [_parameterNames count])
     {
         [_injectedParameters addObject:parameterInjectedAsCollection];
     }
@@ -196,5 +197,4 @@ - (NSInteger)indexOfParameter:(NSString*)name
 }
 
 
-
 @end

Source/Component/Initializer/TyphoonInjectedParameter.h

@@ -12,6 +12,7 @@
 
 
 #import <Foundation/Foundation.h>
+
 @class TyphoonInitializer;
 
 typedef enum

Source/Component/Initializer/TyphoonParameterInjectedByReference.h

@@ -18,9 +18,9 @@
 
 @interface TyphoonParameterInjectedByReference : NSObject <TyphoonInjectedParameter>
 
-@property (nonatomic, readonly) NSUInteger index;
-@property (nonatomic, readonly) TyphoonParameterInjectionType type;
-@property (nonatomic, strong, readonly) NSString* reference;
+@property(nonatomic, readonly) NSUInteger index;
+@property(nonatomic, readonly) TyphoonParameterInjectionType type;
+@property(nonatomic, strong, readonly) NSString* reference;
 
 - (id)initWithParameterIndex:(NSUInteger)parameterIndex reference:(NSString*)reference;
 

Source/Component/Initializer/TyphoonParameterInjectedWithObjectInstance.m

@@ -16,9 +16,10 @@ @implementation TyphoonParameterInjectedWithObjectInstance
 - (id)initWithParameterIndex:(NSUInteger)index value:(id)value
 {
     self = [super init];
-    if (self) {
+    if (self)
+    {
         _index = index;
-        _value = value;        
+        _value = value;
     }
     return self;
 }

Source/Component/Initializer/TyphoonParameterInjectedWithStringRepresentation.m

@@ -20,7 +20,6 @@
 @implementation TyphoonParameterInjectedWithStringRepresentation
 
 
-
 @synthesize textValue = _textValue;
 
 /* ====================================================================================================================================== */

Source/Component/Properties/Collection/TyphoonPropertyInjectedAsCollection.h

@@ -19,7 +19,7 @@
 /**
 * Represents a collection (NSArray, NSSet, c-style array) of items injected by reference, value or type.
 */
-@interface TyphoonPropertyInjectedAsCollection : TyphoonArgumentInjectedAsCollection<TyphoonInjectedProperty>
+@interface TyphoonPropertyInjectedAsCollection : TyphoonArgumentInjectedAsCollection <TyphoonInjectedProperty>
 {
     NSString* _name;
 }
@@ -32,6 +32,6 @@
 * Returns the collection type for the named property on the parameter class. Raises an exception if the property is neither an NSSet nor
 * an NSArray.
 */
-- (TyphoonCollectionType)resolveCollectionTypeWith:(id<TyphoonIntrospectiveNSObject>)instance;
+- (TyphoonCollectionType)resolveCollectionTypeWith:(id <TyphoonIntrospectiveNSObject>)instance;
 
 @end

Source/Component/Properties/Collection/TyphoonPropertyInjectedAsCollection.m

@@ -38,7 +38,7 @@ - (id)initWithName:(NSString*)name
 /* ====================================================================================================================================== */
 #pragma mark - Interface Methods
 
-- (TyphoonCollectionType)resolveCollectionTypeWith:(id<TyphoonIntrospectiveNSObject>)instance;
+- (TyphoonCollectionType)resolveCollectionTypeWith:(id <TyphoonIntrospectiveNSObject>)instance;
 {
     TyphoonTypeDescriptor* descriptor = [TyphoonIntrospectionUtils typeForPropertyWithName:_name inClass:[instance class]];
     Class describedClass = (Class) [descriptor classOrProtocol];

Source/Component/Properties/TyphoonPropertyInjectedAsObjectInstance.h

@@ -14,10 +14,10 @@
 #import "TyphoonInjectedProperty.h"
 
 
-@interface TyphoonPropertyInjectedAsObjectInstance : NSObject<TyphoonInjectedProperty>
+@interface TyphoonPropertyInjectedAsObjectInstance : NSObject <TyphoonInjectedProperty>
 
-@property (nonatomic, strong, readonly) NSString* name;
-@property (nonatomic, strong, readonly) id objectInstance;
+@property(nonatomic, strong, readonly) NSString* name;
+@property(nonatomic, strong, readonly) id objectInstance;
 
 - (id)initWithName:(NSString*)name objectInstance:(id)objectInstance;
 

Source/Component/Properties/TyphoonPropertyInjectedByReference.h

@@ -19,8 +19,8 @@
 */
 @interface TyphoonPropertyInjectedByReference : NSObject <TyphoonInjectedProperty>
 
-@property (nonatomic, strong, readonly) NSString* name;
-@property (nonatomic, strong, readonly) NSString* reference;
+@property(nonatomic, strong, readonly) NSString* name;
+@property(nonatomic, strong, readonly) NSString* reference;
 
 - (id)initWithName:(NSString*)name reference:(NSString*)reference;
 

Source/Component/Properties/TyphoonPropertyInjectedByReference.m

@@ -43,6 +43,4 @@ - (TyphoonPropertyInjectionType)injectionType
 }
 
 
-
-
 @end

Source/Component/Properties/TyphoonPropertyInjectedByType.h

@@ -21,8 +21,8 @@
 */
 @interface TyphoonPropertyInjectedByType : NSObject <TyphoonInjectedProperty>
 
-@property (nonatomic, strong, readonly) NSString* name;
-@property (nonatomic, readonly) TyphoonPropertyInjectionType type;
+@property(nonatomic, strong, readonly) NSString* name;
+@property(nonatomic, readonly) TyphoonPropertyInjectionType type;
 
 - (id)initWithName:(NSString*)name;
 

Source/Component/Properties/TyphoonPropertyInjectedWithStringRepresentation.h

@@ -23,8 +23,8 @@
 */
 @interface TyphoonPropertyInjectedWithStringRepresentation : NSObject <TyphoonInjectedProperty, TyphoonComponentInjectedByValue>
 
-@property (nonatomic, strong, readonly) NSString* name;
-@property (nonatomic, readonly) TyphoonPropertyInjectionType type;
+@property(nonatomic, strong, readonly) NSString* name;
+@property(nonatomic, readonly) TyphoonPropertyInjectionType type;
 
 
 - (id)initWithName:(NSString*)name value:(NSString*)value;

Source/Component/Properties/TyphoonPropertyInjectedWithStringRepresentation.m

@@ -23,7 +23,6 @@
 @implementation TyphoonPropertyInjectedWithStringRepresentation
 
 
-
 @synthesize textValue = _textValue;
 
 /* ====================================================================================================================================== */

Source/Component/Properties/TyphoonPropertyInjectionDelegate.h

@@ -17,6 +17,7 @@
 
 @optional
 - (void)beforePropertiesSet;
+
 - (void)afterPropertiesSet;
 
 @end

Source/Component/TyphoonDefinition+Infrastructure.h

@@ -32,7 +32,7 @@
  @param resource The resource to load.
  @return a definition.
  */
-+ (TyphoonDefinition*)propertyPlaceholderWithResource:(id<TyphoonResource>)resource;
++ (TyphoonDefinition*)propertyPlaceholderWithResource:(id <TyphoonResource>)resource;
 
 
 - (id)initWithClass:(Class)clazz key:(NSString*)key;