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

* origin/develop:
  reverting function renaming in SDLRPCMessage.
  Fixed accidental function renaming.
  Updated SDLFunctionID to project instead of private.
  Updated SDLFunctionID to be private.
  Fixed remaining failing tests.
  Updated SDLFunctionID to be a singleton.
  Fixed issue with tests not passing
  Updated naming of some constant.
  Removed extensibility from SDLName
  Reverted SDLNames to Project instead of Public.
  Replaced all defines with constant strings of the SDLName typedef. Also modified SDLFunctionID to use a static dictionary.

# Conflicts:
#	SmartDeviceLink/SDLAddCommand.m
#	SmartDeviceLink/SDLAlert.m
#	SmartDeviceLink/SDLAlertManeuver.m
#	SmartDeviceLink/SDLChangeRegistration.m
#	SmartDeviceLink/SDLChoice.m
#	SmartDeviceLink/SDLCreateInteractionChoiceSet.m
#	SmartDeviceLink/SDLDiagnosticMessage.m
#	SmartDeviceLink/SDLDiagnosticMessageResponse.m
#	SmartDeviceLink/SDLDisplayCapabilities.m
#	SmartDeviceLink/SDLEncodedSyncPData.m
#	SmartDeviceLink/SDLGetDTCsResponse.m
#	SmartDeviceLink/SDLHMIPermissions.m
#	SmartDeviceLink/SDLImageField.m
#	SmartDeviceLink/SDLKeyboardProperties.m
#	SmartDeviceLink/SDLListFilesResponse.m
#	SmartDeviceLink/SDLOnEncodedSyncPData.m
#	SmartDeviceLink/SDLOnPermissionsChange.m
#	SmartDeviceLink/SDLOnTouchEvent.m
#	SmartDeviceLink/SDLParameterPermissions.m
#	SmartDeviceLink/SDLPerformAudioPassThru.m
#	SmartDeviceLink/SDLPerformInteraction.m
#	SmartDeviceLink/SDLRPCStruct.m
#	SmartDeviceLink/SDLReadDID.m
#	SmartDeviceLink/SDLReadDIDResponse.m
#	SmartDeviceLink/SDLRegisterAppInterface.m
#	SmartDeviceLink/SDLRegisterAppInterfaceResponse.m
#	SmartDeviceLink/SDLResetGlobalProperties.m
#	SmartDeviceLink/SDLScrollableMessage.m
#	SmartDeviceLink/SDLSendLocation.m
#	SmartDeviceLink/SDLSetDisplayLayoutResponse.m
#	SmartDeviceLink/SDLSetGlobalProperties.m
#	SmartDeviceLink/SDLShow.m
#	SmartDeviceLink/SDLShowConstantTBT.m
#	SmartDeviceLink/SDLSlider.m
#	SmartDeviceLink/SDLSpeak.m
#	SmartDeviceLink/SDLTouchEvent.m
#	SmartDeviceLink/SDLUpdateTurnList.m
#	SmartDeviceLink/SDLV2ProtocolMessage.m
#	SmartDeviceLinkTests/RPCSpecs/NotificationSpecs/SDLOnAppInterfaceUnregisteredSpec.m
#	SmartDeviceLinkTests/RPCSpecs/NotificationSpecs/SDLOnButtonEventSpec.m
#	SmartDeviceLinkTests/RPCSpecs/NotificationSpecs/SDLOnButtonPressSpec.m
#	SmartDeviceLinkTests/RPCSpecs/NotificationSpecs/SDLOnCommandSpec.m
#	SmartDeviceLinkTests/RPCSpecs/NotificationSpecs/SDLOnDriverDistractionSpec.m
#	SmartDeviceLinkTests/RPCSpecs/NotificationSpecs/SDLOnEncodedSyncPDataSpec.m
#	SmartDeviceLinkTests/RPCSpecs/NotificationSpecs/SDLOnHMIStatusSpec.m
#	SmartDeviceLinkTests/RPCSpecs/NotificationSpecs/SDLOnHashChangeSpec.m
#	SmartDeviceLinkTests/RPCSpecs/NotificationSpecs/SDLOnKeyboardInputSpec.m
#	SmartDeviceLinkTests/RPCSpecs/NotificationSpecs/SDLOnLanguageChangeSpec.m
#	SmartDeviceLinkTests/RPCSpecs/NotificationSpecs/SDLOnLockScreenStatusSpec.m
#	SmartDeviceLinkTests/RPCSpecs/NotificationSpecs/SDLOnPermissionsChangeSpec.m
#	SmartDeviceLinkTests/RPCSpecs/NotificationSpecs/SDLOnSyncPDataSpec.m
#	SmartDeviceLinkTests/RPCSpecs/NotificationSpecs/SDLOnSystemRequestSpec.m
#	SmartDeviceLinkTests/RPCSpecs/NotificationSpecs/SDLOnTBTClientStateSpec.m
#	SmartDeviceLinkTests/RPCSpecs/NotificationSpecs/SDLOnTouchEventSpec.m
#	SmartDeviceLinkTests/RPCSpecs/NotificationSpecs/SDLOnVehicleDataSpec.m
#	SmartDeviceLinkTests/RPCSpecs/RequestSpecs/SDLAddCommandSpec.m
#	SmartDeviceLinkTests/RPCSpecs/RequestSpecs/SDLAddSubMenuSpec.m
#	SmartDeviceLinkTests/RPCSpecs/RequestSpecs/SDLAlertManeuverSpec.m
#	SmartDeviceLinkTests/RPCSpecs/RequestSpecs/SDLAlertSpec.m
#	SmartDeviceLinkTests/RPCSpecs/RequestSpecs/SDLChangeRegistrationSpec.m
#	SmartDeviceLinkTests/RPCSpecs/RequestSpecs/SDLCreateInteractionChoiceSetSpec.m
#	SmartDeviceLinkTests/RPCSpecs/RequestSpecs/SDLDeleteCommandSpec.m
#	SmartDeviceLinkTests/RPCSpecs/RequestSpecs/SDLDeleteFileSpec.m
#	SmartDeviceLinkTests/RPCSpecs/RequestSpecs/SDLDeleteInteractionChoiceSetSpec.m
#	SmartDeviceLinkTests/RPCSpecs/RequestSpecs/SDLDeleteSubMenuSpec.m
#	SmartDeviceLinkTests/RPCSpecs/RequestSpecs/SDLDiagnosticMessageSpec.m
#	SmartDeviceLinkTests/RPCSpecs/RequestSpecs/SDLEncodedSyncPDataSpec.m
#	SmartDeviceLinkTests/RPCSpecs/RequestSpecs/SDLGetDTCsSpec.m
#	SmartDeviceLinkTests/RPCSpecs/RequestSpecs/SDLGetVehicleDataSpec.m
#	SmartDeviceLinkTests/RPCSpecs/RequestSpecs/SDLPerformAudioPassThruSpec.m
#	SmartDeviceLinkTests/RPCSpecs/RequestSpecs/SDLPerformInteractionSpec.m
#	SmartDeviceLinkTests/RPCSpecs/RequestSpecs/SDLPutFileSpec.m
#	SmartDeviceLinkTests/RPCSpecs/RequestSpecs/SDLReadDIDSpec.m
#	SmartDeviceLinkTests/RPCSpecs/RequestSpecs/SDLRegisterAppInterfaceSpec.m
#	SmartDeviceLinkTests/RPCSpecs/RequestSpecs/SDLResetGlobalPropertiesSpec.m
#	SmartDeviceLinkTests/RPCSpecs/RequestSpecs/SDLScrollableMessageSpec.m
#	SmartDeviceLinkTests/RPCSpecs/RequestSpecs/SDLSetAppIconSpec.m
#	SmartDeviceLinkTests/RPCSpecs/RequestSpecs/SDLSetDisplayLayoutSpec.m
#	SmartDeviceLinkTests/RPCSpecs/RequestSpecs/SDLSetGlobalPropertiesSpec.m
#	SmartDeviceLinkTests/RPCSpecs/RequestSpecs/SDLSetMediaClockTimerSpec.m
#	SmartDeviceLinkTests/RPCSpecs/RequestSpecs/SDLShowConstantTBTSpec.m
#	SmartDeviceLinkTests/RPCSpecs/RequestSpecs/SDLShowSpec.m
#	SmartDeviceLinkTests/RPCSpecs/RequestSpecs/SDLSliderSpec.m
#	SmartDeviceLinkTests/RPCSpecs/RequestSpecs/SDLSpeakSpec.m
#	SmartDeviceLinkTests/RPCSpecs/RequestSpecs/SDLSubscribeButtonSpec.m
#	SmartDeviceLinkTests/RPCSpecs/RequestSpecs/SDLSubscribeVehicleDataSpec.m
#	SmartDeviceLinkTests/RPCSpecs/RequestSpecs/SDLSystemRequestSpec.m
#	SmartDeviceLinkTests/RPCSpecs/RequestSpecs/SDLUnsubscribeButtonSpec.m
#	SmartDeviceLinkTests/RPCSpecs/RequestSpecs/SDLUnsubscribeVehicleDataSpec.m
#	SmartDeviceLinkTests/RPCSpecs/RequestSpecs/SDLUpdateTurnListSpec.m
#	SmartDeviceLinkTests/RPCSpecs/ResponseSpecs/SDLDeleteFileResponseSpec.m
#	SmartDeviceLinkTests/RPCSpecs/ResponseSpecs/SDLDiagnosticMessageResponseSpec.m
#	SmartDeviceLinkTests/RPCSpecs/ResponseSpecs/SDLGetDTCsResponseSpec.m
#	SmartDeviceLinkTests/RPCSpecs/ResponseSpecs/SDLGetVehicleDataResponseSpec.m
#	SmartDeviceLinkTests/RPCSpecs/ResponseSpecs/SDLListFilesResponseSpec.m
#	SmartDeviceLinkTests/RPCSpecs/ResponseSpecs/SDLPerformInteractionResponseSpec.m
#	SmartDeviceLinkTests/RPCSpecs/ResponseSpecs/SDLPutFileResponseSpec.m
#	SmartDeviceLinkTests/RPCSpecs/ResponseSpecs/SDLReadDIDResponseSpec.m
#	SmartDeviceLinkTests/RPCSpecs/ResponseSpecs/SDLRegisterAppInterfaceResponseSpec.m
#	SmartDeviceLinkTests/RPCSpecs/ResponseSpecs/SDLSetDisplayLayoutResponseSpec.m
#	SmartDeviceLinkTests/RPCSpecs/ResponseSpecs/SDLSliderResponseSpec.m
#	SmartDeviceLinkTests/RPCSpecs/ResponseSpecs/SDLSubscribeVehicleDataResponseSpec.m
#	SmartDeviceLinkTests/RPCSpecs/ResponseSpecs/SDLUnsubscribeVehicleDataResponseSpec.m
#	SmartDeviceLinkTests/RPCSpecs/StructSpecs/SDLAirbagStatusSpec.m
#	SmartDeviceLinkTests/RPCSpecs/StructSpecs/SDLAppInfoSpec.m
#	SmartDeviceLinkTests/RPCSpecs/StructSpecs/SDLAudioPassThruCapabilitiesSpec.m
#	SmartDeviceLinkTests/RPCSpecs/StructSpecs/SDLBeltStatusSpec.m
#	SmartDeviceLinkTests/RPCSpecs/StructSpecs/SDLBodyInformationSpec.m
#	SmartDeviceLinkTests/RPCSpecs/StructSpecs/SDLButtonCapabilitiesSpec.m
#	SmartDeviceLinkTests/RPCSpecs/StructSpecs/SDLChoiceSpec.m
#	SmartDeviceLinkTests/RPCSpecs/StructSpecs/SDLClusterModeStatusSpec.m
#	SmartDeviceLinkTests/RPCSpecs/StructSpecs/SDLDIDResult.m
#	SmartDeviceLinkTests/RPCSpecs/StructSpecs/SDLDeviceInfoSpec.m
#	SmartDeviceLinkTests/RPCSpecs/StructSpecs/SDLDeviceStatusSpec.m
#	SmartDeviceLinkTests/RPCSpecs/StructSpecs/SDLDisplayCapabilitiesSpec.m
#	SmartDeviceLinkTests/RPCSpecs/StructSpecs/SDLECallInfoSpec.m
#	SmartDeviceLinkTests/RPCSpecs/StructSpecs/SDLEmergencyEventSpec.m
#	SmartDeviceLinkTests/RPCSpecs/StructSpecs/SDLGPSDataSpec.m
#	SmartDeviceLinkTests/RPCSpecs/StructSpecs/SDLHMIPermissionsSpec.m
#	SmartDeviceLinkTests/RPCSpecs/StructSpecs/SDLHeadLampStatusSpec.m
#	SmartDeviceLinkTests/RPCSpecs/StructSpecs/SDLImageFieldSpec.m
#	SmartDeviceLinkTests/RPCSpecs/StructSpecs/SDLImageSpec.m
#	SmartDeviceLinkTests/RPCSpecs/StructSpecs/SDLKeyboardPropertiesSpec.m
#	SmartDeviceLinkTests/RPCSpecs/StructSpecs/SDLMenuParamsSpec.m
#	SmartDeviceLinkTests/RPCSpecs/StructSpecs/SDLMyKeySpec.m
#	SmartDeviceLinkTests/RPCSpecs/StructSpecs/SDLParameterPermissionsSpec.m
#	SmartDeviceLinkTests/RPCSpecs/StructSpecs/SDLPermissionItemSpec.m
#	SmartDeviceLinkTests/RPCSpecs/StructSpecs/SDLPresetBankCapabilitiesSpec.m
#	SmartDeviceLinkTests/RPCSpecs/StructSpecs/SDLScreenParamsSpec.m
#	SmartDeviceLinkTests/RPCSpecs/StructSpecs/SDLSingleTireStatusSpec.m
#	SmartDeviceLinkTests/RPCSpecs/StructSpecs/SDLSoftButtonCapabilitiesSpec.m
#	SmartDeviceLinkTests/RPCSpecs/StructSpecs/SDLSoftButtonSpec.m
#	SmartDeviceLinkTests/RPCSpecs/StructSpecs/SDLStartTimeSpec.m
#	SmartDeviceLinkTests/RPCSpecs/StructSpecs/SDLSyncMsgVersionSpec.m
#	SmartDeviceLinkTests/RPCSpecs/StructSpecs/SDLTTSChunkSpec.m
#	SmartDeviceLinkTests/RPCSpecs/StructSpecs/SDLTextFieldSpec.m
#	SmartDeviceLinkTests/RPCSpecs/StructSpecs/SDLTireStatusSpec.m
#	SmartDeviceLinkTests/RPCSpecs/StructSpecs/SDLTouchCoordSpec.m
#	SmartDeviceLinkTests/RPCSpecs/StructSpecs/SDLTouchEventCapabilitiesSpec.m
#	SmartDeviceLinkTests/RPCSpecs/StructSpecs/SDLTouchEventSpec.m
#	SmartDeviceLinkTests/RPCSpecs/StructSpecs/SDLTurnSpec.m
#	SmartDeviceLinkTests/RPCSpecs/StructSpecs/SDLVehicleDataResultSpec.m
#	SmartDeviceLinkTests/RPCSpecs/StructSpecs/SDLVehicleTypeSpec.m
#	SmartDeviceLinkTests/RPCSpecs/StructSpecs/SDLVrHelpItemSpec.m

