Merge remote-tracking branch 'origin/develop' into feature/issue_247_objc_generics

* origin/develop:
  Change SDLRPCStruct private method to be a class method
  Migrated initWithDictionary to take non-mutable dictionary as parameter.

# Conflicts:
#	SmartDeviceLink/SDLAddCommand.h
#	SmartDeviceLink/SDLAddCommand.m
#	SmartDeviceLink/SDLAddCommandResponse.h
#	SmartDeviceLink/SDLAddCommandResponse.m
#	SmartDeviceLink/SDLAddSubMenu.h
#	SmartDeviceLink/SDLAddSubMenu.m
#	SmartDeviceLink/SDLAddSubMenuResponse.h
#	SmartDeviceLink/SDLAddSubMenuResponse.m
#	SmartDeviceLink/SDLAirbagStatus.h
#	SmartDeviceLink/SDLAirbagStatus.m
#	SmartDeviceLink/SDLAlert.h
#	SmartDeviceLink/SDLAlert.m
#	SmartDeviceLink/SDLAlertManeuver.h
#	SmartDeviceLink/SDLAlertManeuver.m
#	SmartDeviceLink/SDLAlertManeuverResponse.h
#	SmartDeviceLink/SDLAlertManeuverResponse.m
#	SmartDeviceLink/SDLAlertResponse.h
#	SmartDeviceLink/SDLAlertResponse.m
#	SmartDeviceLink/SDLAudioPassThruCapabilities.h
#	SmartDeviceLink/SDLAudioPassThruCapabilities.m
#	SmartDeviceLink/SDLBeltStatus.h
#	SmartDeviceLink/SDLBeltStatus.m
#	SmartDeviceLink/SDLBodyInformation.h
#	SmartDeviceLink/SDLBodyInformation.m
#	SmartDeviceLink/SDLButtonCapabilities.h
#	SmartDeviceLink/SDLButtonCapabilities.m
#	SmartDeviceLink/SDLChangeRegistration.h
#	SmartDeviceLink/SDLChangeRegistration.m
#	SmartDeviceLink/SDLChangeRegistrationResponse.h
#	SmartDeviceLink/SDLChangeRegistrationResponse.m
#	SmartDeviceLink/SDLChoice.h
#	SmartDeviceLink/SDLChoice.m
#	SmartDeviceLink/SDLClusterModeStatus.h
#	SmartDeviceLink/SDLClusterModeStatus.m
#	SmartDeviceLink/SDLCreateInteractionChoiceSet.h
#	SmartDeviceLink/SDLCreateInteractionChoiceSet.m
#	SmartDeviceLink/SDLCreateInteractionChoiceSetResponse.h
#	SmartDeviceLink/SDLCreateInteractionChoiceSetResponse.m
#	SmartDeviceLink/SDLDIDResult.h
#	SmartDeviceLink/SDLDIDResult.m
#	SmartDeviceLink/SDLDeleteCommand.h
#	SmartDeviceLink/SDLDeleteCommand.m
#	SmartDeviceLink/SDLDeleteCommandResponse.h
#	SmartDeviceLink/SDLDeleteCommandResponse.m
#	SmartDeviceLink/SDLDeleteFile.h
#	SmartDeviceLink/SDLDeleteFile.m
#	SmartDeviceLink/SDLDeleteFileResponse.h
#	SmartDeviceLink/SDLDeleteFileResponse.m
#	SmartDeviceLink/SDLDeleteInteractionChoiceSet.h
#	SmartDeviceLink/SDLDeleteInteractionChoiceSet.m
#	SmartDeviceLink/SDLDeleteInteractionChoiceSetResponse.h
#	SmartDeviceLink/SDLDeleteInteractionChoiceSetResponse.m
#	SmartDeviceLink/SDLDeleteSubMenu.h
#	SmartDeviceLink/SDLDeleteSubMenu.m
#	SmartDeviceLink/SDLDeleteSubMenuResponse.h
#	SmartDeviceLink/SDLDeleteSubMenuResponse.m
#	SmartDeviceLink/SDLDeviceInfo.h
#	SmartDeviceLink/SDLDeviceInfo.m
#	SmartDeviceLink/SDLDeviceStatus.h
#	SmartDeviceLink/SDLDeviceStatus.m
#	SmartDeviceLink/SDLDiagnosticMessage.h
#	SmartDeviceLink/SDLDiagnosticMessage.m
#	SmartDeviceLink/SDLDiagnosticMessageResponse.h
#	SmartDeviceLink/SDLDiagnosticMessageResponse.m
#	SmartDeviceLink/SDLDialNumber.h
#	SmartDeviceLink/SDLDialNumber.m
#	SmartDeviceLink/SDLDialNumberResponse.h
#	SmartDeviceLink/SDLDialNumberResponse.m
#	SmartDeviceLink/SDLDisplayCapabilities.h
#	SmartDeviceLink/SDLDisplayCapabilities.m
#	SmartDeviceLink/SDLECallInfo.h
#	SmartDeviceLink/SDLECallInfo.m
#	SmartDeviceLink/SDLEmergencyEvent.h
#	SmartDeviceLink/SDLEmergencyEvent.m
#	SmartDeviceLink/SDLEncodedSyncPData.h
#	SmartDeviceLink/SDLEncodedSyncPData.m
#	SmartDeviceLink/SDLEncodedSyncPDataResponse.h
#	SmartDeviceLink/SDLEncodedSyncPDataResponse.m
#	SmartDeviceLink/SDLEndAudioPassThru.h
#	SmartDeviceLink/SDLEndAudioPassThru.m
#	SmartDeviceLink/SDLEndAudioPassThruResponse.h
#	SmartDeviceLink/SDLEndAudioPassThruResponse.m
#	SmartDeviceLink/SDLGPSData.h
#	SmartDeviceLink/SDLGPSData.m
#	SmartDeviceLink/SDLGenericResponse.h
#	SmartDeviceLink/SDLGenericResponse.m
#	SmartDeviceLink/SDLGetDTCs.h
#	SmartDeviceLink/SDLGetDTCs.m
#	SmartDeviceLink/SDLGetDTCsResponse.h
#	SmartDeviceLink/SDLGetDTCsResponse.m
#	SmartDeviceLink/SDLGetVehicleData.h
#	SmartDeviceLink/SDLGetVehicleData.m
#	SmartDeviceLink/SDLGetVehicleDataResponse.h
#	SmartDeviceLink/SDLGetVehicleDataResponse.m
#	SmartDeviceLink/SDLHMICapabilities.h
#	SmartDeviceLink/SDLHMICapabilities.m
#	SmartDeviceLink/SDLHMIPermissions.h
#	SmartDeviceLink/SDLHMIPermissions.m
#	SmartDeviceLink/SDLHeadLampStatus.h
#	SmartDeviceLink/SDLHeadLampStatus.m
#	SmartDeviceLink/SDLImage.h
#	SmartDeviceLink/SDLImage.m
#	SmartDeviceLink/SDLImageField.h
#	SmartDeviceLink/SDLImageField.m
#	SmartDeviceLink/SDLImageResolution.h
#	SmartDeviceLink/SDLImageResolution.m
#	SmartDeviceLink/SDLKeyboardProperties.h
#	SmartDeviceLink/SDLKeyboardProperties.m
#	SmartDeviceLink/SDLListFiles.h
#	SmartDeviceLink/SDLListFiles.m
#	SmartDeviceLink/SDLListFilesResponse.h
#	SmartDeviceLink/SDLListFilesResponse.m
#	SmartDeviceLink/SDLMenuParams.h
#	SmartDeviceLink/SDLMenuParams.m
#	SmartDeviceLink/SDLMyKey.h
#	SmartDeviceLink/SDLMyKey.m
#	SmartDeviceLink/SDLOnAppInterfaceUnregistered.h
#	SmartDeviceLink/SDLOnAppInterfaceUnregistered.m
#	SmartDeviceLink/SDLOnAudioPassThru.h
#	SmartDeviceLink/SDLOnAudioPassThru.m
#	SmartDeviceLink/SDLOnButtonEvent.h
#	SmartDeviceLink/SDLOnButtonEvent.m
#	SmartDeviceLink/SDLOnButtonPress.h
#	SmartDeviceLink/SDLOnButtonPress.m
#	SmartDeviceLink/SDLOnCommand.h
#	SmartDeviceLink/SDLOnCommand.m
#	SmartDeviceLink/SDLOnDriverDistraction.h
#	SmartDeviceLink/SDLOnDriverDistraction.m
#	SmartDeviceLink/SDLOnEncodedSyncPData.h
#	SmartDeviceLink/SDLOnEncodedSyncPData.m
#	SmartDeviceLink/SDLOnHMIStatus.h
#	SmartDeviceLink/SDLOnHMIStatus.m
#	SmartDeviceLink/SDLOnHashChange.h
#	SmartDeviceLink/SDLOnHashChange.m
#	SmartDeviceLink/SDLOnKeyboardInput.h
#	SmartDeviceLink/SDLOnKeyboardInput.m
#	SmartDeviceLink/SDLOnLanguageChange.h
#	SmartDeviceLink/SDLOnLanguageChange.m
#	SmartDeviceLink/SDLOnLockScreenStatus.h
#	SmartDeviceLink/SDLOnLockScreenStatus.m
#	SmartDeviceLink/SDLOnPermissionsChange.h
#	SmartDeviceLink/SDLOnPermissionsChange.m
#	SmartDeviceLink/SDLOnSyncPData.h
#	SmartDeviceLink/SDLOnSyncPData.m
#	SmartDeviceLink/SDLOnSystemRequest.h
#	SmartDeviceLink/SDLOnSystemRequest.m
#	SmartDeviceLink/SDLOnTBTClientState.h
#	SmartDeviceLink/SDLOnTBTClientState.m
#	SmartDeviceLink/SDLOnTouchEvent.h
#	SmartDeviceLink/SDLOnTouchEvent.m
#	SmartDeviceLink/SDLOnVehicleData.h
#	SmartDeviceLink/SDLOnVehicleData.m
#	SmartDeviceLink/SDLParameterPermissions.h
#	SmartDeviceLink/SDLParameterPermissions.m
#	SmartDeviceLink/SDLPerformAudioPassThru.h
#	SmartDeviceLink/SDLPerformAudioPassThru.m
#	SmartDeviceLink/SDLPerformAudioPassThruResponse.h
#	SmartDeviceLink/SDLPerformAudioPassThruResponse.m
#	SmartDeviceLink/SDLPerformInteraction.h
#	SmartDeviceLink/SDLPerformInteraction.m
#	SmartDeviceLink/SDLPerformInteractionResponse.h
#	SmartDeviceLink/SDLPerformInteractionResponse.m
#	SmartDeviceLink/SDLPermissionItem.h
#	SmartDeviceLink/SDLPermissionItem.m
#	SmartDeviceLink/SDLPresetBankCapabilities.h
#	SmartDeviceLink/SDLPresetBankCapabilities.m
#	SmartDeviceLink/SDLPutFile.h
#	SmartDeviceLink/SDLPutFile.m
#	SmartDeviceLink/SDLPutFileResponse.h
#	SmartDeviceLink/SDLPutFileResponse.m
#	SmartDeviceLink/SDLRPCMessage.h
#	SmartDeviceLink/SDLRPCMessage.m
#	SmartDeviceLink/SDLRPCNotification.h
#	SmartDeviceLink/SDLRPCNotification.m
#	SmartDeviceLink/SDLRPCStruct.h
#	SmartDeviceLink/SDLRPCStruct.m
#	SmartDeviceLink/SDLReadDID.h
#	SmartDeviceLink/SDLReadDID.m
#	SmartDeviceLink/SDLReadDIDResponse.h
#	SmartDeviceLink/SDLReadDIDResponse.m
#	SmartDeviceLink/SDLRegisterAppInterface.h
#	SmartDeviceLink/SDLRegisterAppInterface.m
#	SmartDeviceLink/SDLRegisterAppInterfaceResponse.h
#	SmartDeviceLink/SDLRegisterAppInterfaceResponse.m
#	SmartDeviceLink/SDLResetGlobalProperties.h
#	SmartDeviceLink/SDLResetGlobalProperties.m
#	SmartDeviceLink/SDLResetGlobalPropertiesResponse.h
#	SmartDeviceLink/SDLResetGlobalPropertiesResponse.m
#	SmartDeviceLink/SDLScreenParams.h
#	SmartDeviceLink/SDLScreenParams.m
#	SmartDeviceLink/SDLScrollableMessage.h
#	SmartDeviceLink/SDLScrollableMessage.m
#	SmartDeviceLink/SDLScrollableMessageResponse.h
#	SmartDeviceLink/SDLScrollableMessageResponse.m
#	SmartDeviceLink/SDLSendLocation.h
#	SmartDeviceLink/SDLSendLocation.m
#	SmartDeviceLink/SDLSendLocationResponse.h
#	SmartDeviceLink/SDLSendLocationResponse.m
#	SmartDeviceLink/SDLSetAppIcon.h
#	SmartDeviceLink/SDLSetAppIcon.m
#	SmartDeviceLink/SDLSetAppIconResponse.h
#	SmartDeviceLink/SDLSetAppIconResponse.m
#	SmartDeviceLink/SDLSetDisplayLayout.h
#	SmartDeviceLink/SDLSetDisplayLayout.m
#	SmartDeviceLink/SDLSetDisplayLayoutResponse.h
#	SmartDeviceLink/SDLSetDisplayLayoutResponse.m
#	SmartDeviceLink/SDLSetGlobalProperties.h
#	SmartDeviceLink/SDLSetGlobalProperties.m
#	SmartDeviceLink/SDLSetGlobalPropertiesResponse.h
#	SmartDeviceLink/SDLSetGlobalPropertiesResponse.m
#	SmartDeviceLink/SDLSetMediaClockTimer.h
#	SmartDeviceLink/SDLSetMediaClockTimer.m
#	SmartDeviceLink/SDLSetMediaClockTimerResponse.h
#	SmartDeviceLink/SDLSetMediaClockTimerResponse.m
#	SmartDeviceLink/SDLShow.h
#	SmartDeviceLink/SDLShow.m
#	SmartDeviceLink/SDLShowConstantTBT.h
#	SmartDeviceLink/SDLShowConstantTBT.m
#	SmartDeviceLink/SDLShowConstantTBTResponse.h
#	SmartDeviceLink/SDLShowConstantTBTResponse.m
#	SmartDeviceLink/SDLShowResponse.h
#	SmartDeviceLink/SDLShowResponse.m
#	SmartDeviceLink/SDLSingleTireStatus.h
#	SmartDeviceLink/SDLSingleTireStatus.m
#	SmartDeviceLink/SDLSlider.h
#	SmartDeviceLink/SDLSlider.m
#	SmartDeviceLink/SDLSliderResponse.h
#	SmartDeviceLink/SDLSliderResponse.m
#	SmartDeviceLink/SDLSoftButton.h
#	SmartDeviceLink/SDLSoftButton.m
#	SmartDeviceLink/SDLSoftButtonCapabilities.h
#	SmartDeviceLink/SDLSoftButtonCapabilities.m
#	SmartDeviceLink/SDLSpeak.h
#	SmartDeviceLink/SDLSpeak.m
#	SmartDeviceLink/SDLSpeakResponse.h
#	SmartDeviceLink/SDLSpeakResponse.m
#	SmartDeviceLink/SDLStartTime.h
#	SmartDeviceLink/SDLStartTime.m
#	SmartDeviceLink/SDLSubscribeButton.h
#	SmartDeviceLink/SDLSubscribeButton.m
#	SmartDeviceLink/SDLSubscribeButtonResponse.h
#	SmartDeviceLink/SDLSubscribeButtonResponse.m
#	SmartDeviceLink/SDLSubscribeVehicleData.h
#	SmartDeviceLink/SDLSubscribeVehicleData.m
#	SmartDeviceLink/SDLSubscribeVehicleDataResponse.h
#	SmartDeviceLink/SDLSubscribeVehicleDataResponse.m
#	SmartDeviceLink/SDLSyncMsgVersion.h
#	SmartDeviceLink/SDLSyncMsgVersion.m
#	SmartDeviceLink/SDLSyncPData.h
#	SmartDeviceLink/SDLSyncPData.m
#	SmartDeviceLink/SDLSyncPDataResponse.h
#	SmartDeviceLink/SDLSyncPDataResponse.m
#	SmartDeviceLink/SDLSystemRequest.h
#	SmartDeviceLink/SDLSystemRequest.m
#	SmartDeviceLink/SDLSystemRequestResponse.h
#	SmartDeviceLink/SDLSystemRequestResponse.m
#	SmartDeviceLink/SDLTTSChunk.h
#	SmartDeviceLink/SDLTTSChunk.m
#	SmartDeviceLink/SDLTextField.h
#	SmartDeviceLink/SDLTextField.m
#	SmartDeviceLink/SDLTireStatus.h
#	SmartDeviceLink/SDLTireStatus.m
#	SmartDeviceLink/SDLTouchCoord.h
#	SmartDeviceLink/SDLTouchCoord.m
#	SmartDeviceLink/SDLTouchEvent.h
#	SmartDeviceLink/SDLTouchEvent.m
#	SmartDeviceLink/SDLTouchEventCapabilities.h
#	SmartDeviceLink/SDLTouchEventCapabilities.m
#	SmartDeviceLink/SDLTurn.h
#	SmartDeviceLink/SDLTurn.m
#	SmartDeviceLink/SDLUnregisterAppInterface.h
#	SmartDeviceLink/SDLUnregisterAppInterface.m
#	SmartDeviceLink/SDLUnregisterAppInterfaceResponse.h
#	SmartDeviceLink/SDLUnregisterAppInterfaceResponse.m
#	SmartDeviceLink/SDLUnsubscribeButton.h
#	SmartDeviceLink/SDLUnsubscribeButton.m
#	SmartDeviceLink/SDLUnsubscribeButtonResponse.h
#	SmartDeviceLink/SDLUnsubscribeButtonResponse.m
#	SmartDeviceLink/SDLUnsubscribeVehicleData.h
#	SmartDeviceLink/SDLUnsubscribeVehicleData.m
#	SmartDeviceLink/SDLUnsubscribeVehicleDataResponse.h
#	SmartDeviceLink/SDLUnsubscribeVehicleDataResponse.m
#	SmartDeviceLink/SDLUpdateTurnList.h
#	SmartDeviceLink/SDLUpdateTurnList.m
#	SmartDeviceLink/SDLUpdateTurnListResponse.h
#	SmartDeviceLink/SDLUpdateTurnListResponse.m
#	SmartDeviceLink/SDLVehicleDataResult.h
#	SmartDeviceLink/SDLVehicleDataResult.m
#	SmartDeviceLink/SDLVehicleType.h
#	SmartDeviceLink/SDLVehicleType.m
#	SmartDeviceLink/SDLVrHelpItem.h
#	SmartDeviceLink/SDLVrHelpItem.m

