Commented the property array to indicate why it is structured the way it is, fixed issue where the Address label would jump when switching from A-D to E.

Author: jszumski

KVC Validation Pattern/KVC Validation Pattern/CTCViewController.m

@@ -40,9 +40,7 @@ - (void)viewDidLoad {
 
 - (void)displayInfoForStation:(CTCStation*)station {
 	_currentStation = station;
-	
-	NSLog(@"%@", station);
-	
+		
 	[self.tableView reloadData];
 }
 
@@ -68,8 +66,6 @@ - (IBAction)viewJSONTapped:(id)sender {
 }
 
 - (void)responseSegmentedControlDidChange:(id)sender {
-	NSLog(@"Response changed to %@", [self.responseSegmentedControl titleForSegmentAtIndex:self.responseSegmentedControl.selectedSegmentIndex]);
-	
 	NSString *json = [self jsonStringForResponse:self.responseSegmentedControl.selectedSegmentIndex];
 
 
@@ -155,14 +151,17 @@ - (UITableViewCell *)tableView:(UITableView *)tableView cellForRowAtIndexPath:(N
 			cell.textLabel.text = NSLocalizedString(@"Name", nil);
 			cell.detailTextLabel.text = _currentStation.stationName;
 
+			
 		} else if (indexPath.row == 1) {
 			cell.textLabel.text = NSLocalizedString(@"Price", nil);
 			cell.detailTextLabel.text = [self stringForPrice:_currentStation.price];
 
+			
 		} else if (indexPath.row == 2) {
 			cell.textLabel.text = NSLocalizedString(@"Sells Diesel", nil);
 			cell.detailTextLabel.text = _currentStation.sellsDiesel ? NSLocalizedString(@"Yes", nil) : NSLocalizedString(@"No", nil);
 
+			
 		} else if (indexPath.row == 3) {
 			CTCAddress *address = _currentStation.address;
 
@@ -171,7 +170,7 @@ - (UITableViewCell *)tableView:(UITableView *)tableView cellForRowAtIndexPath:(N
 			if (address != nil) {
 				cell.detailTextLabel.text = [NSString stringWithFormat:@"%@\n %@, %@ %@", address.street, address.city, address.state, address.zip];
 			} else {
-                cell.detailTextLabel.text = @"";
+                cell.detailTextLabel.text = @"\n "; // prevents Address label from jumping around between real and empty strings
             }
 
 			cell.detailTextLabel.numberOfLines = 2;

KVC Validation Pattern/KVC Validation Pattern/Model/CTCBaseModel.m

@@ -11,22 +11,20 @@
 #import "NSString+Utilities.h"
 #import "ValidationFunctions.h"
 
-#define kPropertyTypesArray @[@"Unknown",@"NSString", [NSString stringWithFormat:@"%s",@encode(BOOL)], @"NSNumber", @"i", @"f", @"NSArray", @"NSMutableArray", @"NSDictionary", @"NSMutableDictionary", @"I", @"NSDate", @"d"]
-
 typedef NS_ENUM(NSUInteger, CTCPropertyType){
-    CTCPropertyUnknown = 0, /**< Property type is unknown */
-            CTCPropertyTypeString, /**< Property is an NSString */
-            CTCPropertyTypeBool, /**< Property is a BOOL */
-            CTCPropertyTypeNumber, /**< Property is an NSNumber */
-            CTCPropertyTypeInteger, /**< Property is an NSInteger */
-            CTCPropertyTypeFloat, /**< Property is a float */
-            CTCPropertyTypeArray, /**< Property is an NSArray */
-            CTCPropertyTypeMutableArray, /**< Property is an NSMutableArray */
-            CTCPropertyTypeDictionary, /**< Property is an NSDictionary */
-            CTCPropertyTypeMutableDictionary, /**< Property is an NSMutableDictionary */
-            CTCPropertyTypeUnsignedInteger, /**< Property is an NSUInteger */
-            CTCPropertyTypeDate, /**< Property is an NSDate */
-            CTCPropertyTypeDouble /**< Property is a double */
+    CTCPropertyUnknown = 0,				// Property type is unknown
+	CTCPropertyTypeString,				// Property is an NSString
+	CTCPropertyTypeBool,				// Property is a BOOL
+	CTCPropertyTypeNumber,				// Property is an NSNumber
+	CTCPropertyTypeInteger,				// Property is an NSInteger
+	CTCPropertyTypeFloat,				// Property is a float
+	CTCPropertyTypeArray,				// Property is an NSArray
+	CTCPropertyTypeMutableArray,		// Property is an NSMutableArray
+	CTCPropertyTypeDictionary,			// Property is an NSDictionary
+	CTCPropertyTypeMutableDictionary,	// Property is an NSMutableDictionary
+	CTCPropertyTypeUnsignedInteger,		// Property is an NSUInteger
+	CTCPropertyTypeDate,				// Property is an NSDate
+	CTCPropertyTypeDouble				// Property is a double
 };
 
 @interface CTCBaseModel ()
@@ -47,9 +45,23 @@ + (void)initialize {
 
     dispatch_once(&onceToken, ^{
         modelProperties = [NSMutableDictionary dictionary];
-        propertyTypesArray = kPropertyTypesArray;
+		
+		// note this array's indexes MUST match the CTCPropertyType enum values for lookups to work properly
+        propertyTypesArray = @[@"Unknown",												// CTCPropertyUnknown
+							   @"NSString",												// CTCPropertyTypeString
+							   [NSString stringWithFormat:@"%s",@encode(BOOL)],			// CTCPropertyTypeBool
+							   @"NSNumber",												// CTCPropertyTypeNumber
+							   [NSString stringWithFormat:@"%s",@encode(int)],			// CTCPropertyTypeInteger
+							   [NSString stringWithFormat:@"%s",@encode(float)],		// CTCPropertyTypeFloat
+							   @"NSArray",												// CTCPropertyTypeArray
+							   @"NSMutableArray",										// CTCPropertyTypeMutableArray
+							   @"NSDictionary",											// CTCPropertyTypeDictionary
+							   @"NSMutableDictionary",									// CTCPropertyTypeMutableDictionary
+							   [NSString stringWithFormat:@"%s",@encode(unsigned int)],	// CTCPropertyTypeUnsignedInteger
+							   @"NSDate",												// CTCPropertyTypeDate
+							   [NSString stringWithFormat:@"%s",@encode(double)]];		// CTCPropertyTypeDouble
     });
-
+	
     NSMutableDictionary *translateNameDict = [NSMutableDictionary dictionary];
     [self hydrateModelProperties:[self class] translateDictionary:translateNameDict];
     [modelProperties setObject:translateNameDict forKey:[self calculateClassName]];