Updated setter/getter for all rpcs and structs to use convenience methods.

1 files changed, 30 insertions, 105 deletions

diff --git a/SmartDeviceLink/SDLBeltStatus.m b/SmartDeviceLink/SDLBeltStatus.m
index b4777519e..73f71ed8d 100644
--- a/SmartDeviceLink/SDLBeltStatus.m
+++ b/SmartDeviceLink/SDLBeltStatus.m
@@ -9,198 +9,123 @@
 @implementation SDLBeltStatus
 
 - (void)setDriverBeltDeployed:(SDLVehicleDataEventStatus)driverBeltDeployed {
-    if (driverBeltDeployed != nil) {
-        [store setObject:driverBeltDeployed forKey:SDLNameDriverBeltDeployed];
-    } else {
-        [store removeObjectForKey:SDLNameDriverBeltDeployed];
-    }
+    [self setObject:driverBeltDeployed forName:SDLNameDriverBeltDeployed];
 }
 
 - (SDLVehicleDataEventStatus)driverBeltDeployed {
-    NSObject *obj = [store objectForKey:SDLNameDriverBeltDeployed];
-    return (SDLVehicleDataEventStatus)obj;
+    return [self objectForName:SDLNameDriverBeltDeployed];
 }
 
 - (void)setPassengerBeltDeployed:(SDLVehicleDataEventStatus)passengerBeltDeployed {
-    if (passengerBeltDeployed != nil) {
-        [store setObject:passengerBeltDeployed forKey:SDLNamePassengerBeltDeployed];
-    } else {
-        [store removeObjectForKey:SDLNamePassengerBeltDeployed];
-    }
+    [self setObject:passengerBeltDeployed forName:SDLNamePassengerBeltDeployed];
 }
 
 - (SDLVehicleDataEventStatus)passengerBeltDeployed {
-    NSObject *obj = [store objectForKey:SDLNamePassengerBeltDeployed];
-    return (SDLVehicleDataEventStatus)obj;
+    return [self objectForName:SDLNamePassengerBeltDeployed];
 }
 
 - (void)setPassengerBuckleBelted:(SDLVehicleDataEventStatus)passengerBuckleBelted {
-    if (passengerBuckleBelted != nil) {
-        [store setObject:passengerBuckleBelted forKey:SDLNamePassengerBuckleBelted];
-    } else {
-        [store removeObjectForKey:SDLNamePassengerBuckleBelted];
-    }
+    [self setObject:passengerBuckleBelted forName:SDLNamePassengerBuckleBelted];
 }
 
 - (SDLVehicleDataEventStatus)passengerBuckleBelted {
-    NSObject *obj = [store objectForKey:SDLNamePassengerBuckleBelted];
-    return (SDLVehicleDataEventStatus)obj;
+    return [self objectForName:SDLNamePassengerBuckleBelted];
 }
 
 - (void)setDriverBuckleBelted:(SDLVehicleDataEventStatus)driverBuckleBelted {
-    if (driverBuckleBelted != nil) {
-        [store setObject:driverBuckleBelted forKey:SDLNameDriverBuckleBelted];
-    } else {
-        [store removeObjectForKey:SDLNameDriverBuckleBelted];
-    }
+    [self setObject:driverBuckleBelted forName:SDLNameDriverBuckleBelted];
 }
 
 - (SDLVehicleDataEventStatus)driverBuckleBelted {
-    NSObject *obj = [store objectForKey:SDLNameDriverBuckleBelted];
-    return (SDLVehicleDataEventStatus)obj;
+    return [self objectForName:SDLNameDriverBuckleBelted];
 }
 
 - (void)setLeftRow2BuckleBelted:(SDLVehicleDataEventStatus)leftRow2BuckleBelted {
-    if (leftRow2BuckleBelted != nil) {
-        [store setObject:leftRow2BuckleBelted forKey:SDLNameLeftRow2BuckleBelted];
-    } else {
-        [store removeObjectForKey:SDLNameLeftRow2BuckleBelted];
-    }
+    [self setObject:leftRow2BuckleBelted forName:SDLNameLeftRow2BuckleBelted];
 }
 
 - (SDLVehicleDataEventStatus)leftRow2BuckleBelted {
-    NSObject *obj = [store objectForKey:SDLNameLeftRow2BuckleBelted];
-    return (SDLVehicleDataEventStatus)obj;
+    return [self objectForName:SDLNameLeftRow2BuckleBelted];
 }
 
 - (void)setPassengerChildDetected:(SDLVehicleDataEventStatus)passengerChildDetected {
-    if (passengerChildDetected != nil) {
-        [store setObject:passengerChildDetected forKey:SDLNamePassengerChildDetected];
-    } else {
-        [store removeObjectForKey:SDLNamePassengerChildDetected];
-    }
+    [self setObject:passengerChildDetected forName:SDLNamePassengerChildDetected];
 }
 
 - (SDLVehicleDataEventStatus)passengerChildDetected {
-    NSObject *obj = [store objectForKey:SDLNamePassengerChildDetected];
-    return (SDLVehicleDataEventStatus)obj;
+    return [self objectForName:SDLNamePassengerChildDetected];
 }
 
 - (void)setRightRow2BuckleBelted:(SDLVehicleDataEventStatus)rightRow2BuckleBelted {
-    if (rightRow2BuckleBelted != nil) {
-        [store setObject:rightRow2BuckleBelted forKey:SDLNameRightRow2BuckleBelted];
-    } else {
-        [store removeObjectForKey:SDLNameRightRow2BuckleBelted];
-    }
+    [self setObject:rightRow2BuckleBelted forName:SDLNameRightRow2BuckleBelted];
 }
 
 - (SDLVehicleDataEventStatus)rightRow2BuckleBelted {
-    NSObject *obj = [store objectForKey:SDLNameRightRow2BuckleBelted];
-    return (SDLVehicleDataEventStatus)obj;
+    return [self objectForName:SDLNameRightRow2BuckleBelted];
 }
 
 - (void)setMiddleRow2BuckleBelted:(SDLVehicleDataEventStatus)middleRow2BuckleBelted {
-    if (middleRow2BuckleBelted != nil) {
-        [store setObject:middleRow2BuckleBelted forKey:SDLNameMiddleRow2BuckleBelted];
-    } else {
-        [store removeObjectForKey:SDLNameMiddleRow2BuckleBelted];
-    }
+    [self setObject:middleRow2BuckleBelted forName:SDLNameMiddleRow2BuckleBelted];
 }
 
 - (SDLVehicleDataEventStatus)middleRow2BuckleBelted {
-    NSObject *obj = [store objectForKey:SDLNameMiddleRow2BuckleBelted];
-    return (SDLVehicleDataEventStatus)obj;
+    return [self objectForName:SDLNameMiddleRow2BuckleBelted];
 }
 
 - (void)setMiddleRow3BuckleBelted:(SDLVehicleDataEventStatus)middleRow3BuckleBelted {
-    if (middleRow3BuckleBelted != nil) {
-        [store setObject:middleRow3BuckleBelted forKey:SDLNameMiddleRow3BuckleBelted];
-    } else {
-        [store removeObjectForKey:SDLNameMiddleRow3BuckleBelted];
-    }
+    [self setObject:middleRow3BuckleBelted forName:SDLNameMiddleRow3BuckleBelted];
 }
 
 - (SDLVehicleDataEventStatus)middleRow3BuckleBelted {
-    NSObject *obj = [store objectForKey:SDLNameMiddleRow3BuckleBelted];
-    return (SDLVehicleDataEventStatus)obj;
+    return [self objectForName:SDLNameMiddleRow3BuckleBelted];
 }
 
 - (void)setLeftRow3BuckleBelted:(SDLVehicleDataEventStatus)leftRow3BuckleBelted {
-    if (leftRow3BuckleBelted != nil) {
-        [store setObject:leftRow3BuckleBelted forKey:SDLNameLeftRow3BuckleBelted];
-    } else {
-        [store removeObjectForKey:SDLNameLeftRow3BuckleBelted];
-    }
+    [self setObject:leftRow3BuckleBelted forName:SDLNameLeftRow3BuckleBelted];
 }
 
 - (SDLVehicleDataEventStatus)leftRow3BuckleBelted {
-    NSObject *obj = [store objectForKey:SDLNameLeftRow3BuckleBelted];
-    return (SDLVehicleDataEventStatus)obj;
+    return [self objectForName:SDLNameLeftRow3BuckleBelted];
 }
 
 - (void)setRightRow3BuckleBelted:(SDLVehicleDataEventStatus)rightRow3BuckleBelted {
-    if (rightRow3BuckleBelted != nil) {
-        [store setObject:rightRow3BuckleBelted forKey:SDLNameRightRow3BuckleBelted];
-    } else {
-        [store removeObjectForKey:SDLNameRightRow3BuckleBelted];
-    }
+    [self setObject:rightRow3BuckleBelted forName:SDLNameRightRow3BuckleBelted];
 }
 
 - (SDLVehicleDataEventStatus)rightRow3BuckleBelted {
-    NSObject *obj = [store objectForKey:SDLNameRightRow3BuckleBelted];
-    return (SDLVehicleDataEventStatus)obj;
+    return [self objectForName:SDLNameRightRow3BuckleBelted];
 }
 
 - (void)setLeftRearInflatableBelted:(SDLVehicleDataEventStatus)leftRearInflatableBelted {
-    if (leftRearInflatableBelted != nil) {
-        [store setObject:leftRearInflatableBelted forKey:SDLNameLeftRearInflatableBelted];
-    } else {
-        [store removeObjectForKey:SDLNameLeftRearInflatableBelted];
-    }
+    [self setObject:leftRearInflatableBelted forName:SDLNameLeftRearInflatableBelted];
 }
 
 - (SDLVehicleDataEventStatus)leftRearInflatableBelted {
-    NSObject *obj = [store objectForKey:SDLNameLeftRearInflatableBelted];
-    return (SDLVehicleDataEventStatus)obj;
+    return [self objectForName:SDLNameLeftRearInflatableBelted];
 }
 
 - (void)setRightRearInflatableBelted:(SDLVehicleDataEventStatus)rightRearInflatableBelted {
-    if (rightRearInflatableBelted != nil) {
-        [store setObject:rightRearInflatableBelted forKey:SDLNameRightRearInflatableBelted];
-    } else {
-        [store removeObjectForKey:SDLNameRightRearInflatableBelted];
-    }
+    [self setObject:rightRearInflatableBelted forName:SDLNameRightRearInflatableBelted];
 }
 
 - (SDLVehicleDataEventStatus)rightRearInflatableBelted {
-    NSObject *obj = [store objectForKey:SDLNameRightRearInflatableBelted];
-    return (SDLVehicleDataEventStatus)obj;
+    return [self objectForName:SDLNameRightRearInflatableBelted];
 }
 
 - (void)setMiddleRow1BeltDeployed:(SDLVehicleDataEventStatus)middleRow1BeltDeployed {
-    if (middleRow1BeltDeployed != nil) {
-        [store setObject:middleRow1BeltDeployed forKey:SDLNameMiddleRow1BeltDeployed];
-    } else {
-        [store removeObjectForKey:SDLNameMiddleRow1BeltDeployed];
-    }
+    [self setObject:middleRow1BeltDeployed forName:SDLNameMiddleRow1BeltDeployed];
 }
 
 - (SDLVehicleDataEventStatus)middleRow1BeltDeployed {
-    NSObject *obj = [store objectForKey:SDLNameMiddleRow1BeltDeployed];
-    return (SDLVehicleDataEventStatus)obj;
+    return [self objectForName:SDLNameMiddleRow1BeltDeployed];
 }
 
 - (void)setMiddleRow1BuckleBelted:(SDLVehicleDataEventStatus)middleRow1BuckleBelted {
-    if (middleRow1BuckleBelted != nil) {
-        [store setObject:middleRow1BuckleBelted forKey:SDLNameMiddleRow1BuckleBelted];
-    } else {
-        [store removeObjectForKey:SDLNameMiddleRow1BuckleBelted];
-    }
+    [self setObject:middleRow1BuckleBelted forName:SDLNameMiddleRow1BuckleBelted];
 }
 
 - (SDLVehicleDataEventStatus)middleRow1BuckleBelted {
-    NSObject *obj = [store objectForKey:SDLNameMiddleRow1BuckleBelted];
-    return (SDLVehicleDataEventStatus)obj;
+    return [self objectForName:SDLNameMiddleRow1BuckleBelted];
 }
 
 @end