Enum to conform to ms_toString pattern; syntax fixes.

Author: kevklam

Templates/ObjC/Models/EnumType.h.tt

@@ -36,6 +36,7 @@ foreach (var member in entity.Members.OrderBy(x => x.Value))
 +(<#=typeName#>*) UnknownEnumValue;
 
 +(<#=typeName#>*) <#=entity.Name.ToLowerFirstChar()#>WithEnumValue:(<#=valueTypeName#>)val;
+-(NSString*) ms_toString;
 
 @property (nonatomic, readonly) <#=typeName#>Value enumValue;
 
@@ -44,7 +45,6 @@ foreach (var member in entity.Members.OrderBy(x => x.Value))
 
 @interface NSString (<#=typeName#>)
 
-+ (instancetype) stringWith<#=typeName#>:(<#=typeName#>*)val;
 - (<#=typeName#>*) to<#=typeName#>;
 
 @end

Templates/ObjC/Models/EnumType.m.tt

@@ -12,6 +12,8 @@ var valueTypeName = typeName + "Value";
 @interface <#=typeName#> () {
     <#=valueTypeName#> _enumValue;
 }
+@property (nonatomic, readwrite) <#=valueTypeName#> enumValue;
+@end
 
 @implementation <#=typeName#>
 
@@ -23,11 +25,11 @@ foreach (var member in entity.Members.OrderBy(x => x.Value))
 {
 #>
 + (<#=typeName#>*) <#=member.Name.ToLowerFirstChar()#> {
-    static <#=typeName#> *_<#=member.Name.ToLowerFirstChar()#>
+    static <#=typeName#> *_<#=member.Name.ToLowerFirstChar()#>;
     static dispatch_once_t onceToken;
     dispatch_once(&onceToken, ^{
         _<#=member.Name.ToLowerFirstChar()#> = [[<#=typeName#> alloc] init];
-        _<#=member.Name.ToLowerFirstChar()#>._enumValue = <#=GetObjCEnumMember(entity, member)#>;
+        _<#=member.Name.ToLowerFirstChar()#>.enumValue = <#=GetObjCEnumMember(entity, member)#>;
     });
     return _<#=member.Name.ToLowerFirstChar()#>;
 }
@@ -36,11 +38,11 @@ foreach (var member in entity.Members.OrderBy(x => x.Value))
 #>
 
 + (<#=typeName#>*) UnknownEnumValue {
-    static <#=typeName#> *_unknownValue
+    static <#=typeName#> *_unknownValue;
     static dispatch_once_t onceToken;
     dispatch_once(&onceToken, ^{
         _unknownValue = [[<#=typeName#> alloc] init];
-        _unknownValue._enumValue = <#=typeName#>EndOfEnum;
+        _unknownValue.enumValue = <#=typeName#>EndOfEnum;
     });
     return _unknownValue;
 }
@@ -73,17 +75,9 @@ foreach (var member in entity.Members.OrderBy(x => x.Value))
     return nil;
 }
 
-- (<#=valueTypeName#>) enumValue {
-    return _enumValue;
-}
-
-@end
-
-@implementation NSString (<#=typeName#>)
-
-+ (instancetype) stringWith<#=typeName#>:(<#=typeName#>*)val {
+- (NSString*) ms_toString {
 
-    switch(val.enumValue)
+    switch(self.enumValue)
     {
 <#
     foreach(var member in entity.Members)
@@ -102,6 +96,14 @@ foreach (var member in entity.Members.OrderBy(x => x.Value))
     return nil;
 }
 
+- (<#=valueTypeName#>) enumValue {
+    return _enumValue;
+}
+
+@end
+
+@implementation NSString (<#=typeName#>)
+
 - (<#=typeName#>*) to<#=typeName#>{
 
     <#

Templates/ObjC/Requests/EntityCollectionRequest.h.tt

@@ -27,11 +27,6 @@ if (innerEntityType.Equals(propName))
 
 #import "<#=writer.GetPrefix()#>Models.h"
 #import "<#=writer.GetStaticCodePrefix()#>CollectionRequest.h"
-<#
-if(prop.IsReference()) {
-#>
-#import "<#=writer.GetStaticCodePrefix()#>CollectionReferences.h"
-<# } #>
 
 typedef void (^<#=innerEntityType#>CompletionHandler)(<#=innerEntityType#> *response, NSError *error);