1 files changed, 37 insertions, 37 deletions

diff --git a/SmartDeviceLink/SDLShow.m b/SmartDeviceLink/SDLShow.m
index c7685ca4c..ca8ed2cdf 100644
--- a/SmartDeviceLink/SDLShow.m
+++ b/SmartDeviceLink/SDLShow.m
@@ -13,7 +13,7 @@
 @implementation SDLShow
 
 - (instancetype)init {
-    if (self = [super initWithName:NAMES_Show]) {
+    if (self = [super initWithName:SDLNameShow]) {
     }
     return self;
 }
@@ -26,62 +26,62 @@
 
 - (void)setMainField1:(NSString *)mainField1 {
     if (mainField1 != nil) {
-        [parameters setObject:mainField1 forKey:NAMES_mainField1];
+        [parameters setObject:mainField1 forKey:SDLNameMainField1];
     } else {
-        [parameters removeObjectForKey:NAMES_mainField1];
+        [parameters removeObjectForKey:SDLNameMainField1];
     }
 }
 
 - (NSString *)mainField1 {
-    return [parameters objectForKey:NAMES_mainField1];
+    return [parameters objectForKey:SDLNameMainField1];
 }
 
 - (void)setMainField2:(NSString *)mainField2 {
     if (mainField2 != nil) {
-        [parameters setObject:mainField2 forKey:NAMES_mainField2];
+        [parameters setObject:mainField2 forKey:SDLNameMainField2];
     } else {
-        [parameters removeObjectForKey:NAMES_mainField2];
+        [parameters removeObjectForKey:SDLNameMainField2];
     }
 }
 
 - (NSString *)mainField2 {
-    return [parameters objectForKey:NAMES_mainField2];
+    return [parameters objectForKey:SDLNameMainField2];
 }
 
 - (void)setMainField3:(NSString *)mainField3 {
     if (mainField3 != nil) {
-        [parameters setObject:mainField3 forKey:NAMES_mainField3];
+        [parameters setObject:mainField3 forKey:SDLNameMainField3];
     } else {
-        [parameters removeObjectForKey:NAMES_mainField3];
+        [parameters removeObjectForKey:SDLNameMainField3];
     }
 }
 
 - (NSString *)mainField3 {
-    return [parameters objectForKey:NAMES_mainField3];
+    return [parameters objectForKey:SDLNameMainField3];
 }
 
 - (void)setMainField4:(NSString *)mainField4 {
     if (mainField4 != nil) {
-        [parameters setObject:mainField4 forKey:NAMES_mainField4];
+        [parameters setObject:mainField4 forKey:SDLNameMainField4];
     } else {
-        [parameters removeObjectForKey:NAMES_mainField4];
+        [parameters removeObjectForKey:SDLNameMainField4];
     }
 }
 
 - (NSString *)mainField4 {
-    return [parameters objectForKey:NAMES_mainField4];
+    return [parameters objectForKey:SDLNameMainField4];
 }
 
 - (void)setAlignment:(SDLTextAlignment *)alignment {
     if (alignment != nil) {
-        [parameters setObject:alignment forKey:NAMES_alignment];
+        [parameters setObject:alignment forKey:SDLNameAlignment];
     } else {
-        [parameters removeObjectForKey:NAMES_alignment];
+        [parameters removeObjectForKey:SDLNameAlignment];
     }
 }
 
 - (SDLTextAlignment *)alignment {
-    NSObject *obj = [parameters objectForKey:NAMES_alignment];
+    NSObject *obj = [parameters objectForKey:SDLNameAlignment];
     if (obj == nil || [obj isKindOfClass:SDLTextAlignment.class]) {
         return (SDLTextAlignment *)obj;
     } else {
@@ -91,50 +91,50 @@
 
 - (void)setStatusBar:(NSString *)statusBar {
     if (statusBar != nil) {
-        [parameters setObject:statusBar forKey:NAMES_statusBar];
+        [parameters setObject:statusBar forKey:SDLNameStatusBar];
     } else {
-        [parameters removeObjectForKey:NAMES_statusBar];
+        [parameters removeObjectForKey:SDLNameStatusBar];
     }
 }
 
 - (NSString *)statusBar {
-    return [parameters objectForKey:NAMES_statusBar];
+    return [parameters objectForKey:SDLNameStatusBar];
 }
 
 - (void)setMediaClock:(NSString *)mediaClock {
     if (mediaClock != nil) {
-        [parameters setObject:mediaClock forKey:NAMES_mediaClock];
+        [parameters setObject:mediaClock forKey:SDLNameMediaClock];
     } else {
-        [parameters removeObjectForKey:NAMES_mediaClock];
+        [parameters removeObjectForKey:SDLNameMediaClock];
     }
 }
 
 - (NSString *)mediaClock {
-    return [parameters objectForKey:NAMES_mediaClock];
+    return [parameters objectForKey:SDLNameMediaClock];
 }
 
 - (void)setMediaTrack:(NSString *)mediaTrack {
     if (mediaTrack != nil) {
-        [parameters setObject:mediaTrack forKey:NAMES_mediaTrack];
+        [parameters setObject:mediaTrack forKey:SDLNameMediaTrack];
     } else {
-        [parameters removeObjectForKey:NAMES_mediaTrack];
+        [parameters removeObjectForKey:SDLNameMediaTrack];
     }
 }
 
 - (NSString *)mediaTrack {
-    return [parameters objectForKey:NAMES_mediaTrack];
+    return [parameters objectForKey:SDLNameMediaTrack];
 }
 
 - (void)setGraphic:(SDLImage *)graphic {
     if (graphic != nil) {
-        [parameters setObject:graphic forKey:NAMES_graphic];
+        [parameters setObject:graphic forKey:SDLNameGraphic];
     } else {
-        [parameters removeObjectForKey:NAMES_graphic];
+        [parameters removeObjectForKey:SDLNameGraphic];
     }
 }
 
 - (SDLImage *)graphic {
-    NSObject *obj = [parameters objectForKey:NAMES_graphic];
+    NSObject *obj = [parameters objectForKey:SDLNameGraphic];
     if (obj == nil || [obj isKindOfClass:SDLImage.class]) {
         return (SDLImage *)obj;
     } else {
@@ -144,14 +144,14 @@
 
 - (void)setSecondaryGraphic:(SDLImage *)secondaryGraphic {
     if (secondaryGraphic != nil) {
-        [parameters setObject:secondaryGraphic forKey:NAMES_secondaryGraphic];
+        [parameters setObject:secondaryGraphic forKey:SDLNameSecondaryGraphic];
     } else {
-        [parameters removeObjectForKey:NAMES_secondaryGraphic];
+        [parameters removeObjectForKey:SDLNameSecondaryGraphic];
     }
 }
 
 - (SDLImage *)secondaryGraphic {
-    NSObject *obj = [parameters objectForKey:NAMES_secondaryGraphic];
+    NSObject *obj = [parameters objectForKey:SDLNameSecondaryGraphic];
     if (obj == nil || [obj isKindOfClass:SDLImage.class]) {
         return (SDLImage *)obj;
     } else {
@@ -161,14 +161,14 @@
 
 - (void)setSoftButtons:(NSMutableArray<SDLSoftButton *> *)softButtons {
     if (softButtons != nil) {
-        [parameters setObject:softButtons forKey:NAMES_softButtons];
+        [parameters setObject:softButtons forKey:SDLNameSoftButtons];
     } else {
-        [parameters removeObjectForKey:NAMES_softButtons];
+        [parameters removeObjectForKey:SDLNameSoftButtons];
     }
 }
 
 - (NSMutableArray<SDLSoftButton *> *)softButtons {
-    NSMutableArray<SDLSoftButton *> *array = [parameters objectForKey:NAMES_softButtons];
+    NSMutableArray<SDLSoftButton *> *array = [parameters objectForKey:SDLNameSoftButtons];
     if ([array count] < 1 || [[array objectAtIndex:0] isKindOfClass:SDLSoftButton.class]) {
         return array;
     } else {
@@ -182,14 +182,14 @@
 
 - (void)setCustomPresets:(NSMutableArray<NSString *> *)customPresets {
     if (customPresets != nil) {
-        [parameters setObject:customPresets forKey:NAMES_customPresets];
+        [parameters setObject:customPresets forKey:SDLNameCustomPresets];
     } else {
-        [parameters removeObjectForKey:NAMES_customPresets];
+        [parameters removeObjectForKey:SDLNameCustomPresets];
     }
 }
 
 - (NSMutableArray<NSString *> *)customPresets {
-    return [parameters objectForKey:NAMES_customPresets];
+    return [parameters objectForKey:SDLNameCustomPresets];
 }
 
 @end