diff options
| author | Joey Grover <joeygrover@gmail.com> | 2015-05-26 11:00:36 -0400 |
|---|---|---|
| committer | Joey Grover <joeygrover@gmail.com> | 2015-05-26 11:00:36 -0400 |
| commit | 986920c4e51a4adf9fee1130c97c9db107abcbff (patch) | |
| tree | be3c540dc4e43d8eade9f6353df282acb1cb6dd0 | |
| parent | adc3a96b60ecd9dd25d4ee961f2ce4966e61da3a (diff) | |
| download | sdl_android-986920c4e51a4adf9fee1130c97c9db107abcbff.tar.gz | |
Changed FunctionId back to FunctionID
101 files changed, 278 insertions, 278 deletions
diff --git a/sdl_android_lib/src/com/smartdevicelink/protocol/enums/FunctionId.java b/sdl_android_lib/src/com/smartdevicelink/protocol/enums/FunctionID.java index 28de6758e..04517d329 100644 --- a/sdl_android_lib/src/com/smartdevicelink/protocol/enums/FunctionId.java +++ b/sdl_android_lib/src/com/smartdevicelink/protocol/enums/FunctionID.java @@ -5,7 +5,7 @@ import java.util.HashMap; import java.util.Iterator;
import java.util.Map.Entry;
-public enum FunctionId{
+public enum FunctionID{
// DEPRECATED FUNCTIONS
SYNC_P_DATA(65537, "SyncPData"),
ON_SYNC_P_DATA(98305, "OnSyncPData"),
@@ -86,7 +86,7 @@ public enum FunctionId{ private final int ID;
private final String JSON_NAME;
- private FunctionId(int id, String jsonName){
+ private FunctionID(int id, String jsonName){
this.ID = id;
this.JSON_NAME = jsonName;
}
@@ -103,7 +103,7 @@ public enum FunctionId{ private static void initFunctionMap(){
functionMap = new HashMap<String, Integer>(values().length);
- for(FunctionId value : EnumSet.allOf(FunctionId.class)){
+ for(FunctionID value : EnumSet.allOf(FunctionID.class)){
functionMap.put(value.toString(), value.getId());
}
}
diff --git a/sdl_android_lib/src/com/smartdevicelink/proxy/SdlProxyBase.java b/sdl_android_lib/src/com/smartdevicelink/proxy/SdlProxyBase.java index edd54d615..8053d870d 100644 --- a/sdl_android_lib/src/com/smartdevicelink/proxy/SdlProxyBase.java +++ b/sdl_android_lib/src/com/smartdevicelink/proxy/SdlProxyBase.java @@ -47,7 +47,7 @@ import com.smartdevicelink.exception.SdlException; import com.smartdevicelink.exception.SdlExceptionCause;
import com.smartdevicelink.marshal.JsonRPCMarshaller;
import com.smartdevicelink.protocol.ProtocolMessage;
-import com.smartdevicelink.protocol.enums.FunctionId;
+import com.smartdevicelink.protocol.enums.FunctionID;
import com.smartdevicelink.protocol.enums.MessageType;
import com.smartdevicelink.protocol.enums.SessionType;
import com.smartdevicelink.protocol.heartbeat.HeartbeatMonitor;
@@ -936,7 +936,7 @@ public abstract class SdlProxyBase<proxyListenerType extends IProxyListenerBase> sendRPCRequestPrivate(mySystemRequest);
Log.i("sendOnSystemRequestToUrl", "sent to sdl");
- updateBroadcastIntent(sendIntent2, "RPC_NAME", FunctionId.SYSTEM_REQUEST.toString());
+ updateBroadcastIntent(sendIntent2, "RPC_NAME", FunctionID.SYSTEM_REQUEST.toString());
updateBroadcastIntent(sendIntent2, "TYPE", RPCMessage.KEY_REQUEST);
updateBroadcastIntent(sendIntent2, "CORRID", mySystemRequest.getCorrelationID());
}
@@ -1291,7 +1291,7 @@ public abstract class SdlProxyBase<proxyListenerType extends IProxyListenerBase> hashTemp.put(RPCMessage.KEY_PARAMETERS, mhash);
}
- String functionName = FunctionId.getFunctionName(message.getFunctionID());
+ String functionName = FunctionID.getFunctionName(message.getFunctionID());
if (functionName != null) {
hashTemp.put(RPCMessage.KEY_FUNCTION_NAME, functionName);
} else {
@@ -1461,7 +1461,7 @@ public abstract class SdlProxyBase<proxyListenerType extends IProxyListenerBase> pm.setSessionID(sdlSession.getSessionId());
pm.setMessageType(MessageType.RPC);
pm.setSessionType(SessionType.RPC);
- pm.setFunctionID(FunctionId.getFunctionId(request.getFunctionName()));
+ pm.setFunctionID(FunctionID.getFunctionId(request.getFunctionName()));
if (request.getCorrelationID() == null)
{
//Log error here
@@ -1497,14 +1497,14 @@ public abstract class SdlProxyBase<proxyListenerType extends IProxyListenerBase> // The app should not receive a response for a request it did not send
if ((new RPCResponse(hash)).getCorrelationID() == REGISTER_APP_INTERFACE_CORRELATION_ID
&& _advancedLifecycleManagementEnabled
- && functionName.equals(FunctionId.REGISTER_APP_INTERFACE.toString())) {
+ && functionName.equals(FunctionID.REGISTER_APP_INTERFACE.toString())) {
final RegisterAppInterfaceResponse msg = new RegisterAppInterfaceResponse(hash);
if (msg.getSuccess()) {
_appInterfaceRegisterd = true;
}
Intent sendIntent = createBroadcastIntent();
- updateBroadcastIntent(sendIntent, "RPC_NAME", FunctionId.REGISTER_APP_INTERFACE.toString());
+ updateBroadcastIntent(sendIntent, "RPC_NAME", FunctionID.REGISTER_APP_INTERFACE.toString());
updateBroadcastIntent(sendIntent, "TYPE", RPCMessage.KEY_RESPONSE);
updateBroadcastIntent(sendIntent, "SUCCESS", msg.getSuccess());
updateBroadcastIntent(sendIntent, "COMMENT1", msg.getInfo());
@@ -1587,7 +1587,7 @@ public abstract class SdlProxyBase<proxyListenerType extends IProxyListenerBase> }
}
} else if ((new RPCResponse(hash)).getCorrelationID() == POLICIES_CORRELATION_ID
- && functionName.equals(FunctionId.ON_ENCODED_SYNC_P_DATA.toString())) {
+ && functionName.equals(FunctionID.ON_ENCODED_SYNC_P_DATA.toString())) {
Log.i("pt", "POLICIES_CORRELATION_ID SystemRequest Notification (Legacy)");
@@ -1608,13 +1608,13 @@ public abstract class SdlProxyBase<proxyListenerType extends IProxyListenerBase> }
}
else if ((new RPCResponse(hash)).getCorrelationID() == POLICIES_CORRELATION_ID
- && functionName.equals(FunctionId.ENCODED_SYNC_P_DATA.toString())) {
+ && functionName.equals(FunctionID.ENCODED_SYNC_P_DATA.toString())) {
Log.i("pt", "POLICIES_CORRELATION_ID SystemRequest Response (Legacy)");
final SystemRequestResponse msg = new SystemRequestResponse(hash);
Intent sendIntent = createBroadcastIntent();
- updateBroadcastIntent(sendIntent, "RPC_NAME", FunctionId.SYSTEM_REQUEST.toString());
+ updateBroadcastIntent(sendIntent, "RPC_NAME", FunctionID.SYSTEM_REQUEST.toString());
updateBroadcastIntent(sendIntent, "TYPE", RPCMessage.KEY_RESPONSE);
updateBroadcastIntent(sendIntent, "SUCCESS", msg.getSuccess());
updateBroadcastIntent(sendIntent, "COMMENT1", msg.getInfo());
@@ -1623,11 +1623,11 @@ public abstract class SdlProxyBase<proxyListenerType extends IProxyListenerBase> sendBroadcastIntent(sendIntent);
}
else if ((new RPCResponse(hash)).getCorrelationID() == POLICIES_CORRELATION_ID
- && functionName.equals(FunctionId.SYSTEM_REQUEST.toString())) {
+ && functionName.equals(FunctionID.SYSTEM_REQUEST.toString())) {
final SystemRequestResponse msg = new SystemRequestResponse(hash);
Intent sendIntent = createBroadcastIntent();
- updateBroadcastIntent(sendIntent, "RPC_NAME", FunctionId.SYSTEM_REQUEST.toString());
+ updateBroadcastIntent(sendIntent, "RPC_NAME", FunctionID.SYSTEM_REQUEST.toString());
updateBroadcastIntent(sendIntent, "TYPE", RPCMessage.KEY_RESPONSE);
updateBroadcastIntent(sendIntent, "SUCCESS", msg.getSuccess());
updateBroadcastIntent(sendIntent, "COMMENT1", msg.getInfo());
@@ -1636,7 +1636,7 @@ public abstract class SdlProxyBase<proxyListenerType extends IProxyListenerBase> updateBroadcastIntent(sendIntent, "DATA", serializeJSON(msg));
sendBroadcastIntent(sendIntent);
}
- else if (functionName.equals(FunctionId.UNREGISTER_APP_INTERFACE.toString())) {
+ else if (functionName.equals(FunctionID.UNREGISTER_APP_INTERFACE.toString())) {
// UnregisterAppInterface
_appInterfaceRegisterd = false;
synchronized(APP_INTERFACE_REGISTERED_LOCK) {
@@ -1644,7 +1644,7 @@ public abstract class SdlProxyBase<proxyListenerType extends IProxyListenerBase> }
final UnregisterAppInterfaceResponse msg = new UnregisterAppInterfaceResponse(hash);
Intent sendIntent = createBroadcastIntent();
- updateBroadcastIntent(sendIntent, "RPC_NAME", FunctionId.UNREGISTER_APP_INTERFACE.toString());
+ updateBroadcastIntent(sendIntent, "RPC_NAME", FunctionID.UNREGISTER_APP_INTERFACE.toString());
updateBroadcastIntent(sendIntent, "TYPE", RPCMessage.KEY_RESPONSE);
updateBroadcastIntent(sendIntent, "SUCCESS", msg.getSuccess());
updateBroadcastIntent(sendIntent, "COMMENT1", msg.getInfo());
@@ -1656,7 +1656,7 @@ public abstract class SdlProxyBase<proxyListenerType extends IProxyListenerBase> return;
}
- if (functionName.equals(FunctionId.REGISTER_APP_INTERFACE.toString())) {
+ if (functionName.equals(FunctionID.REGISTER_APP_INTERFACE.toString())) {
final RegisterAppInterfaceResponse msg = new RegisterAppInterfaceResponse(hash);
if (msg.getSuccess()) {
_appInterfaceRegisterd = true;
@@ -1733,7 +1733,7 @@ public abstract class SdlProxyBase<proxyListenerType extends IProxyListenerBase> }
}
}
- } else if (functionName.equals(FunctionId.SPEAK.toString())) {
+ } else if (functionName.equals(FunctionID.SPEAK.toString())) {
// SpeakResponse
final SpeakResponse msg = new SpeakResponse(hash);
@@ -1748,7 +1748,7 @@ public abstract class SdlProxyBase<proxyListenerType extends IProxyListenerBase> } else {
_proxyListener.onSpeakResponse(msg);
}
- } else if (functionName.equals(FunctionId.ALERT.toString())) {
+ } else if (functionName.equals(FunctionID.ALERT.toString())) {
// AlertResponse
final AlertResponse msg = new AlertResponse(hash);
@@ -1763,7 +1763,7 @@ public abstract class SdlProxyBase<proxyListenerType extends IProxyListenerBase> } else {
_proxyListener.onAlertResponse(msg);
}
- } else if (functionName.equals(FunctionId.SHOW.toString())) {
+ } else if (functionName.equals(FunctionID.SHOW.toString())) {
// ShowResponse
final ShowResponse msg = new ShowResponse(hash);
@@ -1778,7 +1778,7 @@ public abstract class SdlProxyBase<proxyListenerType extends IProxyListenerBase> } else {
_proxyListener.onShowResponse((ShowResponse)msg);
}
- } else if (functionName.equals(FunctionId.ADD_COMMAND.toString())) {
+ } else if (functionName.equals(FunctionID.ADD_COMMAND.toString())) {
// AddCommand
final AddCommandResponse msg = new AddCommandResponse(hash);
@@ -1793,7 +1793,7 @@ public abstract class SdlProxyBase<proxyListenerType extends IProxyListenerBase> } else {
_proxyListener.onAddCommandResponse((AddCommandResponse)msg);
}
- } else if (functionName.equals(FunctionId.DELETE_COMMAND.toString())) {
+ } else if (functionName.equals(FunctionID.DELETE_COMMAND.toString())) {
// DeleteCommandResponse
final DeleteCommandResponse msg = new DeleteCommandResponse(hash);
@@ -1808,7 +1808,7 @@ public abstract class SdlProxyBase<proxyListenerType extends IProxyListenerBase> } else {
_proxyListener.onDeleteCommandResponse((DeleteCommandResponse)msg);
}
- } else if (functionName.equals(FunctionId.ADD_SUB_MENU.toString())) {
+ } else if (functionName.equals(FunctionID.ADD_SUB_MENU.toString())) {
// AddSubMenu
final AddSubMenuResponse msg = new AddSubMenuResponse(hash);
@@ -1823,7 +1823,7 @@ public abstract class SdlProxyBase<proxyListenerType extends IProxyListenerBase> } else {
_proxyListener.onAddSubMenuResponse((AddSubMenuResponse)msg);
}
- } else if (functionName.equals(FunctionId.DELETE_SUB_MENU.toString())) {
+ } else if (functionName.equals(FunctionID.DELETE_SUB_MENU.toString())) {
// DeleteSubMenu
final DeleteSubMenuResponse msg = new DeleteSubMenuResponse(hash);
@@ -1838,7 +1838,7 @@ public abstract class SdlProxyBase<proxyListenerType extends IProxyListenerBase> } else {
_proxyListener.onDeleteSubMenuResponse((DeleteSubMenuResponse)msg);
}
- } else if (functionName.equals(FunctionId.SUBSCRIBE_BUTTON.toString())) {
+ } else if (functionName.equals(FunctionID.SUBSCRIBE_BUTTON.toString())) {
// SubscribeButton
final SubscribeButtonResponse msg = new SubscribeButtonResponse(hash);
@@ -1853,7 +1853,7 @@ public abstract class SdlProxyBase<proxyListenerType extends IProxyListenerBase> } else {
_proxyListener.onSubscribeButtonResponse((SubscribeButtonResponse)msg);
}
- } else if (functionName.equals(FunctionId.UNSUBSCRIBE_BUTTON.toString())) {
+ } else if (functionName.equals(FunctionID.UNSUBSCRIBE_BUTTON.toString())) {
// UnsubscribeButton
final UnsubscribeButtonResponse msg = new UnsubscribeButtonResponse(hash);
@@ -1868,7 +1868,7 @@ public abstract class SdlProxyBase<proxyListenerType extends IProxyListenerBase> } else {
_proxyListener.onUnsubscribeButtonResponse((UnsubscribeButtonResponse)msg);
}
- } else if (functionName.equals(FunctionId.SET_MEDIA_CLOCK_TIMER.toString())) {
+ } else if (functionName.equals(FunctionID.SET_MEDIA_CLOCK_TIMER.toString())) {
// SetMediaClockTimer
final SetMediaClockTimerResponse msg = new SetMediaClockTimerResponse(hash);
@@ -1883,12 +1883,12 @@ public abstract class SdlProxyBase<proxyListenerType extends IProxyListenerBase> } else {
_proxyListener.onSetMediaClockTimerResponse((SetMediaClockTimerResponse)msg);
}
- } else if (functionName.equals(FunctionId.ENCODED_SYNC_P_DATA.toString())) {
+ } else if (functionName.equals(FunctionID.ENCODED_SYNC_P_DATA.toString())) {
final SystemRequestResponse msg = new SystemRequestResponse(hash);
Intent sendIntent = createBroadcastIntent();
- updateBroadcastIntent(sendIntent, "RPC_NAME", FunctionId.SYSTEM_REQUEST.toString());
+ updateBroadcastIntent(sendIntent, "RPC_NAME", FunctionID.SYSTEM_REQUEST.toString());
updateBroadcastIntent(sendIntent, "TYPE", RPCMessage.KEY_RESPONSE);
updateBroadcastIntent(sendIntent, "SUCCESS", msg.getSuccess());
updateBroadcastIntent(sendIntent, "COMMENT1", msg.getInfo());
@@ -1907,7 +1907,7 @@ public abstract class SdlProxyBase<proxyListenerType extends IProxyListenerBase> } else {
_proxyListener.onSystemRequestResponse(msg);
}
- } else if (functionName.equals(FunctionId.CREATE_INTERACTION_CHOICE_SET.toString())) {
+ } else if (functionName.equals(FunctionID.CREATE_INTERACTION_CHOICE_SET.toString())) {
// CreateInteractionChoiceSet
final CreateInteractionChoiceSetResponse msg = new CreateInteractionChoiceSetResponse(hash);
@@ -1922,7 +1922,7 @@ public abstract class SdlProxyBase<proxyListenerType extends IProxyListenerBase> } else {
_proxyListener.onCreateInteractionChoiceSetResponse((CreateInteractionChoiceSetResponse)msg);
}
- } else if (functionName.equals(FunctionId.DELETE_INTERACTION_CHOICE_SET.toString())) {
+ } else if (functionName.equals(FunctionID.DELETE_INTERACTION_CHOICE_SET.toString())) {
// DeleteInteractionChoiceSet
final DeleteInteractionChoiceSetResponse msg = new DeleteInteractionChoiceSetResponse(hash);
@@ -1937,7 +1937,7 @@ public abstract class SdlProxyBase<proxyListenerType extends IProxyListenerBase> } else {
_proxyListener.onDeleteInteractionChoiceSetResponse((DeleteInteractionChoiceSetResponse)msg);
}
- } else if (functionName.equals(FunctionId.PERFORM_INTERACTION.toString())) {
+ } else if (functionName.equals(FunctionID.PERFORM_INTERACTION.toString())) {
// PerformInteraction
final PerformInteractionResponse msg = new PerformInteractionResponse(hash);
@@ -1952,7 +1952,7 @@ public abstract class SdlProxyBase<proxyListenerType extends IProxyListenerBase> } else {
_proxyListener.onPerformInteractionResponse((PerformInteractionResponse)msg);
}
- } else if (functionName.equals(FunctionId.SET_GLOBAL_PROPERTIES.toString())) {
+ } else if (functionName.equals(FunctionID.SET_GLOBAL_PROPERTIES.toString())) {
// SetGlobalPropertiesResponse
final SetGlobalPropertiesResponse msg = new SetGlobalPropertiesResponse(hash);
@@ -1967,7 +1967,7 @@ public abstract class SdlProxyBase<proxyListenerType extends IProxyListenerBase> } else {
_proxyListener.onSetGlobalPropertiesResponse((SetGlobalPropertiesResponse)msg);
}
- } else if (functionName.equals(FunctionId.RESET_GLOBAL_PROPERTIES.toString())) {
+ } else if (functionName.equals(FunctionID.RESET_GLOBAL_PROPERTIES.toString())) {
// ResetGlobalProperties
final ResetGlobalPropertiesResponse msg = new ResetGlobalPropertiesResponse(hash);
@@ -1982,7 +1982,7 @@ public abstract class SdlProxyBase<proxyListenerType extends IProxyListenerBase> } else {
_proxyListener.onResetGlobalPropertiesResponse((ResetGlobalPropertiesResponse)msg);
}
- } else if (functionName.equals(FunctionId.UNREGISTER_APP_INTERFACE.toString())) {
+ } else if (functionName.equals(FunctionID.UNREGISTER_APP_INTERFACE.toString())) {
// UnregisterAppInterface
_appInterfaceRegisterd = false;
@@ -1993,7 +1993,7 @@ public abstract class SdlProxyBase<proxyListenerType extends IProxyListenerBase> final UnregisterAppInterfaceResponse msg = new UnregisterAppInterfaceResponse(hash);
Intent sendIntent = createBroadcastIntent();
- updateBroadcastIntent(sendIntent, "RPC_NAME", FunctionId.UNREGISTER_APP_INTERFACE.toString());
+ updateBroadcastIntent(sendIntent, "RPC_NAME", FunctionID.UNREGISTER_APP_INTERFACE.toString());
updateBroadcastIntent(sendIntent, "TYPE", RPCMessage.KEY_RESPONSE);
updateBroadcastIntent(sendIntent, "SUCCESS", msg.getSuccess());
updateBroadcastIntent(sendIntent, "COMMENT1", msg.getInfo());
@@ -2023,7 +2023,7 @@ public abstract class SdlProxyBase<proxyListenerType extends IProxyListenerBase> }
notifyProxyClosed("UnregisterAppInterfaceResponse", null, SdlDisconnectedReason.APP_INTERFACE_UNREG);
- } else if (functionName.equals(FunctionId.GENERIC_RESPONSE.toString())) {
+ } else if (functionName.equals(FunctionID.GENERIC_RESPONSE.toString())) {
// GenericResponse (Usually and error)
final GenericResponse msg = new GenericResponse(hash);
if (_callbackToUIThread) {
@@ -2037,7 +2037,7 @@ public abstract class SdlProxyBase<proxyListenerType extends IProxyListenerBase> } else {
_proxyListener.onGenericResponse((GenericResponse)msg);
}
- } else if (functionName.equals(FunctionId.SLIDER.toString())) {
+ } else if (functionName.equals(FunctionID.SLIDER.toString())) {
// Slider
final SliderResponse msg = new SliderResponse(hash);
if (_callbackToUIThread) {
@@ -2051,7 +2051,7 @@ public abstract class SdlProxyBase<proxyListenerType extends IProxyListenerBase> } else {
_proxyListener.onSliderResponse((SliderResponse)msg);
}
- } else if (functionName.equals(FunctionId.PUT_FILE.toString())) {
+ } else if (functionName.equals(FunctionID.PUT_FILE.toString())) {
// PutFile
final PutFileResponse msg = new PutFileResponse(hash);
if (_callbackToUIThread) {
@@ -2067,7 +2067,7 @@ public abstract class SdlProxyBase<proxyListenerType extends IProxyListenerBase> _proxyListener.onPutFileResponse((PutFileResponse)msg);
notifyPutFileStreamResponse(msg);
}
- } else if (functionName.equals(FunctionId.DELETE_FILE.toString())) {
+ } else if (functionName.equals(FunctionID.DELETE_FILE.toString())) {
// DeleteFile
final DeleteFileResponse msg = new DeleteFileResponse(hash);
if (_callbackToUIThread) {
@@ -2081,7 +2081,7 @@ public abstract class SdlProxyBase<proxyListenerType extends IProxyListenerBase> } else {
_proxyListener.onDeleteFileResponse((DeleteFileResponse)msg);
}
- } else if (functionName.equals(FunctionId.LIST_FILES.toString())) {
+ } else if (functionName.equals(FunctionID.LIST_FILES.toString())) {
// ListFiles
final ListFilesResponse msg = new ListFilesResponse(hash);
if (_callbackToUIThread) {
@@ -2095,7 +2095,7 @@ public abstract class SdlProxyBase<proxyListenerType extends IProxyListenerBase> } else {
_proxyListener.onListFilesResponse((ListFilesResponse)msg);
}
- } else if (functionName.equals(FunctionId.SET_APP_ICON.toString())) {
+ } else if (functionName.equals(FunctionID.SET_APP_ICON.toString())) {
// SetAppIcon
final SetAppIconResponse msg = new SetAppIconResponse(hash);
if (_callbackToUIThread) {
@@ -2109,7 +2109,7 @@ public abstract class SdlProxyBase<proxyListenerType extends IProxyListenerBase> } else {
_proxyListener.onSetAppIconResponse((SetAppIconResponse)msg);
}
- } else if (functionName.equals(FunctionId.SCROLLABLE_MESSAGE.toString())) {
+ } else if (functionName.equals(FunctionID.SCROLLABLE_MESSAGE.toString())) {
// ScrollableMessage
final ScrollableMessageResponse msg = new ScrollableMessageResponse(hash);
if (_callbackToUIThread) {
@@ -2123,7 +2123,7 @@ public abstract class SdlProxyBase<proxyListenerType extends IProxyListenerBase> } else {
_proxyListener.onScrollableMessageResponse((ScrollableMessageResponse)msg);
}
- } else if (functionName.equals(FunctionId.CHANGE_REGISTRATION.toString())) {
+ } else if (functionName.equals(FunctionID.CHANGE_REGISTRATION.toString())) {
// ChangeLanguageRegistration
final ChangeRegistrationResponse msg = new ChangeRegistrationResponse(hash);
if (_callbackToUIThread) {
@@ -2137,7 +2137,7 @@ public abstract class SdlProxyBase<proxyListenerType extends IProxyListenerBase> } else {
_proxyListener.onChangeRegistrationResponse((ChangeRegistrationResponse)msg);
}
- } else if (functionName.equals(FunctionId.SET_DISPLAY_LAYOUT.toString())) {
+ } else if (functionName.equals(FunctionID.SET_DISPLAY_LAYOUT.toString())) {
// SetDisplayLayout
final SetDisplayLayoutResponse msg = new SetDisplayLayoutResponse(hash);
@@ -2160,7 +2160,7 @@ public abstract class SdlProxyBase<proxyListenerType extends IProxyListenerBase> } else {
_proxyListener.onSetDisplayLayoutResponse((SetDisplayLayoutResponse)msg);
}
- } else if (functionName.equals(FunctionId.PERFORM_AUDIO_PASS_THRU.toString())) {
+ } else if (functionName.equals(FunctionID.PERFORM_AUDIO_PASS_THRU.toString())) {
// PerformAudioPassThru
final PerformAudioPassThruResponse msg = new PerformAudioPassThruResponse(hash);
if (_callbackToUIThread) {
@@ -2174,7 +2174,7 @@ public abstract class SdlProxyBase<proxyListenerType extends IProxyListenerBase> } else {
_proxyListener.onPerformAudioPassThruResponse((PerformAudioPassThruResponse)msg);
}
- } else if (functionName.equals(FunctionId.END_AUDIO_PASS_THRU.toString())) {
+ } else if (functionName.equals(FunctionID.END_AUDIO_PASS_THRU.toString())) {
// EndAudioPassThru
final EndAudioPassThruResponse msg = new EndAudioPassThruResponse(hash);
if (_callbackToUIThread) {
@@ -2188,7 +2188,7 @@ public abstract class SdlProxyBase<proxyListenerType extends IProxyListenerBase> } else {
_proxyListener.onEndAudioPassThruResponse((EndAudioPassThruResponse)msg);
}
- } else if (functionName.equals(FunctionId.SUBSCRIBE_VEHICLE_DATA.toString())) {
+ } else if (functionName.equals(FunctionID.SUBSCRIBE_VEHICLE_DATA.toString())) {
// SubscribeVehicleData
final SubscribeVehicleDataResponse msg = new SubscribeVehicleDataResponse(hash);
if (_callbackToUIThread) {
@@ -2202,7 +2202,7 @@ public abstract class SdlProxyBase<proxyListenerType extends IProxyListenerBase> } else {
_proxyListener.onSubscribeVehicleDataResponse((SubscribeVehicleDataResponse)msg);
}
- } else if (functionName.equals(FunctionId.UNSUBSCRIBE_VEHICLE_DATA.toString())) {
+ } else if (functionName.equals(FunctionID.UNSUBSCRIBE_VEHICLE_DATA.toString())) {
// UnsubscribeVehicleData
final UnsubscribeVehicleDataResponse msg = new UnsubscribeVehicleDataResponse(hash);
if (_callbackToUIThread) {
@@ -2216,7 +2216,7 @@ public abstract class SdlProxyBase<proxyListenerType extends IProxyListenerBase> } else {
_proxyListener.onUnsubscribeVehicleDataResponse((UnsubscribeVehicleDataResponse)msg);
}
- } else if (functionName.equals(FunctionId.GET_VEHICLE_DATA.toString())) {
+ } else if (functionName.equals(FunctionID.GET_VEHICLE_DATA.toString())) {
// GetVehicleData
final GetVehicleDataResponse msg = new GetVehicleDataResponse(hash);
if (_callbackToUIThread) {
@@ -2230,7 +2230,7 @@ public abstract class SdlProxyBase<proxyListenerType extends IProxyListenerBase> } else {
_proxyListener.onGetVehicleDataResponse((GetVehicleDataResponse)msg);
}
- } else if (functionName.equals(FunctionId.READ_DID.toString())) {
+ } else if (functionName.equals(FunctionID.READ_DID.toString())) {
final ReadDIDResponse msg = new ReadDIDResponse(hash);
if (_callbackToUIThread) {
// Run in UI thread
@@ -2243,7 +2243,7 @@ public abstract class SdlProxyBase<proxyListenerType extends IProxyListenerBase> } else {
_proxyListener.onReadDIDResponse((ReadDIDResponse)msg);
}
- } else if (functionName.equals(FunctionId.GET_DTCS.toString())) {
+ } else if (functionName.equals(FunctionID.GET_DTCS.toString())) {
final GetDTCsResponse msg = new GetDTCsResponse(hash);
if (_callbackToUIThread) {
// Run in UI thread
@@ -2256,7 +2256,7 @@ public abstract class SdlProxyBase<proxyListenerType extends IProxyListenerBase> } else {
_proxyListener.onGetDTCsResponse((GetDTCsResponse)msg);
}
- } else if (functionName.equals(FunctionId.DIAGNOSTIC_MESSAGE.toString())) {
+ } else if (functionName.equals(FunctionID.DIAGNOSTIC_MESSAGE.toString())) {
final DiagnosticMessageResponse msg = new DiagnosticMessageResponse(hash);
if (_callbackToUIThread) {
// Run in UI thread
@@ -2270,7 +2270,7 @@ public abstract class SdlProxyBase<proxyListenerType extends IProxyListenerBase> _proxyListener.onDiagnosticMessageResponse((DiagnosticMessageResponse)msg);
}
}
- else if (functionName.equals(FunctionId.SYSTEM_REQUEST.toString())) {
+ else if (functionName.equals(FunctionID.SYSTEM_REQUEST.toString())) {
final SystemRequestResponse msg = new SystemRequestResponse(hash);
if (_callbackToUIThread) {
@@ -2285,7 +2285,7 @@ public abstract class SdlProxyBase<proxyListenerType extends IProxyListenerBase> _proxyListener.onSystemRequestResponse((SystemRequestResponse)msg);
}
}
- else if (functionName.equals(FunctionId.SEND_LOCATION.toString())) {
+ else if (functionName.equals(FunctionID.SEND_LOCATION.toString())) {
final SendLocationResponse msg = new SendLocationResponse(hash);
if (_callbackToUIThread) {
@@ -2300,7 +2300,7 @@ public abstract class SdlProxyBase<proxyListenerType extends IProxyListenerBase> _proxyListener.onSendLocationResponse(msg);
}
}
- else if (functionName.equals(FunctionId.DIAL_NUMBER.toString())) {
+ else if (functionName.equals(FunctionID.DIAL_NUMBER.toString())) {
final DialNumberResponse msg = new DialNumberResponse(hash);
if (_callbackToUIThread) {
@@ -2325,7 +2325,7 @@ public abstract class SdlProxyBase<proxyListenerType extends IProxyListenerBase> } // end-if
} else if (messageType.equals(RPCMessage.KEY_NOTIFICATION)) {
SdlTrace.logRPCEvent(InterfaceActivityDirection.Receive, new RPCNotification(rpcMsg), SDL_LIB_TRACE_KEY);
- if (functionName.equals(FunctionId.ON_HMI_STATUS.toString())) {
+ if (functionName.equals(FunctionID.ON_HMI_STATUS.toString())) {
// OnHMIStatus
final OnHMIStatus msg = new OnHMIStatus(hash);
@@ -2354,7 +2354,7 @@ public abstract class SdlProxyBase<proxyListenerType extends IProxyListenerBase> _proxyListener.onOnLockScreenNotification(sdlSession.getLockScreenMan().getLockObj());
}
}
- } else if (functionName.equals(FunctionId.ON_COMMAND.toString())) {
+ } else if (functionName.equals(FunctionID.ON_COMMAND.toString())) {
// OnCommand
final OnCommand msg = new OnCommand(hash);
@@ -2369,7 +2369,7 @@ public abstract class SdlProxyBase<proxyListenerType extends IProxyListenerBase> } else {
_proxyListener.onOnCommand((OnCommand)msg);
}
- } else if (functionName.equals(FunctionId.ON_DRIVER_DISTRACTION.toString())) {
+ } else if (functionName.equals(FunctionID.ON_DRIVER_DISTRACTION.toString())) {
// OnDriverDistration
final OnDriverDistraction msg = new OnDriverDistraction(hash);
@@ -2399,12 +2399,12 @@ public abstract class SdlProxyBase<proxyListenerType extends IProxyListenerBase> _proxyListener.onOnDriverDistraction(msg);
_proxyListener.onOnLockScreenNotification(sdlSession.getLockScreenMan().getLockObj());
}
- } else if (functionName.equals(FunctionId.ON_ENCODED_SYNC_P_DATA.toString())) {
+ } else if (functionName.equals(FunctionID.ON_ENCODED_SYNC_P_DATA.toString())) {
final OnSystemRequest msg = new OnSystemRequest(hash);
Intent sendIntent = createBroadcastIntent();
- updateBroadcastIntent(sendIntent, "RPC_NAME", FunctionId.ON_SYSTEM_REQUEST.toString());
+ updateBroadcastIntent(sendIntent, "RPC_NAME", FunctionID.ON_SYSTEM_REQUEST.toString());
updateBroadcastIntent(sendIntent, "TYPE", RPCMessage.KEY_NOTIFICATION);
// If url is null, then send notification to the app, otherwise, send to URL
@@ -2440,7 +2440,7 @@ public abstract class SdlProxyBase<proxyListenerType extends IProxyListenerBase> handleOffboardTransmissionThread.start();
}
}
- } else if (functionName.equals(FunctionId.ON_PERMISSIONS_CHANGE.toString())) {
+ } else if (functionName.equals(FunctionID.ON_PERMISSIONS_CHANGE.toString())) {
//OnPermissionsChange
final OnPermissionsChange msg = new OnPermissionsChange(hash);
@@ -2455,7 +2455,7 @@ public abstract class SdlProxyBase<proxyListenerType extends IProxyListenerBase> } else {
_proxyListener.onOnPermissionsChange(msg);
}
- } else if (functionName.equals(FunctionId.ON_TBT_CLIENT_STATE.toString())) {
+ } else if (functionName.equals(FunctionID.ON_TBT_CLIENT_STATE.toString())) {
// OnTBTClientState
final OnTBTClientState msg = new OnTBTClientState(hash);
@@ -2470,7 +2470,7 @@ public abstract class SdlProxyBase<proxyListenerType extends IProxyListenerBase> } else {
_proxyListener.onOnTBTClientState(msg);
}
- } else if (functionName.equals(FunctionId.ON_BUTTON_PRESS.toString())) {
+ } else if (functionName.equals(FunctionID.ON_BUTTON_PRESS.toString())) {
// OnButtonPress
final OnButtonPress msg = new OnButtonPress(hash);
@@ -2485,7 +2485,7 @@ public abstract class SdlProxyBase<proxyListenerType extends IProxyListenerBase> } else {
_proxyListener.onOnButtonPress((OnButtonPress)msg);
}
- } else if (functionName.equals(FunctionId.ON_BUTTON_EVENT.toString())) {
+ } else if (functionName.equals(FunctionID.ON_BUTTON_EVENT.toString())) {
// OnButtonEvent
final OnButtonEvent msg = new OnButtonEvent(hash);
@@ -2500,7 +2500,7 @@ public abstract class SdlProxyBase<proxyListenerType extends IProxyListenerBase> } else {
_proxyListener.onOnButtonEvent((OnButtonEvent)msg);
}
- } else if (functionName.equals(FunctionId.ON_LANGUAGE_CHANGE.toString())) {
+ } else if (functionName.equals(FunctionID.ON_LANGUAGE_CHANGE.toString())) {
// OnLanguageChange
final OnLanguageChange msg = new OnLanguageChange(hash);
@@ -2515,7 +2515,7 @@ public abstract class SdlProxyBase<proxyListenerType extends IProxyListenerBase> } else {
_proxyListener.onOnLanguageChange((OnLanguageChange)msg);
}
- } else if (functionName.equals(FunctionId.ON_HASH_CHANGE.toString())) {
+ } else if (functionName.equals(FunctionID.ON_HASH_CHANGE.toString())) {
// OnLanguageChange
final OnHashChange msg = new OnHashChange(hash);
@@ -2538,7 +2538,7 @@ public abstract class SdlProxyBase<proxyListenerType extends IProxyListenerBase> _lastHashID = msg.getHashID();
}
}
- } else if (functionName.equals(FunctionId.ON_SYSTEM_REQUEST.toString())) {
+ } else if (functionName.equals(FunctionID.ON_SYSTEM_REQUEST.toString())) {
// OnSystemRequest
final OnSystemRequest msg = new OnSystemRequest(hash);
@@ -2569,7 +2569,7 @@ public abstract class SdlProxyBase<proxyListenerType extends IProxyListenerBase> } else {
_proxyListener.onOnSystemRequest((OnSystemRequest)msg);
}
- } else if (functionName.equals(FunctionId.ON_AUDIO_PASS_THRU.toString())) {
+ } else if (functionName.equals(FunctionID.ON_AUDIO_PASS_THRU.toString())) {
// OnAudioPassThru
final OnAudioPassThru msg = new OnAudioPassThru(hash);
if (_callbackToUIThread) {
@@ -2583,7 +2583,7 @@ public abstract class SdlProxyBase<proxyListenerType extends IProxyListenerBase> } else {
_proxyListener.onOnAudioPassThru((OnAudioPassThru)msg);
}
- } else if (functionName.equals(FunctionId.ON_VEHICLE_DATA.toString())) {
+ } else if (functionName.equals(FunctionID.ON_VEHICLE_DATA.toString())) {
// OnVehicleData
final OnVehicleData msg = new OnVehicleData(hash);
if (_callbackToUIThread) {
@@ -2598,7 +2598,7 @@ public abstract class SdlProxyBase<proxyListenerType extends IProxyListenerBase> _proxyListener.onOnVehicleData((OnVehicleData)msg);
}
}
- else if (functionName.equals(FunctionId.ON_APP_INTERFACE_UNREGISTERED.toString())) {
+ else if (functionName.equals(FunctionID.ON_APP_INTERFACE_UNREGISTERED.toString())) {
// OnAppInterfaceUnregistered
_appInterfaceRegisterd = false;
@@ -2609,7 +2609,7 @@ public abstract class SdlProxyBase<proxyListenerType extends IProxyListenerBase> final OnAppInterfaceUnregistered msg = new OnAppInterfaceUnregistered(hash);
Intent sendIntent = createBroadcastIntent();
- updateBroadcastIntent(sendIntent, "RPC_NAME", FunctionId.ON_APP_INTERFACE_UNREGISTERED.toString());
+ updateBroadcastIntent(sendIntent, "RPC_NAME", FunctionID.ON_APP_INTERFACE_UNREGISTERED.toString());
updateBroadcastIntent(sendIntent, "TYPE", RPCMessage.KEY_NOTIFICATION);
updateBroadcastIntent(sendIntent, "DATA",serializeJSON(msg));
sendBroadcastIntent(sendIntent);
@@ -2632,7 +2632,7 @@ public abstract class SdlProxyBase<proxyListenerType extends IProxyListenerBase> notifyProxyClosed("OnAppInterfaceUnregistered", null, SdlDisconnectedReason.APP_INTERFACE_UNREG);
}
}
- else if (functionName.equals(FunctionId.ON_KEYBOARD_INPUT.toString())) {
+ else if (functionName.equals(FunctionID.ON_KEYBOARD_INPUT.toString())) {
final OnKeyboardInput msg = new OnKeyboardInput(hash);
if (_callbackToUIThread) {
// Run in UI thread
@@ -2646,7 +2646,7 @@ public abstract class SdlProxyBase<proxyListenerType extends IProxyListenerBase> _proxyListener.onOnKeyboardInput((OnKeyboardInput)msg);
}
}
- else if (functionName.equals(FunctionId.ON_TOUCH_EVENT.toString())) {
+ else if (functionName.equals(FunctionID.ON_TOUCH_EVENT.toString())) {
final OnTouchEvent msg = new OnTouchEvent(hash);
if (_callbackToUIThread) {
// Run in UI thread
@@ -2709,15 +2709,15 @@ public abstract class SdlProxyBase<proxyListenerType extends IProxyListenerBase> }
// Throw exception if RPCRequest is sent when SDL is unavailable
- if (!_appInterfaceRegisterd && !request.getFunctionName().equals(FunctionId.REGISTER_APP_INTERFACE.toString())) {
+ if (!_appInterfaceRegisterd && !request.getFunctionName().equals(FunctionID.REGISTER_APP_INTERFACE.toString())) {
SdlTrace.logProxyEvent("Application attempted to send an RPCRequest (non-registerAppInterface), before the interface was registerd.", SDL_LIB_TRACE_KEY);
throw new SdlException("SDL is currently unavailable. RPC Requests cannot be sent.", SdlExceptionCause.SDL_UNAVAILABLE);
}
if (_advancedLifecycleManagementEnabled) {
- if (request.getFunctionName().equals(FunctionId.REGISTER_APP_INTERFACE.toString())
- || request.getFunctionName().equals(FunctionId.UNREGISTER_APP_INTERFACE.toString())) {
+ if (request.getFunctionName().equals(FunctionID.REGISTER_APP_INTERFACE.toString())
+ || request.getFunctionName().equals(FunctionID.UNREGISTER_APP_INTERFACE.toString())) {
SdlTrace.logProxyEvent("Application attempted to send a RegisterAppInterface or UnregisterAppInterface while using ALM.", SDL_LIB_TRACE_KEY);
throw new SdlException("The RPCRequest, " + request.getFunctionName() +
@@ -3779,7 +3779,7 @@ public abstract class SdlProxyBase<proxyListenerType extends IProxyListenerBase> }
Intent sendIntent = createBroadcastIntent();
- updateBroadcastIntent(sendIntent, "RPC_NAME", FunctionId.REGISTER_APP_INTERFACE.toString());
+ updateBroadcastIntent(sendIntent, "RPC_NAME", FunctionID.REGISTER_APP_INTERFACE.toString());
updateBroadcastIntent(sendIntent, "TYPE", RPCMessage.KEY_REQUEST);
updateBroadcastIntent(sendIntent, "CORRID", msg.getCorrelationID());
updateBroadcastIntent(sendIntent, "DATA",serializeJSON(msg));
@@ -4094,7 +4094,7 @@ public abstract class SdlProxyBase<proxyListenerType extends IProxyListenerBase> RPCRequestFactory.buildUnregisterAppInterface(correlationID);
Intent sendIntent = createBroadcastIntent();
- updateBroadcastIntent(sendIntent, "RPC_NAME", FunctionId.UNREGISTER_APP_INTERFACE.toString());
+ updateBroadcastIntent(sendIntent, "RPC_NAME", FunctionID.UNREGISTER_APP_INTERFACE.toString());
updateBroadcastIntent(sendIntent, "TYPE", RPCMessage.KEY_REQUEST);
updateBroadcastIntent(sendIntent, "CORRID", msg.getCorrelationID());
updateBroadcastIntent(sendIntent, "DATA",serializeJSON(msg));
diff --git a/sdl_android_lib/src/com/smartdevicelink/proxy/rpc/AddCommand.java b/sdl_android_lib/src/com/smartdevicelink/proxy/rpc/AddCommand.java index 1aa12d235..3ecac23c5 100644 --- a/sdl_android_lib/src/com/smartdevicelink/proxy/rpc/AddCommand.java +++ b/sdl_android_lib/src/com/smartdevicelink/proxy/rpc/AddCommand.java @@ -3,7 +3,7 @@ package com.smartdevicelink.proxy.rpc; import java.util.Hashtable;
import java.util.List;
-import com.smartdevicelink.protocol.enums.FunctionId;
+import com.smartdevicelink.protocol.enums.FunctionID;
import com.smartdevicelink.proxy.RPCRequest;
import com.smartdevicelink.util.DebugTool;
@@ -53,7 +53,7 @@ public class AddCommand extends RPCRequest { * Constructs a new AddCommand object
*/
public AddCommand() {
- super(FunctionId.ADD_COMMAND.toString());
+ super(FunctionID.ADD_COMMAND.toString());
}
/**
diff --git a/sdl_android_lib/src/com/smartdevicelink/proxy/rpc/AddCommandResponse.java b/sdl_android_lib/src/com/smartdevicelink/proxy/rpc/AddCommandResponse.java index e945915c0..5d64cf6c8 100644 --- a/sdl_android_lib/src/com/smartdevicelink/proxy/rpc/AddCommandResponse.java +++ b/sdl_android_lib/src/com/smartdevicelink/proxy/rpc/AddCommandResponse.java @@ -2,7 +2,7 @@ package com.smartdevicelink.proxy.rpc; import java.util.Hashtable;
-import com.smartdevicelink.protocol.enums.FunctionId;
+import com.smartdevicelink.protocol.enums.FunctionID;
import com.smartdevicelink.proxy.RPCResponse;
/**
@@ -13,7 +13,7 @@ import com.smartdevicelink.proxy.RPCResponse; public class AddCommandResponse extends RPCResponse {
public AddCommandResponse() {
- super(FunctionId.ADD_COMMAND.toString());
+ super(FunctionID.ADD_COMMAND.toString());
}
public AddCommandResponse(Hashtable<String, Object> hash) {
diff --git a/sdl_android_lib/src/com/smartdevicelink/proxy/rpc/AddSubMenu.java b/sdl_android_lib/src/com/smartdevicelink/proxy/rpc/AddSubMenu.java index a8ee7e5c7..9985fab61 100644 --- a/sdl_android_lib/src/com/smartdevicelink/proxy/rpc/AddSubMenu.java +++ b/sdl_android_lib/src/com/smartdevicelink/proxy/rpc/AddSubMenu.java @@ -2,7 +2,7 @@ package com.smartdevicelink.proxy.rpc; import java.util.Hashtable;
-import com.smartdevicelink.protocol.enums.FunctionId;
+import com.smartdevicelink.protocol.enums.FunctionID;
import com.smartdevicelink.proxy.RPCRequest;
/**
@@ -29,7 +29,7 @@ public class AddSubMenu extends RPCRequest { * Constructs a new AddSubMenu object
*/
public AddSubMenu() {
- super(FunctionId.ADD_SUB_MENU.toString());
+ super(FunctionID.ADD_SUB_MENU.toString());
}
/**
* Constructs a new AddSubMenu object indicated by the Hashtable parameter
diff --git a/sdl_android_lib/src/com/smartdevicelink/proxy/rpc/AddSubMenuResponse.java b/sdl_android_lib/src/com/smartdevicelink/proxy/rpc/AddSubMenuResponse.java index af6da36db..c43317628 100644 --- a/sdl_android_lib/src/com/smartdevicelink/proxy/rpc/AddSubMenuResponse.java +++ b/sdl_android_lib/src/com/smartdevicelink/proxy/rpc/AddSubMenuResponse.java @@ -2,7 +2,7 @@ package com.smartdevicelink.proxy.rpc; import java.util.Hashtable;
-import com.smartdevicelink.protocol.enums.FunctionId;
+import com.smartdevicelink.protocol.enums.FunctionID;
import com.smartdevicelink.proxy.RPCResponse;
/**
@@ -12,7 +12,7 @@ import com.smartdevicelink.proxy.RPCResponse; public class AddSubMenuResponse extends RPCResponse {
public AddSubMenuResponse() {
- super(FunctionId.ADD_SUB_MENU.toString());
+ super(FunctionID.ADD_SUB_MENU.toString());
}
public AddSubMenuResponse(Hashtable<String, Object> hash) {
super(hash);
diff --git a/sdl_android_lib/src/com/smartdevicelink/proxy/rpc/Alert.java b/sdl_android_lib/src/com/smartdevicelink/proxy/rpc/Alert.java index 6a688a460..dad62cad5 100644 --- a/sdl_android_lib/src/com/smartdevicelink/proxy/rpc/Alert.java +++ b/sdl_android_lib/src/com/smartdevicelink/proxy/rpc/Alert.java @@ -4,7 +4,7 @@ import java.util.ArrayList; import java.util.Hashtable;
import java.util.List;
-import com.smartdevicelink.protocol.enums.FunctionId;
+import com.smartdevicelink.protocol.enums.FunctionID;
import com.smartdevicelink.proxy.RPCRequest;
/**
@@ -52,7 +52,7 @@ public class Alert extends RPCRequest { * Constructs a new Alert object
*/
public Alert() {
- super(FunctionId.ALERT.toString());
+ super(FunctionID.ALERT.toString());
}
/**
* Constructs a new Alert object indicated by the Hashtable parameter
diff --git a/sdl_android_lib/src/com/smartdevicelink/proxy/rpc/AlertManeuver.java b/sdl_android_lib/src/com/smartdevicelink/proxy/rpc/AlertManeuver.java index 5af8bb38f..9aab52589 100644 --- a/sdl_android_lib/src/com/smartdevicelink/proxy/rpc/AlertManeuver.java +++ b/sdl_android_lib/src/com/smartdevicelink/proxy/rpc/AlertManeuver.java @@ -4,7 +4,7 @@ import java.util.ArrayList; import java.util.Hashtable; import java.util.List; -import com.smartdevicelink.protocol.enums.FunctionId; +import com.smartdevicelink.protocol.enums.FunctionID; import com.smartdevicelink.proxy.RPCRequest; /** @@ -28,7 +28,7 @@ public class AlertManeuver extends RPCRequest{ * Constructs a new AlertManeuver object */ public AlertManeuver(){ - super(FunctionId.ALERT_MANEUVER.toString()); + super(FunctionID.ALERT_MANEUVER.toString()); } /** diff --git a/sdl_android_lib/src/com/smartdevicelink/proxy/rpc/AlertManeuverResponse.java b/sdl_android_lib/src/com/smartdevicelink/proxy/rpc/AlertManeuverResponse.java index 94ecb80e0..6ed8ca1a4 100644 --- a/sdl_android_lib/src/com/smartdevicelink/proxy/rpc/AlertManeuverResponse.java +++ b/sdl_android_lib/src/com/smartdevicelink/proxy/rpc/AlertManeuverResponse.java @@ -2,7 +2,7 @@ package com.smartdevicelink.proxy.rpc; import java.util.Hashtable; -import com.smartdevicelink.protocol.enums.FunctionId; +import com.smartdevicelink.protocol.enums.FunctionID; import com.smartdevicelink.proxy.RPCResponse; /** @@ -16,7 +16,7 @@ public class AlertManeuverResponse extends RPCResponse{ * Constructs a new AlertManeuverResponse object */ public AlertManeuverResponse() { - super(FunctionId.ALERT_MANEUVER.toString()); + super(FunctionID.ALERT_MANEUVER.toString()); } /** diff --git a/sdl_android_lib/src/com/smartdevicelink/proxy/rpc/AlertResponse.java b/sdl_android_lib/src/com/smartdevicelink/proxy/rpc/AlertResponse.java index 5c79bad2c..fc01fbe63 100644 --- a/sdl_android_lib/src/com/smartdevicelink/proxy/rpc/AlertResponse.java +++ b/sdl_android_lib/src/com/smartdevicelink/proxy/rpc/AlertResponse.java @@ -2,7 +2,7 @@ package com.smartdevicelink.proxy.rpc; import java.util.Hashtable;
-import com.smartdevicelink.protocol.enums.FunctionId;
+import com.smartdevicelink.protocol.enums.FunctionID;
import com.smartdevicelink.proxy.RPCResponse;
/**
@@ -17,7 +17,7 @@ public class AlertResponse extends RPCResponse { * Constructs a new AlertResponse object
*/
public AlertResponse() {
- super(FunctionId.ALERT.toString());
+ super(FunctionID.ALERT.toString());
}
/**
diff --git a/sdl_android_lib/src/com/smartdevicelink/proxy/rpc/ChangeRegistration.java b/sdl_android_lib/src/com/smartdevicelink/proxy/rpc/ChangeRegistration.java index a2199c6b3..1cf47841e 100644 --- a/sdl_android_lib/src/com/smartdevicelink/proxy/rpc/ChangeRegistration.java +++ b/sdl_android_lib/src/com/smartdevicelink/proxy/rpc/ChangeRegistration.java @@ -4,7 +4,7 @@ import java.util.ArrayList; import java.util.Hashtable;
import java.util.List;
-import com.smartdevicelink.protocol.enums.FunctionId;
+import com.smartdevicelink.protocol.enums.FunctionID;
import com.smartdevicelink.proxy.RPCRequest;
import com.smartdevicelink.proxy.rpc.enums.Language;
@@ -34,7 +34,7 @@ public class ChangeRegistration extends RPCRequest { * Constructs a new ChangeRegistration object
*/
public ChangeRegistration() {
- super(FunctionId.CHANGE_REGISTRATION.toString());
+ super(FunctionID.CHANGE_REGISTRATION.toString());
}
/**
diff --git a/sdl_android_lib/src/com/smartdevicelink/proxy/rpc/ChangeRegistrationResponse.java b/sdl_android_lib/src/com/smartdevicelink/proxy/rpc/ChangeRegistrationResponse.java index 24990601b..0ab62ba49 100644 --- a/sdl_android_lib/src/com/smartdevicelink/proxy/rpc/ChangeRegistrationResponse.java +++ b/sdl_android_lib/src/com/smartdevicelink/proxy/rpc/ChangeRegistrationResponse.java @@ -2,7 +2,7 @@ package com.smartdevicelink.proxy.rpc; import java.util.Hashtable;
-import com.smartdevicelink.protocol.enums.FunctionId;
+import com.smartdevicelink.protocol.enums.FunctionID;
import com.smartdevicelink.proxy.RPCResponse;
/**
@@ -16,7 +16,7 @@ public class ChangeRegistrationResponse extends RPCResponse { * Constructs a new ChangeRegistrationResponse object
*/
public ChangeRegistrationResponse() {
- super(FunctionId.CHANGE_REGISTRATION.toString());
+ super(FunctionID.CHANGE_REGISTRATION.toString());
}
/**
diff --git a/sdl_android_lib/src/com/smartdevicelink/proxy/rpc/CreateInteractionChoiceSet.java b/sdl_android_lib/src/com/smartdevicelink/proxy/rpc/CreateInteractionChoiceSet.java index 2826d7268..45c2901de 100644 --- a/sdl_android_lib/src/com/smartdevicelink/proxy/rpc/CreateInteractionChoiceSet.java +++ b/sdl_android_lib/src/com/smartdevicelink/proxy/rpc/CreateInteractionChoiceSet.java @@ -4,7 +4,7 @@ import java.util.ArrayList; import java.util.Hashtable;
import java.util.List;
-import com.smartdevicelink.protocol.enums.FunctionId;
+import com.smartdevicelink.protocol.enums.FunctionID;
import com.smartdevicelink.proxy.RPCRequest;
/**
@@ -28,7 +28,7 @@ public class CreateInteractionChoiceSet extends RPCRequest { * Constructs a new CreateInteractionChoiceSet object
*/
public CreateInteractionChoiceSet() {
- super(FunctionId.CREATE_INTERACTION_CHOICE_SET.toString());
+ super(FunctionID.CREATE_INTERACTION_CHOICE_SET.toString());
}
/**
* Constructs a new CreateInteractionChoiceSet object indicated by the
diff --git a/sdl_android_lib/src/com/smartdevicelink/proxy/rpc/CreateInteractionChoiceSetResponse.java b/sdl_android_lib/src/com/smartdevicelink/proxy/rpc/CreateInteractionChoiceSetResponse.java index eb93f4da3..d5a417090 100644 --- a/sdl_android_lib/src/com/smartdevicelink/proxy/rpc/CreateInteractionChoiceSetResponse.java +++ b/sdl_android_lib/src/com/smartdevicelink/proxy/rpc/CreateInteractionChoiceSetResponse.java @@ -2,7 +2,7 @@ package com.smartdevicelink.proxy.rpc; import java.util.Hashtable;
-import com.smartdevicelink.protocol.enums.FunctionId;
+import com.smartdevicelink.protocol.enums.FunctionID;
import com.smartdevicelink.proxy.RPCResponse;
/**
@@ -14,7 +14,7 @@ import com.smartdevicelink.proxy.RPCResponse; public class CreateInteractionChoiceSetResponse extends RPCResponse {
public CreateInteractionChoiceSetResponse() {
- super(FunctionId.CREATE_INTERACTION_CHOICE_SET.toString());
+ super(FunctionID.CREATE_INTERACTION_CHOICE_SET.toString());
}
public CreateInteractionChoiceSetResponse(Hashtable<String, Object> hash) {
super(hash);
diff --git a/sdl_android_lib/src/com/smartdevicelink/proxy/rpc/DeleteCommand.java b/sdl_android_lib/src/com/smartdevicelink/proxy/rpc/DeleteCommand.java index 591ec9b55..bf32d6996 100644 --- a/sdl_android_lib/src/com/smartdevicelink/proxy/rpc/DeleteCommand.java +++ b/sdl_android_lib/src/com/smartdevicelink/proxy/rpc/DeleteCommand.java @@ -2,7 +2,7 @@ package com.smartdevicelink.proxy.rpc; import java.util.Hashtable;
-import com.smartdevicelink.protocol.enums.FunctionId;
+import com.smartdevicelink.protocol.enums.FunctionID;
import com.smartdevicelink.proxy.RPCRequest;
/**
@@ -26,7 +26,7 @@ public class DeleteCommand extends RPCRequest { * Constructs a new DeleteCommand object
*/
public DeleteCommand() {
- super(FunctionId.DELETE_COMMAND.toString());
+ super(FunctionID.DELETE_COMMAND.toString());
}
/**
* Constructs a new DeleteCommand object indicated by the Hashtable
diff --git a/sdl_android_lib/src/com/smartdevicelink/proxy/rpc/DeleteCommandResponse.java b/sdl_android_lib/src/com/smartdevicelink/proxy/rpc/DeleteCommandResponse.java index 35156c3b1..b6bcc9e7d 100644 --- a/sdl_android_lib/src/com/smartdevicelink/proxy/rpc/DeleteCommandResponse.java +++ b/sdl_android_lib/src/com/smartdevicelink/proxy/rpc/DeleteCommandResponse.java @@ -2,7 +2,7 @@ package com.smartdevicelink.proxy.rpc; import java.util.Hashtable;
-import com.smartdevicelink.protocol.enums.FunctionId;
+import com.smartdevicelink.protocol.enums.FunctionID;
import com.smartdevicelink.proxy.RPCResponse;
/**
@@ -13,7 +13,7 @@ import com.smartdevicelink.proxy.RPCResponse; public class DeleteCommandResponse extends RPCResponse {
public DeleteCommandResponse() {
- super(FunctionId.DELETE_COMMAND.toString());
+ super(FunctionID.DELETE_COMMAND.toString());
}
public DeleteCommandResponse(Hashtable<String, Object> hash) {
super(hash);
diff --git a/sdl_android_lib/src/com/smartdevicelink/proxy/rpc/DeleteFile.java b/sdl_android_lib/src/com/smartdevicelink/proxy/rpc/DeleteFile.java index f01e74a8d..b2bc91a99 100644 --- a/sdl_android_lib/src/com/smartdevicelink/proxy/rpc/DeleteFile.java +++ b/sdl_android_lib/src/com/smartdevicelink/proxy/rpc/DeleteFile.java @@ -2,7 +2,7 @@ package com.smartdevicelink.proxy.rpc; import java.util.Hashtable;
-import com.smartdevicelink.protocol.enums.FunctionId;
+import com.smartdevicelink.protocol.enums.FunctionID;
import com.smartdevicelink.proxy.RPCRequest;
/**
@@ -21,7 +21,7 @@ public class DeleteFile extends RPCRequest { * Constructs a new DeleteFile object
*/
public DeleteFile() {
- super(FunctionId.DELETE_FILE.toString());
+ super(FunctionID.DELETE_FILE.toString());
}
/**
diff --git a/sdl_android_lib/src/com/smartdevicelink/proxy/rpc/DeleteFileResponse.java b/sdl_android_lib/src/com/smartdevicelink/proxy/rpc/DeleteFileResponse.java index 2dee46df4..ad54b2a14 100644 --- a/sdl_android_lib/src/com/smartdevicelink/proxy/rpc/DeleteFileResponse.java +++ b/sdl_android_lib/src/com/smartdevicelink/proxy/rpc/DeleteFileResponse.java @@ -2,7 +2,7 @@ package com.smartdevicelink.proxy.rpc; import java.util.Hashtable;
-import com.smartdevicelink.protocol.enums.FunctionId;
+import com.smartdevicelink.protocol.enums.FunctionID;
import com.smartdevicelink.proxy.RPCResponse;
/**
@@ -14,7 +14,7 @@ public class DeleteFileResponse extends RPCResponse { public static final String KEY_SPACE_AVAILABLE = "spaceAvailable";
public DeleteFileResponse() {
- super(FunctionId.DELETE_FILE.toString());
+ super(FunctionID.DELETE_FILE.toString());
}
public DeleteFileResponse(Hashtable<String, Object> hash) {
super(hash);
diff --git a/sdl_android_lib/src/com/smartdevicelink/proxy/rpc/DeleteInteractionChoiceSet.java b/sdl_android_lib/src/com/smartdevicelink/proxy/rpc/DeleteInteractionChoiceSet.java index b1d9dc853..0d7d610d7 100644 --- a/sdl_android_lib/src/com/smartdevicelink/proxy/rpc/DeleteInteractionChoiceSet.java +++ b/sdl_android_lib/src/com/smartdevicelink/proxy/rpc/DeleteInteractionChoiceSet.java @@ -2,7 +2,7 @@ package com.smartdevicelink.proxy.rpc; import java.util.Hashtable;
-import com.smartdevicelink.protocol.enums.FunctionId;
+import com.smartdevicelink.protocol.enums.FunctionID;
import com.smartdevicelink.proxy.RPCRequest;
/**
@@ -27,7 +27,7 @@ public class DeleteInteractionChoiceSet extends RPCRequest { * Constructs a new DeleteInteractionChoiceSet object
*/
public DeleteInteractionChoiceSet() {
- super(FunctionId.DELETE_INTERACTION_CHOICE_SET.toString());
+ super(FunctionID.DELETE_INTERACTION_CHOICE_SET.toString());
}
/**
* Constructs a new DeleteInteractionChoiceSet object indicated by the
diff --git a/sdl_android_lib/src/com/smartdevicelink/proxy/rpc/DeleteInteractionChoiceSetResponse.java b/sdl_android_lib/src/com/smartdevicelink/proxy/rpc/DeleteInteractionChoiceSetResponse.java index 4609202c6..5f29ed567 100644 --- a/sdl_android_lib/src/com/smartdevicelink/proxy/rpc/DeleteInteractionChoiceSetResponse.java +++ b/sdl_android_lib/src/com/smartdevicelink/proxy/rpc/DeleteInteractionChoiceSetResponse.java @@ -2,7 +2,7 @@ package com.smartdevicelink.proxy.rpc; import java.util.Hashtable;
-import com.smartdevicelink.protocol.enums.FunctionId;
+import com.smartdevicelink.protocol.enums.FunctionID;
import com.smartdevicelink.proxy.RPCResponse;
/**
@@ -13,7 +13,7 @@ import com.smartdevicelink.proxy.RPCResponse; public class DeleteInteractionChoiceSetResponse extends RPCResponse {
public DeleteInteractionChoiceSetResponse() {
- super(FunctionId.DELETE_INTERACTION_CHOICE_SET.toString());
+ super(FunctionID.DELETE_INTERACTION_CHOICE_SET.toString());
}
public DeleteInteractionChoiceSetResponse(Hashtable<String, Object> hash) {
super(hash);
diff --git a/sdl_android_lib/src/com/smartdevicelink/proxy/rpc/DeleteSubMenu.java b/sdl_android_lib/src/com/smartdevicelink/proxy/rpc/DeleteSubMenu.java index 0af92e859..bd7fc216b 100644 --- a/sdl_android_lib/src/com/smartdevicelink/proxy/rpc/DeleteSubMenu.java +++ b/sdl_android_lib/src/com/smartdevicelink/proxy/rpc/DeleteSubMenu.java @@ -2,7 +2,7 @@ package com.smartdevicelink.proxy.rpc; import java.util.Hashtable;
-import com.smartdevicelink.protocol.enums.FunctionId;
+import com.smartdevicelink.protocol.enums.FunctionID;
import com.smartdevicelink.proxy.RPCRequest;
/**
@@ -25,7 +25,7 @@ public class DeleteSubMenu extends RPCRequest { * Constructs a new DeleteSubMenu object
*/
public DeleteSubMenu() {
- super(FunctionId.DELETE_SUB_MENU.toString());
+ super(FunctionID.DELETE_SUB_MENU.toString());
}
/**
* Constructs a new DeleteSubMenu object indicated by the Hashtable parameter<p>
diff --git a/sdl_android_lib/src/com/smartdevicelink/proxy/rpc/DeleteSubMenuResponse.java b/sdl_android_lib/src/com/smartdevicelink/proxy/rpc/DeleteSubMenuResponse.java index 1e0c70e0e..c13e37131 100644 --- a/sdl_android_lib/src/com/smartdevicelink/proxy/rpc/DeleteSubMenuResponse.java +++ b/sdl_android_lib/src/com/smartdevicelink/proxy/rpc/DeleteSubMenuResponse.java @@ -2,7 +2,7 @@ package com.smartdevicelink.proxy.rpc; import java.util.Hashtable;
-import com.smartdevicelink.protocol.enums.FunctionId;
+import com.smartdevicelink.protocol.enums.FunctionID;
import com.smartdevicelink.proxy.RPCResponse;
/**
@@ -13,7 +13,7 @@ import com.smartdevicelink.proxy.RPCResponse; public class DeleteSubMenuResponse extends RPCResponse {
public DeleteSubMenuResponse() {
- super(FunctionId.DELETE_SUB_MENU.toString());
+ super(FunctionID.DELETE_SUB_MENU.toString());
}
public DeleteSubMenuResponse(Hashtable<String, Object> hash) {
super(hash);
diff --git a/sdl_android_lib/src/com/smartdevicelink/proxy/rpc/DiagnosticMessage.java b/sdl_android_lib/src/com/smartdevicelink/proxy/rpc/DiagnosticMessage.java index 91dc03438..e5b8e8c45 100644 --- a/sdl_android_lib/src/com/smartdevicelink/proxy/rpc/DiagnosticMessage.java +++ b/sdl_android_lib/src/com/smartdevicelink/proxy/rpc/DiagnosticMessage.java @@ -3,7 +3,7 @@ package com.smartdevicelink.proxy.rpc; import java.util.Hashtable;
import java.util.List;
-import com.smartdevicelink.protocol.enums.FunctionId;
+import com.smartdevicelink.protocol.enums.FunctionID;
import com.smartdevicelink.proxy.RPCRequest;
public class DiagnosticMessage extends RPCRequest {
@@ -12,7 +12,7 @@ public class DiagnosticMessage extends RPCRequest { public static final String KEY_MESSAGE_DATA = "messageData";
public DiagnosticMessage() {
- super(FunctionId.DIAGNOSTIC_MESSAGE.toString());
+ super(FunctionID.DIAGNOSTIC_MESSAGE.toString());
}
public DiagnosticMessage(Hashtable<String, Object> hash) {
diff --git a/sdl_android_lib/src/com/smartdevicelink/proxy/rpc/DiagnosticMessageResponse.java b/sdl_android_lib/src/com/smartdevicelink/proxy/rpc/DiagnosticMessageResponse.java index 6b8db38f6..57e5bc98b 100644 --- a/sdl_android_lib/src/com/smartdevicelink/proxy/rpc/DiagnosticMessageResponse.java +++ b/sdl_android_lib/src/com/smartdevicelink/proxy/rpc/DiagnosticMessageResponse.java @@ -3,14 +3,14 @@ package com.smartdevicelink.proxy.rpc; import java.util.Hashtable;
import java.util.List;
-import com.smartdevicelink.protocol.enums.FunctionId;
+import com.smartdevicelink.protocol.enums.FunctionID;
import com.smartdevicelink.proxy.RPCResponse;
public class DiagnosticMessageResponse extends RPCResponse {
public static final String KEY_MESSAGE_DATA_RESULT = "messageDataResult";
public DiagnosticMessageResponse() {
- super(FunctionId.DIAGNOSTIC_MESSAGE.toString());
+ super(FunctionID.DIAGNOSTIC_MESSAGE.toString());
}
public DiagnosticMessageResponse(Hashtable<String, Object> hash) {
super(hash);
diff --git a/sdl_android_lib/src/com/smartdevicelink/proxy/rpc/DialNumber.java b/sdl_android_lib/src/com/smartdevicelink/proxy/rpc/DialNumber.java index 62f55b9ce..76fbc02d1 100644 --- a/sdl_android_lib/src/com/smartdevicelink/proxy/rpc/DialNumber.java +++ b/sdl_android_lib/src/com/smartdevicelink/proxy/rpc/DialNumber.java @@ -2,7 +2,7 @@ package com.smartdevicelink.proxy.rpc; import java.util.Hashtable; -import com.smartdevicelink.protocol.enums.FunctionId; +import com.smartdevicelink.protocol.enums.FunctionID; import com.smartdevicelink.proxy.RPCRequest; /** @@ -15,7 +15,7 @@ public class DialNumber extends RPCRequest { public DialNumber(){ - super(FunctionId.DIAL_NUMBER.toString()); + super(FunctionID.DIAL_NUMBER.toString()); } public DialNumber(Hashtable<String, Object> hash) { diff --git a/sdl_android_lib/src/com/smartdevicelink/proxy/rpc/DialNumberResponse.java b/sdl_android_lib/src/com/smartdevicelink/proxy/rpc/DialNumberResponse.java index 61283411f..613755442 100644 --- a/sdl_android_lib/src/com/smartdevicelink/proxy/rpc/DialNumberResponse.java +++ b/sdl_android_lib/src/com/smartdevicelink/proxy/rpc/DialNumberResponse.java @@ -2,7 +2,7 @@ package com.smartdevicelink.proxy.rpc; import java.util.Hashtable; -import com.smartdevicelink.protocol.enums.FunctionId; +import com.smartdevicelink.protocol.enums.FunctionID; import com.smartdevicelink.proxy.RPCResponse; /** @@ -13,7 +13,7 @@ import com.smartdevicelink.proxy.RPCResponse; public class DialNumberResponse extends RPCResponse { public DialNumberResponse() { - super(FunctionId.DIAL_NUMBER.toString()); + super(FunctionID.DIAL_NUMBER.toString()); } public DialNumberResponse(Hashtable<String, Object> hash) { diff --git a/sdl_android_lib/src/com/smartdevicelink/proxy/rpc/EndAudioPassThru.java b/sdl_android_lib/src/com/smartdevicelink/proxy/rpc/EndAudioPassThru.java index 5f1663ab8..8a6793691 100644 --- a/sdl_android_lib/src/com/smartdevicelink/proxy/rpc/EndAudioPassThru.java +++ b/sdl_android_lib/src/com/smartdevicelink/proxy/rpc/EndAudioPassThru.java @@ -2,7 +2,7 @@ package com.smartdevicelink.proxy.rpc; import java.util.Hashtable;
-import com.smartdevicelink.protocol.enums.FunctionId;
+import com.smartdevicelink.protocol.enums.FunctionID;
import com.smartdevicelink.proxy.RPCRequest;
/**
@@ -21,7 +21,7 @@ public class EndAudioPassThru extends RPCRequest { * Constructs a new EndAudioPassThru object
*/
public EndAudioPassThru() {
- super(FunctionId.END_AUDIO_PASS_THRU.toString());
+ super(FunctionID.END_AUDIO_PASS_THRU.toString());
}
/**
diff --git a/sdl_android_lib/src/com/smartdevicelink/proxy/rpc/EndAudioPassThruResponse.java b/sdl_android_lib/src/com/smartdevicelink/proxy/rpc/EndAudioPassThruResponse.java index 24d7862c9..4f7a09f7b 100644 --- a/sdl_android_lib/src/com/smartdevicelink/proxy/rpc/EndAudioPassThruResponse.java +++ b/sdl_android_lib/src/com/smartdevicelink/proxy/rpc/EndAudioPassThruResponse.java @@ -2,7 +2,7 @@ package com.smartdevicelink.proxy.rpc; import java.util.Hashtable;
-import com.smartdevicelink.protocol.enums.FunctionId;
+import com.smartdevicelink.protocol.enums.FunctionID;
import com.smartdevicelink.proxy.RPCResponse;
/**
@@ -16,7 +16,7 @@ public class EndAudioPassThruResponse extends RPCResponse { * Constructs a new EndAudioPassThruResponse object
*/
public EndAudioPassThruResponse() {
- super(FunctionId.END_AUDIO_PASS_THRU.toString());
+ super(FunctionID.END_AUDIO_PASS_THRU.toString());
}
public EndAudioPassThruResponse(Hashtable<String, Object> hash) {
super(hash);
diff --git a/sdl_android_lib/src/com/smartdevicelink/proxy/rpc/GenericResponse.java b/sdl_android_lib/src/com/smartdevicelink/proxy/rpc/GenericResponse.java index 3a38baf7e..e231dd04d 100644 --- a/sdl_android_lib/src/com/smartdevicelink/proxy/rpc/GenericResponse.java +++ b/sdl_android_lib/src/com/smartdevicelink/proxy/rpc/GenericResponse.java @@ -2,7 +2,7 @@ package com.smartdevicelink.proxy.rpc; import java.util.Hashtable;
-import com.smartdevicelink.protocol.enums.FunctionId;
+import com.smartdevicelink.protocol.enums.FunctionID;
import com.smartdevicelink.proxy.RPCResponse;
/**
@@ -13,7 +13,7 @@ import com.smartdevicelink.proxy.RPCResponse; public class GenericResponse extends RPCResponse {
public GenericResponse() {
- super(FunctionId.GENERIC_RESPONSE.toString());
+ super(FunctionID.GENERIC_RESPONSE.toString());
}
public GenericResponse(Hashtable<String, Object> hash) {
super(hash);
diff --git a/sdl_android_lib/src/com/smartdevicelink/proxy/rpc/GetDTCs.java b/sdl_android_lib/src/com/smartdevicelink/proxy/rpc/GetDTCs.java index dd305beb9..967c62cbb 100644 --- a/sdl_android_lib/src/com/smartdevicelink/proxy/rpc/GetDTCs.java +++ b/sdl_android_lib/src/com/smartdevicelink/proxy/rpc/GetDTCs.java @@ -2,7 +2,7 @@ package com.smartdevicelink.proxy.rpc; import java.util.Hashtable;
-import com.smartdevicelink.protocol.enums.FunctionId;
+import com.smartdevicelink.protocol.enums.FunctionID;
import com.smartdevicelink.proxy.RPCRequest;
/**
@@ -22,7 +22,7 @@ public class GetDTCs extends RPCRequest { * Constructs a new GetDTCs object
*/
public GetDTCs() {
- super(FunctionId.GET_DTCS.toString());
+ super(FunctionID.GET_DTCS.toString());
}
/**
diff --git a/sdl_android_lib/src/com/smartdevicelink/proxy/rpc/GetDTCsResponse.java b/sdl_android_lib/src/com/smartdevicelink/proxy/rpc/GetDTCsResponse.java index f2bdbe539..b3c49b251 100644 --- a/sdl_android_lib/src/com/smartdevicelink/proxy/rpc/GetDTCsResponse.java +++ b/sdl_android_lib/src/com/smartdevicelink/proxy/rpc/GetDTCsResponse.java @@ -3,7 +3,7 @@ package com.smartdevicelink.proxy.rpc; import java.util.Hashtable;
import java.util.List;
-import com.smartdevicelink.protocol.enums.FunctionId;
+import com.smartdevicelink.protocol.enums.FunctionID;
import com.smartdevicelink.proxy.RPCResponse;
/**
@@ -17,7 +17,7 @@ public class GetDTCsResponse extends RPCResponse{ public static final String KEY_DTC = "dtc";
public GetDTCsResponse(){
- super(FunctionId.GET_DTCS.toString());
+ super(FunctionID.GET_DTCS.toString());
}
public GetDTCsResponse(Hashtable<String, Object> hash){
diff --git a/sdl_android_lib/src/com/smartdevicelink/proxy/rpc/GetVehicleData.java b/sdl_android_lib/src/com/smartdevicelink/proxy/rpc/GetVehicleData.java index b4dd60837..fe1efc658 100644 --- a/sdl_android_lib/src/com/smartdevicelink/proxy/rpc/GetVehicleData.java +++ b/sdl_android_lib/src/com/smartdevicelink/proxy/rpc/GetVehicleData.java @@ -2,7 +2,7 @@ package com.smartdevicelink.proxy.rpc; import java.util.Hashtable;
-import com.smartdevicelink.protocol.enums.FunctionId;
+import com.smartdevicelink.protocol.enums.FunctionID;
import com.smartdevicelink.proxy.RPCRequest;
public class GetVehicleData extends RPCRequest {
@@ -33,7 +33,7 @@ public class GetVehicleData extends RPCRequest { public static final String KEY_MY_KEY = "myKey";
public GetVehicleData() {
- super(FunctionId.GET_VEHICLE_DATA.toString());
+ super(FunctionID.GET_VEHICLE_DATA.toString());
}
public GetVehicleData(Hashtable<String, Object> hash) {
super(hash);
diff --git a/sdl_android_lib/src/com/smartdevicelink/proxy/rpc/GetVehicleDataResponse.java b/sdl_android_lib/src/com/smartdevicelink/proxy/rpc/GetVehicleDataResponse.java index 426615173..6fb8e5593 100644 --- a/sdl_android_lib/src/com/smartdevicelink/proxy/rpc/GetVehicleDataResponse.java +++ b/sdl_android_lib/src/com/smartdevicelink/proxy/rpc/GetVehicleDataResponse.java @@ -3,7 +3,7 @@ package com.smartdevicelink.proxy.rpc; import java.util.Hashtable;
-import com.smartdevicelink.protocol.enums.FunctionId;
+import com.smartdevicelink.protocol.enums.FunctionID;
import com.smartdevicelink.proxy.RPCResponse;
import com.smartdevicelink.proxy.rpc.enums.ComponentVolumeStatus;
import com.smartdevicelink.proxy.rpc.enums.PRNDL;
@@ -41,7 +41,7 @@ public class GetVehicleDataResponse extends RPCResponse { public GetVehicleDataResponse() {
- super(FunctionId.GET_VEHICLE_DATA.toString());
+ super(FunctionID.GET_VEHICLE_DATA.toString());
}
public GetVehicleDataResponse(Hashtable<String, Object> hash) {
super(hash);
diff --git a/sdl_android_lib/src/com/smartdevicelink/proxy/rpc/ListFiles.java b/sdl_android_lib/src/com/smartdevicelink/proxy/rpc/ListFiles.java index 1b99e64a3..f135eaa9e 100644 --- a/sdl_android_lib/src/com/smartdevicelink/proxy/rpc/ListFiles.java +++ b/sdl_android_lib/src/com/smartdevicelink/proxy/rpc/ListFiles.java @@ -2,7 +2,7 @@ package com.smartdevicelink.proxy.rpc; import java.util.Hashtable;
-import com.smartdevicelink.protocol.enums.FunctionId;
+import com.smartdevicelink.protocol.enums.FunctionID;
import com.smartdevicelink.proxy.RPCRequest;
/**
@@ -18,7 +18,7 @@ public class ListFiles extends RPCRequest { * Constructs a new ListFiles object
*/
public ListFiles() {
- super(FunctionId.LIST_FILES.toString());
+ super(FunctionID.LIST_FILES.toString());
}
/**
diff --git a/sdl_android_lib/src/com/smartdevicelink/proxy/rpc/ListFilesResponse.java b/sdl_android_lib/src/com/smartdevicelink/proxy/rpc/ListFilesResponse.java index d74482874..2c7a62e3e 100644 --- a/sdl_android_lib/src/com/smartdevicelink/proxy/rpc/ListFilesResponse.java +++ b/sdl_android_lib/src/com/smartdevicelink/proxy/rpc/ListFilesResponse.java @@ -3,7 +3,7 @@ package com.smartdevicelink.proxy.rpc; import java.util.Hashtable;
import java.util.List;
-import com.smartdevicelink.protocol.enums.FunctionId;
+import com.smartdevicelink.protocol.enums.FunctionID;
import com.smartdevicelink.proxy.RPCResponse;
/**
@@ -19,7 +19,7 @@ public class ListFilesResponse extends RPCResponse { * Constructs a new ListFilesResponse object
*/
public ListFilesResponse() {
- super(FunctionId.LIST_FILES.toString());
+ super(FunctionID.LIST_FILES.toString());
}
public ListFilesResponse(Hashtable<String, Object> hash) {
super(hash);
diff --git a/sdl_android_lib/src/com/smartdevicelink/proxy/rpc/OnAppInterfaceUnregistered.java b/sdl_android_lib/src/com/smartdevicelink/proxy/rpc/OnAppInterfaceUnregistered.java index 843d119db..21cb9bc52 100644 --- a/sdl_android_lib/src/com/smartdevicelink/proxy/rpc/OnAppInterfaceUnregistered.java +++ b/sdl_android_lib/src/com/smartdevicelink/proxy/rpc/OnAppInterfaceUnregistered.java @@ -2,7 +2,7 @@ package com.smartdevicelink.proxy.rpc; import java.util.Hashtable;
-import com.smartdevicelink.protocol.enums.FunctionId;
+import com.smartdevicelink.protocol.enums.FunctionID;
import com.smartdevicelink.proxy.RPCNotification;
import com.smartdevicelink.proxy.rpc.enums.AppInterfaceUnregisteredReason;
@@ -46,7 +46,7 @@ public class OnAppInterfaceUnregistered extends RPCNotification { *Constructs a newly allocated OnAppInterfaceUnregistered object
*/
public OnAppInterfaceUnregistered() {
- super(FunctionId.ON_APP_INTERFACE_UNREGISTERED.toString());
+ super(FunctionID.ON_APP_INTERFACE_UNREGISTERED.toString());
}
/**
*<p>Constructs a newly allocated OnAppInterfaceUnregistered object indicated by the Hashtable parameter</p>
diff --git a/sdl_android_lib/src/com/smartdevicelink/proxy/rpc/OnAudioPassThru.java b/sdl_android_lib/src/com/smartdevicelink/proxy/rpc/OnAudioPassThru.java index 54a3e6e99..421bbd933 100644 --- a/sdl_android_lib/src/com/smartdevicelink/proxy/rpc/OnAudioPassThru.java +++ b/sdl_android_lib/src/com/smartdevicelink/proxy/rpc/OnAudioPassThru.java @@ -2,7 +2,7 @@ package com.smartdevicelink.proxy.rpc; import java.util.Hashtable;
-import com.smartdevicelink.protocol.enums.FunctionId;
+import com.smartdevicelink.protocol.enums.FunctionID;
import com.smartdevicelink.proxy.RPCNotification;
/**
@@ -45,7 +45,7 @@ public class OnAudioPassThru extends RPCNotification { *Constructs a newly allocated OnCommand object
*/
public OnAudioPassThru() {
- super(FunctionId.ON_AUDIO_PASS_THRU.toString());
+ super(FunctionID.ON_AUDIO_PASS_THRU.toString());
}
/**
*<p>Constructs a newly allocated OnAudioPassThru object indicated by the Hashtable parameter</p>
diff --git a/sdl_android_lib/src/com/smartdevicelink/proxy/rpc/OnButtonEvent.java b/sdl_android_lib/src/com/smartdevicelink/proxy/rpc/OnButtonEvent.java index b9a32eaa5..3e5bf33f4 100644 --- a/sdl_android_lib/src/com/smartdevicelink/proxy/rpc/OnButtonEvent.java +++ b/sdl_android_lib/src/com/smartdevicelink/proxy/rpc/OnButtonEvent.java @@ -2,7 +2,7 @@ package com.smartdevicelink.proxy.rpc; import java.util.Hashtable;
-import com.smartdevicelink.protocol.enums.FunctionId;
+import com.smartdevicelink.protocol.enums.FunctionID;
import com.smartdevicelink.proxy.RPCNotification;
import com.smartdevicelink.proxy.rpc.enums.ButtonEventMode;
import com.smartdevicelink.proxy.rpc.enums.ButtonName;
@@ -90,7 +90,7 @@ public class OnButtonEvent extends RPCNotification { *Constructs a newly allocated OnButtonEvent object
*/
public OnButtonEvent() {
- super(FunctionId.ON_BUTTON_EVENT.toString());
+ super(FunctionID.ON_BUTTON_EVENT.toString());
}
/**
* <p>
diff --git a/sdl_android_lib/src/com/smartdevicelink/proxy/rpc/OnButtonPress.java b/sdl_android_lib/src/com/smartdevicelink/proxy/rpc/OnButtonPress.java index f0494cccb..2d48b9635 100644 --- a/sdl_android_lib/src/com/smartdevicelink/proxy/rpc/OnButtonPress.java +++ b/sdl_android_lib/src/com/smartdevicelink/proxy/rpc/OnButtonPress.java @@ -2,7 +2,7 @@ package com.smartdevicelink.proxy.rpc; import java.util.Hashtable;
-import com.smartdevicelink.protocol.enums.FunctionId;
+import com.smartdevicelink.protocol.enums.FunctionID;
import com.smartdevicelink.proxy.RPCNotification;
import com.smartdevicelink.proxy.rpc.enums.ButtonName;
import com.smartdevicelink.proxy.rpc.enums.ButtonPressMode;
@@ -95,7 +95,7 @@ public class OnButtonPress extends RPCNotification { *Constructs a newly allocated OnButtonPress object
*/
public OnButtonPress() {
- super(FunctionId.ON_BUTTON_PRESS.toString());
+ super(FunctionID.ON_BUTTON_PRESS.toString());
}
/**
* <p>
diff --git a/sdl_android_lib/src/com/smartdevicelink/proxy/rpc/OnCommand.java b/sdl_android_lib/src/com/smartdevicelink/proxy/rpc/OnCommand.java index d17a96550..77632b8b2 100644 --- a/sdl_android_lib/src/com/smartdevicelink/proxy/rpc/OnCommand.java +++ b/sdl_android_lib/src/com/smartdevicelink/proxy/rpc/OnCommand.java @@ -2,7 +2,7 @@ package com.smartdevicelink.proxy.rpc; import java.util.Hashtable;
-import com.smartdevicelink.protocol.enums.FunctionId;
+import com.smartdevicelink.protocol.enums.FunctionID;
import com.smartdevicelink.proxy.RPCNotification;
import com.smartdevicelink.proxy.rpc.enums.TriggerSource;
@@ -58,7 +58,7 @@ public class OnCommand extends RPCNotification { *Constructs a newly allocated OnCommand object
*/
public OnCommand() {
- super(FunctionId.ON_COMMAND.toString());
+ super(FunctionID.ON_COMMAND.toString());
}
/**
*<p>Constructs a newly allocated OnCommand object indicated by the Hashtable parameter</p>
diff --git a/sdl_android_lib/src/com/smartdevicelink/proxy/rpc/OnDriverDistraction.java b/sdl_android_lib/src/com/smartdevicelink/proxy/rpc/OnDriverDistraction.java index 098bf1fa2..69280ad21 100644 --- a/sdl_android_lib/src/com/smartdevicelink/proxy/rpc/OnDriverDistraction.java +++ b/sdl_android_lib/src/com/smartdevicelink/proxy/rpc/OnDriverDistraction.java @@ -2,7 +2,7 @@ package com.smartdevicelink.proxy.rpc; import java.util.Hashtable;
-import com.smartdevicelink.protocol.enums.FunctionId;
+import com.smartdevicelink.protocol.enums.FunctionID;
import com.smartdevicelink.proxy.RPCNotification;
import com.smartdevicelink.proxy.rpc.enums.DriverDistractionState;
@@ -44,7 +44,7 @@ public class OnDriverDistraction extends RPCNotification { *Constructs a newly allocated OnDriverDistraction object
*/
public OnDriverDistraction() {
- super(FunctionId.ON_DRIVER_DISTRACTION.toString());
+ super(FunctionID.ON_DRIVER_DISTRACTION.toString());
}
/**
*<p>Constructs a newly allocated OnDriverDistraction object indicated by the Hashtable parameter</p>
diff --git a/sdl_android_lib/src/com/smartdevicelink/proxy/rpc/OnHMIStatus.java b/sdl_android_lib/src/com/smartdevicelink/proxy/rpc/OnHMIStatus.java index cf7abeece..31161f2f1 100644 --- a/sdl_android_lib/src/com/smartdevicelink/proxy/rpc/OnHMIStatus.java +++ b/sdl_android_lib/src/com/smartdevicelink/proxy/rpc/OnHMIStatus.java @@ -2,7 +2,7 @@ package com.smartdevicelink.proxy.rpc; import java.util.Hashtable;
-import com.smartdevicelink.protocol.enums.FunctionId;
+import com.smartdevicelink.protocol.enums.FunctionID;
import com.smartdevicelink.proxy.RPCNotification;
import com.smartdevicelink.proxy.rpc.enums.AudioStreamingState;
import com.smartdevicelink.proxy.rpc.enums.HMILevel;
@@ -72,7 +72,7 @@ public class OnHMIStatus extends RPCNotification { *Constructs a newly allocated OnHMIStatus object
*/
public OnHMIStatus() {
- super(FunctionId.ON_HMI_STATUS.toString());
+ super(FunctionID.ON_HMI_STATUS.toString());
}
/**
*<p>Constructs a newly allocated OnHMIStatus object indicated by the Hashtable parameter</p>
diff --git a/sdl_android_lib/src/com/smartdevicelink/proxy/rpc/OnHashChange.java b/sdl_android_lib/src/com/smartdevicelink/proxy/rpc/OnHashChange.java index 07c94f71b..e806e5225 100644 --- a/sdl_android_lib/src/com/smartdevicelink/proxy/rpc/OnHashChange.java +++ b/sdl_android_lib/src/com/smartdevicelink/proxy/rpc/OnHashChange.java @@ -2,14 +2,14 @@ package com.smartdevicelink.proxy.rpc; import java.util.Hashtable;
-import com.smartdevicelink.protocol.enums.FunctionId;
+import com.smartdevicelink.protocol.enums.FunctionID;
import com.smartdevicelink.proxy.RPCNotification;
public class OnHashChange extends RPCNotification {
public static final String KEY_HASH_ID = "hashID";
public OnHashChange() {
- super(FunctionId.ON_HASH_CHANGE.toString());
+ super(FunctionID.ON_HASH_CHANGE.toString());
}
public OnHashChange(Hashtable<String, Object> hash) {
diff --git a/sdl_android_lib/src/com/smartdevicelink/proxy/rpc/OnKeyboardInput.java b/sdl_android_lib/src/com/smartdevicelink/proxy/rpc/OnKeyboardInput.java index 63523991b..4de2acf3f 100644 --- a/sdl_android_lib/src/com/smartdevicelink/proxy/rpc/OnKeyboardInput.java +++ b/sdl_android_lib/src/com/smartdevicelink/proxy/rpc/OnKeyboardInput.java @@ -2,7 +2,7 @@ package com.smartdevicelink.proxy.rpc; import java.util.Hashtable;
-import com.smartdevicelink.protocol.enums.FunctionId;
+import com.smartdevicelink.protocol.enums.FunctionID;
import com.smartdevicelink.proxy.RPCNotification;
import com.smartdevicelink.proxy.rpc.enums.KeyboardEvent;
@@ -12,7 +12,7 @@ public class OnKeyboardInput extends RPCNotification { public static final String KEY_EVENT = "event";
public OnKeyboardInput() {
- super(FunctionId.ON_KEYBOARD_INPUT.toString());
+ super(FunctionID.ON_KEYBOARD_INPUT.toString());
}
public OnKeyboardInput(Hashtable<String, Object> hash) {
diff --git a/sdl_android_lib/src/com/smartdevicelink/proxy/rpc/OnLanguageChange.java b/sdl_android_lib/src/com/smartdevicelink/proxy/rpc/OnLanguageChange.java index 5b180e44b..4f39d55cb 100644 --- a/sdl_android_lib/src/com/smartdevicelink/proxy/rpc/OnLanguageChange.java +++ b/sdl_android_lib/src/com/smartdevicelink/proxy/rpc/OnLanguageChange.java @@ -2,7 +2,7 @@ package com.smartdevicelink.proxy.rpc; import java.util.Hashtable;
-import com.smartdevicelink.protocol.enums.FunctionId;
+import com.smartdevicelink.protocol.enums.FunctionID;
import com.smartdevicelink.proxy.RPCNotification;
import com.smartdevicelink.proxy.rpc.enums.Language;
@@ -63,7 +63,7 @@ public class OnLanguageChange extends RPCNotification { *Constructs a newly allocated OnCommand object
*/
public OnLanguageChange() {
- super(FunctionId.ON_LANGUAGE_CHANGE.toString());
+ super(FunctionID.ON_LANGUAGE_CHANGE.toString());
}
/**
*<p>Constructs a newly allocated OnLanguageChange object indicated by the Hashtable parameter</p>
diff --git a/sdl_android_lib/src/com/smartdevicelink/proxy/rpc/OnLockScreenStatus.java b/sdl_android_lib/src/com/smartdevicelink/proxy/rpc/OnLockScreenStatus.java index 804fc6da3..1ad23994c 100644 --- a/sdl_android_lib/src/com/smartdevicelink/proxy/rpc/OnLockScreenStatus.java +++ b/sdl_android_lib/src/com/smartdevicelink/proxy/rpc/OnLockScreenStatus.java @@ -1,6 +1,6 @@ package com.smartdevicelink.proxy.rpc;
-import com.smartdevicelink.protocol.enums.FunctionId;
+import com.smartdevicelink.protocol.enums.FunctionID;
import com.smartdevicelink.proxy.RPCNotification;
import com.smartdevicelink.proxy.rpc.enums.HMILevel;
import com.smartdevicelink.proxy.rpc.enums.LockScreenStatus;
@@ -11,7 +11,7 @@ public class OnLockScreenStatus extends RPCNotification { public static final String KEY_USER_SELECTED = "userSelected";
public OnLockScreenStatus() {
- super(FunctionId.ON_LOCK_SCREEN_STATUS.toString());
+ super(FunctionID.ON_LOCK_SCREEN_STATUS.toString());
}
public Boolean getDriverDistractionStatus() {
diff --git a/sdl_android_lib/src/com/smartdevicelink/proxy/rpc/OnPermissionsChange.java b/sdl_android_lib/src/com/smartdevicelink/proxy/rpc/OnPermissionsChange.java index 8da8f6fab..4c88c9baa 100644 --- a/sdl_android_lib/src/com/smartdevicelink/proxy/rpc/OnPermissionsChange.java +++ b/sdl_android_lib/src/com/smartdevicelink/proxy/rpc/OnPermissionsChange.java @@ -4,7 +4,7 @@ import java.util.ArrayList; import java.util.Hashtable;
import java.util.List;
-import com.smartdevicelink.protocol.enums.FunctionId;
+import com.smartdevicelink.protocol.enums.FunctionID;
import com.smartdevicelink.proxy.RPCNotification;
/**
@@ -54,7 +54,7 @@ public class OnPermissionsChange extends RPCNotification { *Constructs a newly allocated OnCommand object
*/
public OnPermissionsChange() {
- super(FunctionId.ON_PERMISSIONS_CHANGE.toString());
+ super(FunctionID.ON_PERMISSIONS_CHANGE.toString());
}
/**
*<p>Constructs a newly allocated OnPermissionsChange object indicated by the Hashtable parameter</p>
diff --git a/sdl_android_lib/src/com/smartdevicelink/proxy/rpc/OnSdlChoiceChosen.java b/sdl_android_lib/src/com/smartdevicelink/proxy/rpc/OnSdlChoiceChosen.java index 688615931..a878ade77 100644 --- a/sdl_android_lib/src/com/smartdevicelink/proxy/rpc/OnSdlChoiceChosen.java +++ b/sdl_android_lib/src/com/smartdevicelink/proxy/rpc/OnSdlChoiceChosen.java @@ -3,7 +3,7 @@ package com.smartdevicelink.proxy.rpc; import java.util.Hashtable;
import java.util.List;
-import com.smartdevicelink.protocol.enums.FunctionId;
+import com.smartdevicelink.protocol.enums.FunctionID;
import com.smartdevicelink.proxy.RPCNotification;
import com.smartdevicelink.proxy.rpc.enums.TriggerSource;
@@ -138,7 +138,7 @@ public class OnSdlChoiceChosen extends RPCNotification { public OnSdlChoiceChosen() {
- super(FunctionId.ON_SDL_CHOICE_CHOSEN.toString());
+ super(FunctionID.ON_SDL_CHOICE_CHOSEN.toString());
}
public OnSdlChoiceChosen(Hashtable<String, Object> hash){
super(hash);
diff --git a/sdl_android_lib/src/com/smartdevicelink/proxy/rpc/OnStreamRPC.java b/sdl_android_lib/src/com/smartdevicelink/proxy/rpc/OnStreamRPC.java index 4ff3b8bd4..bb4bcc324 100644 --- a/sdl_android_lib/src/com/smartdevicelink/proxy/rpc/OnStreamRPC.java +++ b/sdl_android_lib/src/com/smartdevicelink/proxy/rpc/OnStreamRPC.java @@ -1,6 +1,6 @@ package com.smartdevicelink.proxy.rpc; -import com.smartdevicelink.protocol.enums.FunctionId; +import com.smartdevicelink.protocol.enums.FunctionID; import com.smartdevicelink.proxy.RPCNotification; public class OnStreamRPC extends RPCNotification { @@ -9,7 +9,7 @@ public class OnStreamRPC extends RPCNotification { public static final String KEY_FILESIZE = "fileSize"; public OnStreamRPC() { - super(FunctionId.ON_STREAM_RPC.toString()); + super(FunctionID.ON_STREAM_RPC.toString()); } public void setFileName(String fileName) { diff --git a/sdl_android_lib/src/com/smartdevicelink/proxy/rpc/OnSystemRequest.java b/sdl_android_lib/src/com/smartdevicelink/proxy/rpc/OnSystemRequest.java index d7d342f5a..fa96cd1cf 100644 --- a/sdl_android_lib/src/com/smartdevicelink/proxy/rpc/OnSystemRequest.java +++ b/sdl_android_lib/src/com/smartdevicelink/proxy/rpc/OnSystemRequest.java @@ -9,7 +9,7 @@ import org.json.JSONObject; import android.util.Log;
import com.smartdevicelink.marshal.JsonRPCMarshaller;
-import com.smartdevicelink.protocol.enums.FunctionId;
+import com.smartdevicelink.protocol.enums.FunctionID;
import com.smartdevicelink.proxy.RPCNotification;
import com.smartdevicelink.proxy.RPCStruct;
import com.smartdevicelink.proxy.rpc.enums.FileType;
@@ -32,7 +32,7 @@ public class OnSystemRequest extends RPCNotification { private Headers headers;
public OnSystemRequest() {
- super(FunctionId.ON_SYSTEM_REQUEST.toString());
+ super(FunctionID.ON_SYSTEM_REQUEST.toString());
}
public OnSystemRequest(Hashtable<String, Object> hash) {
diff --git a/sdl_android_lib/src/com/smartdevicelink/proxy/rpc/OnTBTClientState.java b/sdl_android_lib/src/com/smartdevicelink/proxy/rpc/OnTBTClientState.java index 0ab0f93a5..26965c891 100644 --- a/sdl_android_lib/src/com/smartdevicelink/proxy/rpc/OnTBTClientState.java +++ b/sdl_android_lib/src/com/smartdevicelink/proxy/rpc/OnTBTClientState.java @@ -2,7 +2,7 @@ package com.smartdevicelink.proxy.rpc; import java.util.Hashtable;
-import com.smartdevicelink.protocol.enums.FunctionId;
+import com.smartdevicelink.protocol.enums.FunctionID;
import com.smartdevicelink.proxy.RPCNotification;
import com.smartdevicelink.proxy.rpc.enums.TBTState;
@@ -44,7 +44,7 @@ public class OnTBTClientState extends RPCNotification { *Constructs a newly allocated OnTBTClientState object
*/
public OnTBTClientState() {
- super(FunctionId.ON_TBT_CLIENT_STATE.toString());
+ super(FunctionID.ON_TBT_CLIENT_STATE.toString());
}
/**
*<p>Constructs a newly allocated OnTBTClientState object indicated by the Hashtable parameter</p>
diff --git a/sdl_android_lib/src/com/smartdevicelink/proxy/rpc/OnTouchEvent.java b/sdl_android_lib/src/com/smartdevicelink/proxy/rpc/OnTouchEvent.java index bc0ac0250..47ecc30a3 100644 --- a/sdl_android_lib/src/com/smartdevicelink/proxy/rpc/OnTouchEvent.java +++ b/sdl_android_lib/src/com/smartdevicelink/proxy/rpc/OnTouchEvent.java @@ -4,7 +4,7 @@ import java.util.ArrayList; import java.util.Hashtable;
import java.util.List;
-import com.smartdevicelink.protocol.enums.FunctionId;
+import com.smartdevicelink.protocol.enums.FunctionID;
import com.smartdevicelink.proxy.RPCNotification;
import com.smartdevicelink.proxy.rpc.enums.TouchType;
@@ -13,7 +13,7 @@ public class OnTouchEvent extends RPCNotification { public static final String KEY_TYPE = "type";
public OnTouchEvent() {
- super(FunctionId.ON_TOUCH_EVENT.toString());
+ super(FunctionID.ON_TOUCH_EVENT.toString());
}
public OnTouchEvent(Hashtable<String, Object> hash) {
super(hash);
diff --git a/sdl_android_lib/src/com/smartdevicelink/proxy/rpc/OnVehicleData.java b/sdl_android_lib/src/com/smartdevicelink/proxy/rpc/OnVehicleData.java index c02bf4c3b..40132a8e5 100644 --- a/sdl_android_lib/src/com/smartdevicelink/proxy/rpc/OnVehicleData.java +++ b/sdl_android_lib/src/com/smartdevicelink/proxy/rpc/OnVehicleData.java @@ -2,7 +2,7 @@ package com.smartdevicelink.proxy.rpc; import java.util.Hashtable;
-import com.smartdevicelink.protocol.enums.FunctionId;
+import com.smartdevicelink.protocol.enums.FunctionID;
import com.smartdevicelink.proxy.RPCNotification;
import com.smartdevicelink.proxy.rpc.enums.ComponentVolumeStatus;
import com.smartdevicelink.proxy.rpc.enums.PRNDL;
@@ -39,7 +39,7 @@ public class OnVehicleData extends RPCNotification { public static final String KEY_MY_KEY = "myKey";
public OnVehicleData() {
- super(FunctionId.ON_VEHICLE_DATA.toString());
+ super(FunctionID.ON_VEHICLE_DATA.toString());
}
public OnVehicleData(Hashtable<String, Object> hash) {
super(hash);
diff --git a/sdl_android_lib/src/com/smartdevicelink/proxy/rpc/PerformAudioPassThru.java b/sdl_android_lib/src/com/smartdevicelink/proxy/rpc/PerformAudioPassThru.java index d7b5293b8..4ba1658b2 100644 --- a/sdl_android_lib/src/com/smartdevicelink/proxy/rpc/PerformAudioPassThru.java +++ b/sdl_android_lib/src/com/smartdevicelink/proxy/rpc/PerformAudioPassThru.java @@ -4,7 +4,7 @@ import java.util.ArrayList; import java.util.Hashtable;
import java.util.List;
-import com.smartdevicelink.protocol.enums.FunctionId;
+import com.smartdevicelink.protocol.enums.FunctionID;
import com.smartdevicelink.proxy.RPCRequest;
import com.smartdevicelink.proxy.rpc.enums.AudioType;
import com.smartdevicelink.proxy.rpc.enums.BitsPerSample;
@@ -36,7 +36,7 @@ public class PerformAudioPassThru extends RPCRequest { * Constructs a new PerformAudioPassThru object
*/
public PerformAudioPassThru() {
- super(FunctionId.PERFORM_AUDIO_PASS_THRU.toString());
+ super(FunctionID.PERFORM_AUDIO_PASS_THRU.toString());
}
/**
diff --git a/sdl_android_lib/src/com/smartdevicelink/proxy/rpc/PerformAudioPassThruResponse.java b/sdl_android_lib/src/com/smartdevicelink/proxy/rpc/PerformAudioPassThruResponse.java index 7bf197a37..7ba905f96 100644 --- a/sdl_android_lib/src/com/smartdevicelink/proxy/rpc/PerformAudioPassThruResponse.java +++ b/sdl_android_lib/src/com/smartdevicelink/proxy/rpc/PerformAudioPassThruResponse.java @@ -2,7 +2,7 @@ package com.smartdevicelink.proxy.rpc; import java.util.Hashtable;
-import com.smartdevicelink.protocol.enums.FunctionId;
+import com.smartdevicelink.protocol.enums.FunctionID;
import com.smartdevicelink.proxy.RPCResponse;
/**
@@ -16,7 +16,7 @@ public class PerformAudioPassThruResponse extends RPCResponse { * Constructs a new PerformAudioPassThruResponse object
*/
public PerformAudioPassThruResponse() {
- super(FunctionId.PERFORM_AUDIO_PASS_THRU.toString());
+ super(FunctionID.PERFORM_AUDIO_PASS_THRU.toString());
}
/**
diff --git a/sdl_android_lib/src/com/smartdevicelink/proxy/rpc/PerformInteraction.java b/sdl_android_lib/src/com/smartdevicelink/proxy/rpc/PerformInteraction.java index bd16d3b24..3c6ed46a5 100644 --- a/sdl_android_lib/src/com/smartdevicelink/proxy/rpc/PerformInteraction.java +++ b/sdl_android_lib/src/com/smartdevicelink/proxy/rpc/PerformInteraction.java @@ -4,7 +4,7 @@ import java.util.ArrayList; import java.util.Hashtable;
import java.util.List;
-import com.smartdevicelink.protocol.enums.FunctionId;
+import com.smartdevicelink.protocol.enums.FunctionID;
import com.smartdevicelink.proxy.RPCRequest;
import com.smartdevicelink.proxy.rpc.enums.InteractionMode;
import com.smartdevicelink.proxy.rpc.enums.LayoutMode;
@@ -38,7 +38,7 @@ public class PerformInteraction extends RPCRequest { * Constructs a new PerformInteraction object
*/
public PerformInteraction() {
- super(FunctionId.PERFORM_INTERACTION.toString());
+ super(FunctionID.PERFORM_INTERACTION.toString());
}
/**
* Constructs a new PerformInteraction object indicated by the Hashtable
diff --git a/sdl_android_lib/src/com/smartdevicelink/proxy/rpc/PerformInteractionResponse.java b/sdl_android_lib/src/com/smartdevicelink/proxy/rpc/PerformInteractionResponse.java index 4ce93f9a1..c0c212a85 100644 --- a/sdl_android_lib/src/com/smartdevicelink/proxy/rpc/PerformInteractionResponse.java +++ b/sdl_android_lib/src/com/smartdevicelink/proxy/rpc/PerformInteractionResponse.java @@ -2,7 +2,7 @@ package com.smartdevicelink.proxy.rpc; import java.util.Hashtable;
-import com.smartdevicelink.protocol.enums.FunctionId;
+import com.smartdevicelink.protocol.enums.FunctionID;
import com.smartdevicelink.proxy.RPCResponse;
import com.smartdevicelink.proxy.rpc.enums.TriggerSource;
@@ -20,7 +20,7 @@ public class PerformInteractionResponse extends RPCResponse { * Constructs a new PerformInteractionResponse object
*/
public PerformInteractionResponse() {
- super(FunctionId.PERFORM_INTERACTION.toString());
+ super(FunctionID.PERFORM_INTERACTION.toString());
}
/**
diff --git a/sdl_android_lib/src/com/smartdevicelink/proxy/rpc/PutFile.java b/sdl_android_lib/src/com/smartdevicelink/proxy/rpc/PutFile.java index 2c9ffb00f..2f76f862a 100644 --- a/sdl_android_lib/src/com/smartdevicelink/proxy/rpc/PutFile.java +++ b/sdl_android_lib/src/com/smartdevicelink/proxy/rpc/PutFile.java @@ -2,7 +2,7 @@ package com.smartdevicelink.proxy.rpc; import java.util.Hashtable;
-import com.smartdevicelink.protocol.enums.FunctionId;
+import com.smartdevicelink.protocol.enums.FunctionID;
import com.smartdevicelink.proxy.RPCRequest;
import com.smartdevicelink.proxy.rpc.enums.FileType;
@@ -28,7 +28,7 @@ public class PutFile extends RPCRequest { * Constructs a new PutFile object
*/
public PutFile() {
- super(FunctionId.PUT_FILE.toString());
+ super(FunctionID.PUT_FILE.toString());
}
/**
diff --git a/sdl_android_lib/src/com/smartdevicelink/proxy/rpc/PutFileResponse.java b/sdl_android_lib/src/com/smartdevicelink/proxy/rpc/PutFileResponse.java index 31e6a4539..88c0560b3 100644 --- a/sdl_android_lib/src/com/smartdevicelink/proxy/rpc/PutFileResponse.java +++ b/sdl_android_lib/src/com/smartdevicelink/proxy/rpc/PutFileResponse.java @@ -2,7 +2,7 @@ package com.smartdevicelink.proxy.rpc; import java.util.Hashtable;
-import com.smartdevicelink.protocol.enums.FunctionId;
+import com.smartdevicelink.protocol.enums.FunctionID;
import com.smartdevicelink.proxy.RPCResponse;
/**
@@ -17,7 +17,7 @@ public class PutFileResponse extends RPCResponse { * Constructs a new PutFileResponse object
*/
public PutFileResponse() {
- super(FunctionId.PUT_FILE.toString());
+ super(FunctionID.PUT_FILE.toString());
}
/**
diff --git a/sdl_android_lib/src/com/smartdevicelink/proxy/rpc/ReadDID.java b/sdl_android_lib/src/com/smartdevicelink/proxy/rpc/ReadDID.java index 2579d004c..f165ae050 100644 --- a/sdl_android_lib/src/com/smartdevicelink/proxy/rpc/ReadDID.java +++ b/sdl_android_lib/src/com/smartdevicelink/proxy/rpc/ReadDID.java @@ -3,7 +3,7 @@ package com.smartdevicelink.proxy.rpc; import java.util.Hashtable;
import java.util.List;
-import com.smartdevicelink.protocol.enums.FunctionId;
+import com.smartdevicelink.protocol.enums.FunctionID;
import com.smartdevicelink.proxy.RPCRequest;
/**
@@ -26,7 +26,7 @@ public class ReadDID extends RPCRequest { * Constructs a new ReadDID object
*/
public ReadDID() {
- super(FunctionId.READ_DID.toString());
+ super(FunctionID.READ_DID.toString());
}
/**
diff --git a/sdl_android_lib/src/com/smartdevicelink/proxy/rpc/ReadDIDResponse.java b/sdl_android_lib/src/com/smartdevicelink/proxy/rpc/ReadDIDResponse.java index 82aac9c54..b21395b48 100644 --- a/sdl_android_lib/src/com/smartdevicelink/proxy/rpc/ReadDIDResponse.java +++ b/sdl_android_lib/src/com/smartdevicelink/proxy/rpc/ReadDIDResponse.java @@ -4,7 +4,7 @@ import java.util.ArrayList; import java.util.Hashtable;
import java.util.List;
-import com.smartdevicelink.protocol.enums.FunctionId;
+import com.smartdevicelink.protocol.enums.FunctionID;
import com.smartdevicelink.proxy.RPCResponse;
/**
@@ -16,7 +16,7 @@ public class ReadDIDResponse extends RPCResponse { public static final String KEY_DID_RESULT = "didResult";
public ReadDIDResponse() {
- super(FunctionId.READ_DID.toString());
+ super(FunctionID.READ_DID.toString());
}
public ReadDIDResponse(Hashtable<String, Object> hash) {
super(hash);
diff --git a/sdl_android_lib/src/com/smartdevicelink/proxy/rpc/RegisterAppInterface.java b/sdl_android_lib/src/com/smartdevicelink/proxy/rpc/RegisterAppInterface.java index 18441ae16..8af901be3 100644 --- a/sdl_android_lib/src/com/smartdevicelink/proxy/rpc/RegisterAppInterface.java +++ b/sdl_android_lib/src/com/smartdevicelink/proxy/rpc/RegisterAppInterface.java @@ -4,7 +4,7 @@ import java.util.ArrayList; import java.util.Hashtable;
import java.util.List;
-import com.smartdevicelink.protocol.enums.FunctionId;
+import com.smartdevicelink.protocol.enums.FunctionID;
import com.smartdevicelink.proxy.RPCRequest;
import com.smartdevicelink.proxy.rpc.enums.AppHMIType;
import com.smartdevicelink.proxy.rpc.enums.Language;
@@ -96,7 +96,7 @@ public class RegisterAppInterface extends RPCRequest { * Constructs a new RegisterAppInterface object
*/
public RegisterAppInterface() {
- super(FunctionId.REGISTER_APP_INTERFACE.toString());
+ super(FunctionID.REGISTER_APP_INTERFACE.toString());
}
/**
* Constructs a new RegisterAppInterface object indicated by the Hashtable
diff --git a/sdl_android_lib/src/com/smartdevicelink/proxy/rpc/RegisterAppInterfaceResponse.java b/sdl_android_lib/src/com/smartdevicelink/proxy/rpc/RegisterAppInterfaceResponse.java index 427e99f71..05a96160c 100644 --- a/sdl_android_lib/src/com/smartdevicelink/proxy/rpc/RegisterAppInterfaceResponse.java +++ b/sdl_android_lib/src/com/smartdevicelink/proxy/rpc/RegisterAppInterfaceResponse.java @@ -4,7 +4,7 @@ import java.util.ArrayList; import java.util.Hashtable;
import java.util.List;
-import com.smartdevicelink.protocol.enums.FunctionId;
+import com.smartdevicelink.protocol.enums.FunctionID;
import com.smartdevicelink.proxy.RPCResponse;
import com.smartdevicelink.proxy.Version;
import com.smartdevicelink.proxy.rpc.enums.HmiZoneCapabilities;
@@ -42,7 +42,7 @@ public class RegisterAppInterfaceResponse extends RPCResponse { * Constructs a new RegisterAppInterfaceResponse object
*/
public RegisterAppInterfaceResponse() {
- super(FunctionId.REGISTER_APP_INTERFACE.toString());
+ super(FunctionID.REGISTER_APP_INTERFACE.toString());
}
/**
diff --git a/sdl_android_lib/src/com/smartdevicelink/proxy/rpc/ResetGlobalProperties.java b/sdl_android_lib/src/com/smartdevicelink/proxy/rpc/ResetGlobalProperties.java index af03a508c..1121ce2c8 100644 --- a/sdl_android_lib/src/com/smartdevicelink/proxy/rpc/ResetGlobalProperties.java +++ b/sdl_android_lib/src/com/smartdevicelink/proxy/rpc/ResetGlobalProperties.java @@ -4,7 +4,7 @@ import java.util.ArrayList; import java.util.Hashtable;
import java.util.List;
-import com.smartdevicelink.protocol.enums.FunctionId;
+import com.smartdevicelink.protocol.enums.FunctionID;
import com.smartdevicelink.proxy.RPCRequest;
import com.smartdevicelink.proxy.rpc.enums.GlobalProperty;
/**
@@ -29,7 +29,7 @@ public class ResetGlobalProperties extends RPCRequest { * Constructs a new ResetGlobalProperties object
*/
public ResetGlobalProperties() {
- super(FunctionId.RESET_GLOBAL_PROPERTIES.toString());
+ super(FunctionID.RESET_GLOBAL_PROPERTIES.toString());
}
/**
* Constructs a new ResetGlobalProperties object indicated by the Hashtable
diff --git a/sdl_android_lib/src/com/smartdevicelink/proxy/rpc/ResetGlobalPropertiesResponse.java b/sdl_android_lib/src/com/smartdevicelink/proxy/rpc/ResetGlobalPropertiesResponse.java index 8f69e07f0..3390fb814 100644 --- a/sdl_android_lib/src/com/smartdevicelink/proxy/rpc/ResetGlobalPropertiesResponse.java +++ b/sdl_android_lib/src/com/smartdevicelink/proxy/rpc/ResetGlobalPropertiesResponse.java @@ -2,7 +2,7 @@ package com.smartdevicelink.proxy.rpc; import java.util.Hashtable;
-import com.smartdevicelink.protocol.enums.FunctionId;
+import com.smartdevicelink.protocol.enums.FunctionID;
import com.smartdevicelink.proxy.RPCResponse;
/**
@@ -16,7 +16,7 @@ public class ResetGlobalPropertiesResponse extends RPCResponse { * Constructs a new ResetGlobalPropertiesResponse object
*/
public ResetGlobalPropertiesResponse() {
- super(FunctionId.RESET_GLOBAL_PROPERTIES.toString());
+ super(FunctionID.RESET_GLOBAL_PROPERTIES.toString());
}
/**
diff --git a/sdl_android_lib/src/com/smartdevicelink/proxy/rpc/ScrollableMessage.java b/sdl_android_lib/src/com/smartdevicelink/proxy/rpc/ScrollableMessage.java index 99553bbe5..3f9e75cce 100644 --- a/sdl_android_lib/src/com/smartdevicelink/proxy/rpc/ScrollableMessage.java +++ b/sdl_android_lib/src/com/smartdevicelink/proxy/rpc/ScrollableMessage.java @@ -4,7 +4,7 @@ import java.util.ArrayList; import java.util.Hashtable;
import java.util.List;
-import com.smartdevicelink.protocol.enums.FunctionId;
+import com.smartdevicelink.protocol.enums.FunctionID;
import com.smartdevicelink.proxy.RPCRequest;
/**
@@ -25,7 +25,7 @@ public class ScrollableMessage extends RPCRequest { * Constructs a new ScrollableMessage object
*/
public ScrollableMessage() {
- super(FunctionId.SCROLLABLE_MESSAGE.toString());
+ super(FunctionID.SCROLLABLE_MESSAGE.toString());
}
/**
diff --git a/sdl_android_lib/src/com/smartdevicelink/proxy/rpc/ScrollableMessageResponse.java b/sdl_android_lib/src/com/smartdevicelink/proxy/rpc/ScrollableMessageResponse.java index 51be6b3ad..970782f35 100644 --- a/sdl_android_lib/src/com/smartdevicelink/proxy/rpc/ScrollableMessageResponse.java +++ b/sdl_android_lib/src/com/smartdevicelink/proxy/rpc/ScrollableMessageResponse.java @@ -2,7 +2,7 @@ package com.smartdevicelink.proxy.rpc; import java.util.Hashtable;
-import com.smartdevicelink.protocol.enums.FunctionId;
+import com.smartdevicelink.protocol.enums.FunctionID;
import com.smartdevicelink.proxy.RPCResponse;
/**
@@ -16,7 +16,7 @@ public class ScrollableMessageResponse extends RPCResponse { * Constructs a new ScrollableMessageResponse object
*/
public ScrollableMessageResponse() {
- super(FunctionId.SCROLLABLE_MESSAGE.toString());
+ super(FunctionID.SCROLLABLE_MESSAGE.toString());
}
/**
diff --git a/sdl_android_lib/src/com/smartdevicelink/proxy/rpc/SendLocation.java b/sdl_android_lib/src/com/smartdevicelink/proxy/rpc/SendLocation.java index 802305389..0257a4c1c 100644 --- a/sdl_android_lib/src/com/smartdevicelink/proxy/rpc/SendLocation.java +++ b/sdl_android_lib/src/com/smartdevicelink/proxy/rpc/SendLocation.java @@ -3,7 +3,7 @@ package com.smartdevicelink.proxy.rpc; import java.util.Hashtable; import java.util.List; -import com.smartdevicelink.protocol.enums.FunctionId; +import com.smartdevicelink.protocol.enums.FunctionID; import com.smartdevicelink.proxy.RPCRequest; import com.smartdevicelink.util.SdlDataTypeConverter; @@ -28,7 +28,7 @@ public class SendLocation extends RPCRequest{ * Constructs a new SendLocation object */ public SendLocation(){ - super(FunctionId.SEND_LOCATION.toString()); + super(FunctionID.SEND_LOCATION.toString()); } /** diff --git a/sdl_android_lib/src/com/smartdevicelink/proxy/rpc/SendLocationResponse.java b/sdl_android_lib/src/com/smartdevicelink/proxy/rpc/SendLocationResponse.java index 8d1ab2d41..dcee04e9a 100644 --- a/sdl_android_lib/src/com/smartdevicelink/proxy/rpc/SendLocationResponse.java +++ b/sdl_android_lib/src/com/smartdevicelink/proxy/rpc/SendLocationResponse.java @@ -2,7 +2,7 @@ package com.smartdevicelink.proxy.rpc; import java.util.Hashtable; -import com.smartdevicelink.protocol.enums.FunctionId; +import com.smartdevicelink.protocol.enums.FunctionID; import com.smartdevicelink.proxy.RPCResponse; /** @@ -13,7 +13,7 @@ import com.smartdevicelink.proxy.RPCResponse; public class SendLocationResponse extends RPCResponse{ public SendLocationResponse(){ - super(FunctionId.SEND_LOCATION.toString()); + super(FunctionID.SEND_LOCATION.toString()); } public SendLocationResponse(Hashtable<String, Object> hash){ diff --git a/sdl_android_lib/src/com/smartdevicelink/proxy/rpc/SetAppIcon.java b/sdl_android_lib/src/com/smartdevicelink/proxy/rpc/SetAppIcon.java index 006e9ce8e..1a5d5a22e 100644 --- a/sdl_android_lib/src/com/smartdevicelink/proxy/rpc/SetAppIcon.java +++ b/sdl_android_lib/src/com/smartdevicelink/proxy/rpc/SetAppIcon.java @@ -2,7 +2,7 @@ package com.smartdevicelink.proxy.rpc; import java.util.Hashtable;
-import com.smartdevicelink.protocol.enums.FunctionId;
+import com.smartdevicelink.protocol.enums.FunctionID;
import com.smartdevicelink.proxy.RPCRequest;
/**
@@ -19,7 +19,7 @@ public class SetAppIcon extends RPCRequest { * Constructs a new SetAppIcon object
*/
public SetAppIcon() {
- super(FunctionId.SET_APP_ICON.toString());
+ super(FunctionID.SET_APP_ICON.toString());
}
/**
diff --git a/sdl_android_lib/src/com/smartdevicelink/proxy/rpc/SetAppIconResponse.java b/sdl_android_lib/src/com/smartdevicelink/proxy/rpc/SetAppIconResponse.java index 6b2434998..9d154bebf 100644 --- a/sdl_android_lib/src/com/smartdevicelink/proxy/rpc/SetAppIconResponse.java +++ b/sdl_android_lib/src/com/smartdevicelink/proxy/rpc/SetAppIconResponse.java @@ -2,13 +2,13 @@ package com.smartdevicelink.proxy.rpc; import java.util.Hashtable;
-import com.smartdevicelink.protocol.enums.FunctionId;
+import com.smartdevicelink.protocol.enums.FunctionID;
import com.smartdevicelink.proxy.RPCResponse;
public class SetAppIconResponse extends RPCResponse {
public SetAppIconResponse() {
- super(FunctionId.SET_APP_ICON.toString());
+ super(FunctionID.SET_APP_ICON.toString());
}
public SetAppIconResponse(Hashtable<String, Object> hash) {
super(hash);
diff --git a/sdl_android_lib/src/com/smartdevicelink/proxy/rpc/SetDisplayLayout.java b/sdl_android_lib/src/com/smartdevicelink/proxy/rpc/SetDisplayLayout.java index 0b326d235..ec3b1e62e 100644 --- a/sdl_android_lib/src/com/smartdevicelink/proxy/rpc/SetDisplayLayout.java +++ b/sdl_android_lib/src/com/smartdevicelink/proxy/rpc/SetDisplayLayout.java @@ -2,7 +2,7 @@ package com.smartdevicelink.proxy.rpc; import java.util.Hashtable;
-import com.smartdevicelink.protocol.enums.FunctionId;
+import com.smartdevicelink.protocol.enums.FunctionID;
import com.smartdevicelink.proxy.RPCRequest;
/**
@@ -18,7 +18,7 @@ public class SetDisplayLayout extends RPCRequest { * Constructs a new SetDisplayLayout object
*/
public SetDisplayLayout() {
- super(FunctionId.SET_DISPLAY_LAYOUT.toString());
+ super(FunctionID.SET_DISPLAY_LAYOUT.toString());
}
/**
diff --git a/sdl_android_lib/src/com/smartdevicelink/proxy/rpc/SetDisplayLayoutResponse.java b/sdl_android_lib/src/com/smartdevicelink/proxy/rpc/SetDisplayLayoutResponse.java index 92b916860..787bdd9f7 100644 --- a/sdl_android_lib/src/com/smartdevicelink/proxy/rpc/SetDisplayLayoutResponse.java +++ b/sdl_android_lib/src/com/smartdevicelink/proxy/rpc/SetDisplayLayoutResponse.java @@ -4,7 +4,7 @@ import java.util.ArrayList; import java.util.Hashtable;
import java.util.List;
-import com.smartdevicelink.protocol.enums.FunctionId;
+import com.smartdevicelink.protocol.enums.FunctionID;
import com.smartdevicelink.proxy.RPCResponse;
/**
@@ -22,7 +22,7 @@ public class SetDisplayLayoutResponse extends RPCResponse { * Constructs a new SetDisplayLayoutResponse object
*/
public SetDisplayLayoutResponse() {
- super(FunctionId.SET_DISPLAY_LAYOUT.toString());
+ super(FunctionID.SET_DISPLAY_LAYOUT.toString());
}
/**
diff --git a/sdl_android_lib/src/com/smartdevicelink/proxy/rpc/SetGlobalProperties.java b/sdl_android_lib/src/com/smartdevicelink/proxy/rpc/SetGlobalProperties.java index 8a3c0c732..be1f13bb8 100644 --- a/sdl_android_lib/src/com/smartdevicelink/proxy/rpc/SetGlobalProperties.java +++ b/sdl_android_lib/src/com/smartdevicelink/proxy/rpc/SetGlobalProperties.java @@ -4,7 +4,7 @@ import java.util.ArrayList; import java.util.Hashtable;
import java.util.List;
-import com.smartdevicelink.protocol.enums.FunctionId;
+import com.smartdevicelink.protocol.enums.FunctionID;
import com.smartdevicelink.proxy.RPCRequest;
import com.smartdevicelink.util.DebugTool;
/**
@@ -29,7 +29,7 @@ public class SetGlobalProperties extends RPCRequest { * Constructs a new SetGlobalProperties object
*/
public SetGlobalProperties() {
- super(FunctionId.SET_GLOBAL_PROPERTIES.toString());
+ super(FunctionID.SET_GLOBAL_PROPERTIES.toString());
}
/**
* Constructs a new SetGlobalProperties object indicated by the Hashtable
diff --git a/sdl_android_lib/src/com/smartdevicelink/proxy/rpc/SetGlobalPropertiesResponse.java b/sdl_android_lib/src/com/smartdevicelink/proxy/rpc/SetGlobalPropertiesResponse.java index e2a26f0c8..bef494e69 100644 --- a/sdl_android_lib/src/com/smartdevicelink/proxy/rpc/SetGlobalPropertiesResponse.java +++ b/sdl_android_lib/src/com/smartdevicelink/proxy/rpc/SetGlobalPropertiesResponse.java @@ -2,7 +2,7 @@ package com.smartdevicelink.proxy.rpc; import java.util.Hashtable;
-import com.smartdevicelink.protocol.enums.FunctionId;
+import com.smartdevicelink.protocol.enums.FunctionID;
import com.smartdevicelink.proxy.RPCResponse;
/**
@@ -16,7 +16,7 @@ public class SetGlobalPropertiesResponse extends RPCResponse { * Constructs a new SetGlobalPropertiesResponse object
*/
public SetGlobalPropertiesResponse() {
- super(FunctionId.SET_GLOBAL_PROPERTIES.toString());
+ super(FunctionID.SET_GLOBAL_PROPERTIES.toString());
}
/**
diff --git a/sdl_android_lib/src/com/smartdevicelink/proxy/rpc/SetMediaClockTimer.java b/sdl_android_lib/src/com/smartdevicelink/proxy/rpc/SetMediaClockTimer.java index 877619e00..2b8f33365 100644 --- a/sdl_android_lib/src/com/smartdevicelink/proxy/rpc/SetMediaClockTimer.java +++ b/sdl_android_lib/src/com/smartdevicelink/proxy/rpc/SetMediaClockTimer.java @@ -2,7 +2,7 @@ package com.smartdevicelink.proxy.rpc; import java.util.Hashtable;
-import com.smartdevicelink.protocol.enums.FunctionId;
+import com.smartdevicelink.protocol.enums.FunctionID;
import com.smartdevicelink.proxy.RPCRequest;
import com.smartdevicelink.proxy.rpc.enums.UpdateMode;
/**
@@ -23,7 +23,7 @@ public class SetMediaClockTimer extends RPCRequest { * Constructs a new SetMediaClockTimer object
*/
public SetMediaClockTimer() {
- super(FunctionId.SET_MEDIA_CLOCK_TIMER.toString());
+ super(FunctionID.SET_MEDIA_CLOCK_TIMER.toString());
}
/**
* Constructs a new SetMediaClockTimer object indicated by the Hashtable
diff --git a/sdl_android_lib/src/com/smartdevicelink/proxy/rpc/SetMediaClockTimerResponse.java b/sdl_android_lib/src/com/smartdevicelink/proxy/rpc/SetMediaClockTimerResponse.java index 999bf398c..410b5b68c 100644 --- a/sdl_android_lib/src/com/smartdevicelink/proxy/rpc/SetMediaClockTimerResponse.java +++ b/sdl_android_lib/src/com/smartdevicelink/proxy/rpc/SetMediaClockTimerResponse.java @@ -2,7 +2,7 @@ package com.smartdevicelink.proxy.rpc; import java.util.Hashtable;
-import com.smartdevicelink.protocol.enums.FunctionId;
+import com.smartdevicelink.protocol.enums.FunctionID;
import com.smartdevicelink.proxy.RPCResponse;
/**
@@ -16,7 +16,7 @@ public class SetMediaClockTimerResponse extends RPCResponse { * Constructs a new SetMediaClockTimerResponse object
*/
public SetMediaClockTimerResponse() {
- super(FunctionId.SET_MEDIA_CLOCK_TIMER.toString());
+ super(FunctionID.SET_MEDIA_CLOCK_TIMER.toString());
}
/**
diff --git a/sdl_android_lib/src/com/smartdevicelink/proxy/rpc/Show.java b/sdl_android_lib/src/com/smartdevicelink/proxy/rpc/Show.java index 44f094849..9782b0e7f 100644 --- a/sdl_android_lib/src/com/smartdevicelink/proxy/rpc/Show.java +++ b/sdl_android_lib/src/com/smartdevicelink/proxy/rpc/Show.java @@ -4,7 +4,7 @@ import java.util.ArrayList; import java.util.Hashtable;
import java.util.List;
-import com.smartdevicelink.protocol.enums.FunctionId;
+import com.smartdevicelink.protocol.enums.FunctionID;
import com.smartdevicelink.proxy.RPCRequest;
import com.smartdevicelink.proxy.rpc.enums.TextAlignment;
import com.smartdevicelink.util.DebugTool;
@@ -49,7 +49,7 @@ public class Show extends RPCRequest { * Constructs a new Show object
*/
public Show() {
- super(FunctionId.SHOW.toString());
+ super(FunctionID.SHOW.toString());
}
/**
* Constructs a new Show object indicated by the Hashtable parameter
diff --git a/sdl_android_lib/src/com/smartdevicelink/proxy/rpc/ShowConstantTbt.java b/sdl_android_lib/src/com/smartdevicelink/proxy/rpc/ShowConstantTbt.java index b536bb1bd..293adddbe 100644 --- a/sdl_android_lib/src/com/smartdevicelink/proxy/rpc/ShowConstantTbt.java +++ b/sdl_android_lib/src/com/smartdevicelink/proxy/rpc/ShowConstantTbt.java @@ -4,7 +4,7 @@ import java.util.ArrayList; import java.util.Hashtable; import java.util.List; -import com.smartdevicelink.protocol.enums.FunctionId; +import com.smartdevicelink.protocol.enums.FunctionID; import com.smartdevicelink.proxy.RPCRequest; /** @@ -38,7 +38,7 @@ public class ShowConstantTbt extends RPCRequest{ * Constructs a new ShowConstantTbt object */ public ShowConstantTbt(){ - super(FunctionId.SHOW_CONSTANT_TBT.toString()); + super(FunctionID.SHOW_CONSTANT_TBT.toString()); } /** diff --git a/sdl_android_lib/src/com/smartdevicelink/proxy/rpc/ShowConstantTbtResponse.java b/sdl_android_lib/src/com/smartdevicelink/proxy/rpc/ShowConstantTbtResponse.java index 5939ec054..a3e2dbaf1 100644 --- a/sdl_android_lib/src/com/smartdevicelink/proxy/rpc/ShowConstantTbtResponse.java +++ b/sdl_android_lib/src/com/smartdevicelink/proxy/rpc/ShowConstantTbtResponse.java @@ -2,7 +2,7 @@ package com.smartdevicelink.proxy.rpc; import java.util.Hashtable; -import com.smartdevicelink.protocol.enums.FunctionId; +import com.smartdevicelink.protocol.enums.FunctionID; import com.smartdevicelink.proxy.RPCResponse; /** @@ -13,7 +13,7 @@ import com.smartdevicelink.proxy.RPCResponse; public class ShowConstantTbtResponse extends RPCResponse{ public ShowConstantTbtResponse() { - super(FunctionId.SHOW_CONSTANT_TBT.toString()); + super(FunctionID.SHOW_CONSTANT_TBT.toString()); } public ShowConstantTbtResponse(Hashtable<String, Object> hash) { diff --git a/sdl_android_lib/src/com/smartdevicelink/proxy/rpc/ShowResponse.java b/sdl_android_lib/src/com/smartdevicelink/proxy/rpc/ShowResponse.java index 00d97576d..e12c09029 100644 --- a/sdl_android_lib/src/com/smartdevicelink/proxy/rpc/ShowResponse.java +++ b/sdl_android_lib/src/com/smartdevicelink/proxy/rpc/ShowResponse.java @@ -2,7 +2,7 @@ package com.smartdevicelink.proxy.rpc; import java.util.Hashtable;
-import com.smartdevicelink.protocol.enums.FunctionId;
+import com.smartdevicelink.protocol.enums.FunctionID;
import com.smartdevicelink.proxy.RPCResponse;
/**
@@ -16,7 +16,7 @@ public class ShowResponse extends RPCResponse { * Constructs a new ShowResponse object
*/
public ShowResponse() {
- super(FunctionId.SHOW.toString());
+ super(FunctionID.SHOW.toString());
}
/**
diff --git a/sdl_android_lib/src/com/smartdevicelink/proxy/rpc/Slider.java b/sdl_android_lib/src/com/smartdevicelink/proxy/rpc/Slider.java index 838a98193..4cf914f43 100644 --- a/sdl_android_lib/src/com/smartdevicelink/proxy/rpc/Slider.java +++ b/sdl_android_lib/src/com/smartdevicelink/proxy/rpc/Slider.java @@ -3,7 +3,7 @@ package com.smartdevicelink.proxy.rpc; import java.util.Hashtable;
import java.util.List;
-import com.smartdevicelink.protocol.enums.FunctionId;
+import com.smartdevicelink.protocol.enums.FunctionID;
import com.smartdevicelink.proxy.RPCRequest;
/**
@@ -29,7 +29,7 @@ public class Slider extends RPCRequest { * Constructs a new Slider object
*/
public Slider() {
- super(FunctionId.SLIDER.toString());
+ super(FunctionID.SLIDER.toString());
}
/**
diff --git a/sdl_android_lib/src/com/smartdevicelink/proxy/rpc/SliderResponse.java b/sdl_android_lib/src/com/smartdevicelink/proxy/rpc/SliderResponse.java index 2f5c23c3a..6d168b6ea 100644 --- a/sdl_android_lib/src/com/smartdevicelink/proxy/rpc/SliderResponse.java +++ b/sdl_android_lib/src/com/smartdevicelink/proxy/rpc/SliderResponse.java @@ -2,7 +2,7 @@ package com.smartdevicelink.proxy.rpc; import java.util.Hashtable;
-import com.smartdevicelink.protocol.enums.FunctionId;
+import com.smartdevicelink.protocol.enums.FunctionID;
import com.smartdevicelink.proxy.RPCResponse;
/**
@@ -17,7 +17,7 @@ public class SliderResponse extends RPCResponse { * Constructs a new SliderResponse object
*/
public SliderResponse() {
- super(FunctionId.SLIDER.toString());
+ super(FunctionID.SLIDER.toString());
}
/**
diff --git a/sdl_android_lib/src/com/smartdevicelink/proxy/rpc/Speak.java b/sdl_android_lib/src/com/smartdevicelink/proxy/rpc/Speak.java index 7b7dc86ea..27183af86 100644 --- a/sdl_android_lib/src/com/smartdevicelink/proxy/rpc/Speak.java +++ b/sdl_android_lib/src/com/smartdevicelink/proxy/rpc/Speak.java @@ -4,7 +4,7 @@ import java.util.ArrayList; import java.util.Hashtable;
import java.util.List;
-import com.smartdevicelink.protocol.enums.FunctionId;
+import com.smartdevicelink.protocol.enums.FunctionID;
import com.smartdevicelink.proxy.RPCRequest;
/**
@@ -79,7 +79,7 @@ public class Speak extends RPCRequest { * Constructs a new Speak object
*/
public Speak() {
- super(FunctionId.SPEAK.toString());
+ super(FunctionID.SPEAK.toString());
}
/**
* Constructs a new Speak object indicated by the Hashtable parameter
diff --git a/sdl_android_lib/src/com/smartdevicelink/proxy/rpc/SpeakResponse.java b/sdl_android_lib/src/com/smartdevicelink/proxy/rpc/SpeakResponse.java index 6292f4050..3e7be103c 100644 --- a/sdl_android_lib/src/com/smartdevicelink/proxy/rpc/SpeakResponse.java +++ b/sdl_android_lib/src/com/smartdevicelink/proxy/rpc/SpeakResponse.java @@ -2,7 +2,7 @@ package com.smartdevicelink.proxy.rpc; import java.util.Hashtable;
-import com.smartdevicelink.protocol.enums.FunctionId;
+import com.smartdevicelink.protocol.enums.FunctionID;
import com.smartdevicelink.proxy.RPCResponse;
/**
@@ -16,7 +16,7 @@ public class SpeakResponse extends RPCResponse { * Constructs a new SpeakResponse object
*/
public SpeakResponse() {
- super(FunctionId.SPEAK.toString());
+ super(FunctionID.SPEAK.toString());
}
/**
diff --git a/sdl_android_lib/src/com/smartdevicelink/proxy/rpc/StreamRPCResponse.java b/sdl_android_lib/src/com/smartdevicelink/proxy/rpc/StreamRPCResponse.java index 5d0483ba9..bd75bef6d 100644 --- a/sdl_android_lib/src/com/smartdevicelink/proxy/rpc/StreamRPCResponse.java +++ b/sdl_android_lib/src/com/smartdevicelink/proxy/rpc/StreamRPCResponse.java @@ -2,7 +2,7 @@ package com.smartdevicelink.proxy.rpc; import java.util.Hashtable; -import com.smartdevicelink.protocol.enums.FunctionId; +import com.smartdevicelink.protocol.enums.FunctionID; import com.smartdevicelink.proxy.RPCResponse; public class StreamRPCResponse extends RPCResponse { @@ -10,7 +10,7 @@ public class StreamRPCResponse extends RPCResponse { public static final String KEY_FILESIZE = "fileSize"; public StreamRPCResponse() { - super(FunctionId.STREAM_RPC.toString()); + super(FunctionID.STREAM_RPC.toString()); } public StreamRPCResponse(Hashtable<String, Object> hash) { super(hash); diff --git a/sdl_android_lib/src/com/smartdevicelink/proxy/rpc/SubscribeButton.java b/sdl_android_lib/src/com/smartdevicelink/proxy/rpc/SubscribeButton.java index fe0bbcb1f..9f09fb5fa 100644 --- a/sdl_android_lib/src/com/smartdevicelink/proxy/rpc/SubscribeButton.java +++ b/sdl_android_lib/src/com/smartdevicelink/proxy/rpc/SubscribeButton.java @@ -2,7 +2,7 @@ package com.smartdevicelink.proxy.rpc; import java.util.Hashtable;
-import com.smartdevicelink.protocol.enums.FunctionId;
+import com.smartdevicelink.protocol.enums.FunctionID;
import com.smartdevicelink.proxy.RPCRequest;
import com.smartdevicelink.proxy.rpc.enums.ButtonName;
/**
@@ -62,7 +62,7 @@ public class SubscribeButton extends RPCRequest { * Constructs a new SubscribeButton object
*/
public SubscribeButton() {
- super(FunctionId.SUBSCRIBE_BUTTON.toString());
+ super(FunctionID.SUBSCRIBE_BUTTON.toString());
}
/**
* Constructs a new SubscribeButton object indicated by the Hashtable
diff --git a/sdl_android_lib/src/com/smartdevicelink/proxy/rpc/SubscribeButtonResponse.java b/sdl_android_lib/src/com/smartdevicelink/proxy/rpc/SubscribeButtonResponse.java index a5c1456cf..b51f75eee 100644 --- a/sdl_android_lib/src/com/smartdevicelink/proxy/rpc/SubscribeButtonResponse.java +++ b/sdl_android_lib/src/com/smartdevicelink/proxy/rpc/SubscribeButtonResponse.java @@ -2,7 +2,7 @@ package com.smartdevicelink.proxy.rpc; import java.util.Hashtable;
-import com.smartdevicelink.protocol.enums.FunctionId;
+import com.smartdevicelink.protocol.enums.FunctionID;
import com.smartdevicelink.proxy.RPCResponse;
/**
@@ -16,7 +16,7 @@ public class SubscribeButtonResponse extends RPCResponse { * Constructs a new SubscribeButtonResponse object
*/
public SubscribeButtonResponse() {
- super(FunctionId.SUBSCRIBE_BUTTON.toString());
+ super(FunctionID.SUBSCRIBE_BUTTON.toString());
}
/**
diff --git a/sdl_android_lib/src/com/smartdevicelink/proxy/rpc/SubscribeVehicleData.java b/sdl_android_lib/src/com/smartdevicelink/proxy/rpc/SubscribeVehicleData.java index d570151f8..8715c98c3 100644 --- a/sdl_android_lib/src/com/smartdevicelink/proxy/rpc/SubscribeVehicleData.java +++ b/sdl_android_lib/src/com/smartdevicelink/proxy/rpc/SubscribeVehicleData.java @@ -2,7 +2,7 @@ package com.smartdevicelink.proxy.rpc; import java.util.Hashtable;
-import com.smartdevicelink.protocol.enums.FunctionId;
+import com.smartdevicelink.protocol.enums.FunctionID;
import com.smartdevicelink.proxy.RPCRequest;
/**
@@ -51,7 +51,7 @@ public class SubscribeVehicleData extends RPCRequest { * Constructs a new SubscribeVehicleData object
*/
public SubscribeVehicleData() {
- super(FunctionId.SUBSCRIBE_VEHICLE_DATA.toString());
+ super(FunctionID.SUBSCRIBE_VEHICLE_DATA.toString());
}
/**
diff --git a/sdl_android_lib/src/com/smartdevicelink/proxy/rpc/SubscribeVehicleDataResponse.java b/sdl_android_lib/src/com/smartdevicelink/proxy/rpc/SubscribeVehicleDataResponse.java index c760a0658..b7a7c2c0c 100644 --- a/sdl_android_lib/src/com/smartdevicelink/proxy/rpc/SubscribeVehicleDataResponse.java +++ b/sdl_android_lib/src/com/smartdevicelink/proxy/rpc/SubscribeVehicleDataResponse.java @@ -2,7 +2,7 @@ package com.smartdevicelink.proxy.rpc; import java.util.Hashtable;
-import com.smartdevicelink.protocol.enums.FunctionId;
+import com.smartdevicelink.protocol.enums.FunctionID;
import com.smartdevicelink.proxy.RPCResponse;
import com.smartdevicelink.util.DebugTool;
@@ -41,7 +41,7 @@ public class SubscribeVehicleDataResponse extends RPCResponse { * Constructs a new SubscribeVehicleDataResponse object
*/
public SubscribeVehicleDataResponse() {
- super(FunctionId.SUBSCRIBE_VEHICLE_DATA.toString());
+ super(FunctionID.SUBSCRIBE_VEHICLE_DATA.toString());
}
/**
diff --git a/sdl_android_lib/src/com/smartdevicelink/proxy/rpc/SystemRequest.java b/sdl_android_lib/src/com/smartdevicelink/proxy/rpc/SystemRequest.java index 6296a951d..94fe62353 100644 --- a/sdl_android_lib/src/com/smartdevicelink/proxy/rpc/SystemRequest.java +++ b/sdl_android_lib/src/com/smartdevicelink/proxy/rpc/SystemRequest.java @@ -3,7 +3,7 @@ package com.smartdevicelink.proxy.rpc; import java.util.Hashtable;
import java.util.List;
-import com.smartdevicelink.protocol.enums.FunctionId;
+import com.smartdevicelink.protocol.enums.FunctionID;
import com.smartdevicelink.proxy.RPCRequest;
import com.smartdevicelink.proxy.rpc.enums.RequestType;
@@ -13,11 +13,11 @@ public class SystemRequest extends RPCRequest { public static final String KEY_DATA = "data";
public SystemRequest() {
- super(FunctionId.SYSTEM_REQUEST.toString());
+ super(FunctionID.SYSTEM_REQUEST.toString());
}
public SystemRequest(boolean bLegacy) {
- super(FunctionId.ENCODED_SYNC_P_DATA.toString());
+ super(FunctionID.ENCODED_SYNC_P_DATA.toString());
}
public SystemRequest(Hashtable<String, Object> hash) {
diff --git a/sdl_android_lib/src/com/smartdevicelink/proxy/rpc/SystemRequestResponse.java b/sdl_android_lib/src/com/smartdevicelink/proxy/rpc/SystemRequestResponse.java index 9c266a2a9..201c186c8 100644 --- a/sdl_android_lib/src/com/smartdevicelink/proxy/rpc/SystemRequestResponse.java +++ b/sdl_android_lib/src/com/smartdevicelink/proxy/rpc/SystemRequestResponse.java @@ -2,12 +2,12 @@ package com.smartdevicelink.proxy.rpc; import java.util.Hashtable;
-import com.smartdevicelink.protocol.enums.FunctionId;
+import com.smartdevicelink.protocol.enums.FunctionID;
import com.smartdevicelink.proxy.RPCResponse;
public class SystemRequestResponse extends RPCResponse {
public SystemRequestResponse() {
- super(FunctionId.SYSTEM_REQUEST.toString());
+ super(FunctionID.SYSTEM_REQUEST.toString());
}
public SystemRequestResponse(Hashtable<String, Object> hash) {
diff --git a/sdl_android_lib/src/com/smartdevicelink/proxy/rpc/UnregisterAppInterface.java b/sdl_android_lib/src/com/smartdevicelink/proxy/rpc/UnregisterAppInterface.java index dd620c146..aafdb53f9 100644 --- a/sdl_android_lib/src/com/smartdevicelink/proxy/rpc/UnregisterAppInterface.java +++ b/sdl_android_lib/src/com/smartdevicelink/proxy/rpc/UnregisterAppInterface.java @@ -2,7 +2,7 @@ package com.smartdevicelink.proxy.rpc; import java.util.Hashtable;
-import com.smartdevicelink.protocol.enums.FunctionId;
+import com.smartdevicelink.protocol.enums.FunctionID;
import com.smartdevicelink.proxy.RPCRequest;
/**
@@ -26,7 +26,7 @@ public class UnregisterAppInterface extends RPCRequest { * Constructs a new UnregisterAppInterface object
*/
public UnregisterAppInterface() {
- super(FunctionId.UNREGISTER_APP_INTERFACE.toString());
+ super(FunctionID.UNREGISTER_APP_INTERFACE.toString());
}
/**
* Constructs a new UnregisterAppInterface object indicated by the Hashtable
diff --git a/sdl_android_lib/src/com/smartdevicelink/proxy/rpc/UnregisterAppInterfaceResponse.java b/sdl_android_lib/src/com/smartdevicelink/proxy/rpc/UnregisterAppInterfaceResponse.java index e0e6f29aa..db425a503 100644 --- a/sdl_android_lib/src/com/smartdevicelink/proxy/rpc/UnregisterAppInterfaceResponse.java +++ b/sdl_android_lib/src/com/smartdevicelink/proxy/rpc/UnregisterAppInterfaceResponse.java @@ -2,7 +2,7 @@ package com.smartdevicelink.proxy.rpc; import java.util.Hashtable;
-import com.smartdevicelink.protocol.enums.FunctionId;
+import com.smartdevicelink.protocol.enums.FunctionID;
import com.smartdevicelink.proxy.RPCResponse;
/**
@@ -16,7 +16,7 @@ public class UnregisterAppInterfaceResponse extends RPCResponse { * Constructs a new UnregisterAppInterfaceResponse object
*/
public UnregisterAppInterfaceResponse() {
- super(FunctionId.UNREGISTER_APP_INTERFACE.toString());
+ super(FunctionID.UNREGISTER_APP_INTERFACE.toString());
}
/**
diff --git a/sdl_android_lib/src/com/smartdevicelink/proxy/rpc/UnsubscribeButton.java b/sdl_android_lib/src/com/smartdevicelink/proxy/rpc/UnsubscribeButton.java index e6cbc63a9..7575fd84a 100644 --- a/sdl_android_lib/src/com/smartdevicelink/proxy/rpc/UnsubscribeButton.java +++ b/sdl_android_lib/src/com/smartdevicelink/proxy/rpc/UnsubscribeButton.java @@ -2,7 +2,7 @@ package com.smartdevicelink.proxy.rpc; import java.util.Hashtable;
-import com.smartdevicelink.protocol.enums.FunctionId;
+import com.smartdevicelink.protocol.enums.FunctionID;
import com.smartdevicelink.proxy.RPCRequest;
import com.smartdevicelink.proxy.rpc.enums.ButtonName;
@@ -26,7 +26,7 @@ public class UnsubscribeButton extends RPCRequest { * Constructs a new UnsubscribeButton object
*/
public UnsubscribeButton() {
- super(FunctionId.UNSUBSCRIBE_BUTTON.toString());
+ super(FunctionID.UNSUBSCRIBE_BUTTON.toString());
}
/**
* Constructs a new UnsubscribeButton object indicated by the Hashtable
diff --git a/sdl_android_lib/src/com/smartdevicelink/proxy/rpc/UnsubscribeButtonResponse.java b/sdl_android_lib/src/com/smartdevicelink/proxy/rpc/UnsubscribeButtonResponse.java index 27129c771..58f7326e1 100644 --- a/sdl_android_lib/src/com/smartdevicelink/proxy/rpc/UnsubscribeButtonResponse.java +++ b/sdl_android_lib/src/com/smartdevicelink/proxy/rpc/UnsubscribeButtonResponse.java @@ -2,7 +2,7 @@ package com.smartdevicelink.proxy.rpc; import java.util.Hashtable;
-import com.smartdevicelink.protocol.enums.FunctionId;
+import com.smartdevicelink.protocol.enums.FunctionID;
import com.smartdevicelink.proxy.RPCResponse;
/**
@@ -16,7 +16,7 @@ public class UnsubscribeButtonResponse extends RPCResponse { * Constructs a new UnsubscribeButtonResponse object
*/
public UnsubscribeButtonResponse() {
- super(FunctionId.UNSUBSCRIBE_BUTTON.toString());
+ super(FunctionID.UNSUBSCRIBE_BUTTON.toString());
}
/**
diff --git a/sdl_android_lib/src/com/smartdevicelink/proxy/rpc/UnsubscribeVehicleData.java b/sdl_android_lib/src/com/smartdevicelink/proxy/rpc/UnsubscribeVehicleData.java index 632599299..65a260d26 100644 --- a/sdl_android_lib/src/com/smartdevicelink/proxy/rpc/UnsubscribeVehicleData.java +++ b/sdl_android_lib/src/com/smartdevicelink/proxy/rpc/UnsubscribeVehicleData.java @@ -2,7 +2,7 @@ package com.smartdevicelink.proxy.rpc; import java.util.Hashtable;
-import com.smartdevicelink.protocol.enums.FunctionId;
+import com.smartdevicelink.protocol.enums.FunctionID;
import com.smartdevicelink.proxy.RPCRequest;
/**
@@ -49,7 +49,7 @@ public class UnsubscribeVehicleData extends RPCRequest { * Constructs a new UnsubscribeVehicleData object
*/
public UnsubscribeVehicleData() {
- super(FunctionId.UNSUBSCRIBE_VEHICLE_DATA.toString());
+ super(FunctionID.UNSUBSCRIBE_VEHICLE_DATA.toString());
}
/**
diff --git a/sdl_android_lib/src/com/smartdevicelink/proxy/rpc/UnsubscribeVehicleDataResponse.java b/sdl_android_lib/src/com/smartdevicelink/proxy/rpc/UnsubscribeVehicleDataResponse.java index 1d2aeb320..0ff328c0e 100644 --- a/sdl_android_lib/src/com/smartdevicelink/proxy/rpc/UnsubscribeVehicleDataResponse.java +++ b/sdl_android_lib/src/com/smartdevicelink/proxy/rpc/UnsubscribeVehicleDataResponse.java @@ -2,7 +2,7 @@ package com.smartdevicelink.proxy.rpc; import java.util.Hashtable;
-import com.smartdevicelink.protocol.enums.FunctionId;
+import com.smartdevicelink.protocol.enums.FunctionID;
import com.smartdevicelink.proxy.RPCResponse;
import com.smartdevicelink.util.DebugTool;
@@ -41,7 +41,7 @@ public class UnsubscribeVehicleDataResponse extends RPCResponse { * Constructs a new UnsubscribeVehicleDataResponse object
*/
public UnsubscribeVehicleDataResponse() {
- super(FunctionId.UNSUBSCRIBE_VEHICLE_DATA.toString());
+ super(FunctionID.UNSUBSCRIBE_VEHICLE_DATA.toString());
}
/**
diff --git a/sdl_android_lib/src/com/smartdevicelink/proxy/rpc/UpdateTurnList.java b/sdl_android_lib/src/com/smartdevicelink/proxy/rpc/UpdateTurnList.java index f3e04bebc..aa79068ef 100644 --- a/sdl_android_lib/src/com/smartdevicelink/proxy/rpc/UpdateTurnList.java +++ b/sdl_android_lib/src/com/smartdevicelink/proxy/rpc/UpdateTurnList.java @@ -4,7 +4,7 @@ import java.util.ArrayList; import java.util.Hashtable; import java.util.List; -import com.smartdevicelink.protocol.enums.FunctionId; +import com.smartdevicelink.protocol.enums.FunctionID; import com.smartdevicelink.proxy.RPCRequest; /** @@ -27,7 +27,7 @@ public class UpdateTurnList extends RPCRequest{ * Constructs a new UpdateTurnList object */ public UpdateTurnList() { - super(FunctionId.UPDATE_TURN_LIST.toString()); + super(FunctionID.UPDATE_TURN_LIST.toString()); } /** diff --git a/sdl_android_lib/src/com/smartdevicelink/proxy/rpc/UpdateTurnListResponse.java b/sdl_android_lib/src/com/smartdevicelink/proxy/rpc/UpdateTurnListResponse.java index c3bfd50e0..add51c5a5 100644 --- a/sdl_android_lib/src/com/smartdevicelink/proxy/rpc/UpdateTurnListResponse.java +++ b/sdl_android_lib/src/com/smartdevicelink/proxy/rpc/UpdateTurnListResponse.java @@ -2,7 +2,7 @@ package com.smartdevicelink.proxy.rpc; import java.util.Hashtable; -import com.smartdevicelink.protocol.enums.FunctionId; +import com.smartdevicelink.protocol.enums.FunctionID; import com.smartdevicelink.proxy.RPCResponse; /** @@ -16,7 +16,7 @@ public class UpdateTurnListResponse extends RPCResponse{ * Constructs a new UpdateTurnListResponse object */ public UpdateTurnListResponse() { - super(FunctionId.UPDATE_TURN_LIST.toString()); + super(FunctionID.UPDATE_TURN_LIST.toString()); } public UpdateTurnListResponse(Hashtable<String, Object> hash) { diff --git a/sdl_android_lib/src/com/smartdevicelink/streaming/StreamRPCPacketizer.java b/sdl_android_lib/src/com/smartdevicelink/streaming/StreamRPCPacketizer.java index fcf9365e3..1fdc50351 100644 --- a/sdl_android_lib/src/com/smartdevicelink/streaming/StreamRPCPacketizer.java +++ b/sdl_android_lib/src/com/smartdevicelink/streaming/StreamRPCPacketizer.java @@ -6,7 +6,7 @@ import java.util.Hashtable; import com.smartdevicelink.marshal.JsonRPCMarshaller;
import com.smartdevicelink.protocol.ProtocolMessage;
-import com.smartdevicelink.protocol.enums.FunctionId;
+import com.smartdevicelink.protocol.enums.FunctionID;
import com.smartdevicelink.protocol.enums.MessageType;
import com.smartdevicelink.protocol.enums.SessionType;
import com.smartdevicelink.proxy.RPCRequest;
@@ -195,7 +195,7 @@ public class StreamRPCPacketizer extends AbstractPacketizer implements IPutFileR pm.setSessionID(_rpcSessionID);
pm.setMessageType(MessageType.RPC);
pm.setSessionType(_session);
- pm.setFunctionID(FunctionId.getFunctionId(msg.getFunctionName()));
+ pm.setFunctionID(FunctionID.getFunctionId(msg.getFunctionName()));
if (buffer.length != length)
pm.setBulkData(buffer, length);
|