1 files changed, 8 insertions, 20 deletions

diff --git a/SmartDeviceLink/SDLTouchEvent.m b/SmartDeviceLink/SDLTouchEvent.m
index a831011c2..2dd3119a6 100644
--- a/SmartDeviceLink/SDLTouchEvent.m
+++ b/SmartDeviceLink/SDLTouchEvent.m
@@ -9,18 +9,6 @@
 
 @implementation SDLTouchEvent
 
-- (instancetype)init {
-    if (self = [super init]) {
-    }
-    return self;
-}
-
-- (instancetype)initWithDictionary:(NSMutableDictionary<NSString *, id> *)dict {
-    if (self = [super initWithDictionary:dict]) {
-    }
-    return self;
-}
-
 - (void)setTouchEventId:(NSNumber *)touchEventId {
     if (touchEventId != nil) {
         [store setObject:touchEventId forKey:SDLNameId];
@@ -33,7 +21,7 @@
     return [store objectForKey:SDLNameId];
 }
 
-- (void)setTimeStamp:(NSMutableArray<NSNumber *> *)timeStamp {
+- (void)setTimeStamp:(NSMutableArray *)timeStamp {
     if (timeStamp != nil) {
         [store setObject:timeStamp forKey:SDLNameTimestamp];
     } else {
@@ -41,11 +29,11 @@
     }
 }
 
-- (NSMutableArray<NSNumber *> *)timeStamp {
+- (NSMutableArray *)timeStamp {
     return [store objectForKey:SDLNameTimestamp];
 }
 
-- (void)setCoord:(NSMutableArray<SDLTouchCoord *> *)coord {
+- (void)setCoord:(NSMutableArray *)coord {
     if (coord != nil) {
         [store setObject:coord forKey:SDLNameCoordinate];
     } else {
@@ -53,14 +41,14 @@
     }
 }
 
-- (NSMutableArray<SDLTouchCoord *> *)coord {
-    NSMutableArray<SDLTouchCoord *> *array = [store objectForKey:SDLNameCoordinate];
+- (NSMutableArray *)coord {
+    NSMutableArray *array = [store objectForKey:SDLNameCoordinate];
     if ([array count] < 1 || [[array objectAtIndex:0] isKindOfClass:SDLTouchCoord.class]) {
         return array;
     } else {
-        NSMutableArray<SDLTouchCoord *> *newList = [NSMutableArray arrayWithCapacity:[array count]];
-        for (NSDictionary *dict in array) {
-            [newList addObject:[[SDLTouchCoord alloc] initWithDictionary:(NSMutableDictionary<NSString *, id> *)dict]];
+        NSMutableArray *newList = [NSMutableArray arrayWithCapacity:[array count]];
+        for (NSDictionary<NSString *, id> *dict in array) {
+            [newList addObject:[[SDLTouchCoord alloc] initWithDictionary:(NSDictionary *)dict]];
         }
         return newList;
     }