diff options
| author | Austin Kirk <askirk@umich.edu> | 2017-06-01 16:20:34 -0400 |
|---|---|---|
| committer | Austin Kirk <askirk@umich.edu> | 2017-06-06 15:15:38 -0400 |
| commit | cea9db552d815df960d46fcb59d15f3d98669e28 (patch) | |
| tree | 1bba3fb822894530f00ec4e6ee2298ad84f26c48 | |
| parent | 48d41d6e3af5784be53254df2d388e1bc7df97b5 (diff) | |
| download | sdl_android-cea9db552d815df960d46fcb59d15f3d98669e28.tar.gz | |
Refactoring with new Getters and Setters in RPCMessage and RPCStruct
- Now getters/setters in RPCMessage override those in RPCStruct (parameters object vs store object)
- Needs more unit tests for RPC classes
121 files changed, 1454 insertions, 4838 deletions
diff --git a/sdl_android/src/main/java/com/smartdevicelink/proxy/RPCMessage.java b/sdl_android/src/main/java/com/smartdevicelink/proxy/RPCMessage.java index 6435946a2..5647f923b 100644 --- a/sdl_android/src/main/java/com/smartdevicelink/proxy/RPCMessage.java +++ b/sdl_android/src/main/java/com/smartdevicelink/proxy/RPCMessage.java @@ -1,9 +1,6 @@ package com.smartdevicelink.proxy;
-import java.lang.reflect.Constructor;
-import java.util.ArrayList;
import java.util.Hashtable;
-import java.util.List;
public class RPCMessage extends RPCStruct {
public static final String KEY_REQUEST = "request";
@@ -76,63 +73,44 @@ public class RPCMessage extends RPCStruct { // Generalized Getters and Setters
- public void setParameters(String functionName, Object value) {
+ public void setParameter(String key, Object value) {
if (value != null) {
- parameters.put(functionName, value);
+ parameters.put(key, value);
} else {
- parameters.remove(functionName);
+ parameters.remove(key);
}
}
- public Object getParameters(String key) {
+ public Object getParameter(String key) {
return parameters.get(key);
}
- public Object getParameterArray(Class tClass, String key){
+ @Override
+ public Object getObject(Class tClass, String key) {
Object obj = parameters.get(key);
- if (obj instanceof Hashtable) {
- try {
- Constructor constructor = tClass.getConstructor(Hashtable.class);
- return constructor.newInstance((Hashtable<String, Object>) obj);
- } catch (Exception e) {
- e.printStackTrace();
- }
- }else if (obj instanceof List<?>) {
- List<?> list = (List<?>)parameters.get(key);
- if (list != null && list.size() > 0) {
- Object item = list.get(0);
- if (tClass.isInstance(item)) {
- return list;
- } else if (item instanceof Hashtable) {
- List<Object> newList = new ArrayList<Object>();
- for (Object hashObj : list) {
- try {
- Constructor constructor = tClass.getConstructor(Hashtable.class);
- newList.add(constructor.newInstance((Hashtable<String, Object>)hashObj));
- } catch (Exception e) {
- e.printStackTrace();
- }
- }
- return newList;
- }
- }
- }
- return null;
+ return formatObject(tClass, obj);
}
// Common Object Getters
+ @Override
public String getString(String key) {
- return (String) getParameters(key);
+ return (String) parameters.get(key);
}
+ @Override
public Integer getInteger(String key) {
- return (Integer) getParameters(key);
+ return (Integer) parameters.get(key);
}
+ @Override
public Double getDouble(String key) {
- return (Double) getParameters(key);
+ return (Double) parameters.get(key);
}
- public Boolean getBoolean(String key) { return (Boolean) getParameters(key); }
+ @Override
+ public Boolean getBoolean(String key) { return (Boolean) parameters.get(key); }
+
+ @Override
+ public Long getLong(String key){ return (Long) parameters.get(key); }
}
diff --git a/sdl_android/src/main/java/com/smartdevicelink/proxy/RPCStruct.java b/sdl_android/src/main/java/com/smartdevicelink/proxy/RPCStruct.java index 4aea8e146..18561ea68 100644 --- a/sdl_android/src/main/java/com/smartdevicelink/proxy/RPCStruct.java +++ b/sdl_android/src/main/java/com/smartdevicelink/proxy/RPCStruct.java @@ -1,12 +1,17 @@ package com.smartdevicelink.proxy;
-import java.util.Hashtable;
-import java.util.Set;
+import com.smartdevicelink.marshal.JsonRPCMarshaller;
import org.json.JSONException;
import org.json.JSONObject;
-import com.smartdevicelink.marshal.JsonRPCMarshaller;
+import java.lang.reflect.Constructor;
+import java.lang.reflect.InvocationTargetException;
+import java.lang.reflect.Method;
+import java.util.ArrayList;
+import java.util.Hashtable;
+import java.util.List;
+import java.util.Set;
public class RPCStruct {
public static final String KEY_BULK_DATA = "bulkData";
@@ -110,4 +115,109 @@ public class RPCStruct { }
return false;
}
+
+ // Generalized Getters and Setters
+
+ public void setValue(String key, Object value){
+ if (value != null) {
+ store.put(key, value);
+ } else {
+ store.remove(key);
+ }
+ }
+
+ public Object getValue(String key) {
+ return store.get(key);
+ }
+
+ public Object getObject(Class tClass, String key) {
+ Object obj = store.get(key);
+ return formatObject(tClass, obj);
+ }
+
+ // Helper methods
+
+ protected Object formatObject(Class tClass, Object obj){
+ if(obj == null){
+ return null;
+ } else if (tClass.isInstance(obj)) {
+ return obj;
+ } else if (obj instanceof String) {
+ return getValueForString(tClass, (String) obj);
+ } else if (obj instanceof Hashtable) {
+ try {
+ Constructor constructor = tClass.getConstructor(Hashtable.class);
+ return constructor.newInstance((Hashtable<String, Object>) obj);
+ } catch (Exception e) {
+ e.printStackTrace();
+ }
+ } else if (obj instanceof List<?>) {
+ List<?> list = (List<?>) obj;
+ if (list != null && list.size() > 0) {
+ Object item = list.get(0);
+ if (tClass.isInstance(item)) {
+ return list;
+ } else if (item instanceof Hashtable) {
+ List<Object> newList = new ArrayList<Object>();
+ for (Object hashObj : list) {
+ try {
+ Constructor constructor = tClass.getConstructor(Hashtable.class);
+ newList.add(constructor.newInstance((Hashtable<String, Object>)hashObj));
+ } catch (Exception e) {
+ e.printStackTrace();
+ }
+ }
+ return newList;
+ } else if (item instanceof String){
+ List<Object> newList = new ArrayList<Object>();
+ for (Object hashObj : list) {
+ Object toAdd = getValueForString(tClass, (String) hashObj);
+ if (toAdd != null) {
+ newList.add(toAdd);
+ }
+ }
+ return newList;
+ }
+ }
+ }
+ return null;
+ }
+
+ protected Object getValueForString(Class tClass, String s){
+ Method valueForString = null;
+ try {
+ valueForString = tClass.getDeclaredMethod("valueForString", String.class);
+ } catch (NoSuchMethodException e) {
+ e.printStackTrace();
+ }
+ if(valueForString != null){
+ try {
+ Object value = valueForString.invoke(null, (String) s);
+ return value;
+ } catch (IllegalAccessException e) {
+ e.printStackTrace();
+ } catch (InvocationTargetException e) {
+ e.printStackTrace();
+ }
+ }
+ return null;
+ }
+
+ // Common Object Getters
+
+ public String getString(String key) {
+ return (String) store.get(key);
+ }
+
+ public Integer getInteger(String key) {
+ return (Integer) store.get(key);
+ }
+
+ public Double getDouble(String key) {
+ return (Double) store.get(key);
+ }
+
+ public Boolean getBoolean(String key) { return (Boolean) store.get(key); }
+
+ public Long getLong(String key){ return (Long) store.get(key); }
}
diff --git a/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/AddCommand.java b/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/AddCommand.java index 63c5cc71b..9cb6f4a44 100644 --- a/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/AddCommand.java +++ b/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/AddCommand.java @@ -2,7 +2,6 @@ package com.smartdevicelink.proxy.rpc; import com.smartdevicelink.protocol.enums.FunctionID;
import com.smartdevicelink.proxy.RPCRequest;
-import com.smartdevicelink.util.DebugTool;
import java.util.Hashtable;
import java.util.List;
@@ -119,7 +118,7 @@ public class AddCommand extends RPCRequest { * @return Integer -an integer representation a Unique Command ID
*/
public Integer getCmdID() {
- return (Integer) parameters.get(KEY_CMD_ID);
+ return getInteger(KEY_CMD_ID);
}
/**
* <p>Sets an Unique Command ID that identifies the command. Is returned in an
@@ -133,7 +132,7 @@ public class AddCommand extends RPCRequest { * <b>Notes:</b> Min Value: 0; Max Value: 2000000000</p>
*/
public void setCmdID(Integer cmdID) {
- setParameters(KEY_CMD_ID, cmdID);
+ setParameter(KEY_CMD_ID, cmdID);
}
/**
* <p>
@@ -146,18 +145,7 @@ public class AddCommand extends RPCRequest { */
@SuppressWarnings("unchecked")
public MenuParams getMenuParams() {
- Object obj = parameters.get(KEY_MENU_PARAMS);
- if (obj instanceof MenuParams) {
- return (MenuParams) obj;
- }
- else if (obj instanceof Hashtable) {
- try {
- return new MenuParams((Hashtable<String, Object>) obj);
- } catch (Exception e) {
- DebugTool.logError("Failed to parse " + getClass().getSimpleName() + "." + KEY_MENU_PARAMS, e);
- }
- }
- return null;
+ return (MenuParams) getObject(MenuParams.class, KEY_MENU_PARAMS);
}
/**
* <p>
@@ -171,7 +159,7 @@ public class AddCommand extends RPCRequest { * a menuParams object
*/
public void setMenuParams(MenuParams menuParams) {
- setParameters(KEY_MENU_PARAMS, menuParams);
+ setParameter(KEY_MENU_PARAMS, menuParams);
}
/**
* <p>
@@ -182,16 +170,7 @@ public class AddCommand extends RPCRequest { */
@SuppressWarnings("unchecked")
public List<String> getVrCommands() {
- if (parameters.get(KEY_VR_COMMANDS) instanceof List<?>) {
- List<?> list = (List<?>)parameters.get(KEY_VR_COMMANDS);
- if (list != null && list.size() > 0) {
- Object obj = list.get(0);
- if (obj instanceof String) {
- return (List<String>)list;
- }
- }
- }
- return null;
+ return (List<String>) getObject(String.class, KEY_VR_COMMANDS);
}
/**
* <p>
@@ -211,7 +190,7 @@ public class AddCommand extends RPCRequest { * not zero-length, not whitespace only) element</p>
*/
public void setVrCommands( List<String> vrCommands ) {
- setParameters(KEY_VR_COMMANDS, vrCommands);
+ setParameter(KEY_VR_COMMANDS, vrCommands);
}
/**
@@ -222,17 +201,7 @@ public class AddCommand extends RPCRequest { */
@SuppressWarnings("unchecked")
public Image getCmdIcon() {
- Object obj = parameters.get(KEY_CMD_ICON);
- if (obj instanceof Image) {
- return (Image) obj;
- } else if (obj instanceof Hashtable) {
- try {
- return new Image((Hashtable<String, Object>) obj);
- } catch (Exception e) {
- DebugTool.logError("Failed to parse " + getClass().getSimpleName() + "." + KEY_CMD_ICON, e);
- }
- }
- return null;
+ return (Image) getObject(Image.class, KEY_CMD_ICON);
}
/**
@@ -247,6 +216,6 @@ public class AddCommand extends RPCRequest { * @since SmartDeviceLink 2.0
*/
public void setCmdIcon(Image cmdIcon) {
- setParameters(KEY_CMD_ICON, cmdIcon);
+ setParameter(KEY_CMD_ICON, cmdIcon);
}
}
diff --git a/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/AddSubMenu.java b/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/AddSubMenu.java index 3498c679b..09dccf9ed 100644 --- a/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/AddSubMenu.java +++ b/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/AddSubMenu.java @@ -90,7 +90,7 @@ public class AddSubMenu extends RPCRequest { * menu
*/
public Integer getMenuID() {
- return (Integer) parameters.get( KEY_MENU_ID );
+ return getInteger( KEY_MENU_ID );
}
/**
* <p>Sets a Menu ID that identifies a sub menu.</p><p> This value is used in
@@ -104,7 +104,7 @@ public class AddSubMenu extends RPCRequest { * <p><b>Notes:</b> Min Value: 0; Max Value: 2000000000</p>
*/
public void setMenuID( Integer menuID ) {
- setParameters(KEY_MENU_ID, menuID);
+ setParameter(KEY_MENU_ID, menuID);
}
/**
* <p>Returns an <i>Integer</i> object representing the position of menu</p>
@@ -113,7 +113,7 @@ public class AddSubMenu extends RPCRequest { * @return Integer -the value representing the relative position of menus
*/
public Integer getPosition() {
- return (Integer) parameters.get( KEY_POSITION );
+ return getInteger( KEY_POSITION );
}
/**
* Sets a position of menu
@@ -136,7 +136,7 @@ public class AddSubMenu extends RPCRequest { * </ul>
*/
public void setPosition( Integer position ) {
- setParameters(KEY_POSITION, position);
+ setParameter(KEY_POSITION, position);
}
/**
* Returns String which is displayed representing this submenu item
@@ -144,7 +144,7 @@ public class AddSubMenu extends RPCRequest { * @return String -a Submenu item's name
*/
public String getMenuName() {
- return (String) parameters.get( KEY_MENU_NAME );
+ return getString( KEY_MENU_NAME );
}
/**
* Sets a menuName which is displayed representing this submenu item
@@ -153,6 +153,6 @@ public class AddSubMenu extends RPCRequest { * String which will be displayed representing this submenu item
*/
public void setMenuName( String menuName ) {
- setParameters(KEY_MENU_NAME, menuName);
+ setParameter(KEY_MENU_NAME, menuName);
}
}
diff --git a/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/AirbagStatus.java b/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/AirbagStatus.java index b80a9c2c4..1c6fb52bb 100644 --- a/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/AirbagStatus.java +++ b/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/AirbagStatus.java @@ -4,6 +4,10 @@ import java.util.Hashtable; import com.smartdevicelink.proxy.RPCStruct;
import com.smartdevicelink.proxy.rpc.enums.VehicleDataEventStatus;
+
+import static com.smartdevicelink.proxy.constants.Names.driverCurtainAirbagDeployed;
+import static com.smartdevicelink.proxy.constants.Names.driverSideAirbagDeployed;
+
/**
* <p>The status of the air bags.</p>
*
@@ -104,131 +108,51 @@ public class AirbagStatus extends RPCStruct { }
public void setDriverAirbagDeployed(VehicleDataEventStatus driverAirbagDeployed) {
- if (driverAirbagDeployed != null) {
- store.put(KEY_DRIVER_AIRBAG_DEPLOYED, driverAirbagDeployed);
- } else {
- store.remove(KEY_DRIVER_AIRBAG_DEPLOYED);
- }
+ setValue(KEY_DRIVER_AIRBAG_DEPLOYED, driverAirbagDeployed);
}
public VehicleDataEventStatus getDriverAirbagDeployed() {
- Object obj = store.get(KEY_DRIVER_AIRBAG_DEPLOYED);
- if (obj instanceof VehicleDataEventStatus) {
- return (VehicleDataEventStatus) obj;
- } else if (obj instanceof String) {
- return VehicleDataEventStatus.valueForString((String) obj);
- }
- return null;
+ return (VehicleDataEventStatus) getObject(VehicleDataEventStatus.class, KEY_DRIVER_AIRBAG_DEPLOYED);
}
public void setDriverSideAirbagDeployed(VehicleDataEventStatus driverSideAirbagDeployed) {
- if (driverSideAirbagDeployed != null) {
- store.put(KEY_DRIVER_SIDE_AIRBAG_DEPLOYED, driverSideAirbagDeployed);
- } else {
- store.remove(KEY_DRIVER_SIDE_AIRBAG_DEPLOYED);
- }
+ setValue(KEY_DRIVER_SIDE_AIRBAG_DEPLOYED, driverSideAirbagDeployed);
}
public VehicleDataEventStatus getDriverSideAirbagDeployed() {
- Object obj = store.get(KEY_DRIVER_SIDE_AIRBAG_DEPLOYED);
- if (obj instanceof VehicleDataEventStatus) {
- return (VehicleDataEventStatus) obj;
- } else if (obj instanceof String) {
- return VehicleDataEventStatus.valueForString((String) obj);
- }
- return null;
+ return (VehicleDataEventStatus) getObject(VehicleDataEventStatus.class, KEY_DRIVER_SIDE_AIRBAG_DEPLOYED);
}
public void setDriverCurtainAirbagDeployed(VehicleDataEventStatus driverCurtainAirbagDeployed) {
- if (driverCurtainAirbagDeployed != null) {
- store.put(KEY_DRIVER_CURTAIN_AIRBAG_DEPLOYED, driverCurtainAirbagDeployed);
- } else {
- store.remove(KEY_DRIVER_CURTAIN_AIRBAG_DEPLOYED);
- }
+ setValue(KEY_DRIVER_CURTAIN_AIRBAG_DEPLOYED, driverCurtainAirbagDeployed);
}
public VehicleDataEventStatus getDriverCurtainAirbagDeployed() {
- Object obj = store.get(KEY_DRIVER_CURTAIN_AIRBAG_DEPLOYED);
- if (obj instanceof VehicleDataEventStatus) {
- return (VehicleDataEventStatus) obj;
- } else if (obj instanceof String) {
- return VehicleDataEventStatus.valueForString((String) obj);
- }
- return null;
+ return (VehicleDataEventStatus) getObject(VehicleDataEventStatus.class, KEY_DRIVER_CURTAIN_AIRBAG_DEPLOYED);
}
public void setPassengerAirbagDeployed(VehicleDataEventStatus passengerAirbagDeployed) {
- if (passengerAirbagDeployed != null) {
- store.put(KEY_PASSENGER_AIRBAG_DEPLOYED, passengerAirbagDeployed);
- } else {
- store.remove(KEY_PASSENGER_AIRBAG_DEPLOYED);
- }
+ setValue(KEY_PASSENGER_AIRBAG_DEPLOYED, passengerAirbagDeployed);
}
public VehicleDataEventStatus getPassengerAirbagDeployed() {
- Object obj = store.get(KEY_PASSENGER_AIRBAG_DEPLOYED);
- if (obj instanceof VehicleDataEventStatus) {
- return (VehicleDataEventStatus) obj;
- } else if (obj instanceof String) {
- return VehicleDataEventStatus.valueForString((String) obj);
- }
- return null;
+ return (VehicleDataEventStatus) getObject(VehicleDataEventStatus.class, KEY_PASSENGER_AIRBAG_DEPLOYED);
}
public void setPassengerCurtainAirbagDeployed(VehicleDataEventStatus passengerCurtainAirbagDeployed) {
- if (passengerCurtainAirbagDeployed != null) {
- store.put(KEY_PASSENGER_CURTAIN_AIRBAG_DEPLOYED, passengerCurtainAirbagDeployed);
- } else {
- store.remove(KEY_PASSENGER_CURTAIN_AIRBAG_DEPLOYED);
- }
+ setValue(KEY_PASSENGER_CURTAIN_AIRBAG_DEPLOYED, passengerCurtainAirbagDeployed);
}
public VehicleDataEventStatus getPassengerCurtainAirbagDeployed() {
- Object obj = store.get(KEY_PASSENGER_CURTAIN_AIRBAG_DEPLOYED);
- if (obj instanceof VehicleDataEventStatus) {
- return (VehicleDataEventStatus) obj;
- } else if (obj instanceof String) {
- return VehicleDataEventStatus.valueForString((String) obj);
- }
- return null;
+ return (VehicleDataEventStatus) getObject(VehicleDataEventStatus.class, KEY_PASSENGER_CURTAIN_AIRBAG_DEPLOYED);
}
public void setDriverKneeAirbagDeployed(VehicleDataEventStatus driverKneeAirbagDeployed) {
- if (driverKneeAirbagDeployed != null) {
- store.put(KEY_DRIVER_KNEE_AIRBAG_DEPLOYED, driverKneeAirbagDeployed);
- } else {
- store.remove(KEY_DRIVER_KNEE_AIRBAG_DEPLOYED);
- }
+ setValue(KEY_DRIVER_KNEE_AIRBAG_DEPLOYED, driverKneeAirbagDeployed);
}
public VehicleDataEventStatus getDriverKneeAirbagDeployed() {
- Object obj = store.get(KEY_DRIVER_KNEE_AIRBAG_DEPLOYED);
- if (obj instanceof VehicleDataEventStatus) {
- return (VehicleDataEventStatus) obj;
- } else if (obj instanceof String) {
- return VehicleDataEventStatus.valueForString((String) obj);
- }
- return null;
+ return (VehicleDataEventStatus) getObject(VehicleDataEventStatus.class, KEY_DRIVER_KNEE_AIRBAG_DEPLOYED);
}
public void setPassengerSideAirbagDeployed(VehicleDataEventStatus passengerSideAirbagDeployed) {
- if (passengerSideAirbagDeployed != null) {
- store.put(KEY_PASSENGER_SIDE_AIRBAG_DEPLOYED, passengerSideAirbagDeployed);
- } else {
- store.remove(KEY_PASSENGER_SIDE_AIRBAG_DEPLOYED);
- }
+ setValue(KEY_PASSENGER_SIDE_AIRBAG_DEPLOYED, passengerSideAirbagDeployed);
}
public VehicleDataEventStatus getPassengerSideAirbagDeployed() {
- Object obj = store.get(KEY_PASSENGER_SIDE_AIRBAG_DEPLOYED);
- if (obj instanceof VehicleDataEventStatus) {
- return (VehicleDataEventStatus) obj;
- } else if (obj instanceof String) {
- return VehicleDataEventStatus.valueForString((String) obj);
- }
- return null;
+ return (VehicleDataEventStatus) getObject(VehicleDataEventStatus.class, KEY_PASSENGER_SIDE_AIRBAG_DEPLOYED);
}
public void setPassengerKneeAirbagDeployed(VehicleDataEventStatus passengerKneeAirbagDeployed) {
- if (passengerKneeAirbagDeployed != null) {
- store.put(KEY_PASSENGER_KNEE_AIRBAG_DEPLOYED, passengerKneeAirbagDeployed);
- } else {
- store.remove(KEY_PASSENGER_KNEE_AIRBAG_DEPLOYED);
- }
+ setValue(KEY_PASSENGER_KNEE_AIRBAG_DEPLOYED, passengerKneeAirbagDeployed);
}
public VehicleDataEventStatus getPassengerKneeAirbagDeployed() {
- Object obj = store.get(KEY_PASSENGER_KNEE_AIRBAG_DEPLOYED);
- if (obj instanceof VehicleDataEventStatus) {
- return (VehicleDataEventStatus) obj;
- } else if (obj instanceof String) {
- return VehicleDataEventStatus.valueForString((String) obj);
- }
- return null;
+ return (VehicleDataEventStatus) getObject(VehicleDataEventStatus.class, KEY_PASSENGER_KNEE_AIRBAG_DEPLOYED);
}
}
diff --git a/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/Alert.java b/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/Alert.java index 8fca39622..b166460f2 100644 --- a/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/Alert.java +++ b/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/Alert.java @@ -166,7 +166,7 @@ public class Alert extends RPCRequest { * </ul>
*/
public void setAlertText1(String alertText1) {
- setParameters(KEY_ALERT_TEXT_1, alertText1);
+ setParameter(KEY_ALERT_TEXT_1, alertText1);
}
/**
* Gets the text which is displayed in the second field of the display
@@ -195,7 +195,7 @@ public class Alert extends RPCRequest { * </ul>
*/
public void setAlertText2(String alertText2) {
- setParameters(KEY_ALERT_TEXT_2, alertText2);
+ setParameter(KEY_ALERT_TEXT_2, alertText2);
}
/**
@@ -230,7 +230,7 @@ public class Alert extends RPCRequest { * @since SmartDeviceLink 2.0
*/
public void setAlertText3(String alertText3) {
- setParameters(KEY_ALERT_TEXT_3, alertText3);
+ setParameter(KEY_ALERT_TEXT_3, alertText3);
}
/**
* Gets TTSChunk[], the Array of type TTSChunk which, taken together,
@@ -241,7 +241,7 @@ public class Alert extends RPCRequest { */
@SuppressWarnings("unchecked")
public List<TTSChunk> getTtsChunks() {
- return (List<TTSChunk>) getParameterArray(TTSChunk.class, KEY_TTS_CHUNKS);
+ return (List<TTSChunk>) getObject(TTSChunk.class, KEY_TTS_CHUNKS);
}
/**
* Sets array of type TTSChunk which, taken together, specify what is to be
@@ -252,7 +252,7 @@ public class Alert extends RPCRequest { * <p> <b>Notes: </b>Array must have a least one element</p>
*/
public void setTtsChunks(List<TTSChunk> ttsChunks) {
- setParameters(KEY_TTS_CHUNKS, ttsChunks);
+ setParameter(KEY_TTS_CHUNKS, ttsChunks);
}
/**
* Gets the duration of the displayed portion of the alert, in milliseconds
@@ -281,7 +281,7 @@ public class Alert extends RPCRequest { * </ul>
*/
public void setDuration(Integer duration) {
- setParameters(KEY_DURATION, duration);
+ setParameter(KEY_DURATION, duration);
}
/**
* Gets a Boolean value representing the alert tone
@@ -303,7 +303,7 @@ public class Alert extends RPCRequest { * <p> <b>Notes: </b>If omitted, default is true</p>
*/
public void setPlayTone(Boolean playTone) {
- setParameters(KEY_PLAY_TONE, playTone);
+ setParameter(KEY_PLAY_TONE, playTone);
}
/**
@@ -315,7 +315,7 @@ public class Alert extends RPCRequest { */
@SuppressWarnings("unchecked")
public List<SoftButton> getSoftButtons() {
- return (List<SoftButton>) getParameterArray(SoftButton.class, KEY_SOFT_BUTTONS);
+ return (List<SoftButton>) getObject(SoftButton.class, KEY_SOFT_BUTTONS);
}
/**
@@ -335,12 +335,12 @@ public class Alert extends RPCRequest { */
public void setSoftButtons(List<SoftButton> softButtons) {
- setParameters(KEY_SOFT_BUTTONS, softButtons);
+ setParameter(KEY_SOFT_BUTTONS, softButtons);
}
public Boolean getProgressIndicator() {
return getBoolean(KEY_PROGRESS_INDICATOR);
}
public void setProgressIndicator(Boolean progressIndicator) {
- setParameters(KEY_PROGRESS_INDICATOR, progressIndicator);
+ setParameter(KEY_PROGRESS_INDICATOR, progressIndicator);
}
}
diff --git a/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/AlertManeuver.java b/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/AlertManeuver.java index 75be857cd..ca2990971 100644 --- a/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/AlertManeuver.java +++ b/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/AlertManeuver.java @@ -3,7 +3,6 @@ package com.smartdevicelink.proxy.rpc; import com.smartdevicelink.protocol.enums.FunctionID; import com.smartdevicelink.proxy.RPCRequest; -import java.util.ArrayList; import java.util.Hashtable; import java.util.List; @@ -51,23 +50,7 @@ public class AlertManeuver extends RPCRequest{ */ @SuppressWarnings("unchecked") public List<SoftButton> getSoftButtons(){ - if(parameters.get(KEY_SOFT_BUTTONS) instanceof List<?>){ - List<?> list = (List<?>) parameters.get(KEY_SOFT_BUTTONS); - if(list != null && list.size() > 0){ - Object obj = list.get(0); - if(obj instanceof SoftButton){ - return (List<SoftButton>) list; - } - else if(obj instanceof Hashtable){ - List<SoftButton> newList = new ArrayList<SoftButton>(); - for(Object hashObj : list){ - newList.add(new SoftButton((Hashtable<String, Object>) hashObj)); - } - return newList; - } - } - } - return null; + return (List<SoftButton>) getObject(SoftButton.class, KEY_SOFT_BUTTONS); } /** @@ -86,7 +69,7 @@ public class AlertManeuver extends RPCRequest{ */ public void setSoftButtons(List<SoftButton> softButtons){ - setParameters(KEY_SOFT_BUTTONS, softButtons); + setParameter(KEY_SOFT_BUTTONS, softButtons); } /** @@ -96,23 +79,7 @@ public class AlertManeuver extends RPCRequest{ */ @SuppressWarnings("unchecked") public List<TTSChunk> getTtsChunks(){ - if(parameters.get(KEY_TTS_CHUNKS) instanceof List<?>){ - List<?> list = (List<?>) parameters.get(KEY_TTS_CHUNKS); - if(list != null && list.size() > 0){ - Object obj = list.get(0); - if(obj instanceof TTSChunk){ - return (List<TTSChunk>) list; - } - else if(obj instanceof Hashtable){ - List<TTSChunk> newList = new ArrayList<TTSChunk>(); - for(Object hashObj : list){ - newList.add(new TTSChunk((Hashtable<String, Object>) hashObj)); - } - return newList; - } - } - } - return null; + return (List<TTSChunk>) getObject(TTSChunk.class, KEY_TTS_CHUNKS); } /** @@ -123,7 +90,7 @@ public class AlertManeuver extends RPCRequest{ * <b>Notes: </b></p>Array must have a least one element */ public void setTtsChunks(List<TTSChunk> ttsChunks){ - setParameters(KEY_TTS_CHUNKS, ttsChunks); + setParameter(KEY_TTS_CHUNKS, ttsChunks); } } diff --git a/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/AlertResponse.java b/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/AlertResponse.java index 30b9b9962..26cabb5c7 100644 --- a/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/AlertResponse.java +++ b/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/AlertResponse.java @@ -32,9 +32,9 @@ public class AlertResponse extends RPCResponse { super(hash);
}
public Integer getTryAgainTime() {
- return (Integer) parameters.get(KEY_TRY_AGAIN_TIME);
+ return getInteger(KEY_TRY_AGAIN_TIME);
}
public void setTryAgainTime(Integer tryAgainTime) {
- setParameters(KEY_TRY_AGAIN_TIME, tryAgainTime);
+ setParameter(KEY_TRY_AGAIN_TIME, tryAgainTime);
}
}
diff --git a/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/AudioPassThruCapabilities.java b/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/AudioPassThruCapabilities.java index 48cfd129b..61de1d1f5 100644 --- a/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/AudioPassThruCapabilities.java +++ b/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/AudioPassThruCapabilities.java @@ -1,11 +1,14 @@ package com.smartdevicelink.proxy.rpc;
-import java.util.Hashtable;
-
import com.smartdevicelink.proxy.RPCStruct;
import com.smartdevicelink.proxy.rpc.enums.AudioType;
import com.smartdevicelink.proxy.rpc.enums.BitsPerSample;
import com.smartdevicelink.proxy.rpc.enums.SamplingRate;
+import com.smartdevicelink.proxy.rpc.enums.VehicleDataEventStatus;
+
+import java.util.Hashtable;
+
+import static com.smartdevicelink.proxy.rpc.AirbagStatus.KEY_DRIVER_CURTAIN_AIRBAG_DEPLOYED;
/**
*<p> Describes different audio type configurations for PerformAudioPassThru, e.g. {8kHz,8-bit,PCM}
@@ -68,11 +71,7 @@ public class AudioPassThruCapabilities extends RPCStruct { * @param samplingRate the sampling rate for AudioPassThru
*/
public void setSamplingRate(SamplingRate samplingRate) {
- if (samplingRate != null) {
- store.put(KEY_SAMPLING_RATE, samplingRate);
- } else {
- store.remove(KEY_SAMPLING_RATE);
- }
+ setValue(KEY_SAMPLING_RATE, samplingRate);
}
/**
@@ -80,13 +79,7 @@ public class AudioPassThruCapabilities extends RPCStruct { * @return the sampling rate for AudioPassThru
*/
public SamplingRate getSamplingRate() {
- Object obj = store.get(KEY_SAMPLING_RATE);
- if (obj instanceof SamplingRate) {
- return (SamplingRate) obj;
- } else if (obj instanceof String) {
- return SamplingRate.valueForString((String) obj);
- }
- return null;
+ return (SamplingRate) getObject(SamplingRate.class, KEY_SAMPLING_RATE);
}
/**
@@ -94,11 +87,7 @@ public class AudioPassThruCapabilities extends RPCStruct { * @param bitsPerSample the sample depth in bit for AudioPassThru
*/
public void setBitsPerSample(BitsPerSample bitsPerSample) {
- if (bitsPerSample != null) {
- store.put(KEY_BITS_PER_SAMPLE, bitsPerSample);
- } else {
- store.remove(KEY_BITS_PER_SAMPLE);
- }
+ setValue(KEY_BITS_PER_SAMPLE, bitsPerSample);
}
/**
@@ -106,13 +95,7 @@ public class AudioPassThruCapabilities extends RPCStruct { * @return the sample depth in bit for AudioPassThru
*/
public BitsPerSample getBitsPerSample() {
- Object obj = store.get(KEY_BITS_PER_SAMPLE);
- if (obj instanceof BitsPerSample) {
- return (BitsPerSample) obj;
- } else if (obj instanceof String) {
- return BitsPerSample.valueForString((String) obj);
- }
- return null;
+ return (BitsPerSample) getObject(BitsPerSample.class, KEY_BITS_PER_SAMPLE);
}
/**
@@ -120,11 +103,7 @@ public class AudioPassThruCapabilities extends RPCStruct { * @param audioType the audiotype for AudioPassThru
*/
public void setAudioType(AudioType audioType) {
- if (audioType != null) {
- store.put(KEY_AUDIO_TYPE, audioType);
- } else {
- store.remove(KEY_AUDIO_TYPE);
- }
+ setValue(KEY_AUDIO_TYPE, audioType);
}
/**
@@ -132,12 +111,6 @@ public class AudioPassThruCapabilities extends RPCStruct { * @return the audiotype for AudioPassThru
*/
public AudioType getAudioType() {
- Object obj = store.get(KEY_AUDIO_TYPE);
- if (obj instanceof AudioType) {
- return (AudioType) obj;
- } else if (obj instanceof String) {
- return AudioType.valueForString((String) obj);
- }
- return null;
+ return (AudioType) getObject(AudioType.class, KEY_AUDIO_TYPE);
}
}
diff --git a/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/BeltStatus.java b/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/BeltStatus.java index 71db21640..598cf3adf 100644 --- a/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/BeltStatus.java +++ b/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/BeltStatus.java @@ -4,7 +4,11 @@ import java.util.Hashtable; import com.smartdevicelink.proxy.RPCStruct;
import com.smartdevicelink.proxy.rpc.enums.VehicleDataEventStatus;
-/** The status of the seat belts.
+
+import static com.smartdevicelink.proxy.rpc.AirbagStatus.KEY_DRIVER_AIRBAG_DEPLOYED;
+import static com.smartdevicelink.proxy.rpc.AirbagStatus.KEY_DRIVER_CURTAIN_AIRBAG_DEPLOYED;
+
+/** The status of the seat belts.
*
* <p><b>Parameter List</b></p>
*
@@ -143,243 +147,93 @@ public class BeltStatus extends RPCStruct { }
public void setDriverBeltDeployed(VehicleDataEventStatus driverBeltDeployed) {
- if (driverBeltDeployed != null) {
- store.put(KEY_DRIVER_BELT_DEPLOYED, driverBeltDeployed);
- } else {
- store.remove(KEY_DRIVER_BELT_DEPLOYED);
- }
+ setValue(KEY_DRIVER_BELT_DEPLOYED, driverBeltDeployed);
}
public VehicleDataEventStatus getDriverBeltDeployed() {
- Object obj = store.get(KEY_DRIVER_BELT_DEPLOYED);
- if (obj instanceof VehicleDataEventStatus) {
- return (VehicleDataEventStatus) obj;
- } else if (obj instanceof String) {
- return VehicleDataEventStatus.valueForString((String) obj);
- }
- return null;
+ return (VehicleDataEventStatus) getObject(VehicleDataEventStatus.class, KEY_DRIVER_BELT_DEPLOYED);
}
public void setPassengerBeltDeployed(VehicleDataEventStatus passengerBeltDeployed) {
- if (passengerBeltDeployed != null) {
- store.put(KEY_PASSENGER_BELT_DEPLOYED, passengerBeltDeployed);
- } else {
- store.remove(KEY_PASSENGER_BELT_DEPLOYED);
- }
+ setValue(KEY_PASSENGER_BELT_DEPLOYED, passengerBeltDeployed);
}
public VehicleDataEventStatus getPassengerBeltDeployed() {
- Object obj = store.get(KEY_PASSENGER_BELT_DEPLOYED);
- if (obj instanceof VehicleDataEventStatus) {
- return (VehicleDataEventStatus) obj;
- } else if (obj instanceof String) {
- return VehicleDataEventStatus.valueForString((String) obj);
- }
- return null;
+ return (VehicleDataEventStatus) getObject(VehicleDataEventStatus.class, KEY_PASSENGER_BELT_DEPLOYED);
}
public void setPassengerBuckleBelted(VehicleDataEventStatus passengerBuckleBelted) {
- if (passengerBuckleBelted != null) {
- store.put(KEY_PASSENGER_BUCKLE_BELTED, passengerBuckleBelted);
- } else {
- store.remove(KEY_PASSENGER_BUCKLE_BELTED);
- }
+ setValue(KEY_PASSENGER_BUCKLE_BELTED, passengerBuckleBelted);
}
public VehicleDataEventStatus getPassengerBuckleBelted() {
- Object obj = store.get(KEY_PASSENGER_BUCKLE_BELTED);
- if (obj instanceof VehicleDataEventStatus) {
- return (VehicleDataEventStatus) obj;
- } else if (obj instanceof String) {
- return VehicleDataEventStatus.valueForString((String) obj);
- }
- return null;
+ return (VehicleDataEventStatus) getObject(VehicleDataEventStatus.class, KEY_PASSENGER_BUCKLE_BELTED);
}
public void setDriverBuckleBelted(VehicleDataEventStatus driverBuckleBelted) {
- if (driverBuckleBelted != null) {
- store.put(KEY_DRIVER_BUCKLE_BELTED, driverBuckleBelted);
- } else {
- store.remove(KEY_DRIVER_BUCKLE_BELTED);
- }
+ setValue(KEY_DRIVER_BUCKLE_BELTED, driverBuckleBelted);
}
public VehicleDataEventStatus getDriverBuckleBelted() {
- Object obj = store.get(KEY_DRIVER_BUCKLE_BELTED);
- if (obj instanceof VehicleDataEventStatus) {
- return (VehicleDataEventStatus) obj;
- } else if (obj instanceof String) {
- return VehicleDataEventStatus.valueForString((String) obj);
- }
- return null;
+ return (VehicleDataEventStatus) getObject(VehicleDataEventStatus.class, KEY_DRIVER_BUCKLE_BELTED);
}
public void setLeftRow2BuckleBelted(VehicleDataEventStatus leftRow2BuckleBelted) {
- if (leftRow2BuckleBelted != null) {
- store.put(KEY_LEFT_ROW_2_BUCKLE_BELTED, leftRow2BuckleBelted);
- } else {
- store.remove(KEY_LEFT_ROW_2_BUCKLE_BELTED);
- }
+ setValue(KEY_LEFT_ROW_2_BUCKLE_BELTED, leftRow2BuckleBelted);
}
public VehicleDataEventStatus getLeftRow2BuckleBelted() {
- Object obj = store.get(KEY_LEFT_ROW_2_BUCKLE_BELTED);
- if (obj instanceof VehicleDataEventStatus) {
- return (VehicleDataEventStatus) obj;
- } else if (obj instanceof String) {
- return VehicleDataEventStatus.valueForString((String) obj);
- }
- return null;
+ return (VehicleDataEventStatus) getObject(VehicleDataEventStatus.class, KEY_LEFT_ROW_2_BUCKLE_BELTED);
}
public void setPassengerChildDetected(VehicleDataEventStatus passengerChildDetected) {
- if (passengerChildDetected != null) {
- store.put(KEY_PASSENGER_CHILD_DETECTED, passengerChildDetected);
- } else {
- store.remove(KEY_PASSENGER_CHILD_DETECTED);
- }
+ setValue(KEY_PASSENGER_CHILD_DETECTED, passengerChildDetected);
}
public VehicleDataEventStatus getPassengerChildDetected() {
- Object obj = store.get(KEY_PASSENGER_CHILD_DETECTED);
- if (obj instanceof VehicleDataEventStatus) {
- return (VehicleDataEventStatus) obj;
- } else if (obj instanceof String) {
- return VehicleDataEventStatus.valueForString((String) obj);
- }
- return null;
+ return (VehicleDataEventStatus) getObject(VehicleDataEventStatus.class, KEY_PASSENGER_CHILD_DETECTED);
}
public void setRightRow2BuckleBelted(VehicleDataEventStatus rightRow2BuckleBelted) {
- if (rightRow2BuckleBelted != null) {
- store.put(KEY_RIGHT_ROW_2_BUCKLE_BELTED, rightRow2BuckleBelted);
- } else {
- store.remove(KEY_RIGHT_ROW_2_BUCKLE_BELTED);
- }
+ setValue(KEY_RIGHT_ROW_2_BUCKLE_BELTED, rightRow2BuckleBelted);
}
public VehicleDataEventStatus getRightRow2BuckleBelted() {
- Object obj = store.get(KEY_RIGHT_ROW_2_BUCKLE_BELTED);
- if (obj instanceof VehicleDataEventStatus) {
- return (VehicleDataEventStatus) obj;
- } else if (obj instanceof String) {
- return VehicleDataEventStatus.valueForString((String) obj);
- }
- return null;
+ return (VehicleDataEventStatus) getObject(VehicleDataEventStatus.class, KEY_RIGHT_ROW_2_BUCKLE_BELTED);
}
public void setMiddleRow2BuckleBelted(VehicleDataEventStatus middleRow2BuckleBelted) {
- if (middleRow2BuckleBelted != null) {
- store.put(KEY_MIDDLE_ROW_2_BUCKLE_BELTED, middleRow2BuckleBelted);
- } else {
- store.remove(KEY_MIDDLE_ROW_2_BUCKLE_BELTED);
- }
+ setValue(KEY_MIDDLE_ROW_2_BUCKLE_BELTED, middleRow2BuckleBelted);
}
public VehicleDataEventStatus getMiddleRow2BuckleBelted() {
- Object obj = store.get(KEY_MIDDLE_ROW_2_BUCKLE_BELTED);
- if (obj instanceof VehicleDataEventStatus) {
- return (VehicleDataEventStatus) obj;
- } else if (obj instanceof String) {
- return VehicleDataEventStatus.valueForString((String) obj);
- }
- return null;
+ return (VehicleDataEventStatus) getObject(VehicleDataEventStatus.class, KEY_MIDDLE_ROW_2_BUCKLE_BELTED);
}
public void setMiddleRow3BuckleBelted(VehicleDataEventStatus middleRow3BuckleBelted) {
- if (middleRow3BuckleBelted != null) {
- store.put(KEY_MIDDLE_ROW_3_BUCKLE_BELTED, middleRow3BuckleBelted);
- } else {
- store.remove(KEY_MIDDLE_ROW_3_BUCKLE_BELTED);
- }
+ setValue(KEY_MIDDLE_ROW_3_BUCKLE_BELTED, middleRow3BuckleBelted);
}
public VehicleDataEventStatus getMiddleRow3BuckleBelted() {
- Object obj = store.get(KEY_MIDDLE_ROW_3_BUCKLE_BELTED);
- if (obj instanceof VehicleDataEventStatus) {
- return (VehicleDataEventStatus) obj;
- } else if (obj instanceof String) {
- return VehicleDataEventStatus.valueForString((String) obj);
- }
- return null;
+ return (VehicleDataEventStatus) getObject(VehicleDataEventStatus.class, KEY_MIDDLE_ROW_3_BUCKLE_BELTED);
}
public void setLeftRow3BuckleBelted(VehicleDataEventStatus leftRow3BuckleBelted) {
- if (leftRow3BuckleBelted != null) {
- store.put(KEY_LEFT_ROW_3_BUCKLE_BELTED, leftRow3BuckleBelted);
- } else {
- store.remove(KEY_LEFT_ROW_3_BUCKLE_BELTED);
- }
+ setValue(KEY_LEFT_ROW_3_BUCKLE_BELTED, leftRow3BuckleBelted);
}
public VehicleDataEventStatus getLeftRow3BuckleBelted() {
- Object obj = store.get(KEY_LEFT_ROW_3_BUCKLE_BELTED);
- if (obj instanceof VehicleDataEventStatus) {
- return (VehicleDataEventStatus) obj;
- } else if (obj instanceof String) {
- return VehicleDataEventStatus.valueForString((String) obj);
- }
- return null;
+ return (VehicleDataEventStatus) getObject(VehicleDataEventStatus.class, KEY_LEFT_ROW_3_BUCKLE_BELTED);
}
public void setRightRow3BuckleBelted(VehicleDataEventStatus rightRow3BuckleBelted) {
- if (rightRow3BuckleBelted != null) {
- store.put(KEY_RIGHT_ROW_3_BUCKLE_BELTED, rightRow3BuckleBelted);
- } else {
- store.remove(KEY_RIGHT_ROW_3_BUCKLE_BELTED);
- }
+ setValue(KEY_RIGHT_ROW_3_BUCKLE_BELTED, rightRow3BuckleBelted);
}
public VehicleDataEventStatus getRightRow3BuckleBelted() {
- Object obj = store.get(KEY_RIGHT_ROW_3_BUCKLE_BELTED);
- if (obj instanceof VehicleDataEventStatus) {
- return (VehicleDataEventStatus) obj;
- } else if (obj instanceof String) {
- return VehicleDataEventStatus.valueForString((String) obj);
- }
- return null;
+ return (VehicleDataEventStatus) getObject(VehicleDataEventStatus.class, KEY_RIGHT_ROW_3_BUCKLE_BELTED);
}
public void setLeftRearInflatableBelted(VehicleDataEventStatus rearInflatableBelted) {
- if (rearInflatableBelted != null) {
- store.put(KEY_REAR_INFLATABLE_BELTED, rearInflatableBelted);
- } else {
- store.remove(KEY_REAR_INFLATABLE_BELTED);
- }
+ setValue(KEY_REAR_INFLATABLE_BELTED, rearInflatableBelted);
}
public VehicleDataEventStatus getLeftRearInflatableBelted() {
- Object obj = store.get(KEY_REAR_INFLATABLE_BELTED);
- if (obj instanceof VehicleDataEventStatus) {
- return (VehicleDataEventStatus) obj;
- } else if (obj instanceof String) {
- return VehicleDataEventStatus.valueForString((String) obj);
- }
- return null;
+ return (VehicleDataEventStatus) getObject(VehicleDataEventStatus.class, KEY_REAR_INFLATABLE_BELTED);
}
public void setRightRearInflatableBelted(VehicleDataEventStatus rightRearInflatableBelted) {
- if (rightRearInflatableBelted != null) {
- store.put(KEY_RIGHT_REAR_INFLATABLE_BELTED, rightRearInflatableBelted);
- } else {
- store.remove(KEY_RIGHT_REAR_INFLATABLE_BELTED);
- }
+ setValue(KEY_RIGHT_REAR_INFLATABLE_BELTED, rightRearInflatableBelted);
}
public VehicleDataEventStatus getRightRearInflatableBelted() {
- Object obj = store.get(KEY_RIGHT_REAR_INFLATABLE_BELTED);
- if (obj instanceof VehicleDataEventStatus) {
- return (VehicleDataEventStatus) obj;
- } else if (obj instanceof String) {
- return VehicleDataEventStatus.valueForString((String) obj);
- }
- return null;
+ return (VehicleDataEventStatus) getObject(VehicleDataEventStatus.class, KEY_RIGHT_REAR_INFLATABLE_BELTED);
}
public void setMiddleRow1BeltDeployed(VehicleDataEventStatus middleRow1BeltDeployed) {
- if (middleRow1BeltDeployed != null) {
- store.put(KEY_MIDDLE_ROW_1_BELT_DEPLOYED, middleRow1BeltDeployed);
- } else {
- store.remove(KEY_MIDDLE_ROW_1_BELT_DEPLOYED);
- }
+ setValue(KEY_MIDDLE_ROW_1_BELT_DEPLOYED, middleRow1BeltDeployed);
}
public VehicleDataEventStatus getMiddleRow1BeltDeployed() {
- Object obj = store.get(KEY_MIDDLE_ROW_1_BELT_DEPLOYED);
- if (obj instanceof VehicleDataEventStatus) {
- return (VehicleDataEventStatus) obj;
- } else if (obj instanceof String) {
- return VehicleDataEventStatus.valueForString((String) obj);
- }
- return null;
+ return (VehicleDataEventStatus) getObject(VehicleDataEventStatus.class, KEY_MIDDLE_ROW_1_BELT_DEPLOYED);
}
public void setMiddleRow1BuckleBelted(VehicleDataEventStatus middleRow1BuckleBelted) {
- if (middleRow1BuckleBelted != null) {
- store.put(KEY_MIDDLE_ROW_1_BUCKLE_BELTED, middleRow1BuckleBelted);
- } else {
- store.remove(KEY_MIDDLE_ROW_1_BUCKLE_BELTED);
- }
+ setValue(KEY_MIDDLE_ROW_1_BUCKLE_BELTED, middleRow1BuckleBelted);
}
public VehicleDataEventStatus getMiddleRow1BuckleBelted() {
- Object obj = store.get(KEY_MIDDLE_ROW_1_BUCKLE_BELTED);
- if (obj instanceof VehicleDataEventStatus) {
- return (VehicleDataEventStatus) obj;
- } else if (obj instanceof String) {
- return VehicleDataEventStatus.valueForString((String) obj);
- }
- return null;
+ return (VehicleDataEventStatus) getObject(VehicleDataEventStatus.class, KEY_MIDDLE_ROW_1_BUCKLE_BELTED);
}
}
diff --git a/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/BodyInformation.java b/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/BodyInformation.java index 038b1970e..4f851c383 100644 --- a/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/BodyInformation.java +++ b/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/BodyInformation.java @@ -1,11 +1,15 @@ package com.smartdevicelink.proxy.rpc;
-import java.util.Hashtable;
-
import com.smartdevicelink.proxy.RPCStruct;
import com.smartdevicelink.proxy.rpc.enums.IgnitionStableStatus;
import com.smartdevicelink.proxy.rpc.enums.IgnitionStatus;
-/** The body information including power modes.
+import com.smartdevicelink.proxy.rpc.enums.VehicleDataEventStatus;
+
+import java.util.Hashtable;
+
+import static com.smartdevicelink.proxy.rpc.AirbagStatus.KEY_DRIVER_CURTAIN_AIRBAG_DEPLOYED;
+
+/** The body information including power modes.
*
* <p><b>Note:</b> The structure defines the information about the park brake and ignition.</p>
*
@@ -105,91 +109,51 @@ public class BodyInformation extends RPCStruct { }
public void setParkBrakeActive(Boolean parkBrakeActive) {
- if (parkBrakeActive != null) {
- store.put(KEY_PARK_BRAKE_ACTIVE, parkBrakeActive);
- } else {
- store.remove(KEY_PARK_BRAKE_ACTIVE);
- }
+ setValue(KEY_PARK_BRAKE_ACTIVE, parkBrakeActive);
}
public Boolean getParkBrakeActive() {
- return (Boolean) store.get(KEY_PARK_BRAKE_ACTIVE);
+ return getBoolean(KEY_PARK_BRAKE_ACTIVE);
}
public void setIgnitionStableStatus(IgnitionStableStatus ignitionStableStatus) {
- if (ignitionStableStatus != null) {
- store.put(KEY_IGNITION_STABLE_STATUS, ignitionStableStatus);
- } else {
- store.remove(KEY_IGNITION_STABLE_STATUS);
- }
+ setValue(KEY_IGNITION_STABLE_STATUS, ignitionStableStatus);
}
public IgnitionStableStatus getIgnitionStableStatus() {
- Object obj = store.get(KEY_IGNITION_STABLE_STATUS);
- if (obj instanceof IgnitionStableStatus) {
- return (IgnitionStableStatus) obj;
- } else if (obj instanceof String) {
- return IgnitionStableStatus.valueForString((String) obj);
- }
- return null;
+ return (IgnitionStableStatus) getObject(IgnitionStableStatus.class, KEY_IGNITION_STABLE_STATUS);
}
public void setIgnitionStatus(IgnitionStatus ignitionStatus) {
- if (ignitionStatus != null) {
- store.put(KEY_IGNITION_STATUS, ignitionStatus);
- } else {
- store.remove(KEY_IGNITION_STATUS);
- }
+ setValue(KEY_IGNITION_STATUS, ignitionStatus);
}
public IgnitionStatus getIgnitionStatus() {
- Object obj = store.get(KEY_IGNITION_STATUS);
- if (obj instanceof IgnitionStatus) {
- return (IgnitionStatus) obj;
- } else if (obj instanceof String) {
- return IgnitionStatus.valueForString((String) obj);
- }
- return null;
+ return (IgnitionStatus) getObject(IgnitionStatus.class, KEY_IGNITION_STATUS);
}
public void setDriverDoorAjar(Boolean driverDoorAjar) {
- if (driverDoorAjar != null) {
- store.put(KEY_DRIVER_DOOR_AJAR, driverDoorAjar);
- } else {
- store.remove(KEY_DRIVER_DOOR_AJAR);
- }
+ setValue(KEY_DRIVER_DOOR_AJAR, driverDoorAjar);
}
public Boolean getDriverDoorAjar() {
- return (Boolean) store.get(KEY_DRIVER_DOOR_AJAR);
+ return getBoolean(KEY_DRIVER_DOOR_AJAR);
}
public void setPassengerDoorAjar(Boolean passengerDoorAjar) {
- if (passengerDoorAjar != null) {
- store.put(KEY_PASSENGER_DOOR_AJAR, passengerDoorAjar);
- } else {
- store.remove(KEY_PASSENGER_DOOR_AJAR);
- }
+ setValue(KEY_PASSENGER_DOOR_AJAR, passengerDoorAjar);
}
public Boolean getPassengerDoorAjar() {
- return (Boolean) store.get(KEY_PASSENGER_DOOR_AJAR);
+ return getBoolean(KEY_PASSENGER_DOOR_AJAR);
}
public void setRearLeftDoorAjar(Boolean rearLeftDoorAjar) {
- if (rearLeftDoorAjar != null) {
- store.put(KEY_REAR_LEFT_DOOR_AJAR, rearLeftDoorAjar);
- } else {
- store.remove(KEY_REAR_LEFT_DOOR_AJAR);
- }
+ setValue(KEY_REAR_LEFT_DOOR_AJAR, rearLeftDoorAjar);
}
public Boolean getRearLeftDoorAjar() {
- return (Boolean) store.get(KEY_REAR_LEFT_DOOR_AJAR);
+ return getBoolean(KEY_REAR_LEFT_DOOR_AJAR);
}
public void setRearRightDoorAjar(Boolean rearRightDoorAjar) {
- if (rearRightDoorAjar != null) {
- store.put(KEY_REAR_RIGHT_DOOR_AJAR, rearRightDoorAjar);
- } else {
- store.remove(KEY_REAR_RIGHT_DOOR_AJAR);
- }
+ setValue(KEY_REAR_RIGHT_DOOR_AJAR, rearRightDoorAjar);
}
public Boolean getRearRightDoorAjar() {
- return (Boolean) store.get(KEY_REAR_RIGHT_DOOR_AJAR);
+ return getBoolean(KEY_REAR_RIGHT_DOOR_AJAR);
}
}
diff --git a/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/ButtonCapabilities.java b/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/ButtonCapabilities.java index 9b15c5be9..5c0ebd779 100644 --- a/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/ButtonCapabilities.java +++ b/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/ButtonCapabilities.java @@ -80,77 +80,55 @@ public class ButtonCapabilities extends RPCStruct { * @return ButtonName the name of the Button
*/
public ButtonName getName() {
- Object obj = store.get(KEY_NAME);
- if (obj instanceof ButtonName) {
- return (ButtonName) obj;
- } else if (obj instanceof String) {
- return ButtonName.valueForString((String) obj);
- }
- return null;
+ return (ButtonName) getObject(ButtonName.class, KEY_NAME);
}
/**
* Set the name of theSDL HMI button.
* @param name the name of button
*/
public void setName( ButtonName name ) {
- if (name != null) {
- store.put(KEY_NAME, name );
- } else {
- store.remove(KEY_NAME);
- }
+ setValue(KEY_NAME, name);
}
/**
* Whether the button supports a SHORT press. See <i>{@linkplain com.smartdevicelink.proxy.rpc.enums.ButtonPressMode}</i> for more information.
* @return True if support otherwise False.
*/
public Boolean getShortPressAvailable() {
- return (Boolean) store.get( KEY_SHORT_PRESS_AVAILABLE );
+ return getBoolean( KEY_SHORT_PRESS_AVAILABLE );
}
/**
* Set the button supports a SHORT press. See <i>{@linkplain com.smartdevicelink.proxy.rpc.enums.ButtonPressMode}</i> for more information.
* @param shortPressAvailable True if support otherwise False.
*/
public void setShortPressAvailable( Boolean shortPressAvailable ) {
- if (shortPressAvailable != null) {
- store.put(KEY_SHORT_PRESS_AVAILABLE, shortPressAvailable );
- } else {
- store.remove(KEY_SHORT_PRESS_AVAILABLE);
- }
+ setValue(KEY_SHORT_PRESS_AVAILABLE, shortPressAvailable);
}
/**
* Whether the button supports a LONG press. See <i>{@linkplain com.smartdevicelink.proxy.rpc.enums.ButtonPressMode}</i> for more information.
* @return True if support otherwise False.
*/
public Boolean getLongPressAvailable() {
- return (Boolean) store.get( KEY_LONG_PRESS_AVAILABLE );
+ return getBoolean( KEY_LONG_PRESS_AVAILABLE );
}
/**
* Set the button supports a LONG press. See <i>{@linkplain com.smartdevicelink.proxy.rpc.enums.ButtonPressMode}</i> for more information.
* @param longPressAvailable True if support otherwise False.
*/
public void setLongPressAvailable( Boolean longPressAvailable ) {
- if (longPressAvailable != null) {
- store.put(KEY_LONG_PRESS_AVAILABLE, longPressAvailable );
- } else {
- store.remove(KEY_LONG_PRESS_AVAILABLE);
- }
+ setValue(KEY_LONG_PRESS_AVAILABLE, longPressAvailable);
}
/**
* Whether the button supports "button down" and "button up". When the button is depressed, the <i>{@linkplain OnButtonEvent}</i> notification will be invoked with a value of BUTTONDOWN.
* @return True if support otherwise False.
*/
public Boolean getUpDownAvailable() {
- return (Boolean) store.get( KEY_UP_DOWN_AVAILABLE );
+ return getBoolean( KEY_UP_DOWN_AVAILABLE );
}
/**
* Set the button supports "button down" and "button up". When the button is depressed, the <i>{@linkplain OnButtonEvent}</i> notification will be invoked with a value of BUTTONDOWN.
* @param upDownAvailable True if support otherwise False.
*/
public void setUpDownAvailable( Boolean upDownAvailable ) {
- if (upDownAvailable != null) {
- store.put(KEY_UP_DOWN_AVAILABLE, upDownAvailable );
- } else {
- store.remove(KEY_UP_DOWN_AVAILABLE);
- }
+ setValue(KEY_UP_DOWN_AVAILABLE, upDownAvailable);
}
}
diff --git a/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/ChangeRegistration.java b/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/ChangeRegistration.java index d9f354ef2..d5f4e68f4 100644 --- a/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/ChangeRegistration.java +++ b/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/ChangeRegistration.java @@ -4,7 +4,6 @@ import com.smartdevicelink.protocol.enums.FunctionID; import com.smartdevicelink.proxy.RPCRequest;
import com.smartdevicelink.proxy.rpc.enums.Language;
-import java.util.ArrayList;
import java.util.Hashtable;
import java.util.List;
@@ -132,7 +131,7 @@ public class ChangeRegistration extends RPCRequest { * a language value
*/
public void setLanguage(Language language) {
- setParameters(KEY_LANGUAGE, language);
+ setParameter(KEY_LANGUAGE, language);
}
/**
@@ -141,13 +140,7 @@ public class ChangeRegistration extends RPCRequest { * @return Language -a Language value
*/
public Language getLanguage() {
- Object obj = parameters.get(KEY_LANGUAGE);
- if (obj instanceof Language) {
- return (Language) obj;
- } else if (obj instanceof String) {
- return Language.valueForString((String) obj);
- }
- return null;
+ return (Language) getObject(Language.class, KEY_LANGUAGE);
}
/**
@@ -157,7 +150,7 @@ public class ChangeRegistration extends RPCRequest { * a Language value
*/
public void setHmiDisplayLanguage(Language hmiDisplayLanguage) {
- setParameters(KEY_HMI_DISPLAY_LANGUAGE, hmiDisplayLanguage);
+ setParameter(KEY_HMI_DISPLAY_LANGUAGE, hmiDisplayLanguage);
}
/**
@@ -166,13 +159,7 @@ public class ChangeRegistration extends RPCRequest { * @return Language -a Language value
*/
public Language getHmiDisplayLanguage() {
- Object obj = parameters.get(KEY_HMI_DISPLAY_LANGUAGE);
- if (obj instanceof Language) {
- return (Language) obj;
- } else if (obj instanceof String) {
- return Language.valueForString((String) obj);
- }
- return null;
+ return (Language) getObject(Language.class, KEY_HMI_DISPLAY_LANGUAGE);
}
/**
@@ -181,7 +168,7 @@ public class ChangeRegistration extends RPCRequest { * @param appName App name to set
*/
public void setAppName(String appName){
- setParameters(KEY_APP_NAME, appName);
+ setParameter(KEY_APP_NAME, appName);
}
/**
@@ -190,7 +177,7 @@ public class ChangeRegistration extends RPCRequest { * @return The app name
*/
public String getAppName(){
- return (String) parameters.get(KEY_APP_NAME);
+ return getString(KEY_APP_NAME);
}
/**
@@ -199,7 +186,7 @@ public class ChangeRegistration extends RPCRequest { * @param ngnAppName The NGN app name
*/
public void setNgnMediaScreenAppName(String ngnAppName){
- setParameters(KEY_NGN_MEDIA_SCREEN_NAME, ngnAppName);
+ setParameter(KEY_NGN_MEDIA_SCREEN_NAME, ngnAppName);
}
/**
@@ -208,7 +195,7 @@ public class ChangeRegistration extends RPCRequest { * @return The NGN app name
*/
public String getNgnMediaScreenAppName(){
- return (String) parameters.get(KEY_NGN_MEDIA_SCREEN_NAME);
+ return getString(KEY_NGN_MEDIA_SCREEN_NAME);
}
/**
@@ -217,7 +204,7 @@ public class ChangeRegistration extends RPCRequest { * @param ttsName The TTS name to set
*/
public void setTtsName(List<TTSChunk> ttsName){
- setParameters(KEY_TTS_NAME, ttsName);
+ setParameter(KEY_TTS_NAME, ttsName);
}
/**
@@ -227,22 +214,7 @@ public class ChangeRegistration extends RPCRequest { */
@SuppressWarnings("unchecked")
public List<TTSChunk> getTtsName(){
- if (parameters.get(KEY_TTS_NAME) instanceof List<?>) {
- List<?> list = (List<?>)parameters.get(KEY_TTS_NAME);
- if (list != null && list.size() > 0) {
- Object obj = list.get(0);
- if (obj instanceof TTSChunk) {
- return (List<TTSChunk>) list;
- } else if (obj instanceof Hashtable) {
- List<TTSChunk> newList = new ArrayList<TTSChunk>();
- for (Object hashObj : list) {
- newList.add(new TTSChunk((Hashtable<String, Object>)hashObj));
- }
- return newList;
- }
- }
- }
- return null;
+ return (List<TTSChunk>) getObject(TTSChunk.class, KEY_TTS_NAME);
}
/**
@@ -255,16 +227,7 @@ public class ChangeRegistration extends RPCRequest { */
@SuppressWarnings("unchecked")
public List<String> getVrSynonyms() {
- if (parameters.get(KEY_VR_SYNONYMS) instanceof List<?>) {
- List<?> list = (List<?>)parameters.get(KEY_VR_SYNONYMS);
- if (list != null && list.size()>0) {
- Object obj = list.get(0);
- if (obj instanceof String) {
- return (List<String>) list;
- }
- }
- }
- return null;
+ return (List<String>) getObject(String.class, KEY_VR_SYNONYMS);
}
/**
@@ -285,6 +248,6 @@ public class ChangeRegistration extends RPCRequest { * </ul>
*/
public void setVrSynonyms(List<String> vrSynonyms) {
- setParameters(KEY_VR_SYNONYMS, vrSynonyms);
+ setParameter(KEY_VR_SYNONYMS, vrSynonyms);
}
}
diff --git a/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/Choice.java b/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/Choice.java index 2bc59736e..886a88d23 100644 --- a/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/Choice.java +++ b/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/Choice.java @@ -1,11 +1,10 @@ package com.smartdevicelink.proxy.rpc;
+import com.smartdevicelink.proxy.RPCStruct;
+
import java.util.Hashtable;
import java.util.List;
-import com.smartdevicelink.proxy.RPCStruct;
-import com.smartdevicelink.util.DebugTool;
-
/**
* A choice is an option which a user can select either via the menu or via voice recognition (VR) during an application initiated interaction.
* For example, the application may request for the user`s choice among several suggested ones: Yes, No, Skip.
@@ -79,18 +78,14 @@ public class Choice extends RPCStruct { * @return choiceID Min: 0; Max: 65535
*/
public Integer getChoiceID() {
- return (Integer) store.get(KEY_CHOICE_ID);
+ return getInteger(KEY_CHOICE_ID);
}
/**
* Set the application-scoped identifier that uniquely identifies this choice.
* @param choiceID Min: 0 Max: 65535
*/
public void setChoiceID(Integer choiceID) {
- if (choiceID != null) {
- store.put(KEY_CHOICE_ID, choiceID);
- } else {
- store.remove(KEY_CHOICE_ID);
- }
+ setValue(KEY_CHOICE_ID, choiceID);
}
/**
* Text which appears in menu, representing this choice.
@@ -99,7 +94,7 @@ public class Choice extends RPCStruct { * @return menuName the menu name
*/
public String getMenuName() {
- return (String) store.get(KEY_MENU_NAME);
+ return getString(KEY_MENU_NAME);
}
/**
* Text which appears in menu, representing this choice.
@@ -108,11 +103,7 @@ public class Choice extends RPCStruct { * @param menuName the menu name
*/
public void setMenuName(String menuName) {
- if (menuName != null) {
- store.put(KEY_MENU_NAME, menuName);
- } else {
- store.remove(KEY_MENU_NAME);
- }
+ setValue(KEY_MENU_NAME, menuName);
}
/**
* Get an array of strings to be used as VR synonyms for this choice. If this array is provided, it must have at least one non-empty element
@@ -121,16 +112,7 @@ public class Choice extends RPCStruct { */
@SuppressWarnings("unchecked")
public List<String> getVrCommands() {
- if (store.get(KEY_VR_COMMANDS) instanceof List<?>) {
- List<?> list = (List<?>)store.get( KEY_VR_COMMANDS);
- if (list != null && list.size() > 0) {
- Object obj = list.get(0);
- if (obj instanceof String) {
- return (List<String>) list;
- }
- }
- }
- return null;
+ return (List<String>) getObject(String.class, KEY_VR_COMMANDS);
}
/**
* Set an array of strings to be used as VR synonyms for this choice. If this array is provided, it must have at least one non-empty element
@@ -138,22 +120,14 @@ public class Choice extends RPCStruct { * @since SmartDeviceLink 2.0
*/
public void setVrCommands(List<String> vrCommands) {
- if (vrCommands != null) {
- store.put(KEY_VR_COMMANDS, vrCommands);
- } else {
- store.remove(KEY_VR_COMMANDS);
- }
+ setValue(KEY_VR_COMMANDS, vrCommands);
}
/**
* Set the image
* @param image the image of the choice
*/
public void setImage(Image image) {
- if (image != null) {
- store.put(KEY_IMAGE, image);
- } else {
- store.remove(KEY_IMAGE);
- }
+ setValue(KEY_IMAGE, image);
}
/**
* Get the image
@@ -161,65 +135,31 @@ public class Choice extends RPCStruct { */
@SuppressWarnings("unchecked")
public Image getImage() {
- Object obj = store.get(KEY_IMAGE);
- if (obj instanceof Image) {
- return (Image) obj;
- } else if (obj instanceof Hashtable) {
- try {
- return new Image((Hashtable<String, Object>) obj);
- } catch (Exception e) {
- DebugTool.logError("Failed to parse " + getClass().getSimpleName() + "." + KEY_IMAGE, e);
- }
- }
- return null;
+ return (Image) getObject(Image.class, KEY_IMAGE);
}
public String getSecondaryText() {
- return (String) store.get(KEY_SECONDARY_TEXT);
+ return getString(KEY_SECONDARY_TEXT);
}
public void setSecondaryText(String secondaryText) {
- if (secondaryText != null) {
- store.put(KEY_SECONDARY_TEXT, secondaryText);
- }
- else {
- store.remove(KEY_SECONDARY_TEXT);
- }
+ setValue(KEY_SECONDARY_TEXT, secondaryText);
}
public String getTertiaryText() {
- return (String) store.get(KEY_TERTIARY_TEXT);
+ return getString(KEY_TERTIARY_TEXT);
}
public void setTertiaryText(String tertiaryText) {
- if (tertiaryText != null) {
- store.put(KEY_TERTIARY_TEXT, tertiaryText);
- }
- else {
- store.remove(KEY_TERTIARY_TEXT);
- }
+ setValue(KEY_TERTIARY_TEXT, tertiaryText);
}
public void setSecondaryImage(Image image) {
- if (image != null) {
- store.put(KEY_SECONDARY_IMAGE, image);
- } else {
- store.remove(KEY_SECONDARY_IMAGE);
- }
+ setValue(KEY_SECONDARY_IMAGE, image);
}
@SuppressWarnings("unchecked")
public Image getSecondaryImage() {
- Object obj = store.get(KEY_SECONDARY_IMAGE);
- if (obj instanceof Image) {
- return (Image) obj;
- } else if (obj instanceof Hashtable) {
- try {
- return new Image((Hashtable<String, Object>) obj);
- } catch (Exception e) {
- DebugTool.logError("Failed to parse " + getClass().getSimpleName() + "." + KEY_SECONDARY_IMAGE, e);
- }
- }
- return null;
+ return (Image) getObject(Image.class, KEY_SECONDARY_IMAGE);
}
}
diff --git a/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/ClusterModeStatus.java b/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/ClusterModeStatus.java index 17e16af65..c58f70b50 100644 --- a/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/ClusterModeStatus.java +++ b/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/ClusterModeStatus.java @@ -6,6 +6,9 @@ import com.smartdevicelink.proxy.RPCStruct; import com.smartdevicelink.proxy.rpc.enums.CarModeStatus;
import com.smartdevicelink.proxy.rpc.enums.PowerModeQualificationStatus;
import com.smartdevicelink.proxy.rpc.enums.PowerModeStatus;
+
+import static android.provider.Contacts.SettingsColumns.KEY;
+
/** <p>The status modes of the instrument panel cluster.</p>
*
*
@@ -69,61 +72,27 @@ public class ClusterModeStatus extends RPCStruct { }
public void setPowerModeActive(Boolean powerModeActive) {
- if (powerModeActive != null) {
- store.put(KEY_POWER_MODE_ACTIVE, powerModeActive);
- } else {
- store.remove(KEY_POWER_MODE_ACTIVE);
- }
+ setValue(KEY_POWER_MODE_ACTIVE, powerModeActive);
}
public Boolean getPowerModeActive() {
- return (Boolean) store.get(KEY_POWER_MODE_ACTIVE);
+ return getBoolean(KEY_POWER_MODE_ACTIVE);
}
public void setPowerModeQualificationStatus(PowerModeQualificationStatus powerModeQualificationStatus) {
- if (powerModeQualificationStatus != null) {
- store.put(KEY_POWER_MODE_QUALIFICATION_STATUS, powerModeQualificationStatus);
- } else {
- store.remove(KEY_POWER_MODE_QUALIFICATION_STATUS);
- }
+ setValue(KEY_POWER_MODE_QUALIFICATION_STATUS, powerModeQualificationStatus);
}
public PowerModeQualificationStatus getPowerModeQualificationStatus() {
- Object obj = store.get(KEY_POWER_MODE_QUALIFICATION_STATUS);
- if (obj instanceof PowerModeQualificationStatus) {
- return (PowerModeQualificationStatus) obj;
- } else if (obj instanceof String) {
- return PowerModeQualificationStatus.valueForString((String) obj);
- }
- return null;
+ return (PowerModeQualificationStatus) getObject(PowerModeQualificationStatus.class, KEY_POWER_MODE_QUALIFICATION_STATUS);
}
public void setCarModeStatus(CarModeStatus carModeStatus) {
- if (carModeStatus != null) {
- store.put(KEY_CAR_MODE_STATUS, carModeStatus);
- } else {
- store.remove(KEY_CAR_MODE_STATUS);
- }
+ setValue(KEY_CAR_MODE_STATUS, carModeStatus);
}
public CarModeStatus getCarModeStatus() {
- Object obj = store.get(KEY_CAR_MODE_STATUS);
- if (obj instanceof CarModeStatus) {
- return (CarModeStatus) obj;
- } else if (obj instanceof String) {
- return CarModeStatus.valueForString((String) obj);
- }
- return null;
+ return (CarModeStatus) getObject(CarModeStatus.class, KEY_CAR_MODE_STATUS);
}
public void setPowerModeStatus(PowerModeStatus powerModeStatus) {
- if (powerModeStatus != null) {
- store.put(KEY_POWER_MODE_STATUS, powerModeStatus);
- } else {
- store.remove(KEY_POWER_MODE_STATUS);
- }
+ setValue(KEY_POWER_MODE_STATUS, powerModeStatus);
}
public PowerModeStatus getPowerModeStatus() {
- Object obj = store.get(KEY_POWER_MODE_STATUS);
- if (obj instanceof PowerModeStatus) {
- return (PowerModeStatus) obj;
- } else if (obj instanceof String) {
- return PowerModeStatus.valueForString((String) obj);
- }
- return null;
+ return (PowerModeStatus) getObject(PowerModeStatus.class, KEY_POWER_MODE_STATUS);
}
}
diff --git a/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/Coordinate.java b/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/Coordinate.java index 7e899168c..433f9540b 100644 --- a/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/Coordinate.java +++ b/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/Coordinate.java @@ -17,28 +17,20 @@ public class Coordinate extends RPCStruct{ } public Float getLatitudeDegrees() { - Object value = store.get(KEY_LATITUDE_DEGREES); + Object value = getValue(KEY_LATITUDE_DEGREES); return SdlDataTypeConverter.objectToFloat(value); } public void setLatitudeDegrees(Float latitudeDegrees) { - if (latitudeDegrees != null) { - store.put(KEY_LATITUDE_DEGREES, latitudeDegrees); - } else { - store.remove(KEY_LATITUDE_DEGREES); - } + setValue(KEY_LATITUDE_DEGREES, latitudeDegrees); } public Float getLongitudeDegrees() { - Object value = store.get(KEY_LONGITUDE_DEGREES); + Object value = getValue(KEY_LONGITUDE_DEGREES); return SdlDataTypeConverter.objectToFloat(value); } public void setLongitudeDegrees(Float longitudeDegrees) { - if (longitudeDegrees != null) { - store.put(KEY_LONGITUDE_DEGREES, longitudeDegrees); - } else { - store.remove(KEY_LONGITUDE_DEGREES); - } + setValue(KEY_LONGITUDE_DEGREES, longitudeDegrees); } } diff --git a/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/CreateInteractionChoiceSet.java b/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/CreateInteractionChoiceSet.java index 1d5b0372b..43e23f4c8 100644 --- a/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/CreateInteractionChoiceSet.java +++ b/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/CreateInteractionChoiceSet.java @@ -3,7 +3,6 @@ package com.smartdevicelink.proxy.rpc; import com.smartdevicelink.protocol.enums.FunctionID;
import com.smartdevicelink.proxy.RPCRequest;
-import java.util.ArrayList;
import java.util.Hashtable;
import java.util.List;
@@ -100,7 +99,7 @@ public class CreateInteractionChoiceSet extends RPCRequest { * @return Integer -an Integer representing the Choice Set ID
*/
public Integer getInteractionChoiceSetID() {
- return (Integer) parameters.get( KEY_INTERACTION_CHOICE_SET_ID );
+ return getInteger( KEY_INTERACTION_CHOICE_SET_ID );
}
/**
* Sets a unique ID that identifies the Choice Set
@@ -111,7 +110,7 @@ public class CreateInteractionChoiceSet extends RPCRequest { * <b>Notes: </b>Min Value: 0; Max Value: 2000000000
*/
public void setInteractionChoiceSetID( Integer interactionChoiceSetID ) {
- setParameters(KEY_INTERACTION_CHOICE_SET_ID, interactionChoiceSetID);
+ setParameter(KEY_INTERACTION_CHOICE_SET_ID, interactionChoiceSetID);
}
/**
* Gets Choice Set Array of one or more elements
@@ -121,22 +120,7 @@ public class CreateInteractionChoiceSet extends RPCRequest { */
@SuppressWarnings("unchecked")
public List<Choice> getChoiceSet() {
- if (parameters.get(KEY_CHOICE_SET) instanceof List<?>) {
- List<?> list = (List<?>)parameters.get(KEY_CHOICE_SET);
- if (list != null && list.size() > 0) {
- Object obj = list.get(0);
- if (obj instanceof Choice) {
- return (List<Choice>) list;
- } else if (obj instanceof Hashtable) {
- List<Choice> newList = new ArrayList<Choice>();
- for (Object hashObj : list) {
- newList.add(new Choice((Hashtable<String, Object>)hashObj));
- }
- return newList;
- }
- }
- }
- return null;
+ return (List<Choice>) getObject(Choice.class, KEY_CHOICE_SET);
}
/**
* Sets a Choice Set that is an Array of one or more elements
@@ -148,6 +132,6 @@ public class CreateInteractionChoiceSet extends RPCRequest { * <b>Notes: </b>Min Value: 1; Max Value: 100
*/
public void setChoiceSet( List<Choice> choiceSet ) {
- setParameters(KEY_CHOICE_SET, choiceSet);
+ setParameter(KEY_CHOICE_SET, choiceSet);
}
}
diff --git a/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/DIDResult.java b/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/DIDResult.java index 84afe2a70..cd9d24c78 100644 --- a/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/DIDResult.java +++ b/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/DIDResult.java @@ -59,39 +59,21 @@ public class DIDResult extends RPCStruct { super(hash);
}
public void setResultCode(VehicleDataResultCode resultCode) {
- if (resultCode != null) {
- store.put(KEY_RESULT_CODE, resultCode);
- } else {
- store.remove(KEY_RESULT_CODE);
- }
+ setValue(KEY_RESULT_CODE, resultCode);
}
public VehicleDataResultCode getResultCode() {
- Object obj = store.get(KEY_RESULT_CODE);
- if (obj instanceof VehicleDataResultCode) {
- return (VehicleDataResultCode) obj;
- } else if (obj instanceof String) {
- return VehicleDataResultCode.valueForString((String) obj);
- }
- return null;
+ return (VehicleDataResultCode) getObject(VehicleDataResultCode.class, KEY_RESULT_CODE);
}
public void setDidLocation(Integer didLocation) {
- if (didLocation != null) {
- store.put(KEY_DID_LOCATION, didLocation);
- } else {
- store.remove(KEY_DID_LOCATION);
- }
+ setValue(KEY_DID_LOCATION, didLocation);
}
public Integer getDidLocation() {
- return (Integer) store.get(KEY_DID_LOCATION);
+ return getInteger(KEY_DID_LOCATION);
}
public void setData(String data) {
- if (data != null) {
- store.put(KEY_DATA, data);
- } else {
- store.remove(KEY_DATA);
- }
+ setValue(KEY_DATA, data);
}
public String getData() {
- return (String) store.get(KEY_DATA);
+ return getString(KEY_DATA);
}
}
diff --git a/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/DTC.java b/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/DTC.java index e8ff471d8..57595672e 100644 --- a/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/DTC.java +++ b/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/DTC.java @@ -1,9 +1,9 @@ package com.smartdevicelink.proxy.rpc;
-import java.util.Hashtable;
-
import com.smartdevicelink.proxy.RPCStruct;
+import java.util.Hashtable;
+
/**
* String containing hexadecimal identifier as well as other common names.
* <p><b>Parameter List</b></p>
@@ -48,11 +48,7 @@ public class DTC extends RPCStruct { * @param identifier
*/
public void setIdentifier(String identifier) {
- if (identifier != null) {
- store.put(KEY_IDENTIFIER, identifier);
- } else {
- store.remove(KEY_IDENTIFIER);
- }
+ setValue(KEY_IDENTIFIER, identifier);
}
/**
@@ -60,7 +56,7 @@ public class DTC extends RPCStruct { * @return identifier
*/
public String getIdentifier() {
- return (String) store.get(KEY_IDENTIFIER);
+ return getString(KEY_IDENTIFIER);
}
/**
@@ -68,11 +64,7 @@ public class DTC extends RPCStruct { * @param statusByte Hexadecimal byte string
*/
public void setStatusByte(String statusByte) {
- if (statusByte != null) {
- store.put(KEY_STATUS_BYTE, statusByte);
- } else {
- store.remove(KEY_STATUS_BYTE);
- }
+ setValue(KEY_STATUS_BYTE, statusByte);
}
/**
@@ -80,6 +72,6 @@ public class DTC extends RPCStruct { * @return Hexadecimal byte string
*/
public String getStatusByte() {
- return (String) store.get(KEY_STATUS_BYTE);
+ return getString(KEY_STATUS_BYTE);
}
}
diff --git a/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/DateTime.java b/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/DateTime.java index aeb302ffb..1c3af0e88 100644 --- a/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/DateTime.java +++ b/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/DateTime.java @@ -30,7 +30,7 @@ public class DateTime extends RPCStruct{ * */ public Integer getMilliSecond() { - return (Integer) store.get(KEY_MILLISECOND); + return getInteger(KEY_MILLISECOND); } /** @@ -41,11 +41,7 @@ public class DateTime extends RPCStruct{ * */ public void setMilliSecond(Integer milliSecond) { - if (milliSecond != null) { - store.put(KEY_MILLISECOND, milliSecond); - } else { - store.remove(KEY_MILLISECOND); - } + setValue(KEY_MILLISECOND, milliSecond); } @@ -56,7 +52,7 @@ public class DateTime extends RPCStruct{ * */ public Integer getSecond() { - return (Integer) store.get(KEY_SECOND); + return getInteger(KEY_SECOND); } /** @@ -67,11 +63,7 @@ public class DateTime extends RPCStruct{ * */ public void setSecond(Integer second) { - if (second != null) { - store.put(KEY_SECOND, second); - } else { - store.remove(KEY_SECOND); - } + setValue(KEY_SECOND, second); } @@ -82,7 +74,7 @@ public class DateTime extends RPCStruct{ * */ public Integer getMinute() { - return (Integer) store.get(KEY_MINUTE); + return getInteger(KEY_MINUTE); } /** @@ -93,11 +85,7 @@ public class DateTime extends RPCStruct{ * */ public void setMinute(Integer minute) { - if (minute != null) { - store.put(KEY_MINUTE, minute); - } else { - store.remove(KEY_MINUTE); - } + setValue(KEY_MINUTE, minute); } /** @@ -107,7 +95,7 @@ public class DateTime extends RPCStruct{ * */ public Integer getHour() { - return (Integer) store.get(KEY_HOUR); + return getInteger(KEY_HOUR); } /** @@ -118,11 +106,7 @@ public class DateTime extends RPCStruct{ * */ public void setHour(Integer hour) { - if (hour != null) { - store.put(KEY_HOUR, hour); - } else { - store.remove(KEY_HOUR); - } + setValue(KEY_HOUR, hour); } /** @@ -132,7 +116,7 @@ public class DateTime extends RPCStruct{ * */ public Integer getDay() { - return (Integer) store.get(KEY_DAY); + return getInteger(KEY_DAY); } /** @@ -143,11 +127,7 @@ public class DateTime extends RPCStruct{ * */ public void setDay(Integer day) { - if (day != null) { - store.put(KEY_DAY, day); - } else { - store.remove(KEY_DAY); - } + setValue(KEY_DAY, day); } /** @@ -157,7 +137,7 @@ public class DateTime extends RPCStruct{ * */ public Integer getMonth() { - return (Integer) store.get(KEY_MONTH); + return getInteger(KEY_MONTH); } /** @@ -168,11 +148,7 @@ public class DateTime extends RPCStruct{ * */ public void setMonth(Integer month) { - if (month != null) { - store.put(KEY_MONTH, month); - } else { - store.remove(KEY_MONTH); - } + setValue(KEY_MONTH, month); } /** @@ -182,7 +158,7 @@ public class DateTime extends RPCStruct{ * */ public Integer getYear() { - return (Integer) store.get(KEY_YEAR); + return getInteger(KEY_YEAR); } /** @@ -193,11 +169,7 @@ public class DateTime extends RPCStruct{ * */ public void setYear(Integer year) { - if (year != null) { - store.put(KEY_YEAR, year); - } else { - store.remove(KEY_YEAR); - } + setValue(KEY_YEAR, year); } /** @@ -207,7 +179,7 @@ public class DateTime extends RPCStruct{ * */ public Integer getTzHour() { - return (Integer) store.get(KEY_TZ_HOUR); + return getInteger(KEY_TZ_HOUR); } /** @@ -218,11 +190,7 @@ public class DateTime extends RPCStruct{ * */ public void setTzHour(Integer tzHour) { - if (tzHour != null) { - store.put(KEY_TZ_HOUR, tzHour); - } else { - store.remove(KEY_TZ_HOUR); - } + setValue(KEY_TZ_HOUR, tzHour); } /** @@ -232,7 +200,7 @@ public class DateTime extends RPCStruct{ * */ public Integer getTzMinute() { - return (Integer) store.get(KEY_TZ_MINUTE); + return getInteger(KEY_TZ_MINUTE); } /** @@ -242,10 +210,6 @@ public class DateTime extends RPCStruct{ * The time zone offset in Minutes with regard to UTC associated with this DateTime class */ public void setTzMinute(Integer tzMinute) { - if (tzMinute != null) { - store.put(KEY_TZ_MINUTE, tzMinute); - } else { - store.remove(KEY_TZ_MINUTE); - } + setValue(KEY_TZ_MINUTE, tzMinute); } } diff --git a/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/DeleteCommand.java b/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/DeleteCommand.java index 5f07169a4..8e8f58fd1 100644 --- a/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/DeleteCommand.java +++ b/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/DeleteCommand.java @@ -80,7 +80,7 @@ public class DeleteCommand extends RPCRequest { * the Command to be deleted from Command Menu
*/
public Integer getCmdID() {
- return (Integer) parameters.get( KEY_CMD_ID );
+ return getInteger( KEY_CMD_ID );
}
/**
* Sets the Command ID that identifies the Command to be deleted from Command Menu
@@ -91,6 +91,6 @@ public class DeleteCommand extends RPCRequest { * <p><b>Notes: </b>Min Value: 0; Max Value: 2000000000</p>
*/
public void setCmdID( Integer cmdID ) {
- setParameters(KEY_CMD_ID, cmdID);
+ setParameter(KEY_CMD_ID, cmdID);
}
}
diff --git a/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/DeleteFile.java b/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/DeleteFile.java index 2d4e2b215..c0c330c65 100644 --- a/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/DeleteFile.java +++ b/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/DeleteFile.java @@ -71,7 +71,7 @@ public class DeleteFile extends RPCRequest { * a String value representing a file reference name
*/
public void setSdlFileName(String sdlFileName) {
- setParameters(KEY_SDL_FILE_NAME, sdlFileName);
+ setParameter(KEY_SDL_FILE_NAME, sdlFileName);
}
/**
@@ -80,6 +80,6 @@ public class DeleteFile extends RPCRequest { * @return String -a String value representing a file reference name
*/
public String getSdlFileName() {
- return (String) parameters.get(KEY_SDL_FILE_NAME);
+ return getString(KEY_SDL_FILE_NAME);
}
}
diff --git a/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/DeleteFileResponse.java b/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/DeleteFileResponse.java index 34ea796e6..ae8315bb1 100644 --- a/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/DeleteFileResponse.java +++ b/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/DeleteFileResponse.java @@ -23,9 +23,9 @@ public class DeleteFileResponse extends RPCResponse { super(hash);
}
public void setSpaceAvailable(Integer spaceAvailable) {
- setParameters(KEY_SPACE_AVAILABLE, spaceAvailable);
+ setParameter(KEY_SPACE_AVAILABLE, spaceAvailable);
}
public Integer getSpaceAvailable() {
- return (Integer) parameters.get(KEY_SPACE_AVAILABLE);
+ return getInteger(KEY_SPACE_AVAILABLE);
}
}
diff --git a/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/DeleteInteractionChoiceSet.java b/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/DeleteInteractionChoiceSet.java index 4c3ccc95d..8f43b6758 100644 --- a/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/DeleteInteractionChoiceSet.java +++ b/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/DeleteInteractionChoiceSet.java @@ -83,7 +83,7 @@ public class DeleteInteractionChoiceSet extends RPCRequest { * @return Integer -an Integer value representing the unique Choice Set ID
*/
public Integer getInteractionChoiceSetID() {
- return (Integer) parameters.get( KEY_INTERACTION_CHOICE_SET_ID );
+ return getInteger( KEY_INTERACTION_CHOICE_SET_ID );
}
/**
* Sets a unique ID that identifies the Choice Set
@@ -91,6 +91,6 @@ public class DeleteInteractionChoiceSet extends RPCRequest { * <p><b>Notes: </b>Min Value: 0; Max Value: 2000000000 </p>
*/
public void setInteractionChoiceSetID( Integer interactionChoiceSetID ) {
- setParameters(KEY_INTERACTION_CHOICE_SET_ID, interactionChoiceSetID);
+ setParameter(KEY_INTERACTION_CHOICE_SET_ID, interactionChoiceSetID);
}
}
diff --git a/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/DeleteSubMenu.java b/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/DeleteSubMenu.java index bd5e724f6..1f76d7861 100644 --- a/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/DeleteSubMenu.java +++ b/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/DeleteSubMenu.java @@ -72,7 +72,7 @@ public class DeleteSubMenu extends RPCRequest { * @return Integer -an Integer value representing menuID that identifies the SubMenu to be delete
*/
public Integer getMenuID() {
- return (Integer) parameters.get( KEY_MENU_ID );
+ return getInteger( KEY_MENU_ID );
}
/**
* Sets the MenuID that identifies the SubMenu to be delete
@@ -81,6 +81,6 @@ public class DeleteSubMenu extends RPCRequest { * <p><b>Notes: </b>Min Value: 0; Max Value: 2000000000</p>
*/
public void setMenuID( Integer menuID ) {
- setParameters(KEY_MENU_ID, menuID);
+ setParameter(KEY_MENU_ID, menuID);
}
}
diff --git a/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/DeviceInfo.java b/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/DeviceInfo.java index b7d8ea5cf..485d859b7 100644 --- a/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/DeviceInfo.java +++ b/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/DeviceInfo.java @@ -95,76 +95,51 @@ public class DeviceInfo extends RPCStruct{ }
public void setHardware(String hardware) {
- if (hardware != null) {
- store.put(KEY_HARDWARE, hardware);
- } else {
- store.remove(KEY_HARDWARE);
- }
+ setValue(KEY_HARDWARE, hardware);
}
public String getHardware() {
- return (String) store.get(KEY_HARDWARE);
+ return getString(KEY_HARDWARE);
}
public void setFirmwareRev(String firmwareRev) {
- if (firmwareRev != null) {
- store.put(KEY_FIRMWARE_REV, firmwareRev);
- } else {
- store.remove(KEY_FIRMWARE_REV);
- }
+ setValue(KEY_FIRMWARE_REV, firmwareRev);
}
public String getFirmwareRev() {
- return (String) store.get(KEY_FIRMWARE_REV);
+ return getString(KEY_FIRMWARE_REV);
}
public void setOs(String os) {
- if (os != null) {
- store.put(KEY_OS, os);
- } else {
- store.remove(KEY_OS);
- }
+ setValue(KEY_OS, os);
}
public String getOs() {
- return (String) store.get(KEY_OS);
+ return getString(KEY_OS);
}
public void setOsVersion(String osVersion) {
- if (osVersion != null) {
- store.put(KEY_OS_VERSION, osVersion);
- } else {
- store.remove(KEY_OS_VERSION);
- }
+ setValue(KEY_OS_VERSION, osVersion);
}
public String getOsVersion() {
- return (String) store.get(KEY_OS_VERSION);
+ return getString(KEY_OS_VERSION);
}
public void setCarrier(String carrier) {
- if (carrier != null) {
- store.put(KEY_CARRIER, carrier);
- } else {
- store.remove(KEY_CARRIER);
- }
+ setValue(KEY_CARRIER, carrier);
}
public String getCarrier() {
- return (String) store.get(KEY_CARRIER);
+ return getString(KEY_CARRIER);
}
public Integer getMaxNumberRFCOMMPorts() {
- return (Integer) store.get( KEY_MAX_NUMBER_RFCOMM_PORTS );
+ return getInteger( KEY_MAX_NUMBER_RFCOMM_PORTS );
}
public void setMaxNumberRFCOMMPorts( Integer maxNumberRFCOMMPorts ) {
- if (maxNumberRFCOMMPorts != null) {
- store.put(KEY_MAX_NUMBER_RFCOMM_PORTS, maxNumberRFCOMMPorts );
- }
- else {
- store.remove(KEY_MAX_NUMBER_RFCOMM_PORTS);
- }
+ setValue(KEY_MAX_NUMBER_RFCOMM_PORTS, maxNumberRFCOMMPorts);
}
}
diff --git a/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/DeviceStatus.java b/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/DeviceStatus.java index 51d5304b4..d90c4631f 100644 --- a/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/DeviceStatus.java +++ b/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/DeviceStatus.java @@ -1,11 +1,11 @@ package com.smartdevicelink.proxy.rpc;
-import java.util.Hashtable;
-
import com.smartdevicelink.proxy.RPCStruct;
import com.smartdevicelink.proxy.rpc.enums.DeviceLevelStatus;
import com.smartdevicelink.proxy.rpc.enums.PrimaryAudioSource;
+import java.util.Hashtable;
+
/**
* Describes the status related to a connected mobile device or SDL and if or how it is represented in the vehicle.
* <p><b>Parameter List</b></p>
@@ -132,11 +132,7 @@ public class DeviceStatus extends RPCStruct { * @param voiceRecOn
*/
public void setVoiceRecOn(Boolean voiceRecOn) {
- if (voiceRecOn != null) {
- store.put(KEY_VOICE_REC_ON, voiceRecOn);
- } else {
- store.remove(KEY_VOICE_REC_ON);
- }
+ setValue(KEY_VOICE_REC_ON, voiceRecOn);
}
/**
@@ -144,7 +140,7 @@ public class DeviceStatus extends RPCStruct { * @return whether the voice recognition is on
*/
public Boolean getVoiceRecOn() {
- return (Boolean) store.get(KEY_VOICE_REC_ON);
+ return getBoolean(KEY_VOICE_REC_ON);
}
/**
@@ -152,11 +148,7 @@ public class DeviceStatus extends RPCStruct { * @param btIconOn the bluetooth connection established
*/
public void setBtIconOn(Boolean btIconOn) {
- if (btIconOn != null) {
- store.put(KEY_BT_ICON_ON, btIconOn);
- } else {
- store.remove(KEY_BT_ICON_ON);
- }
+ setValue(KEY_BT_ICON_ON, btIconOn);
}
/**
@@ -164,7 +156,7 @@ public class DeviceStatus extends RPCStruct { * @return the bluetooth connection established
*/
public Boolean getBtIconOn() {
- return (Boolean) store.get(KEY_BT_ICON_ON);
+ return getBoolean(KEY_BT_ICON_ON);
}
/**
@@ -172,11 +164,7 @@ public class DeviceStatus extends RPCStruct { * @param callActive a call is being active
*/
public void setCallActive(Boolean callActive) {
- if (callActive != null) {
- store.put(KEY_CALL_ACTIVE, callActive);
- } else {
- store.remove(KEY_CALL_ACTIVE);
- }
+ setValue(KEY_CALL_ACTIVE, callActive);
}
/**
@@ -184,7 +172,7 @@ public class DeviceStatus extends RPCStruct { * @return a call is being active
*/
public Boolean getCallActive() {
- return (Boolean) store.get(KEY_CALL_ACTIVE);
+ return getBoolean(KEY_CALL_ACTIVE);
}
/**
@@ -192,11 +180,7 @@ public class DeviceStatus extends RPCStruct { * @param phoneRoaming the phone is in roaming mode
*/
public void setPhoneRoaming(Boolean phoneRoaming) {
- if (phoneRoaming != null) {
- store.put(KEY_PHONE_ROAMING, phoneRoaming);
- } else {
- store.remove(KEY_PHONE_ROAMING);
- }
+ setValue(KEY_PHONE_ROAMING, phoneRoaming);
}
/**
@@ -204,14 +188,10 @@ public class DeviceStatus extends RPCStruct { * @return the phone is in roaming mode
*/
public Boolean getPhoneRoaming() {
- return (Boolean) store.get(KEY_PHONE_ROAMING);
+ return getBoolean(KEY_PHONE_ROAMING);
}
public void setTextMsgAvailable(Boolean textMsgAvailable) {
- if (textMsgAvailable != null) {
- store.put(KEY_TEXT_MSG_AVAILABLE, textMsgAvailable);
- } else {
- store.remove(KEY_TEXT_MSG_AVAILABLE);
- }
+ setValue(KEY_TEXT_MSG_AVAILABLE, textMsgAvailable);
}
/**
@@ -219,7 +199,7 @@ public class DeviceStatus extends RPCStruct { * @return a textmessage is available
*/
public Boolean getTextMsgAvailable() {
- return (Boolean) store.get(KEY_TEXT_MSG_AVAILABLE);
+ return getBoolean(KEY_TEXT_MSG_AVAILABLE);
}
/**
@@ -227,11 +207,7 @@ public class DeviceStatus extends RPCStruct { * @param battLevelStatus battery level status
*/
public void setBattLevelStatus(DeviceLevelStatus battLevelStatus) {
- if (battLevelStatus != null) {
- store.put(KEY_BATT_LEVEL_STATUS, battLevelStatus);
- } else {
- store.remove(KEY_BATT_LEVEL_STATUS);
- }
+ setValue(KEY_BATT_LEVEL_STATUS, battLevelStatus);
}
/**
@@ -239,13 +215,7 @@ public class DeviceStatus extends RPCStruct { * @return battery level status
*/
public DeviceLevelStatus getBattLevelStatus() {
- Object obj = store.get(KEY_BATT_LEVEL_STATUS);
- if (obj instanceof DeviceLevelStatus) {
- return (DeviceLevelStatus) obj;
- } else if (obj instanceof String) {
- return DeviceLevelStatus.valueForString((String) obj);
- }
- return null;
+ return (DeviceLevelStatus) getObject(DeviceLevelStatus.class, KEY_BATT_LEVEL_STATUS);
}
/**
@@ -253,11 +223,7 @@ public class DeviceStatus extends RPCStruct { * @param stereoAudioOutputMuted the status of the stereo audio output channel
*/
public void setStereoAudioOutputMuted(Boolean stereoAudioOutputMuted) {
- if (stereoAudioOutputMuted != null) {
- store.put(KEY_STEREO_AUDIO_OUTPUT_MUTED, stereoAudioOutputMuted);
- } else {
- store.remove(KEY_STEREO_AUDIO_OUTPUT_MUTED);
- }
+ setValue(KEY_STEREO_AUDIO_OUTPUT_MUTED, stereoAudioOutputMuted);
}
/**
@@ -265,7 +231,7 @@ public class DeviceStatus extends RPCStruct { * @return the status of the stereo audio output channel
*/
public Boolean getStereoAudioOutputMuted() {
- return (Boolean) store.get(KEY_STEREO_AUDIO_OUTPUT_MUTED);
+ return getBoolean(KEY_STEREO_AUDIO_OUTPUT_MUTED);
}
/**
@@ -273,11 +239,7 @@ public class DeviceStatus extends RPCStruct { * @param monoAudioOutputMuted the status of the mono audio output channel
*/
public void setMonoAudioOutputMuted(Boolean monoAudioOutputMuted) {
- if (monoAudioOutputMuted != null) {
- store.put(KEY_MONO_AUDIO_OUTPUT_MUTED, monoAudioOutputMuted);
- } else {
- store.remove(KEY_MONO_AUDIO_OUTPUT_MUTED);
- }
+ setValue(KEY_MONO_AUDIO_OUTPUT_MUTED, monoAudioOutputMuted);
}
/**
@@ -285,7 +247,7 @@ public class DeviceStatus extends RPCStruct { * @return the status of the mono audio output channel
*/
public Boolean getMonoAudioOutputMuted() {
- return (Boolean) store.get(KEY_MONO_AUDIO_OUTPUT_MUTED);
+ return getBoolean(KEY_MONO_AUDIO_OUTPUT_MUTED);
}
/**
@@ -293,11 +255,7 @@ public class DeviceStatus extends RPCStruct { * @param signalLevelStatus signal level status
*/
public void setSignalLevelStatus(DeviceLevelStatus signalLevelStatus) {
- if (signalLevelStatus != null) {
- store.put(KEY_SIGNAL_LEVEL_STATUS, signalLevelStatus);
- } else {
- store.remove(KEY_SIGNAL_LEVEL_STATUS);
- }
+ setValue(KEY_SIGNAL_LEVEL_STATUS, signalLevelStatus);
}
/**
@@ -305,13 +263,7 @@ public class DeviceStatus extends RPCStruct { * @return signal level status
*/
public DeviceLevelStatus getSignalLevelStatus() {
- Object obj = store.get(KEY_SIGNAL_LEVEL_STATUS);
- if (obj instanceof DeviceLevelStatus) {
- return (DeviceLevelStatus) obj;
- } else if (obj instanceof String) {
- return DeviceLevelStatus.valueForString((String) obj);
- }
- return null;
+ return (DeviceLevelStatus) getObject(DeviceLevelStatus.class, KEY_SIGNAL_LEVEL_STATUS);
}
/**
@@ -319,11 +271,7 @@ public class DeviceStatus extends RPCStruct { * @param primaryAudioSource the current primary audio source of SDL (if selected).
*/
public void setPrimaryAudioSource(PrimaryAudioSource primaryAudioSource) {
- if (primaryAudioSource != null) {
- store.put(KEY_PRIMARY_AUDIO_SOURCE, primaryAudioSource);
- } else {
- store.remove(KEY_PRIMARY_AUDIO_SOURCE);
- }
+ setValue(KEY_PRIMARY_AUDIO_SOURCE, primaryAudioSource);
}
/**
@@ -331,22 +279,12 @@ public class DeviceStatus extends RPCStruct { * @return the current primary audio source of SDL (if selected).
*/
public PrimaryAudioSource getPrimaryAudioSource() {
- Object obj = store.get(KEY_PRIMARY_AUDIO_SOURCE);
- if (obj instanceof PrimaryAudioSource) {
- return (PrimaryAudioSource) obj;
- } else if (obj instanceof String) {
- return PrimaryAudioSource.valueForString((String) obj);
- }
- return null;
+ return (PrimaryAudioSource) getObject(PrimaryAudioSource.class, KEY_PRIMARY_AUDIO_SOURCE);
}
public void setECallEventActive(Boolean eCallEventActive) {
- if (eCallEventActive != null) {
- store.put(KEY_E_CALL_EVENT_ACTIVE, eCallEventActive);
- } else {
- store.remove(KEY_E_CALL_EVENT_ACTIVE);
- }
+ setValue(KEY_E_CALL_EVENT_ACTIVE, eCallEventActive);
}
public Boolean getECallEventActive() {
- return (Boolean) store.get(KEY_E_CALL_EVENT_ACTIVE);
+ return getBoolean(KEY_E_CALL_EVENT_ACTIVE);
}
}
diff --git a/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/DiagnosticMessage.java b/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/DiagnosticMessage.java index b40b9b299..1600f0523 100644 --- a/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/DiagnosticMessage.java +++ b/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/DiagnosticMessage.java @@ -82,7 +82,7 @@ public class DiagnosticMessage extends RPCRequest { public void setTargetID(Integer targetID) {
- setParameters(KEY_TARGET_ID, targetID);
+ setParameter(KEY_TARGET_ID, targetID);
}
/**
* <p>
@@ -93,31 +93,22 @@ public class DiagnosticMessage extends RPCRequest { */
public Integer getTargetID() {
- return (Integer) parameters.get(KEY_TARGET_ID);
+ return getInteger(KEY_TARGET_ID);
}
public void setMessageLength(Integer messageLength) {
- setParameters(KEY_MESSAGE_LENGTH, messageLength);
+ setParameter(KEY_MESSAGE_LENGTH, messageLength);
}
public Integer getMessageLength() {
- return (Integer) parameters.get(KEY_MESSAGE_LENGTH);
+ return getInteger(KEY_MESSAGE_LENGTH);
}
@SuppressWarnings("unchecked")
public List<Integer> getMessageData() {
- if(parameters.get(KEY_MESSAGE_DATA) instanceof List<?>){
- List<?> list = (List<?>)parameters.get(KEY_MESSAGE_DATA);
- if(list != null && list.size()>0){
- Object obj = list.get(0);
- if(obj instanceof Integer){
- return (List<Integer>) list;
- }
- }
- }
- return null;
+ return (List<Integer>) getObject(Integer.class, KEY_MESSAGE_DATA);
}
public void setMessageData(List<Integer> messageData) {
- setParameters(KEY_MESSAGE_DATA, messageData);
+ setParameter(KEY_MESSAGE_DATA, messageData);
}
}
diff --git a/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/DiagnosticMessageResponse.java b/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/DiagnosticMessageResponse.java index a32ea24f4..f5b22201d 100644 --- a/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/DiagnosticMessageResponse.java +++ b/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/DiagnosticMessageResponse.java @@ -25,19 +25,10 @@ public class DiagnosticMessageResponse extends RPCResponse { }
@SuppressWarnings("unchecked")
public List<Integer> getMessageDataResult() {
- if(parameters.get(KEY_MESSAGE_DATA_RESULT) instanceof List<?>){
- List<?> list = (List<?>)parameters.get(KEY_MESSAGE_DATA_RESULT);
- if(list != null && list.size()>0){
- Object obj = list.get(0);
- if(obj instanceof Integer){
- return (List<Integer>) list;
- }
- }
- }
- return null;
+ return (List<Integer>) getObject(Integer.class, KEY_MESSAGE_DATA_RESULT);
}
public void setMessageDataResult(List<Integer> messageDataResult) {
- setParameters(KEY_MESSAGE_DATA_RESULT, messageDataResult);
+ setParameter(KEY_MESSAGE_DATA_RESULT, messageDataResult);
}
}
diff --git a/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/DialNumber.java b/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/DialNumber.java index 95a0cc8d1..1f1956d3c 100644 --- a/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/DialNumber.java +++ b/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/DialNumber.java @@ -35,7 +35,7 @@ public class DialNumber extends RPCRequest { if (number != null) { number = number.replaceAll("[^0-9*#,;+]", ""); //This will sanitize the input } - setParameters(KEY_NUMBER, number); + setParameter(KEY_NUMBER, number); } /** @@ -44,6 +44,6 @@ public class DialNumber extends RPCRequest { * @return String - a String value representing a number to dial */ public String getNumber() { - return (String) parameters.get(KEY_NUMBER); + return getString(KEY_NUMBER); } } diff --git a/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/DisplayCapabilities.java b/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/DisplayCapabilities.java index f0739e371..69928a128 100644 --- a/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/DisplayCapabilities.java +++ b/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/DisplayCapabilities.java @@ -1,13 +1,14 @@ package com.smartdevicelink.proxy.rpc;
-import java.util.ArrayList;
-import java.util.Hashtable;
-import java.util.List;
-
import com.smartdevicelink.proxy.RPCStruct;
import com.smartdevicelink.proxy.rpc.enums.DisplayType;
import com.smartdevicelink.proxy.rpc.enums.MediaClockFormat;
+import com.smartdevicelink.proxy.rpc.enums.VehicleDataResultCode;
import com.smartdevicelink.util.DebugTool;
+
+import java.util.ArrayList;
+import java.util.Hashtable;
+import java.util.List;
/**
* Contains information about the display for the SDL system to which the application is currently connected.
* <p><b> Parameter List</b></p>
@@ -78,24 +79,14 @@ public class DisplayCapabilities extends RPCStruct { * @return the type of display
*/
public DisplayType getDisplayType() {
- Object obj = store.get(KEY_DISPLAY_TYPE);
- if (obj instanceof DisplayType) {
- return (DisplayType) obj;
- } else if (obj instanceof String) {
- return DisplayType.valueForString((String) obj);
- }
- return null;
+ return (DisplayType) getObject(DisplayType.class, KEY_DISPLAY_TYPE);
}
/**
* Set the type of display
* @param displayType the display type
*/
public void setDisplayType( DisplayType displayType ) {
- if (displayType != null) {
- store.put(KEY_DISPLAY_TYPE, displayType );
- } else {
- store.remove(KEY_DISPLAY_TYPE);
- }
+ setValue(KEY_DISPLAY_TYPE, displayType);
}
/**
*Get an array of TextField structures, each of which describes a field in the HMI which the application can write to using operations such as <i>{@linkplain Show}</i>, <i>{@linkplain SetMediaClockTimer}</i>, etc.
@@ -104,22 +95,7 @@ public class DisplayCapabilities extends RPCStruct { */
@SuppressWarnings("unchecked")
public List<TextField> getTextFields() {
- if (store.get(KEY_TEXT_FIELDS) instanceof List<?>) {
- List<?> list = (List<?>)store.get(KEY_TEXT_FIELDS);
- if (list != null && list.size() > 0) {
- Object obj = list.get(0);
- if (obj instanceof TextField) {
- return (List<TextField>) list;
- } else if (obj instanceof Hashtable) {
- List<TextField> newList = new ArrayList<TextField>();
- for (Object hashObj : list) {
- newList.add(new TextField((Hashtable<String, Object>)hashObj));
- }
- return newList;
- }
- }
- }
- return null;
+ return (List<TextField>) getObject(TextField.class, KEY_TEXT_FIELDS);
}
/**
* Set an array of TextField structures, each of which describes a field in the HMI which the application can write to using operations such as <i>{@linkplain Show}</i>, <i>{@linkplain SetMediaClockTimer}</i>, etc.
@@ -127,57 +103,26 @@ public class DisplayCapabilities extends RPCStruct { * @param textFields the List of textFields
*/
public void setTextFields( List<TextField> textFields ) {
- if (textFields != null) {
- store.put(KEY_TEXT_FIELDS, textFields );
- } else {
- store.remove(KEY_TEXT_FIELDS);
- }
+ setValue(KEY_TEXT_FIELDS, textFields);
}
@SuppressWarnings("unchecked")
public List<ImageField> getImageFields() {
- if (store.get(KEY_IMAGE_FIELDS) instanceof List<?>) {
- List<?> list = (List<?>)store.get(KEY_IMAGE_FIELDS);
- if (list != null && list.size() > 0) {
- Object obj = list.get(0);
- if (obj instanceof ImageField) {
- return (List<ImageField>) list;
- } else if (obj instanceof Hashtable) {
- List<ImageField> newList = new ArrayList<ImageField>();
- for (Object hashObj : list) {
- newList.add(new ImageField((Hashtable<String, Object>)hashObj));
- }
- return newList;
- }
- }
- }
- return null;
+ return (List<ImageField>) getObject(ImageField.class, KEY_IMAGE_FIELDS);
}
public void setImageFields( List<ImageField> imageFields ) {
- if (imageFields != null) {
- store.put(KEY_IMAGE_FIELDS, imageFields );
- }
- else
- {
- store.remove(KEY_IMAGE_FIELDS);
- }
+ setValue(KEY_IMAGE_FIELDS, imageFields);
}
public Integer getNumCustomPresetsAvailable() {
- return (Integer) store.get(KEY_NUM_CUSTOM_PRESETS_AVAILABLE);
+ return getInteger(KEY_NUM_CUSTOM_PRESETS_AVAILABLE);
}
public void setNumCustomPresetsAvailable(Integer numCustomPresetsAvailable) {
- if (numCustomPresetsAvailable != null) {
- store.put(KEY_NUM_CUSTOM_PRESETS_AVAILABLE, numCustomPresetsAvailable);
- }
- else
- {
- store.remove(KEY_NUM_CUSTOM_PRESETS_AVAILABLE);
- }
+ setValue(KEY_NUM_CUSTOM_PRESETS_AVAILABLE, numCustomPresetsAvailable);
}
/**
@@ -186,37 +131,14 @@ public class DisplayCapabilities extends RPCStruct { */
@SuppressWarnings("unchecked")
public List<MediaClockFormat> getMediaClockFormats() {
- if (store.get(KEY_MEDIA_CLOCK_FORMATS) instanceof List<?>) {
- List<?> list = (List<?>)store.get(KEY_MEDIA_CLOCK_FORMATS);
- if (list != null && list.size() > 0) {
- Object obj = list.get(0);
- if (obj instanceof MediaClockFormat) {
- return (List<MediaClockFormat>) list;
- } else if (obj instanceof String) {
- List<MediaClockFormat> newList = new ArrayList<MediaClockFormat>();
- for (Object hashObj : list) {
- String strFormat = (String)hashObj;
- MediaClockFormat toAdd = MediaClockFormat.valueForString(strFormat);
- if (toAdd != null) {
- newList.add(toAdd);
- }
- }
- return newList;
- }
- }
- }
- return null;
+ return (List<MediaClockFormat>) getObject(MediaClockFormat.class, KEY_MEDIA_CLOCK_FORMATS);
}
/**
* Set an array of MediaClockFormat elements, defining the valid string formats used in specifying the contents of the media clock field
* @param mediaClockFormats the List of MediaClockFormat
*/
public void setMediaClockFormats( List<MediaClockFormat> mediaClockFormats ) {
- if (mediaClockFormats != null) {
- store.put(KEY_MEDIA_CLOCK_FORMATS, mediaClockFormats );
- } else {
- store.remove(KEY_MEDIA_CLOCK_FORMATS);
- }
+ setValue(KEY_MEDIA_CLOCK_FORMATS, mediaClockFormats);
}
/**
@@ -225,11 +147,7 @@ public class DisplayCapabilities extends RPCStruct { * @since SmartDeviceLink 2.0
*/
public void setGraphicSupported(Boolean graphicSupported) {
- if (graphicSupported != null) {
- store.put(KEY_GRAPHIC_SUPPORTED, graphicSupported);
- } else {
- store.remove(KEY_GRAPHIC_SUPPORTED);
- }
+ setValue(KEY_GRAPHIC_SUPPORTED, graphicSupported);
}
/**
@@ -238,53 +156,24 @@ public class DisplayCapabilities extends RPCStruct { * @since SmartDeviceLink 2.0
*/
public Boolean getGraphicSupported() {
- return (Boolean) store.get(KEY_GRAPHIC_SUPPORTED);
+ return getBoolean(KEY_GRAPHIC_SUPPORTED);
}
@SuppressWarnings("unchecked")
public List<String> getTemplatesAvailable() {
- if (store.get(KEY_TEMPLATES_AVAILABLE) instanceof List<?>) {
- List<?> list = (List<?>)store.get( KEY_TEMPLATES_AVAILABLE);
- if (list != null && list.size() > 0) {
- Object obj = list.get(0);
- if (obj instanceof String) {
- return (List<String>) list;
- }
- }
- }
- return null;
+ return (List<String>) getObject(String.class, KEY_TEMPLATES_AVAILABLE);
}
public void setTemplatesAvailable(List<String> templatesAvailable) {
- if (templatesAvailable != null) {
- store.put(KEY_TEMPLATES_AVAILABLE, templatesAvailable);
- }
- else
- {
- store.remove(KEY_TEMPLATES_AVAILABLE);
- }
+ setValue(KEY_TEMPLATES_AVAILABLE, templatesAvailable);
}
public void setScreenParams(ScreenParams screenParams) {
- if (screenParams != null) {
- store.put(KEY_SCREEN_PARAMS, screenParams);
- } else {
- store.remove(KEY_SCREEN_PARAMS);
- }
+ setValue(KEY_SCREEN_PARAMS, screenParams);
}
@SuppressWarnings("unchecked")
public ScreenParams getScreenParams() {
- Object obj = store.get(KEY_SCREEN_PARAMS);
- if (obj instanceof ScreenParams) {
- return (ScreenParams) obj;
- } else if (obj instanceof Hashtable) {
- try {
- return new ScreenParams((Hashtable<String, Object>) obj);
- } catch (Exception e) {
- DebugTool.logError("Failed to parse " + getClass().getSimpleName() + "." + KEY_SCREEN_PARAMS, e);
- }
- }
- return null;
+ return (ScreenParams) getObject(ScreenParams.class, KEY_SCREEN_PARAMS);
}
}
diff --git a/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/ECallInfo.java b/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/ECallInfo.java index 88eb89e03..da6c37d9a 100644 --- a/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/ECallInfo.java +++ b/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/ECallInfo.java @@ -1,10 +1,12 @@ package com.smartdevicelink.proxy.rpc;
-import java.util.Hashtable;
-
import com.smartdevicelink.proxy.RPCStruct;
import com.smartdevicelink.proxy.rpc.enums.ECallConfirmationStatus;
import com.smartdevicelink.proxy.rpc.enums.VehicleDataNotificationStatus;
+import com.smartdevicelink.proxy.rpc.enums.VehicleDataResultCode;
+
+import java.util.Hashtable;
+
/** Emergency Call notification and confirmation data.
*
* <p><b>Parameter List</b></p>
@@ -67,51 +69,21 @@ public class ECallInfo extends RPCStruct { }
public void setECallNotificationStatus(VehicleDataNotificationStatus eCallNotificationStatus) {
- if (eCallNotificationStatus != null) {
- store.put(KEY_E_CALL_NOTIFICATION_STATUS, eCallNotificationStatus);
- } else {
- store.remove(KEY_E_CALL_NOTIFICATION_STATUS);
- }
+ setValue(KEY_E_CALL_NOTIFICATION_STATUS, eCallNotificationStatus);
}
public VehicleDataNotificationStatus getECallNotificationStatus() {
- Object obj = store.get(KEY_E_CALL_NOTIFICATION_STATUS);
- if (obj instanceof VehicleDataNotificationStatus) {
- return (VehicleDataNotificationStatus) obj;
- } else if (obj instanceof String) {
- return VehicleDataNotificationStatus.valueForString((String) obj);
- }
- return null;
+ return (VehicleDataNotificationStatus) getObject(VehicleDataNotificationStatus.class, KEY_E_CALL_NOTIFICATION_STATUS);
}
public void setAuxECallNotificationStatus(VehicleDataNotificationStatus auxECallNotificationStatus) {
- if (auxECallNotificationStatus != null) {
- store.put(KEY_AUX_E_CALL_NOTIFICATION_STATUS, auxECallNotificationStatus);
- } else {
- store.remove(KEY_AUX_E_CALL_NOTIFICATION_STATUS);
- }
+ setValue(KEY_AUX_E_CALL_NOTIFICATION_STATUS, auxECallNotificationStatus);
}
public VehicleDataNotificationStatus getAuxECallNotificationStatus() {
- Object obj = store.get(KEY_AUX_E_CALL_NOTIFICATION_STATUS);
- if (obj instanceof VehicleDataNotificationStatus) {
- return (VehicleDataNotificationStatus) obj;
- } else if (obj instanceof String) {
- return VehicleDataNotificationStatus.valueForString((String) obj);
- }
- return null;
+ return (VehicleDataNotificationStatus) getObject(VehicleDataNotificationStatus.class, KEY_AUX_E_CALL_NOTIFICATION_STATUS);
}
public void setECallConfirmationStatus(ECallConfirmationStatus eCallConfirmationStatus) {
- if (eCallConfirmationStatus != null) {
- store.put(KEY_E_CALL_CONFIRMATION_STATUS, eCallConfirmationStatus);
- } else {
- store.remove(KEY_E_CALL_CONFIRMATION_STATUS);
- }
+ setValue(KEY_E_CALL_CONFIRMATION_STATUS, eCallConfirmationStatus);
}
public ECallConfirmationStatus getECallConfirmationStatus() {
- Object obj = store.get(KEY_E_CALL_CONFIRMATION_STATUS);
- if (obj instanceof ECallConfirmationStatus) {
- return (ECallConfirmationStatus) obj;
- } else if (obj instanceof String) {
- return ECallConfirmationStatus.valueForString((String) obj);
- }
- return null;
+ return (ECallConfirmationStatus) getObject(ECallConfirmationStatus.class, KEY_E_CALL_CONFIRMATION_STATUS);
}
}
diff --git a/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/EmergencyEvent.java b/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/EmergencyEvent.java index 5e1f2ede1..19b8f69bb 100644 --- a/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/EmergencyEvent.java +++ b/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/EmergencyEvent.java @@ -6,6 +6,11 @@ import com.smartdevicelink.proxy.RPCStruct; import com.smartdevicelink.proxy.rpc.enums.EmergencyEventType;
import com.smartdevicelink.proxy.rpc.enums.FuelCutoffStatus;
import com.smartdevicelink.proxy.rpc.enums.VehicleDataEventStatus;
+
+import static android.provider.Contacts.SettingsColumns.KEY;
+import static com.smartdevicelink.proxy.constants.Names.multipleEvents;
+import static com.smartdevicelink.proxy.rpc.TireStatus.KEY_INNER_RIGHT_REAR;
+
/** Information related to an emergency event (and if it occurred).
*
* <p><b>Parameter List</b></p>
@@ -88,77 +93,33 @@ public class EmergencyEvent extends RPCStruct { }
public void setEmergencyEventType(EmergencyEventType emergencyEventType) {
- if (emergencyEventType != null) {
- store.put(KEY_EMERGENCY_EVENT_TYPE, emergencyEventType);
- } else {
- store.remove(KEY_EMERGENCY_EVENT_TYPE);
- }
+ setValue(KEY_EMERGENCY_EVENT_TYPE, emergencyEventType);
}
public EmergencyEventType getEmergencyEventType() {
- Object obj = store.get(KEY_EMERGENCY_EVENT_TYPE);
- if (obj instanceof EmergencyEventType) {
- return (EmergencyEventType) obj;
- } else if (obj instanceof String) {
- return EmergencyEventType.valueForString((String) obj);
- }
- return null;
+ return (EmergencyEventType) getObject(EmergencyEventType.class, KEY_EMERGENCY_EVENT_TYPE);
}
public void setFuelCutoffStatus(FuelCutoffStatus fuelCutoffStatus) {
- if (fuelCutoffStatus != null) {
- store.put(KEY_FUEL_CUTOFF_STATUS, fuelCutoffStatus);
- } else {
- store.remove(KEY_FUEL_CUTOFF_STATUS);
- }
+ setValue(KEY_FUEL_CUTOFF_STATUS, fuelCutoffStatus);
}
public FuelCutoffStatus getFuelCutoffStatus() {
- Object obj = store.get(KEY_FUEL_CUTOFF_STATUS);
- if (obj instanceof FuelCutoffStatus) {
- return (FuelCutoffStatus) obj;
- } else if (obj instanceof String) {
- return FuelCutoffStatus.valueForString((String) obj);
- }
- return null;
+ return (FuelCutoffStatus) getObject(FuelCutoffStatus.class, KEY_FUEL_CUTOFF_STATUS);
}
public void setRolloverEvent(VehicleDataEventStatus rolloverEvent) {
- if (rolloverEvent != null) {
- store.put(KEY_ROLLOVER_EVENT, rolloverEvent);
- } else {
- store.remove(KEY_ROLLOVER_EVENT);
- }
+ setValue(KEY_ROLLOVER_EVENT, rolloverEvent);
}
public VehicleDataEventStatus getRolloverEvent() {
- Object obj = store.get(KEY_ROLLOVER_EVENT);
- if (obj instanceof VehicleDataEventStatus) {
- return (VehicleDataEventStatus) obj;
- } else if (obj instanceof String) {
- return VehicleDataEventStatus.valueForString((String) obj);
- }
- return null;
+ return (VehicleDataEventStatus) getObject(VehicleDataEventStatus.class, KEY_ROLLOVER_EVENT);
}
public void setMaximumChangeVelocity(Integer maximumChangeVelocity) {
- if (maximumChangeVelocity != null) {
- store.put(KEY_MAXIMUM_CHANGE_VELOCITY, maximumChangeVelocity);
- } else {
- store.remove(KEY_MAXIMUM_CHANGE_VELOCITY);
- }
+ setValue(KEY_MAXIMUM_CHANGE_VELOCITY, maximumChangeVelocity);
}
public Integer getMaximumChangeVelocity() {
- return (Integer) store.get(KEY_MAXIMUM_CHANGE_VELOCITY);
+ return getInteger(KEY_MAXIMUM_CHANGE_VELOCITY);
}
public void setMultipleEvents(VehicleDataEventStatus multipleEvents) {
- if (multipleEvents != null) {
- store.put(KEY_MULTIPLE_EVENTS, multipleEvents);
- } else {
- store.remove(KEY_MULTIPLE_EVENTS);
- }
+ setValue(KEY_MULTIPLE_EVENTS, multipleEvents);
}
public VehicleDataEventStatus getMultipleEvents() {
- Object obj = store.get(KEY_MULTIPLE_EVENTS);
- if (obj instanceof VehicleDataEventStatus) {
- return (VehicleDataEventStatus) obj;
- } else if (obj instanceof String) {
- return VehicleDataEventStatus.valueForString((String) obj);
- }
- return null;
+ return (VehicleDataEventStatus) getObject(VehicleDataEventStatus.class, KEY_MULTIPLE_EVENTS);
}
}
diff --git a/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/GPSData.java b/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/GPSData.java index d76b11355..fec91005b 100644 --- a/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/GPSData.java +++ b/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/GPSData.java @@ -1,11 +1,12 @@ package com.smartdevicelink.proxy.rpc;
-import java.util.Hashtable;
-
import com.smartdevicelink.proxy.RPCStruct;
import com.smartdevicelink.proxy.rpc.enums.CompassDirection;
import com.smartdevicelink.proxy.rpc.enums.Dimension;
import com.smartdevicelink.util.SdlDataTypeConverter;
+
+import java.util.Hashtable;
+
/**
* Describes the GPS data. Not all data will be available on all carlines.
* <p><b>Parameter List</b></p>
@@ -180,11 +181,7 @@ public class GPSData extends RPCStruct { * @param longitudeDegrees
*/
public void setLongitudeDegrees(Double longitudeDegrees) {
- if (longitudeDegrees != null) {
- store.put(KEY_LONGITUDE_DEGREES, longitudeDegrees);
- } else {
- store.remove(KEY_LONGITUDE_DEGREES);
- }
+ setValue(KEY_LONGITUDE_DEGREES, longitudeDegrees);
}
/**
@@ -192,7 +189,7 @@ public class GPSData extends RPCStruct { * @return longitude degrees
*/
public Double getLongitudeDegrees() {
- Object object = store.get(KEY_LONGITUDE_DEGREES);
+ Object object = getValue(KEY_LONGITUDE_DEGREES);
return SdlDataTypeConverter.objectToDouble(object);
}
@@ -201,11 +198,7 @@ public class GPSData extends RPCStruct { * @param latitudeDegrees latitude degrees
*/
public void setLatitudeDegrees(Double latitudeDegrees) {
- if (latitudeDegrees != null) {
- store.put(KEY_LATITUDE_DEGREES, latitudeDegrees);
- } else {
- store.remove(KEY_LATITUDE_DEGREES);
- }
+ setValue(KEY_LATITUDE_DEGREES, latitudeDegrees);
}
/**
@@ -213,7 +206,7 @@ public class GPSData extends RPCStruct { * @return latitude degrees
*/
public Double getLatitudeDegrees() {
- Object object = store.get(KEY_LATITUDE_DEGREES);
+ Object object = getValue(KEY_LATITUDE_DEGREES);
return SdlDataTypeConverter.objectToDouble(object);
}
@@ -222,11 +215,7 @@ public class GPSData extends RPCStruct { * @param utcYear utc year
*/
public void setUtcYear(Integer utcYear) {
- if (utcYear != null) {
- store.put(KEY_UTC_YEAR, utcYear);
- } else {
- store.remove(KEY_UTC_YEAR);
- }
+ setValue(KEY_UTC_YEAR, utcYear);
}
/**
@@ -234,7 +223,7 @@ public class GPSData extends RPCStruct { * @return utc year
*/
public Integer getUtcYear() {
- return (Integer) store.get(KEY_UTC_YEAR);
+ return getInteger(KEY_UTC_YEAR);
}
/**
@@ -242,11 +231,7 @@ public class GPSData extends RPCStruct { * @param utcMonth utc month
*/
public void setUtcMonth(Integer utcMonth) {
- if (utcMonth != null) {
- store.put(KEY_UTC_MONTH, utcMonth);
- } else {
- store.remove(KEY_UTC_MONTH);
- }
+ setValue(KEY_UTC_MONTH, utcMonth);
}
/**
@@ -254,7 +239,7 @@ public class GPSData extends RPCStruct { * @return utc month
*/
public Integer getUtcMonth() {
- return (Integer) store.get(KEY_UTC_MONTH);
+ return getInteger(KEY_UTC_MONTH);
}
/**
@@ -262,11 +247,7 @@ public class GPSData extends RPCStruct { * @param utcDay utc day
*/
public void setUtcDay(Integer utcDay) {
- if (utcDay != null) {
- store.put(KEY_UTC_DAY, utcDay);
- } else {
- store.remove(KEY_UTC_DAY);
- }
+ setValue(KEY_UTC_DAY, utcDay);
}
/**
@@ -274,7 +255,7 @@ public class GPSData extends RPCStruct { * @return utc day
*/
public Integer getUtcDay() {
- return (Integer) store.get(KEY_UTC_DAY);
+ return getInteger(KEY_UTC_DAY);
}
/**
@@ -282,11 +263,7 @@ public class GPSData extends RPCStruct { * @param utcHours utc hours
*/
public void setUtcHours(Integer utcHours) {
- if (utcHours != null) {
- store.put(KEY_UTC_HOURS, utcHours);
- } else {
- store.remove(KEY_UTC_HOURS);
- }
+ setValue(KEY_UTC_HOURS, utcHours);
}
/**
@@ -294,7 +271,7 @@ public class GPSData extends RPCStruct { * @return utc hours
*/
public Integer getUtcHours() {
- return (Integer) store.get(KEY_UTC_HOURS);
+ return getInteger(KEY_UTC_HOURS);
}
/**
@@ -302,11 +279,7 @@ public class GPSData extends RPCStruct { * @param utcMinutes utc minutes
*/
public void setUtcMinutes(Integer utcMinutes) {
- if (utcMinutes != null) {
- store.put(KEY_UTC_MINUTES, utcMinutes);
- } else {
- store.remove(KEY_UTC_MINUTES);
- }
+ setValue(KEY_UTC_MINUTES, utcMinutes);
}
/**
@@ -314,7 +287,7 @@ public class GPSData extends RPCStruct { * @return utc minutes
*/
public Integer getUtcMinutes() {
- return (Integer) store.get(KEY_UTC_MINUTES);
+ return getInteger(KEY_UTC_MINUTES);
}
/**
@@ -322,11 +295,7 @@ public class GPSData extends RPCStruct { * @param utcSeconds utc seconds
*/
public void setUtcSeconds(Integer utcSeconds) {
- if (utcSeconds != null) {
- store.put(KEY_UTC_SECONDS, utcSeconds);
- } else {
- store.remove(KEY_UTC_SECONDS);
- }
+ setValue(KEY_UTC_SECONDS, utcSeconds);
}
/**
@@ -334,23 +303,13 @@ public class GPSData extends RPCStruct { * @return utc seconds
*/
public Integer getUtcSeconds() {
- return (Integer) store.get(KEY_UTC_SECONDS);
+ return getInteger(KEY_UTC_SECONDS);
}
public void setCompassDirection(CompassDirection compassDirection) {
- if (compassDirection != null) {
- store.put(KEY_COMPASS_DIRECTION, compassDirection);
- } else {
- store.remove(KEY_COMPASS_DIRECTION);
- }
+ setValue(KEY_COMPASS_DIRECTION, compassDirection);
}
public CompassDirection getCompassDirection() {
- Object obj = store.get(KEY_COMPASS_DIRECTION);
- if (obj instanceof CompassDirection) {
- return (CompassDirection) obj;
- } else if (obj instanceof String) {
- return CompassDirection.valueForString((String) obj);
- }
- return null;
+ return (CompassDirection) getObject(CompassDirection.class, KEY_COMPASS_DIRECTION);
}
/**
@@ -358,18 +317,14 @@ public class GPSData extends RPCStruct { * @param pdop the positional dilution of precision
*/
public void setPdop(Double pdop) {
- if (pdop != null) {
- store.put(KEY_PDOP, pdop);
- } else {
- store.remove(KEY_PDOP);
- }
+ setValue(KEY_PDOP, pdop);
}
/**
* get the positional dilution of precision
*/
public Double getPdop() {
- Object object = store.get(KEY_PDOP);
+ Object object = getValue(KEY_PDOP);
return SdlDataTypeConverter.objectToDouble(object);
}
@@ -378,11 +333,7 @@ public class GPSData extends RPCStruct { * @param hdop the horizontal dilution of precision
*/
public void setHdop(Double hdop) {
- if (hdop != null) {
- store.put(KEY_HDOP, hdop);
- } else {
- store.remove(KEY_HDOP);
- }
+ setValue(KEY_HDOP, hdop);
}
/**
@@ -390,7 +341,7 @@ public class GPSData extends RPCStruct { * @return the horizontal dilution of precision
*/
public Double getHdop() {
- Object object = store.get(KEY_HDOP);
+ Object object = getValue(KEY_HDOP);
return SdlDataTypeConverter.objectToDouble(object);
}
@@ -399,11 +350,7 @@ public class GPSData extends RPCStruct { * @param vdop the vertical dilution of precision
*/
public void setVdop(Double vdop) {
- if (vdop != null) {
- store.put(KEY_VDOP, vdop);
- } else {
- store.remove(KEY_VDOP);
- }
+ setValue(KEY_VDOP, vdop);
}
/**
@@ -411,7 +358,7 @@ public class GPSData extends RPCStruct { * @return the vertical dilution of precision
*/
public Double getVdop() {
- Object object = store.get(KEY_VDOP);
+ Object object = getValue(KEY_VDOP);
return SdlDataTypeConverter.objectToDouble(object);
}
@@ -420,11 +367,7 @@ public class GPSData extends RPCStruct { * @param actual True, if coordinates are based on satellites.False, if based on dead reckoning
*/
public void setActual(Boolean actual) {
- if (actual != null) {
- store.put(KEY_ACTUAL, actual);
- } else {
- store.remove(KEY_ACTUAL);
- }
+ setValue(KEY_ACTUAL, actual);
}
/**
@@ -432,7 +375,7 @@ public class GPSData extends RPCStruct { * @return True, if coordinates are based on satellites.False, if based on dead reckoning
*/
public Boolean getActual() {
- return (Boolean) store.get(KEY_ACTUAL);
+ return getBoolean(KEY_ACTUAL);
}
/**
@@ -440,11 +383,7 @@ public class GPSData extends RPCStruct { * @param satellites the number of satellites in view
*/
public void setSatellites(Integer satellites) {
- if (satellites != null) {
- store.put(KEY_SATELLITES, satellites);
- } else {
- store.remove(KEY_SATELLITES);
- }
+ setValue(KEY_SATELLITES, satellites);
}
/**
@@ -452,23 +391,13 @@ public class GPSData extends RPCStruct { * @return the number of satellites in view
*/
public Integer getSatellites() {
- return (Integer) store.get(KEY_SATELLITES);
+ return getInteger(KEY_SATELLITES);
}
public void setDimension(Dimension dimension) {
- if (dimension != null) {
- store.put(KEY_DIMENSION, dimension);
- } else {
- store.remove(KEY_DIMENSION);
- }
+ setValue(KEY_DIMENSION, dimension);
}
public Dimension getDimension() {
- Object obj = store.get(KEY_DIMENSION);
- if (obj instanceof Dimension) {
- return (Dimension) obj;
- } else if (obj instanceof String) {
- return Dimension.valueForString((String) obj);
- }
- return null;
+ return (Dimension) getObject(Dimension.class, KEY_DIMENSION);
}
/**
@@ -476,11 +405,7 @@ public class GPSData extends RPCStruct { * @param altitude altitude in meters
*/
public void setAltitude(Double altitude) {
- if (altitude != null) {
- store.put(KEY_ALTITUDE, altitude);
- } else {
- store.remove(KEY_ALTITUDE);
- }
+ setValue(KEY_ALTITUDE, altitude);
}
/**
@@ -488,7 +413,7 @@ public class GPSData extends RPCStruct { * @return altitude in meters
*/
public Double getAltitude() {
- Object object = store.get(KEY_ALTITUDE);
+ Object object = getValue(KEY_ALTITUDE);
return SdlDataTypeConverter.objectToDouble(object);
}
@@ -497,18 +422,14 @@ public class GPSData extends RPCStruct { * @param heading the heading.
*/
public void setHeading(Double heading) {
- if (heading != null) {
- store.put(KEY_HEADING, heading);
- } else {
- store.remove(KEY_HEADING);
- }
+ setValue(KEY_HEADING, heading);
}
/**
* get the heading
*/
public Double getHeading() {
- Object object = store.get(KEY_HEADING);
+ Object object = getValue(KEY_HEADING);
return SdlDataTypeConverter.objectToDouble(object);
}
@@ -517,11 +438,7 @@ public class GPSData extends RPCStruct { * @param speed the speed
*/
public void setSpeed(Double speed) {
- if (speed != null) {
- store.put(KEY_SPEED, speed);
- } else {
- store.remove(KEY_SPEED);
- }
+ setValue(KEY_SPEED, speed);
}
/**
@@ -529,7 +446,7 @@ public class GPSData extends RPCStruct { * @return the speed in KPH
*/
public Double getSpeed() {
- Object object = store.get(KEY_SPEED);
+ Object object = getValue(KEY_SPEED);
return SdlDataTypeConverter.objectToDouble(object);
}
}
diff --git a/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/GetDTCs.java b/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/GetDTCs.java index 41992efd3..c7f9a8824 100644 --- a/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/GetDTCs.java +++ b/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/GetDTCs.java @@ -86,7 +86,7 @@ public class GetDTCs extends RPCRequest { * <b>Notes:</p> </b>Minvalue:0; Maxvalue:65535
*/
public void setEcuName(Integer ecuName) {
- setParameters(KEY_ECU_NAME, ecuName);
+ setParameter(KEY_ECU_NAME, ecuName);
}
/**
@@ -96,12 +96,12 @@ public class GetDTCs extends RPCRequest { * receive the DTC form
*/
public Integer getEcuName() {
- return (Integer) parameters.get(KEY_ECU_NAME);
+ return getInteger(KEY_ECU_NAME);
}
public void setDtcMask(Integer dtcMask) {
- setParameters(KEY_DTC_MASK, dtcMask);
+ setParameter(KEY_DTC_MASK, dtcMask);
}
public Integer getDtcMask() {
- return (Integer) parameters.get(KEY_DTC_MASK);
+ return getInteger(KEY_DTC_MASK);
}
}
diff --git a/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/GetDTCsResponse.java b/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/GetDTCsResponse.java index 459353273..f1bcfd316 100644 --- a/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/GetDTCsResponse.java +++ b/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/GetDTCsResponse.java @@ -6,8 +6,6 @@ import com.smartdevicelink.proxy.RPCResponse; import java.util.Hashtable;
import java.util.List;
-import static com.smartdevicelink.proxy.constants.Names.choiceSet;
-
/**
* Get DTCs Response is sent, when GetDTCs has been called
*
@@ -28,27 +26,18 @@ public class GetDTCsResponse extends RPCResponse{ @SuppressWarnings("unchecked")
public List<String> getDtc(){
- if(parameters.get(KEY_DTC) instanceof List<?>){
- List<?> list = (List<?>) parameters.get(KEY_DTC);
- if(list != null && list.size() > 0){
- Object obj = list.get(0);
- if(obj instanceof String){
- return (List<String>) list;
- }
- }
- }
- return null;
+ return (List<String>) getObject(String.class, KEY_DTC);
}
public void setDtc(List<String> dtc){
- setParameters(KEY_DTC, dtc);
+ setParameter(KEY_DTC, dtc);
}
public Integer getEcuHeader(){
- return (Integer) parameters.get(KEY_ECU_HEADER);
+ return getInteger(KEY_ECU_HEADER);
}
public void setEcuHeader(Integer ecuHeader){
- setParameters(KEY_ECU_HEADER, ecuHeader);
+ setParameter(KEY_ECU_HEADER, ecuHeader);
}
}
diff --git a/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/GetVehicleData.java b/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/GetVehicleData.java index 0a615a4ac..018c2e8bf 100644 --- a/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/GetVehicleData.java +++ b/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/GetVehicleData.java @@ -256,28 +256,28 @@ public class GetVehicleData extends RPCRequest { super(hash);
}
public void setGps(Boolean gps) {
- setParameters(KEY_GPS, gps);
+ setParameter(KEY_GPS, gps);
}
public Boolean getGps() {
- return (Boolean) parameters.get(KEY_GPS);
+ return getBoolean(KEY_GPS);
}
public void setSpeed(Boolean speed) {
- setParameters(KEY_SPEED, speed);
+ setParameter(KEY_SPEED, speed);
}
public Boolean getSpeed() {
- return (Boolean) parameters.get(KEY_SPEED);
+ return getBoolean(KEY_SPEED);
}
public void setRpm(Boolean rpm) {
- setParameters(KEY_RPM, rpm);
+ setParameter(KEY_RPM, rpm);
}
public Boolean getRpm() {
- return (Boolean) parameters.get(KEY_RPM);
+ return getBoolean(KEY_RPM);
}
public void setFuelLevel(Boolean fuelLevel) {
- setParameters(KEY_FUEL_LEVEL, fuelLevel);
+ setParameter(KEY_FUEL_LEVEL, fuelLevel);
}
public Boolean getFuelLevel() {
- return (Boolean) parameters.get(KEY_FUEL_LEVEL);
+ return getBoolean(KEY_FUEL_LEVEL);
}
@Deprecated
public void setFuelLevel_State(Boolean fuelLevel_State) {
@@ -288,134 +288,134 @@ public class GetVehicleData extends RPCRequest { return getFuelLevelState();
}
public void setFuelLevelState(Boolean fuelLevelState) {
- setParameters(KEY_FUEL_LEVEL_STATE, fuelLevelState);
+ setParameter(KEY_FUEL_LEVEL_STATE, fuelLevelState);
}
public Boolean getFuelLevelState() {
- return (Boolean) parameters.get(KEY_FUEL_LEVEL_STATE);
+ return getBoolean(KEY_FUEL_LEVEL_STATE);
}
public void setInstantFuelConsumption(Boolean instantFuelConsumption) {
- setParameters(KEY_INSTANT_FUEL_CONSUMPTION, instantFuelConsumption);
+ setParameter(KEY_INSTANT_FUEL_CONSUMPTION, instantFuelConsumption);
}
public Boolean getInstantFuelConsumption() {
- return (Boolean) parameters.get(KEY_INSTANT_FUEL_CONSUMPTION);
+ return getBoolean(KEY_INSTANT_FUEL_CONSUMPTION);
}
public void setExternalTemperature(Boolean externalTemperature) {
- setParameters(KEY_EXTERNAL_TEMPERATURE, externalTemperature);
+ setParameter(KEY_EXTERNAL_TEMPERATURE, externalTemperature);
}
public Boolean getExternalTemperature() {
- return (Boolean) parameters.get(KEY_EXTERNAL_TEMPERATURE);
+ return getBoolean(KEY_EXTERNAL_TEMPERATURE);
}
public void setVin(Boolean vin) {
- setParameters(KEY_VIN, vin);
+ setParameter(KEY_VIN, vin);
}
public Boolean getVin() {
- return (Boolean) parameters.get(KEY_VIN);
+ return getBoolean(KEY_VIN);
}
public void setPrndl(Boolean prndl) {
- setParameters(KEY_PRNDL, prndl);
+ setParameter(KEY_PRNDL, prndl);
}
public Boolean getPrndl() {
- return (Boolean) parameters.get(KEY_PRNDL);
+ return getBoolean(KEY_PRNDL);
}
public void setTirePressure(Boolean tirePressure) {
- setParameters(KEY_TIRE_PRESSURE, tirePressure);
+ setParameter(KEY_TIRE_PRESSURE, tirePressure);
}
public Boolean getTirePressure() {
- return (Boolean) parameters.get(KEY_TIRE_PRESSURE);
+ return getBoolean(KEY_TIRE_PRESSURE);
}
public void setOdometer(Boolean odometer) {
- setParameters(KEY_ODOMETER, odometer);
+ setParameter(KEY_ODOMETER, odometer);
}
public Boolean getOdometer() {
- return (Boolean) parameters.get(KEY_ODOMETER);
+ return getBoolean(KEY_ODOMETER);
}
public void setBeltStatus(Boolean beltStatus) {
- setParameters(KEY_BELT_STATUS, beltStatus);
+ setParameter(KEY_BELT_STATUS, beltStatus);
}
public Boolean getBeltStatus() {
- return (Boolean) parameters.get(KEY_BELT_STATUS);
+ return getBoolean(KEY_BELT_STATUS);
}
public void setBodyInformation(Boolean bodyInformation) {
- setParameters(KEY_BODY_INFORMATION, bodyInformation);
+ setParameter(KEY_BODY_INFORMATION, bodyInformation);
}
public Boolean getBodyInformation() {
- return (Boolean) parameters.get(KEY_BODY_INFORMATION);
+ return getBoolean(KEY_BODY_INFORMATION);
}
public void setDeviceStatus(Boolean deviceStatus) {
- setParameters(KEY_DEVICE_STATUS, deviceStatus);
+ setParameter(KEY_DEVICE_STATUS, deviceStatus);
}
public Boolean getDeviceStatus() {
- return (Boolean) parameters.get(KEY_DEVICE_STATUS);
+ return getBoolean(KEY_DEVICE_STATUS);
}
public void setDriverBraking(Boolean driverBraking) {
- setParameters(KEY_DRIVER_BRAKING, driverBraking);
+ setParameter(KEY_DRIVER_BRAKING, driverBraking);
}
public Boolean getDriverBraking() {
- return (Boolean) parameters.get(KEY_DRIVER_BRAKING);
+ return getBoolean(KEY_DRIVER_BRAKING);
}
public void setWiperStatus(Boolean wiperStatus) {
- setParameters(KEY_WIPER_STATUS, wiperStatus);
+ setParameter(KEY_WIPER_STATUS, wiperStatus);
}
public Boolean getWiperStatus() {
- return (Boolean) parameters.get(KEY_WIPER_STATUS);
+ return getBoolean(KEY_WIPER_STATUS);
}
public void setHeadLampStatus(Boolean headLampStatus) {
- setParameters(KEY_HEAD_LAMP_STATUS, headLampStatus);
+ setParameter(KEY_HEAD_LAMP_STATUS, headLampStatus);
}
public Boolean getHeadLampStatus() {
- return (Boolean) parameters.get(KEY_HEAD_LAMP_STATUS);
+ return getBoolean(KEY_HEAD_LAMP_STATUS);
}
public void setEngineTorque(Boolean engineTorque) {
- setParameters(KEY_ENGINE_TORQUE, engineTorque);
+ setParameter(KEY_ENGINE_TORQUE, engineTorque);
}
public Boolean getEngineTorque() {
- return (Boolean) parameters.get(KEY_ENGINE_TORQUE);
+ return getBoolean(KEY_ENGINE_TORQUE);
}
public void setAccPedalPosition(Boolean accPedalPosition) {
- setParameters(KEY_ACC_PEDAL_POSITION, accPedalPosition);
+ setParameter(KEY_ACC_PEDAL_POSITION, accPedalPosition);
}
public Boolean getAccPedalPosition() {
- return (Boolean) parameters.get(KEY_ACC_PEDAL_POSITION);
+ return getBoolean(KEY_ACC_PEDAL_POSITION);
}
public void setSteeringWheelAngle(Boolean steeringWheelAngle) {
- setParameters(KEY_STEERING_WHEEL_ANGLE, steeringWheelAngle);
+ setParameter(KEY_STEERING_WHEEL_ANGLE, steeringWheelAngle);
}
public Boolean getSteeringWheelAngle() {
- return (Boolean) parameters.get(KEY_STEERING_WHEEL_ANGLE);
+ return getBoolean(KEY_STEERING_WHEEL_ANGLE);
}
public void setECallInfo(Boolean eCallInfo) {
- setParameters(KEY_E_CALL_INFO, eCallInfo);
+ setParameter(KEY_E_CALL_INFO, eCallInfo);
}
public Boolean getECallInfo() {
- return (Boolean) parameters.get(KEY_E_CALL_INFO);
+ return getBoolean(KEY_E_CALL_INFO);
}
public void setAirbagStatus(Boolean airbagStatus) {
- setParameters(KEY_AIRBAG_STATUS, airbagStatus);
+ setParameter(KEY_AIRBAG_STATUS, airbagStatus);
}
public Boolean getAirbagStatus() {
- return (Boolean) parameters.get(KEY_AIRBAG_STATUS);
+ return getBoolean(KEY_AIRBAG_STATUS);
}
public void setEmergencyEvent(Boolean emergencyEvent) {
- setParameters(KEY_EMERGENCY_EVENT, emergencyEvent);
+ setParameter(KEY_EMERGENCY_EVENT, emergencyEvent);
}
public Boolean getEmergencyEvent() {
- return (Boolean) parameters.get(KEY_EMERGENCY_EVENT);
+ return getBoolean(KEY_EMERGENCY_EVENT);
}
public void setClusterModeStatus(Boolean clusterModeStatus) {
- setParameters(KEY_CLUSTER_MODE_STATUS, clusterModeStatus);
+ setParameter(KEY_CLUSTER_MODE_STATUS, clusterModeStatus);
}
public Boolean getClusterModeStatus() {
- return (Boolean) parameters.get(KEY_CLUSTER_MODE_STATUS);
+ return getBoolean(KEY_CLUSTER_MODE_STATUS);
}
public void setMyKey(Boolean myKey) {
- setParameters(KEY_MY_KEY, myKey);
+ setParameter(KEY_MY_KEY, myKey);
}
public Boolean getMyKey() {
- return (Boolean) parameters.get(KEY_MY_KEY);
+ return getBoolean(KEY_MY_KEY);
}
}
diff --git a/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/GetVehicleDataResponse.java b/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/GetVehicleDataResponse.java index dd154e10b..86b73ed46 100644 --- a/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/GetVehicleDataResponse.java +++ b/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/GetVehicleDataResponse.java @@ -7,7 +7,6 @@ import com.smartdevicelink.proxy.rpc.enums.ComponentVolumeStatus; import com.smartdevicelink.proxy.rpc.enums.PRNDL;
import com.smartdevicelink.proxy.rpc.enums.VehicleDataEventStatus;
import com.smartdevicelink.proxy.rpc.enums.WiperStatus;
-import com.smartdevicelink.util.DebugTool;
import com.smartdevicelink.util.SdlDataTypeConverter;
import java.util.Hashtable;
@@ -55,42 +54,30 @@ public class GetVehicleDataResponse extends RPCResponse { super(hash);
}
public void setGps(GPSData gps) {
- setParameters(KEY_GPS, gps);
+ setParameter(KEY_GPS, gps);
}
@SuppressWarnings("unchecked")
public GPSData getGps() {
- Object obj = parameters.get(KEY_GPS);
- if (obj instanceof GPSData) {
- return (GPSData) obj;
- } else if (obj instanceof Hashtable) {
- GPSData theCode = null;
- try {
- theCode = new GPSData((Hashtable<String, Object>) obj);
- } catch (Exception e) {
- DebugTool.logError("Failed to parse " + getClass().getSimpleName() + "." + KEY_GPS, e);
- }
- return theCode;
- }
- return null;
+ return (GPSData) getObject(GPSData.class, KEY_GPS);
}
public void setSpeed(Double speed) {
- setParameters(KEY_SPEED, speed);
+ setParameter(KEY_SPEED, speed);
}
public Double getSpeed() {
- Object object = parameters.get(KEY_SPEED);
+ Object object = getParameter(KEY_SPEED);
return SdlDataTypeConverter.objectToDouble(object);
}
public void setRpm(Integer rpm) {
- setParameters(KEY_RPM, rpm);
+ setParameter(KEY_RPM, rpm);
}
public Integer getRpm() {
- return (Integer) parameters.get(KEY_RPM);
+ return getInteger(KEY_RPM);
}
public void setFuelLevel(Double fuelLevel) {
- setParameters(KEY_FUEL_LEVEL, fuelLevel);
+ setParameter(KEY_FUEL_LEVEL, fuelLevel);
}
public Double getFuelLevel() {
- Object object = parameters.get(KEY_FUEL_LEVEL);
+ Object object = getParameter(KEY_FUEL_LEVEL);
return SdlDataTypeConverter.objectToDouble(object);
}
@Deprecated
@@ -102,280 +89,150 @@ public class GetVehicleDataResponse extends RPCResponse { return getFuelLevelState();
}
public void setFuelLevelState(ComponentVolumeStatus fuelLevelState) {
- setParameters(KEY_FUEL_LEVEL_STATE, fuelLevelState);
+ setParameter(KEY_FUEL_LEVEL_STATE, fuelLevelState);
}
public ComponentVolumeStatus getFuelLevelState() {
- Object obj = parameters.get(KEY_FUEL_LEVEL_STATE);
- if (obj instanceof ComponentVolumeStatus) {
- return (ComponentVolumeStatus) obj;
- } else if (obj instanceof String) {
- ComponentVolumeStatus theCode = null;
- try {
- theCode = ComponentVolumeStatus.valueForString((String) obj);
- } catch (Exception e) {
- DebugTool.logError("Failed to parse " + getClass().getSimpleName() + "." + KEY_FUEL_LEVEL_STATE, e);
- }
- return theCode;
- }
- return null;
+ return (ComponentVolumeStatus) getObject(ComponentVolumeStatus.class, KEY_FUEL_LEVEL_STATE);
}
public void setInstantFuelConsumption(Double instantFuelConsumption) {
- setParameters(KEY_INSTANT_FUEL_CONSUMPTION, instantFuelConsumption);
+ setParameter(KEY_INSTANT_FUEL_CONSUMPTION, instantFuelConsumption);
}
public Double getInstantFuelConsumption() {
- Object object = parameters.get(KEY_INSTANT_FUEL_CONSUMPTION);
+ Object object = getParameter(KEY_INSTANT_FUEL_CONSUMPTION);
return SdlDataTypeConverter.objectToDouble(object);
}
public void setExternalTemperature(Double externalTemperature) {
- setParameters(KEY_EXTERNAL_TEMPERATURE, externalTemperature);
+ setParameter(KEY_EXTERNAL_TEMPERATURE, externalTemperature);
}
public Double getExternalTemperature() {
- Object object = parameters.get(KEY_EXTERNAL_TEMPERATURE);
+ Object object = getParameter(KEY_EXTERNAL_TEMPERATURE);
return SdlDataTypeConverter.objectToDouble(object);
}
public void setVin(String vin) {
- setParameters(KEY_VIN, vin);
+ setParameter(KEY_VIN, vin);
}
public String getVin() {
- return (String) parameters.get(KEY_VIN);
+ return getString(KEY_VIN);
}
public void setPrndl(PRNDL prndl) {
- setParameters(KEY_PRNDL, prndl);
+ setParameter(KEY_PRNDL, prndl);
}
public PRNDL getPrndl() {
- Object obj = parameters.get(KEY_PRNDL);
- if (obj instanceof PRNDL) {
- return (PRNDL) obj;
- } else if (obj instanceof String) {
- return PRNDL.valueForString((String) obj);
- }
- return null;
+ return (PRNDL) getObject(PRNDL.class, KEY_PRNDL);
}
public void setTirePressure(TireStatus tirePressure) {
- setParameters(KEY_TIRE_PRESSURE, tirePressure);
+ setParameter(KEY_TIRE_PRESSURE, tirePressure);
}
@SuppressWarnings("unchecked")
public TireStatus getTirePressure() {
- Object obj = parameters.get(KEY_TIRE_PRESSURE);
- if (obj instanceof TireStatus) {
- return (TireStatus) obj;
- } else if (obj instanceof Hashtable) {
- try {
- return new TireStatus((Hashtable<String, Object>) obj);
- } catch (Exception e) {
- DebugTool.logError("Failed to parse " + getClass().getSimpleName() + "." + KEY_TIRE_PRESSURE, e);
- }
- }
- return null;
+ return (TireStatus) getObject(TireStatus.class, KEY_TIRE_PRESSURE);
}
public void setOdometer(Integer odometer) {
- setParameters(KEY_ODOMETER, odometer);
+ setParameter(KEY_ODOMETER, odometer);
}
public Integer getOdometer() {
- return (Integer) parameters.get(KEY_ODOMETER);
+ return getInteger(KEY_ODOMETER);
}
public void setBeltStatus(BeltStatus beltStatus) {
- setParameters(KEY_BELT_STATUS, beltStatus);
+ setParameter(KEY_BELT_STATUS, beltStatus);
}
@SuppressWarnings("unchecked")
public BeltStatus getBeltStatus() {
- Object obj = parameters.get(KEY_BELT_STATUS);
- if (obj instanceof BeltStatus) {
- return (BeltStatus) obj;
- } else if (obj instanceof Hashtable) {
- try {
- return new BeltStatus((Hashtable<String, Object>) obj);
- } catch (Exception e) {
- DebugTool.logError("Failed to parse " + getClass().getSimpleName() + "." + KEY_BELT_STATUS, e);
- }
- }
- return null;
+ return (BeltStatus) getObject(BeltStatus.class, KEY_BELT_STATUS);
}
public void setBodyInformation(BodyInformation bodyInformation) {
- setParameters(KEY_BODY_INFORMATION, bodyInformation);
+ setParameter(KEY_BODY_INFORMATION, bodyInformation);
}
@SuppressWarnings("unchecked")
public BodyInformation getBodyInformation() {
- Object obj = parameters.get(KEY_BODY_INFORMATION);
- if (obj instanceof BodyInformation) {
- return (BodyInformation) obj;
- } else if (obj instanceof Hashtable) {
- try {
- return new BodyInformation((Hashtable<String, Object>) obj);
- } catch (Exception e) {
- DebugTool.logError("Failed to parse " + getClass().getSimpleName() + "." + KEY_BODY_INFORMATION, e);
- }
- }
- return null;
+ return (BodyInformation) getObject(BodyInformation.class, KEY_BODY_INFORMATION);
}
public void setDeviceStatus(DeviceStatus deviceStatus) {
- setParameters(KEY_DEVICE_STATUS, deviceStatus);
+ setParameter(KEY_DEVICE_STATUS, deviceStatus);
}
@SuppressWarnings("unchecked")
public DeviceStatus getDeviceStatus() {
- Object obj = parameters.get(KEY_DEVICE_STATUS);
- if (obj instanceof DeviceStatus) {
- return (DeviceStatus) obj;
- } else if (obj instanceof Hashtable) {
- try {
- return new DeviceStatus((Hashtable<String, Object>) obj);
- } catch (Exception e) {
- DebugTool.logError("Failed to parse " + getClass().getSimpleName() + "." + KEY_DEVICE_STATUS, e);
- }
- }
- return null;
+ return (DeviceStatus) getObject(DeviceStatus.class, KEY_DEVICE_STATUS);
}
public void setDriverBraking(VehicleDataEventStatus driverBraking) {
- setParameters(KEY_DRIVER_BRAKING, driverBraking);
+ setParameter(KEY_DRIVER_BRAKING, driverBraking);
}
public VehicleDataEventStatus getDriverBraking() {
- Object obj = parameters.get(KEY_DRIVER_BRAKING);
- if (obj instanceof VehicleDataEventStatus) {
- return (VehicleDataEventStatus) obj;
- } else if (obj instanceof String) {
- return VehicleDataEventStatus.valueForString((String) obj);
- }
- return null;
+ return (VehicleDataEventStatus) getObject(VehicleDataEventStatus.class, KEY_DRIVER_BRAKING);
}
public void setWiperStatus(WiperStatus wiperStatus) {
- setParameters(KEY_WIPER_STATUS, wiperStatus);
+ setParameter(KEY_WIPER_STATUS, wiperStatus);
}
public WiperStatus getWiperStatus() {
- Object obj = parameters.get(KEY_WIPER_STATUS);
- if (obj instanceof WiperStatus) {
- return (WiperStatus) obj;
- } else if (obj instanceof String) {
- return WiperStatus.valueForString((String) obj);
- }
- return null;
+ return (WiperStatus) getObject(WiperStatus.class, KEY_WIPER_STATUS);
}
public void setHeadLampStatus(HeadLampStatus headLampStatus) {
- setParameters(KEY_HEAD_LAMP_STATUS, headLampStatus);
+ setParameter(KEY_HEAD_LAMP_STATUS, headLampStatus);
}
@SuppressWarnings("unchecked")
public HeadLampStatus getHeadLampStatus() {
- Object obj = parameters.get(KEY_HEAD_LAMP_STATUS);
- if (obj instanceof HeadLampStatus) {
- return (HeadLampStatus) obj;
- } else if (obj instanceof Hashtable) {
- try {
- return new HeadLampStatus((Hashtable<String, Object>) obj);
- } catch (Exception e) {
- DebugTool.logError("Failed to parse " + getClass().getSimpleName() + "." + KEY_HEAD_LAMP_STATUS, e);
- }
- }
- return null;
+ return (HeadLampStatus) getObject(HeadLampStatus.class, KEY_HEAD_LAMP_STATUS);
}
public void setEngineTorque(Double engineTorque) {
- setParameters(KEY_ENGINE_TORQUE, engineTorque);
+ setParameter(KEY_ENGINE_TORQUE, engineTorque);
}
public Double getEngineTorque() {
- Object object = parameters.get(KEY_ENGINE_TORQUE);
+ Object object = getParameter(KEY_ENGINE_TORQUE);
return SdlDataTypeConverter.objectToDouble(object);
}
public void setAccPedalPosition(Double accPedalPosition) {
- setParameters(KEY_ACC_PEDAL_POSITION, accPedalPosition);
+ setParameter(KEY_ACC_PEDAL_POSITION, accPedalPosition);
}
public Double getAccPedalPosition() {
- Object object = parameters.get(KEY_ACC_PEDAL_POSITION);
+ Object object = getParameter(KEY_ACC_PEDAL_POSITION);
return SdlDataTypeConverter.objectToDouble(object);
}
public void setSteeringWheelAngle(Double steeringWheelAngle) {
- setParameters(KEY_STEERING_WHEEL_ANGLE, steeringWheelAngle);
+ setParameter(KEY_STEERING_WHEEL_ANGLE, steeringWheelAngle);
}
public Double getSteeringWheelAngle() {
- Object object = parameters.get(KEY_STEERING_WHEEL_ANGLE);
+ Object object = getParameter(KEY_STEERING_WHEEL_ANGLE);
return SdlDataTypeConverter.objectToDouble(object);
}
public void setECallInfo(ECallInfo eCallInfo) {
- setParameters(KEY_E_CALL_INFO, eCallInfo);
+ setParameter(KEY_E_CALL_INFO, eCallInfo);
}
@SuppressWarnings("unchecked")
public ECallInfo getECallInfo() {
- Object obj = parameters.get(KEY_E_CALL_INFO);
- if (obj instanceof ECallInfo) {
- return (ECallInfo) obj;
- } else if (obj instanceof Hashtable) {
- try {
- return new ECallInfo((Hashtable<String, Object>) obj);
- } catch (Exception e) {
- DebugTool.logError("Failed to parse " + getClass().getSimpleName() + "." + KEY_E_CALL_INFO, e);
- }
- }
- return null;
+ return (ECallInfo) getObject(ECallInfo.class, KEY_E_CALL_INFO);
}
public void setAirbagStatus(AirbagStatus airbagStatus) {
- setParameters(KEY_AIRBAG_STATUS, airbagStatus);
+ setParameter(KEY_AIRBAG_STATUS, airbagStatus);
}
@SuppressWarnings("unchecked")
public AirbagStatus getAirbagStatus() {
- Object obj = parameters.get(KEY_AIRBAG_STATUS);
- if (obj instanceof AirbagStatus) {
- return (AirbagStatus) obj;
- } else if (obj instanceof Hashtable) {
- try {
- return new AirbagStatus((Hashtable<String, Object>) obj);
- } catch (Exception e) {
- DebugTool.logError("Failed to parse " + getClass().getSimpleName() + "." + KEY_AIRBAG_STATUS, e);
- }
- }
- return null;
+ return (AirbagStatus) getObject(AirbagStatus.class, KEY_AIRBAG_STATUS);
}
public void setEmergencyEvent(EmergencyEvent emergencyEvent) {
- setParameters(KEY_EMERGENCY_EVENT, emergencyEvent);
+ setParameter(KEY_EMERGENCY_EVENT, emergencyEvent);
}
@SuppressWarnings("unchecked")
public EmergencyEvent getEmergencyEvent() {
- Object obj = parameters.get(KEY_EMERGENCY_EVENT);
- if (obj instanceof EmergencyEvent) {
- return (EmergencyEvent) obj;
- } else if (obj instanceof Hashtable) {
- try {
- return new EmergencyEvent((Hashtable<String, Object>) obj);
- } catch (Exception e) {
- DebugTool.logError("Failed to parse " + getClass().getSimpleName() + "." + KEY_EMERGENCY_EVENT, e);
- }
- }
- return null;
+ return (EmergencyEvent) getObject(EmergencyEvent.class, KEY_EMERGENCY_EVENT);
}
public void setClusterModeStatus(ClusterModeStatus clusterModeStatus) {
- setParameters(KEY_CLUSTER_MODE_STATUS, clusterModeStatus);
+ setParameter(KEY_CLUSTER_MODE_STATUS, clusterModeStatus);
}
@SuppressWarnings("unchecked")
public ClusterModeStatus getClusterModeStatus() {
- Object obj = parameters.get(KEY_CLUSTER_MODE_STATUS);
- if (obj instanceof ClusterModeStatus) {
- return (ClusterModeStatus) obj;
- } else if (obj instanceof Hashtable) {
- try {
- return new ClusterModeStatus((Hashtable<String, Object>) obj);
- } catch (Exception e) {
- DebugTool.logError("Failed to parse " + getClass().getSimpleName() + "." + KEY_CLUSTER_MODE_STATUS, e);
- }
- }
- return null;
+ return (ClusterModeStatus) getObject(ClusterModeStatus.class, KEY_CLUSTER_MODE_STATUS);
}
public void setMyKey(MyKey myKey) {
- setParameters(KEY_MY_KEY, myKey);
+ setParameter(KEY_MY_KEY, myKey);
}
@SuppressWarnings("unchecked")
public MyKey getMyKey() {
- Object obj = parameters.get(KEY_MY_KEY);
- if (obj instanceof MyKey) {
- return (MyKey) obj;
- } else if (obj instanceof Hashtable) {
- try {
- return new MyKey((Hashtable<String, Object>) obj);
- } catch (Exception e) {
- DebugTool.logError("Failed to parse " + getClass().getSimpleName() + "." + KEY_MY_KEY, e);
- }
- }
- return null;
+ return (MyKey) getObject(MyKey.class, KEY_MY_KEY);
}
}
diff --git a/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/GetWayPoints.java b/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/GetWayPoints.java index 9f2a4807e..a8d5e2d1d 100644 --- a/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/GetWayPoints.java +++ b/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/GetWayPoints.java @@ -18,16 +18,10 @@ public class GetWayPoints extends RPCRequest { } public WayPointType getWayPointType() { - Object obj = parameters.get(KEY_WAY_POINT_TYPE); - if (obj instanceof WayPointType) { - return (WayPointType) obj; - } else if (obj instanceof String) { - return WayPointType.valueForString((String) obj); - } - return null; + return (WayPointType) getObject(WayPointType.class, KEY_WAY_POINT_TYPE); } public void setWayPointType(WayPointType wayPointType) { - setParameters(KEY_WAY_POINT_TYPE, wayPointType); + setParameter(KEY_WAY_POINT_TYPE, wayPointType); } } diff --git a/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/GetWayPointsResponse.java b/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/GetWayPointsResponse.java index 9c6ad8d99..ded55e19c 100644 --- a/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/GetWayPointsResponse.java +++ b/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/GetWayPointsResponse.java @@ -3,7 +3,6 @@ package com.smartdevicelink.proxy.rpc; import com.smartdevicelink.protocol.enums.FunctionID; import com.smartdevicelink.proxy.RPCResponse; -import java.util.ArrayList; import java.util.Hashtable; import java.util.List; @@ -18,25 +17,10 @@ public class GetWayPointsResponse extends RPCResponse { } public void setWayPoints(List<LocationDetails> wayPoints) { - setParameters(KEY_WAY_POINTS, wayPoints); + setParameter(KEY_WAY_POINTS, wayPoints); } @SuppressWarnings("unchecked") public List<LocationDetails> getWayPoints() { - if (parameters.get(KEY_WAY_POINTS) instanceof List<?>) { - List<?> list = (List<?>)parameters.get(KEY_WAY_POINTS); - if (list != null && list.size() > 0) { - Object obj = list.get(0); - if (obj instanceof LocationDetails) { - return (List<LocationDetails>) list; - } else if (obj instanceof Hashtable) { - List<LocationDetails> newList = new ArrayList<LocationDetails>(); - for (Object hashObj : list) { - newList.add(new LocationDetails((Hashtable<String, Object>)hashObj)); - } - return newList; - } - } - } - return null; + return (List<LocationDetails>) getObject(LocationDetails.class, KEY_WAY_POINTS); } } diff --git a/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/HMICapabilities.java b/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/HMICapabilities.java index efc94f57c..accc18aba 100644 --- a/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/HMICapabilities.java +++ b/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/HMICapabilities.java @@ -1,9 +1,9 @@ package com.smartdevicelink.proxy.rpc; -import java.util.Hashtable; - import com.smartdevicelink.proxy.RPCStruct; +import java.util.Hashtable; + public class HMICapabilities extends RPCStruct{ public static final String KEY_NAVIGATION = "navigation"; public static final String KEY_PHONE_CALL = "phoneCall"; @@ -15,7 +15,7 @@ public class HMICapabilities extends RPCStruct{ } public boolean isNavigationAvailable(){ - Object available = store.get(KEY_NAVIGATION); + Object available = getValue(KEY_NAVIGATION); if(available == null){ return false; } @@ -23,15 +23,11 @@ public class HMICapabilities extends RPCStruct{ } public void setNavigationAvilable(Boolean available){ - if (available) { - store.put(KEY_NAVIGATION, available); - } else { - store.remove(KEY_NAVIGATION); - } + setValue(KEY_NAVIGATION, available); } public boolean isPhoneCallAvailable(){ - Object available = store.get(KEY_PHONE_CALL); + Object available = getValue(KEY_PHONE_CALL); if(available == null){ return false; } @@ -39,11 +35,7 @@ public class HMICapabilities extends RPCStruct{ } public void setPhoneCallAvilable(Boolean available){ - if (available) { - store.put(KEY_PHONE_CALL, available); - } else { - store.remove(KEY_PHONE_CALL); - } + setValue(KEY_PHONE_CALL, available); } } diff --git a/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/HMIPermissions.java b/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/HMIPermissions.java index d8223279a..bf2184d0c 100644 --- a/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/HMIPermissions.java +++ b/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/HMIPermissions.java @@ -1,11 +1,11 @@ package com.smartdevicelink.proxy.rpc;
-import java.util.ArrayList;
+import com.smartdevicelink.proxy.RPCStruct;
+import com.smartdevicelink.proxy.rpc.enums.HMILevel;
+
import java.util.Hashtable;
import java.util.List;
-import com.smartdevicelink.proxy.RPCStruct;
-import com.smartdevicelink.proxy.rpc.enums.HMILevel;
/**
* Defining sets of HMI levels, which are permitted or prohibited for a given RPC.
* <p><b>Parameter List</b></p>
@@ -63,26 +63,7 @@ public class HMIPermissions extends RPCStruct { */
@SuppressWarnings("unchecked")
public List<HMILevel> getAllowed() {
- if (store.get(KEY_ALLOWED) instanceof List<?>) {
- List<?> list = (List<?>)store.get(KEY_ALLOWED);
- if (list != null && list.size() > 0) {
- Object obj = list.get(0);
- if (obj instanceof HMILevel) {
- return (List<HMILevel>) list;
- } else if (obj instanceof String) {
- List<HMILevel> newList = new ArrayList<HMILevel>();
- for (Object hashObj : list) {
- String strFormat = (String)hashObj;
- HMILevel toAdd = HMILevel.valueForString(strFormat);
- if (toAdd != null) {
- newList.add(toAdd);
- }
- }
- return newList;
- }
- }
- }
- return null;
+ return (List<HMILevel>) getObject(HMILevel.class, KEY_ALLOWED);
}
/**
@@ -90,11 +71,7 @@ public class HMIPermissions extends RPCStruct { * @param allowed HMI level that is permitted for this given RPC
*/
public void setAllowed(List<HMILevel> allowed) {
- if (allowed != null) {
- store.put(KEY_ALLOWED, allowed);
- } else {
- store.remove(KEY_ALLOWED);
- }
+ setValue(KEY_ALLOWED, allowed);
}
/**
@@ -103,26 +80,7 @@ public class HMIPermissions extends RPCStruct { */
@SuppressWarnings("unchecked")
public List<HMILevel> getUserDisallowed() {
- if (store.get(KEY_USER_DISALLOWED) instanceof List<?>) {
- List<?> list = (List<?>)store.get(KEY_USER_DISALLOWED);
- if (list != null && list.size() > 0) {
- Object obj = list.get(0);
- if (obj instanceof HMILevel) {
- return (List<HMILevel>) list;
- } else if (obj instanceof String) {
- List<HMILevel> newList = new ArrayList<HMILevel>();
- for (Object hashObj : list) {
- String strFormat = (String)hashObj;
- HMILevel toAdd = HMILevel.valueForString(strFormat);
- if (toAdd != null) {
- newList.add(toAdd);
- }
- }
- return newList;
- }
- }
- }
- return null;
+ return (List<HMILevel>) getObject(HMILevel.class, KEY_USER_DISALLOWED);
}
/**
@@ -130,10 +88,6 @@ public class HMIPermissions extends RPCStruct { * @param userDisallowed HMI level that is prohibited for this given RPC
*/
public void setUserDisallowed(List<HMILevel> userDisallowed) {
- if (userDisallowed != null) {
- store.put(KEY_USER_DISALLOWED, userDisallowed);
- } else {
- store.remove(KEY_USER_DISALLOWED);
- }
+ setValue(KEY_USER_DISALLOWED, userDisallowed);
}
}
diff --git a/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/HeadLampStatus.java b/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/HeadLampStatus.java index 46a982fe2..935b8357e 100644 --- a/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/HeadLampStatus.java +++ b/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/HeadLampStatus.java @@ -55,39 +55,21 @@ public class HeadLampStatus extends RPCStruct { super(hash);
}
public void setAmbientLightStatus(AmbientLightStatus ambientLightSensorStatus) {
- if (ambientLightSensorStatus != null) {
- store.put(KEY_AMBIENT_LIGHT_SENSOR_STATUS, ambientLightSensorStatus);
- } else {
- store.remove(KEY_AMBIENT_LIGHT_SENSOR_STATUS);
- }
+ setValue(KEY_AMBIENT_LIGHT_SENSOR_STATUS, ambientLightSensorStatus);
}
public AmbientLightStatus getAmbientLightStatus() {
- Object obj = store.get(KEY_AMBIENT_LIGHT_SENSOR_STATUS);
- if (obj instanceof AmbientLightStatus) {
- return (AmbientLightStatus) obj;
- } else if (obj instanceof String) {
- return AmbientLightStatus.valueForString((String) obj);
- }
- return null;
+ return (AmbientLightStatus) getObject(AmbientLightStatus.class, KEY_AMBIENT_LIGHT_SENSOR_STATUS);
}
public void setHighBeamsOn(Boolean highBeamsOn) {
- if (highBeamsOn != null) {
- store.put(KEY_HIGH_BEAMS_ON, highBeamsOn);
- } else {
- store.remove(KEY_HIGH_BEAMS_ON);
- }
+ setValue(KEY_HIGH_BEAMS_ON, highBeamsOn);
}
public Boolean getHighBeamsOn() {
- return (Boolean) store.get(KEY_HIGH_BEAMS_ON);
+ return getBoolean(KEY_HIGH_BEAMS_ON);
}
public void setLowBeamsOn(Boolean lowBeamsOn) {
- if (lowBeamsOn != null) {
- store.put(KEY_LOW_BEAMS_ON, lowBeamsOn);
- } else {
- store.remove(KEY_LOW_BEAMS_ON);
- }
+ setValue(KEY_LOW_BEAMS_ON, lowBeamsOn);
}
public Boolean getLowBeamsOn() {
- return (Boolean) store.get(KEY_LOW_BEAMS_ON);
+ return getBoolean(KEY_LOW_BEAMS_ON);
}
}
diff --git a/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/Headers.java b/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/Headers.java index 2be4f1a17..2ae607100 100644 --- a/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/Headers.java +++ b/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/Headers.java @@ -1,8 +1,8 @@ package com.smartdevicelink.proxy.rpc;
-import java.util.Hashtable;
-
import com.smartdevicelink.proxy.RPCStruct;
+
+import java.util.Hashtable;
/**
*
* @since SmartDeviceLink 3.0
@@ -37,123 +37,83 @@ public class Headers extends RPCStruct { }
public void setContentType(String contenttype) {
- if (contenttype != null) {
- store.put(KEY_CONTENT_TYPE, contenttype);
- } else {
- store.remove(KEY_CONTENT_TYPE);
- }
+ setValue(KEY_CONTENT_TYPE, contenttype);
}
public String getContentType() {
- return (String) store.get(KEY_CONTENT_TYPE);
+ return getString(KEY_CONTENT_TYPE);
}
public void setConnectTimeout(Integer connectiontimeout) {
- if (connectiontimeout != null) {
- store.put(KEY_CONNECT_TIMEOUT, connectiontimeout);
- } else {
- store.remove(KEY_CONNECT_TIMEOUT);
- }
+ setValue(KEY_CONNECT_TIMEOUT, connectiontimeout);
}
public Integer getConnectTimeout() {
- return (Integer) store.get(KEY_CONNECT_TIMEOUT);
+ return getInteger(KEY_CONNECT_TIMEOUT);
}
public void setDoOutput(Boolean dooutput) {
- if (dooutput != null) {
- store.put(KEY_DO_OUTPUT, dooutput);
- } else {
- store.remove(KEY_DO_OUTPUT);
- }
+ setValue(KEY_DO_OUTPUT, dooutput);
}
public Boolean getDoOutput() {
- return (Boolean) store.get(KEY_DO_OUTPUT);
+ return getBoolean(KEY_DO_OUTPUT);
}
- public void setDoInput(Boolean dooutput) {
- if (dooutput != null) {
- store.put(KEY_DO_INPUT, dooutput);
- } else {
- store.remove(KEY_DO_INPUT);
- }
+ public void setDoInput(Boolean doinput) {
+ setValue(KEY_DO_INPUT, doinput);
}
public Boolean getDoInput() {
- return (Boolean) store.get(KEY_DO_INPUT);
+ return getBoolean(KEY_DO_INPUT);
}
public void setUseCaches(Boolean usescaches) {
- if (usescaches != null) {
- store.put(KEY_USE_CACHES, usescaches);
- } else {
- store.remove(KEY_USE_CACHES);
- }
+ setValue(KEY_USE_CACHES, usescaches);
}
public Boolean getUseCaches() {
- return (Boolean) store.get(KEY_USE_CACHES);
+ return getBoolean(KEY_USE_CACHES);
}
public void setRequestMethod(String requestmethod) {
- if (requestmethod != null) {
- store.put(KEY_REQUEST_METHOD, requestmethod);
- } else {
- store.remove(KEY_REQUEST_METHOD);
- }
+ setValue(KEY_REQUEST_METHOD, requestmethod);
}
public String getRequestMethod() {
- return (String) store.get(KEY_REQUEST_METHOD);
+ return getString(KEY_REQUEST_METHOD);
}
public void setReadTimeout(Integer readtimeout) {
- if (readtimeout != null) {
- store.put(KEY_READ_TIMEOUT, readtimeout);
- } else {
- store.remove(KEY_READ_TIMEOUT);
- }
+ setValue(KEY_READ_TIMEOUT, readtimeout);
}
public Integer getReadTimeout() {
- return (Integer) store.get(KEY_READ_TIMEOUT);
+ return getInteger(KEY_READ_TIMEOUT);
}
public void setInstanceFollowRedirects(Boolean instancefollowredirects) {
- if (instancefollowredirects != null) {
- store.put(KEY_INSTANCE_FOLLOW_REDIRECTS, instancefollowredirects);
- } else {
- store.remove(KEY_INSTANCE_FOLLOW_REDIRECTS);
- }
+ setValue(KEY_INSTANCE_FOLLOW_REDIRECTS, instancefollowredirects);
}
public Boolean getInstanceFollowRedirects() {
- return (Boolean) store.get(KEY_INSTANCE_FOLLOW_REDIRECTS);
+ return getBoolean(KEY_INSTANCE_FOLLOW_REDIRECTS);
}
public void setCharset(String charset) {
- if (charset != null) {
- store.put(KEY_CHARSET, charset);
- } else {
- store.remove(KEY_CHARSET);
- }
+ setValue(KEY_CHARSET, charset);
}
public String getCharset() {
- return (String) store.get(KEY_CHARSET);
+ return getString(KEY_CHARSET);
}
public void setContentLength(Integer contentlength) {
- if (contentlength != null) {
- store.put(KEY_CONTENT_LENGTH, contentlength);
- } else {
- store.remove(KEY_CONTENT_LENGTH);
- }
+ setValue(KEY_CONTENT_LENGTH, contentlength);
}
public Integer getContentLength() {
- return (Integer) store.get(KEY_CONTENT_LENGTH);
+ return getInteger(KEY_CONTENT_LENGTH);
}
}
diff --git a/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/Image.java b/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/Image.java index 76ad2d224..8182fc43c 100644 --- a/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/Image.java +++ b/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/Image.java @@ -1,10 +1,10 @@ package com.smartdevicelink.proxy.rpc;
-import java.util.Hashtable;
-
import com.smartdevicelink.proxy.RPCStruct;
import com.smartdevicelink.proxy.rpc.enums.ImageType;
+import java.util.Hashtable;
+
/**
*Specifies, which image shall be used, e.g. in Alerts or on Softbuttons provided the display supports it.
*<p><b>Parameter List</b></p>
@@ -57,11 +57,7 @@ public class Image extends RPCStruct { * @param value either the static hex icon value or the binary image file name identifier (sent by PutFile)
*/
public void setValue(String value) {
- if (value != null) {
- store.put(KEY_VALUE, value);
- } else {
- store.remove(KEY_VALUE);
- }
+ setValue(KEY_VALUE, value);
}
/**
@@ -69,7 +65,7 @@ public class Image extends RPCStruct { * @return either the static hex icon value or the binary image file name identifier (sent by PutFile)
*/
public String getValue() {
- return (String) store.get(KEY_VALUE);
+ return getString(KEY_VALUE);
}
/**
@@ -77,11 +73,7 @@ public class Image extends RPCStruct { * @param imageType whether it is a static or dynamic image
*/
public void setImageType(ImageType imageType) {
- if (imageType != null) {
- store.put(KEY_IMAGE_TYPE, imageType);
- } else {
- store.remove(KEY_IMAGE_TYPE);
- }
+ setValue(KEY_IMAGE_TYPE, imageType);
}
/**
@@ -89,12 +81,6 @@ public class Image extends RPCStruct { * @return the image type
*/
public ImageType getImageType() {
- Object obj = store.get(KEY_IMAGE_TYPE);
- if (obj instanceof ImageType) {
- return (ImageType) obj;
- } else if (obj instanceof String) {
- return ImageType.valueForString((String) obj);
- }
- return null;
+ return (ImageType) getObject(ImageType.class, KEY_IMAGE_TYPE);
}
}
diff --git a/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/ImageField.java b/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/ImageField.java index 9e38dc264..1d3b32967 100644 --- a/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/ImageField.java +++ b/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/ImageField.java @@ -1,13 +1,17 @@ package com.smartdevicelink.proxy.rpc;
-import java.util.ArrayList;
-import java.util.Hashtable;
-import java.util.List;
-
import com.smartdevicelink.proxy.RPCStruct;
+import com.smartdevicelink.proxy.rpc.enums.AmbientLightStatus;
import com.smartdevicelink.proxy.rpc.enums.FileType;
import com.smartdevicelink.proxy.rpc.enums.ImageFieldName;
import com.smartdevicelink.util.DebugTool;
+
+import java.util.ArrayList;
+import java.util.Hashtable;
+import java.util.List;
+
+import static com.smartdevicelink.proxy.rpc.HeadLampStatus.KEY_AMBIENT_LIGHT_SENSOR_STATUS;
+
/** <p>The name that identifies the field.For example AppIcon,SoftButton, LocationImage, etc.</p>
*
* <p><b>Parameter List</b></p>
@@ -68,73 +72,23 @@ public class ImageField extends RPCStruct { super(hash);
}
public ImageFieldName getName() {
- Object obj = store.get(KEY_NAME);
- if (obj instanceof ImageFieldName) {
- return (ImageFieldName) obj;
- } else if (obj instanceof String) {
- return ImageFieldName.valueForString((String) obj);
- }
- return null;
+ return (ImageFieldName) getObject(ImageFieldName.class, KEY_NAME);
}
public void setName( ImageFieldName name ) {
- if (name != null) {
- store.put(KEY_NAME, name );
- }
- else {
- store.remove(KEY_NAME);
- }
+ setValue(KEY_NAME, name);
}
@SuppressWarnings("unchecked")
public List<FileType> getImageTypeSupported() {
- if (store.get(KEY_IMAGE_TYPE_SUPPORTED) instanceof List<?>) {
- List<?> list = (List<?>)store.get(KEY_IMAGE_TYPE_SUPPORTED);
- if (list != null && list.size() > 0) {
- Object obj = list.get(0);
- if (obj instanceof FileType) {
- return (List<FileType>) list;
- } else if (obj instanceof String) {
- List<FileType> newList = new ArrayList<FileType>();
- for (Object hashObj : list) {
- String strFormat = (String)hashObj;
- FileType theCode = FileType.valueForString(strFormat);
- if (theCode != null) {
- newList.add(theCode);
- }
- }
- return newList;
- }
- }
- }
- return null;
+ return (List<FileType>) getObject(FileType.class, KEY_IMAGE_TYPE_SUPPORTED);
}
public void setImageTypeSupported( List<FileType> imageTypeSupported ) {
- if (imageTypeSupported != null) {
- store.put(KEY_IMAGE_TYPE_SUPPORTED, imageTypeSupported );
- }
- else {
- store.remove(KEY_IMAGE_TYPE_SUPPORTED);
- }
+ setValue(KEY_IMAGE_TYPE_SUPPORTED, imageTypeSupported);
}
@SuppressWarnings("unchecked")
public ImageResolution getImageResolution() {
- Object obj = store.get(KEY_IMAGE_RESOLUTION);
- if (obj instanceof ImageResolution) {
- return (ImageResolution) obj;
- } else if (obj instanceof Hashtable) {
- try {
- return new ImageResolution((Hashtable<String, Object>) obj);
- } catch (Exception e) {
- DebugTool.logError("Failed to parse " + getClass().getSimpleName() + "." + KEY_IMAGE_RESOLUTION, e);
- }
- }
- return null;
+ return (ImageResolution) getObject(ImageResolution.class, KEY_IMAGE_RESOLUTION);
}
public void setImageResolution( ImageResolution imageResolution ) {
- if (imageResolution != null) {
- store.put(KEY_IMAGE_RESOLUTION, imageResolution );
- }
- else {
- store.remove(KEY_IMAGE_RESOLUTION);
- }
+ setValue(KEY_IMAGE_RESOLUTION, imageResolution);
}
}
diff --git a/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/ImageResolution.java b/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/ImageResolution.java index 682092082..d9c85eb8f 100644 --- a/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/ImageResolution.java +++ b/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/ImageResolution.java @@ -62,26 +62,18 @@ public class ImageResolution extends RPCStruct { }
public void setResolutionWidth(Integer resolutionWidth) {
- if (resolutionWidth != null) {
- store.put(KEY_RESOLUTION_WIDTH, resolutionWidth);
- } else {
- store.remove(KEY_RESOLUTION_WIDTH);
- }
+ setValue(KEY_RESOLUTION_WIDTH, resolutionWidth);
}
public Integer getResolutionWidth() {
- return (Integer) store.get(KEY_RESOLUTION_WIDTH);
+ return getInteger(KEY_RESOLUTION_WIDTH);
}
public void setResolutionHeight(Integer resolutionHeight) {
- if (resolutionHeight != null) {
- store.put(KEY_RESOLUTION_HEIGHT, resolutionHeight);
- } else {
- store.remove(KEY_RESOLUTION_HEIGHT);
- }
+ setValue(KEY_RESOLUTION_HEIGHT, resolutionHeight);
}
public Integer getResolutionHeight() {
- return (Integer) store.get(KEY_RESOLUTION_HEIGHT);
+ return getInteger(KEY_RESOLUTION_HEIGHT);
}
}
diff --git a/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/KeyboardProperties.java b/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/KeyboardProperties.java index fb35dcf24..6f651b832 100644 --- a/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/KeyboardProperties.java +++ b/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/KeyboardProperties.java @@ -1,12 +1,17 @@ package com.smartdevicelink.proxy.rpc;
-import java.util.Hashtable;
-import java.util.List;
-
import com.smartdevicelink.proxy.RPCStruct;
+import com.smartdevicelink.proxy.rpc.enums.AmbientLightStatus;
import com.smartdevicelink.proxy.rpc.enums.KeyboardLayout;
import com.smartdevicelink.proxy.rpc.enums.KeypressMode;
import com.smartdevicelink.proxy.rpc.enums.Language;
+
+import java.util.Hashtable;
+import java.util.List;
+
+import static android.provider.Contacts.SettingsColumns.KEY;
+import static com.smartdevicelink.proxy.rpc.HeadLampStatus.KEY_AMBIENT_LIGHT_SENSOR_STATUS;
+
/** This mode causes the interaction to immediately display a keyboard entry through the HMI.
*
* <p><b>Parameter List</b></p>
@@ -78,106 +83,62 @@ public class KeyboardProperties extends RPCStruct { private static final KeypressMode KEYPRESS_MODE_DEFAULT = KeypressMode.RESEND_CURRENT_ENTRY;
public KeyboardProperties() {
- store.put(KEY_KEYPRESS_MODE, KEYPRESS_MODE_DEFAULT);
+ setValue(KEY_KEYPRESS_MODE, KEYPRESS_MODE_DEFAULT);
}
public KeyboardProperties(Hashtable<String, Object> hash) {
super(hash);
if (!store.containsKey(KEY_KEYPRESS_MODE)) {
- store.put(KEY_KEYPRESS_MODE, KEYPRESS_MODE_DEFAULT);
+ setValue(KEY_KEYPRESS_MODE, KEYPRESS_MODE_DEFAULT);
}
}
public Language getLanguage() {
- Object obj = store.get(KEY_LANGUAGE);
- if (obj instanceof Language) {
- return (Language) obj;
- } else if (obj instanceof String) {
- return Language.valueForString((String) obj);
- }
- return null;
+ return (Language) getObject(Language.class, KEY_LANGUAGE);
}
public void setLanguage(Language language) {
- if (language != null) {
- store.put(KEY_LANGUAGE, language);
- } else {
- store.remove(KEY_LANGUAGE);
- }
+ setValue(KEY_LANGUAGE, language);
}
public KeyboardLayout getKeyboardLayout() {
- Object obj = store.get(KEY_KEYBOARD_LAYOUT);
- if (obj instanceof KeyboardLayout) {
- return (KeyboardLayout) obj;
- } else if (obj instanceof String) {
- return KeyboardLayout.valueForString((String) obj);
- }
- return null;
+ return (KeyboardLayout) getObject(KeyboardLayout.class, KEY_KEYBOARD_LAYOUT);
}
public void setKeyboardLayout(KeyboardLayout keyboardLayout) {
- if (keyboardLayout != null) {
- store.put(KEY_KEYBOARD_LAYOUT, keyboardLayout);
- } else {
- store.remove(KEY_KEYBOARD_LAYOUT);
- }
+ setValue(KEY_KEYBOARD_LAYOUT, keyboardLayout);
}
public KeypressMode getKeypressMode() {
- Object obj = store.get(KEY_KEYPRESS_MODE);
- if (obj instanceof KeypressMode) {
- return (KeypressMode) obj;
- } else if (obj instanceof String) {
- return KeypressMode.valueForString((String) obj);
+ KeypressMode kp = (KeypressMode) getObject(KeypressMode.class, KEY_KEYPRESS_MODE);
+ if(kp == null){
+ kp = KEYPRESS_MODE_DEFAULT;
}
- return KEYPRESS_MODE_DEFAULT;
+ return kp;
}
public void setKeypressMode(KeypressMode keypressMode) {
if (keypressMode != null) {
- store.put(KEY_KEYPRESS_MODE, keypressMode);
+ setValue(KEY_KEYPRESS_MODE, keypressMode);
} else {
- store.put(KEY_KEYPRESS_MODE, KEYPRESS_MODE_DEFAULT);
+ setValue(KEY_KEYPRESS_MODE, KEYPRESS_MODE_DEFAULT);
}
}
@SuppressWarnings("unchecked")
public List<String> getLimitedCharacterList() {
- final Object listObj = store.get(KEY_LIMITED_CHARACTER_LIST);
- if (listObj instanceof List<?>) {
- List<?> list = (List<?>) listObj;
- if (list != null && list.size() > 0) {
- Object obj = list.get(0);
- if (obj instanceof String) {
- return (List<String>) list;
- }
- }
- }
- return null;
+ return (List<String>) getObject(String.class, KEY_LIMITED_CHARACTER_LIST);
}
public void setLimitedCharacterList(List<String> limitedCharacterList) {
- if (limitedCharacterList != null) {
- store.put(KEY_LIMITED_CHARACTER_LIST, limitedCharacterList);
- } else {
- store.remove(KEY_LIMITED_CHARACTER_LIST);
- }
+ setValue(KEY_LIMITED_CHARACTER_LIST, limitedCharacterList);
}
public String getAutoCompleteText() {
- final Object obj = store.get(KEY_AUTO_COMPLETE_TEXT);
- if (obj instanceof String) {
- return (String) obj;
- }
- return null;
+ return (String) getObject(String.class, KEY_AUTO_COMPLETE_TEXT);
}
public void setAutoCompleteText(String autoCompleteText) {
- if (autoCompleteText != null) {
- store.put(KEY_AUTO_COMPLETE_TEXT, autoCompleteText);
- } else {
- store.remove(KEY_AUTO_COMPLETE_TEXT);
- }
+ setValue(KEY_AUTO_COMPLETE_TEXT, autoCompleteText);
}
}
diff --git a/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/ListFilesResponse.java b/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/ListFilesResponse.java index 1c7db6673..c96bff428 100644 --- a/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/ListFilesResponse.java +++ b/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/ListFilesResponse.java @@ -25,25 +25,16 @@ public class ListFilesResponse extends RPCResponse { super(hash);
}
public void setFilenames(List<String> filenames) {
- setParameters(KEY_FILENAMES, filenames);
+ setParameter(KEY_FILENAMES, filenames);
}
@SuppressWarnings("unchecked")
public List<String> getFilenames() {
- if (parameters.get(KEY_FILENAMES) instanceof List<?>) {
- List<?> list = (List<?>)parameters.get(KEY_FILENAMES);
- if (list != null && list.size()>0) {
- Object obj = list.get(0);
- if (obj instanceof String) {
- return (List<String>) list;
- }
- }
- }
- return null;
+ return (List<String>) getObject(String.class, KEY_FILENAMES);
}
public void setSpaceAvailable(Integer spaceAvailable) {
- setParameters(KEY_SPACE_AVAILABLE, spaceAvailable);
+ setParameter(KEY_SPACE_AVAILABLE, spaceAvailable);
}
public Integer getSpaceAvailable() {
- return (Integer) parameters.get(KEY_SPACE_AVAILABLE);
+ return getInteger(KEY_SPACE_AVAILABLE);
}
}
diff --git a/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/LocationDetails.java b/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/LocationDetails.java index 50dcaf49b..51d150a2b 100644 --- a/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/LocationDetails.java +++ b/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/LocationDetails.java @@ -1,7 +1,6 @@ package com.smartdevicelink.proxy.rpc; import com.smartdevicelink.proxy.RPCStruct; -import com.smartdevicelink.util.DebugTool; import java.util.Hashtable; import java.util.List; @@ -24,127 +23,59 @@ public class LocationDetails extends RPCStruct{ @SuppressWarnings("unchecked") public Coordinate getCoordinate() { - Object obj = store.get(KEY_COORDINATE); - if (obj instanceof Coordinate) { - return (Coordinate) obj; - } else if (obj instanceof Hashtable) { - try { - return new Coordinate((Hashtable<String, Object>) obj); - } catch (Exception e) { - DebugTool.logError("Failed to parse " + getClass().getSimpleName() + "." + KEY_COORDINATE, e); - } - } - return null; + return (Coordinate) getObject(Coordinate.class, KEY_COORDINATE); } public void setCoordinate(Coordinate coordinate) { - if (coordinate != null) { - store.put(KEY_COORDINATE, coordinate); - } else { - store.remove(KEY_COORDINATE); - } + setValue(KEY_COORDINATE, coordinate); } public String getLocationName() { - return (String) store.get(KEY_LOCATION_NAME); + return getString(KEY_LOCATION_NAME); } public void setLocationName(String locationName) { - if (locationName != null) { - store.put(KEY_LOCATION_NAME, locationName); - } else { - store.remove(KEY_LOCATION_NAME); - } + setValue(KEY_LOCATION_NAME, locationName); } @SuppressWarnings("unchecked") public List<String> getAddressLines() { - final Object listObj = store.get(KEY_ADDRESS_LINES); - if (listObj instanceof List<?>) { - List<?> list = (List<?>) listObj; - if (list.size() > 0) { - Object obj = list.get(0); - if (obj instanceof String) { - return (List<String>) list; - } - } - } - return null; + return (List<String>) getObject(String.class, KEY_ADDRESS_LINES); } public void setAddressLines(List<String> addressLines) { - if (addressLines != null) { - store.put(KEY_ADDRESS_LINES, addressLines); - } else { - store.remove(KEY_ADDRESS_LINES); - } + setValue(KEY_ADDRESS_LINES, addressLines); } public String getLocationDescription() { - return (String) store.get(KEY_LOCATION_DESCRIPTION); + return getString(KEY_LOCATION_DESCRIPTION); } public void setLocationDescription(String locationDescription) { - if (locationDescription != null) { - store.put(KEY_LOCATION_DESCRIPTION, locationDescription); - } else { - store.remove(KEY_LOCATION_DESCRIPTION); - } + setValue(KEY_LOCATION_DESCRIPTION, locationDescription); } public String getPhoneNumber() { - return (String) store.get(KEY_PHONE_NUMBER); + return getString(KEY_PHONE_NUMBER); } public void setPhoneNumber(String phoneNumber) { - if (phoneNumber != null) { - store.put(KEY_PHONE_NUMBER, phoneNumber); - } else { - store.remove(KEY_PHONE_NUMBER); - } + setValue(KEY_PHONE_NUMBER, phoneNumber); } @SuppressWarnings("unchecked") public Image getLocationImage() { - Object obj = store.get(KEY_LOCATION_IMAGE); - if (obj instanceof Image) { - return (Image) obj; - } else if (obj instanceof Hashtable) { - try { - return new Image((Hashtable<String, Object>) obj); - } catch (Exception e) { - DebugTool.logError("Failed to parse " + getClass().getSimpleName() + "." + KEY_LOCATION_IMAGE, e); - } - } - return null; + return (Image) getObject(Image.class, KEY_LOCATION_IMAGE); } public void setLocationImage(Image locationImage) { - if (locationImage != null) { - store.put(KEY_LOCATION_IMAGE, locationImage); - } else { - store.remove(KEY_LOCATION_IMAGE); - } + setValue(KEY_LOCATION_IMAGE, locationImage); } @SuppressWarnings("unchecked") public OasisAddress getSearchAddress() { - Object obj = store.get(KEY_SEARCH_ADDRESS); - if (obj instanceof OasisAddress) { - return (OasisAddress) obj; - } else if (obj instanceof Hashtable) { - try { - return new OasisAddress((Hashtable<String, Object>) obj); - } catch (Exception e) { - DebugTool.logError("Failed to parse " + getClass().getSimpleName() + "." + KEY_SEARCH_ADDRESS, e); - } - } - return null; + return (OasisAddress) getObject(OasisAddress.class, KEY_SEARCH_ADDRESS); } public void setSearchAddress(OasisAddress searchAddress) { - if (searchAddress != null) { - store.put(KEY_SEARCH_ADDRESS, searchAddress); - } else { - store.remove(KEY_SEARCH_ADDRESS); - } + setValue(KEY_SEARCH_ADDRESS, searchAddress); } } diff --git a/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/MenuParams.java b/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/MenuParams.java index a9f22238a..e096cb7df 100644 --- a/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/MenuParams.java +++ b/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/MenuParams.java @@ -1,8 +1,8 @@ package com.smartdevicelink.proxy.rpc;
-import java.util.Hashtable;
-
import com.smartdevicelink.proxy.RPCStruct;
+
+import java.util.Hashtable;
/**
* Used when adding a sub menu to an application menu or existing sub menu.
* <p><b> Parameter List</b></p>
@@ -76,7 +76,7 @@ public class MenuParams extends RPCStruct { * @return parentID Min: 0 Max: 2000000000
*/
public Integer getParentID() {
- return (Integer) store.get( KEY_PARENT_ID );
+ return getInteger( KEY_PARENT_ID );
}
/**
* Set the unique ID of an existing submenu to which a command will be added.
@@ -84,11 +84,7 @@ public class MenuParams extends RPCStruct { * @param parentID Min: 0; Max: 2000000000
*/
public void setParentID( Integer parentID ) {
- if (parentID != null) {
- store.put(KEY_PARENT_ID, parentID );
- } else {
- store.remove(KEY_PARENT_ID);
- }
+ setValue(KEY_PARENT_ID, parentID);
}
/**
* Get the position within the items of the parent Command Menu. 0 will insert at the front, 1 will insert after the first existing element, etc.
@@ -102,7 +98,7 @@ public class MenuParams extends RPCStruct { * @return the position within the items of the parent Command Menu
*/
public Integer getPosition() {
- return (Integer) store.get( KEY_POSITION );
+ return getInteger( KEY_POSITION );
}
/**
* Set the position within the items of the parent Command Menu. 0 will insert at the front, 1 will insert after the first existing element, etc.
@@ -116,11 +112,7 @@ public class MenuParams extends RPCStruct { * @param position Mix: 0 Max: 1000
*/
public void setPosition( Integer position ) {
- if (position != null) {
- store.put(KEY_POSITION, position );
- } else {
- store.remove(KEY_POSITION);
- }
+ setValue(KEY_POSITION, position);
}
/**
* Get the text which appears in menu, representing this command.
@@ -132,7 +124,7 @@ public class MenuParams extends RPCStruct { */
public String getMenuName() {
- return (String) store.get( KEY_MENU_NAME );
+ return getString( KEY_MENU_NAME );
}
/**
* Set text which appears in menu, representing this command.
@@ -144,10 +136,6 @@ public class MenuParams extends RPCStruct { */
public void setMenuName( String menuName ) {
- if (menuName != null) {
- store.put(KEY_MENU_NAME, menuName );
- } else {
- store.remove(KEY_MENU_NAME);
- }
+ setValue(KEY_MENU_NAME, menuName);
}
}
diff --git a/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/MyKey.java b/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/MyKey.java index 4936f9fec..f17a6b54c 100644 --- a/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/MyKey.java +++ b/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/MyKey.java @@ -48,19 +48,9 @@ public class MyKey extends RPCStruct { }
public void setE911Override(VehicleDataStatus e911Override) {
- if (e911Override != null) {
- store.put(KEY_E_911_OVERRIDE, e911Override);
- } else {
- store.remove(KEY_E_911_OVERRIDE);
- }
+ setValue(KEY_E_911_OVERRIDE, e911Override);
}
public VehicleDataStatus getE911Override() {
- Object obj = store.get(KEY_E_911_OVERRIDE);
- if (obj instanceof VehicleDataStatus) {
- return (VehicleDataStatus) obj;
- } else if (obj instanceof String) {
- return VehicleDataStatus.valueForString((String) obj);
- }
- return null;
+ return (VehicleDataStatus) getObject(VehicleDataStatus.class, KEY_E_911_OVERRIDE);
}
}
diff --git a/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/OasisAddress.java b/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/OasisAddress.java index 131edaa9a..54b95e300 100644 --- a/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/OasisAddress.java +++ b/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/OasisAddress.java @@ -35,7 +35,7 @@ public class OasisAddress extends RPCStruct{ * */ public String getCountryName() { - return (String) store.get(KEY_COUNTRY_NAME); + return getString(KEY_COUNTRY_NAME); } /** @@ -46,11 +46,7 @@ public class OasisAddress extends RPCStruct{ * */ public void setCountryName(String countryName) { - if (countryName != null) { - store.put(KEY_COUNTRY_NAME, countryName); - } else { - store.remove(KEY_COUNTRY_NAME); - } + setValue(KEY_COUNTRY_NAME, countryName); } /** @@ -60,7 +56,7 @@ public class OasisAddress extends RPCStruct{ * */ public String getCountryCode() { - return (String) store.get(KEY_COUNTRY_CODE); + return getString(KEY_COUNTRY_CODE); } /** @@ -71,11 +67,7 @@ public class OasisAddress extends RPCStruct{ * */ public void setCountryCode(String countryCode) { - if (countryCode != null) { - store.put(KEY_COUNTRY_CODE, countryCode); - } else { - store.remove(KEY_COUNTRY_CODE); - } + setValue(KEY_COUNTRY_CODE, countryCode); } /** @@ -85,7 +77,7 @@ public class OasisAddress extends RPCStruct{ * */ public String getPostalCode() { - return (String) store.get(KEY_POSTAL_CODE); + return getString(KEY_POSTAL_CODE); } /** @@ -96,11 +88,7 @@ public class OasisAddress extends RPCStruct{ * */ public void setPostalCode(String postalCode) { - if (postalCode != null) { - store.put(KEY_POSTAL_CODE, postalCode); - } else { - store.remove(KEY_POSTAL_CODE); - } + setValue(KEY_POSTAL_CODE, postalCode); } /** @@ -110,7 +98,7 @@ public class OasisAddress extends RPCStruct{ * */ public String getAdministrativeArea() { - return (String) store.get(KEY_ADMINISTRATIVE_AREA); + return getString(KEY_ADMINISTRATIVE_AREA); } /** @@ -121,11 +109,7 @@ public class OasisAddress extends RPCStruct{ * */ public void setAdministrativeArea(String administrativeArea) { - if (administrativeArea != null) { - store.put(KEY_ADMINISTRATIVE_AREA, administrativeArea); - } else { - store.remove(KEY_ADMINISTRATIVE_AREA); - } + setValue(KEY_ADMINISTRATIVE_AREA, administrativeArea); } /** @@ -135,7 +119,7 @@ public class OasisAddress extends RPCStruct{ * */ public String getSubAdministrativeArea() { - return (String) store.get(KEY_SUB_ADMINISTRATIVE_AREA); + return getString(KEY_SUB_ADMINISTRATIVE_AREA); } /** @@ -146,11 +130,7 @@ public class OasisAddress extends RPCStruct{ * */ public void setSubAdministrativeArea(String subAdministrativeArea) { - if (subAdministrativeArea != null) { - store.put(KEY_SUB_ADMINISTRATIVE_AREA, subAdministrativeArea); - } else { - store.remove(KEY_SUB_ADMINISTRATIVE_AREA); - } + setValue(KEY_SUB_ADMINISTRATIVE_AREA, subAdministrativeArea); } /** @@ -160,7 +140,7 @@ public class OasisAddress extends RPCStruct{ * */ public String getLocality() { - return (String) store.get(KEY_LOCALITY); + return getString(KEY_LOCALITY); } /** @@ -171,11 +151,7 @@ public class OasisAddress extends RPCStruct{ * */ public void setLocality(String locality) { - if (locality != null) { - store.put(KEY_LOCALITY, locality); - } else { - store.remove(KEY_LOCALITY); - } + setValue(KEY_LOCALITY, locality); } /** @@ -185,7 +161,7 @@ public class OasisAddress extends RPCStruct{ * */ public String getSubLocality() { - return (String) store.get(KEY_SUB_LOCALITY); + return getString(KEY_SUB_LOCALITY); } /** @@ -196,11 +172,7 @@ public class OasisAddress extends RPCStruct{ * */ public void setSubLocality(String subLocality) { - if (subLocality != null) { - store.put(KEY_SUB_LOCALITY, subLocality); - } else { - store.remove(KEY_SUB_LOCALITY); - } + setValue(KEY_SUB_LOCALITY, subLocality); } /** @@ -210,7 +182,7 @@ public class OasisAddress extends RPCStruct{ * */ public String getThoroughfare() { - return (String) store.get(KEY_THOROUGH_FARE); + return getString(KEY_THOROUGH_FARE); } /** @@ -221,11 +193,7 @@ public class OasisAddress extends RPCStruct{ * */ public void setThoroughfare(String thoroughFare) { - if (thoroughFare != null) { - store.put(KEY_THOROUGH_FARE, thoroughFare); - } else { - store.remove(KEY_THOROUGH_FARE); - } + setValue(KEY_THOROUGH_FARE, thoroughFare); } /** @@ -234,7 +202,7 @@ public class OasisAddress extends RPCStruct{ * @return String - The Sub-Thoroughfare associated with the OasisAddress class. */ public String getSubThoroughfare() { - return (String) store.get(KEY_SUB_THOROUGH_FARE); + return getString(KEY_SUB_THOROUGH_FARE); } /** @@ -245,10 +213,6 @@ public class OasisAddress extends RPCStruct{ * */ public void setSubThoroughfare(String subThoroughfare) { - if (subThoroughfare != null) { - store.put(KEY_SUB_THOROUGH_FARE, subThoroughfare); - } else { - store.remove(KEY_SUB_THOROUGH_FARE); - } + setValue(KEY_SUB_THOROUGH_FARE, subThoroughfare); } } diff --git a/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/OnAppInterfaceUnregistered.java b/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/OnAppInterfaceUnregistered.java index 323c0414e..5529a04e3 100644 --- a/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/OnAppInterfaceUnregistered.java +++ b/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/OnAppInterfaceUnregistered.java @@ -59,19 +59,13 @@ public class OnAppInterfaceUnregistered extends RPCNotification { * @return {@linkplain AppInterfaceUnregisteredReason} the reason the application's interface registration was terminated
*/
public AppInterfaceUnregisteredReason getReason() {
- Object obj = parameters.get(KEY_REASON);
- if (obj instanceof AppInterfaceUnregisteredReason) {
- return (AppInterfaceUnregisteredReason) obj;
- } else if (obj instanceof String) {
- return AppInterfaceUnregisteredReason.valueForString((String) obj);
- }
- return null;
+ return (AppInterfaceUnregisteredReason) getObject(AppInterfaceUnregisteredReason.class, KEY_REASON);
}
/**
* <p>Set the reason application's interface was terminated</p>
* @param reason The reason application's interface registration was terminated
*/
public void setReason( AppInterfaceUnregisteredReason reason ) {
- setParameters(KEY_REASON, reason);
+ setParameter(KEY_REASON, reason);
}
}
diff --git a/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/OnButtonEvent.java b/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/OnButtonEvent.java index 7bbb51c2f..eb83016e1 100644 --- a/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/OnButtonEvent.java +++ b/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/OnButtonEvent.java @@ -109,33 +109,21 @@ public class OnButtonEvent extends RPCNotification { * @return ButtonName Name of the button
*/
public ButtonName getButtonName() {
- Object obj = parameters.get(KEY_BUTTON_NAME);
- if (obj instanceof ButtonName) {
- return (ButtonName) obj;
- } else if (obj instanceof String) {
- return ButtonName.valueForString((String) obj);
- }
- return null;
+ return (ButtonName) getObject(ButtonName.class, KEY_BUTTON_NAME);
}
/**
* <p>Set the button's name</p>
* @param buttonName name of the button
*/
public void setButtonName(ButtonName buttonName) {
- setParameters(KEY_BUTTON_NAME, buttonName);
+ setParameter(KEY_BUTTON_NAME, buttonName);
}
/**
* <p>Return <i>{@linkplain ButtonEventMode} indicates the button was depressed or released</i></p>
* @return ButtonEventMode the button depressed or released
*/
public ButtonEventMode getButtonEventMode() {
- Object obj = parameters.get(KEY_BUTTON_EVENT_MODE);
- if (obj instanceof ButtonEventMode) {
- return (ButtonEventMode) obj;
- } else if (obj instanceof String) {
- return ButtonEventMode.valueForString((String) obj);
- }
- return null;
+ return (ButtonEventMode) getObject(ButtonEventMode.class, KEY_BUTTON_EVENT_MODE);
}
/**
* <p> Set the event mode of the button,pressed or released</p>
@@ -143,12 +131,12 @@ public class OnButtonEvent extends RPCNotification { * @see ButtonEventMode
*/
public void setButtonEventMode(ButtonEventMode buttonEventMode) {
- setParameters(KEY_BUTTON_EVENT_MODE, buttonEventMode);
+ setParameter(KEY_BUTTON_EVENT_MODE, buttonEventMode);
}
public void setCustomButtonID(Integer customButtonID) {
- setParameters(KEY_CUSTOM_BUTTON_ID, customButtonID);
+ setParameter(KEY_CUSTOM_BUTTON_ID, customButtonID);
}
public Integer getCustomButtonID() {
- return (Integer) parameters.get(KEY_CUSTOM_BUTTON_ID);
+ return getInteger(KEY_CUSTOM_BUTTON_ID);
}
}
diff --git a/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/OnButtonPress.java b/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/OnButtonPress.java index afec69151..fad1dccfb 100644 --- a/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/OnButtonPress.java +++ b/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/OnButtonPress.java @@ -114,44 +114,32 @@ public class OnButtonPress extends RPCNotification { * @return ButtonName Name of the button
*/
public ButtonName getButtonName() {
- Object obj = parameters.get(KEY_BUTTON_NAME);
- if (obj instanceof ButtonName) {
- return (ButtonName) obj;
- } else if (obj instanceof String) {
- return ButtonName.valueForString((String) obj);
- }
- return null;
+ return (ButtonName) getObject(ButtonName.class, KEY_BUTTON_NAME);
}
/**
* <p>Set the button's name</p>
* @param buttonName name of the button
*/
public void setButtonName( ButtonName buttonName ) {
- setParameters(KEY_BUTTON_NAME, buttonName);
+ setParameter(KEY_BUTTON_NAME, buttonName);
}
/**<p>Returns <i>{@linkplain ButtonPressMode}</i></p>
* @return ButtonPressMode whether this is a long or short button press event
*/
public ButtonPressMode getButtonPressMode() {
- Object obj = parameters.get(KEY_BUTTON_PRESS_MODE);
- if (obj instanceof ButtonPressMode) {
- return (ButtonPressMode) obj;
- } else if (obj instanceof String) {
- return ButtonPressMode.valueForString((String) obj);
- }
- return null;
+ return (ButtonPressMode) getObject(ButtonPressMode.class, KEY_BUTTON_PRESS_MODE);
}
/**
* <p>Set the button press mode of the event</p>
* @param buttonPressMode indicates whether this is a short or long press
*/
public void setButtonPressMode( ButtonPressMode buttonPressMode ) {
- setParameters(KEY_BUTTON_PRESS_MODE, buttonPressMode);
+ setParameter(KEY_BUTTON_PRESS_MODE, buttonPressMode);
}
public void setCustomButtonName(Integer customButtonID) {
- setParameters(KEY_CUSTOM_BUTTON_ID, customButtonID);
+ setParameter(KEY_CUSTOM_BUTTON_ID, customButtonID);
}
public Integer getCustomButtonName() {
- return (Integer) parameters.get(KEY_CUSTOM_BUTTON_ID);
+ return getInteger(KEY_CUSTOM_BUTTON_ID);
}
}
diff --git a/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/OnCommand.java b/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/OnCommand.java index c9f0fe21b..75442c3e6 100644 --- a/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/OnCommand.java +++ b/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/OnCommand.java @@ -72,27 +72,21 @@ public class OnCommand extends RPCNotification { * @return Integer an integer representation of this object
*/
public Integer getCmdID() {
- return (Integer) parameters.get( KEY_CMD_ID );
+ return getInteger( KEY_CMD_ID );
}
/**
* <p>Sets a Command ID</p>
* @param cmdID an integer object representing a Command ID
*/
public void setCmdID( Integer cmdID ) {
- setParameters(KEY_CMD_ID, cmdID);
+ setParameter(KEY_CMD_ID, cmdID);
}
/**
* <p>Returns a <I>TriggerSource</I> object which will be shown in the HMI</p>
* @return TriggerSource a TriggerSource object
*/
public TriggerSource getTriggerSource() {
- Object obj = parameters.get(KEY_TRIGGER_SOURCE);
- if (obj instanceof TriggerSource) {
- return (TriggerSource) obj;
- } else if (obj instanceof String) {
- return TriggerSource.valueForString((String) obj);
- }
- return null;
+ return (TriggerSource) getObject(TriggerSource.class, KEY_TRIGGER_SOURCE);
}
/**
* <p>Sets TriggerSource</p>
@@ -100,6 +94,6 @@ public class OnCommand extends RPCNotification { * @param triggerSource a TriggerSource object
*/
public void setTriggerSource( TriggerSource triggerSource ) {
- setParameters(KEY_TRIGGER_SOURCE, triggerSource);
+ setParameter(KEY_TRIGGER_SOURCE, triggerSource);
}
}
diff --git a/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/OnDriverDistraction.java b/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/OnDriverDistraction.java index e7d8a1cd2..264362d16 100644 --- a/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/OnDriverDistraction.java +++ b/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/OnDriverDistraction.java @@ -6,8 +6,6 @@ import com.smartdevicelink.proxy.rpc.enums.DriverDistractionState; import java.util.Hashtable;
-import static com.smartdevicelink.proxy.constants.Names.triggerSource;
-
/**
* <p>Notifies the application of the current driver distraction state (whether driver distraction rules are in effect, or
* not).</p>
@@ -60,19 +58,13 @@ public class OnDriverDistraction extends RPCNotification { * @return {@linkplain DriverDistractionState} the Current driver distraction state.
*/
public DriverDistractionState getState() {
- Object obj = parameters.get(KEY_STATE);
- if (obj instanceof DriverDistractionState) {
- return (DriverDistractionState)obj;
- } else if(obj instanceof String) {
- return DriverDistractionState.valueForString((String) obj);
- }
- return null;
+ return (DriverDistractionState) getObject(DriverDistractionState.class, KEY_STATE);
}
/**
* <p>Called to set the driver distraction state(i.e. whether driver distraction rules are in effect, or not)</p>
* @param state the current driver distraction state
*/
public void setState( DriverDistractionState state ) {
- setParameters(KEY_STATE, state);
+ setParameter(KEY_STATE, state);
}
}
diff --git a/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/OnHMIStatus.java b/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/OnHMIStatus.java index 99f45a52d..588034c46 100644 --- a/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/OnHMIStatus.java +++ b/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/OnHMIStatus.java @@ -87,53 +87,35 @@ public class OnHMIStatus extends RPCNotification { * @return {@linkplain HMILevel} the current HMI Level in effect for the application
*/
public HMILevel getHmiLevel() {
- Object obj = parameters.get(KEY_HMI_LEVEL);
- if (obj instanceof HMILevel) {
- return (HMILevel) obj;
- } else if (obj instanceof String) {
- return HMILevel.valueForString((String) obj);
- }
- return null;
+ return (HMILevel) getObject(HMILevel.class, KEY_HMI_LEVEL);
}
/**
* <p>Set the HMILevel of OnHMIStatus</p>
* @param hmiLevel the HMILevel to set
*/
public void setHmiLevel( HMILevel hmiLevel ) {
- setParameters(KEY_HMI_LEVEL, hmiLevel);
+ setParameter(KEY_HMI_LEVEL, hmiLevel);
}
/**
* <p>Get current state of audio streaming for the application</p>
* @return {@linkplain AudioStreamingState} Returns current state of audio streaming for the application
*/
public AudioStreamingState getAudioStreamingState() {
- Object obj = parameters.get(KEY_AUDIO_STREAMING_STATE);
- if (obj instanceof AudioStreamingState) {
- return (AudioStreamingState) obj;
- } else if (obj instanceof String) {
- return AudioStreamingState.valueForString((String) obj);
- }
- return null;
+ return (AudioStreamingState) getObject(AudioStreamingState.class, KEY_AUDIO_STREAMING_STATE);
}
/**
* <p>Set the audio streaming state</p>
* @param audioStreamingState the state of audio streaming of the application
*/
public void setAudioStreamingState( AudioStreamingState audioStreamingState ) {
- setParameters(KEY_AUDIO_STREAMING_STATE, audioStreamingState);
+ setParameter(KEY_AUDIO_STREAMING_STATE, audioStreamingState);
}
/**
* <p>Get the System Context</p>
* @return {@linkplain SystemContext} whether a user-initiated interaction is in-progress (VRSESSION or MENU), or not (MAIN).
*/
public SystemContext getSystemContext() {
- Object obj = parameters.get(KEY_SYSTEM_CONTEXT);
- if (obj instanceof SystemContext) {
- return (SystemContext) obj;
- } else if (obj instanceof String) {
- return SystemContext.valueForString((String) obj);
- }
- return null;
+ return (SystemContext) getObject(SystemContext.class, KEY_SYSTEM_CONTEXT);
}
/**
* <p>Set the System Context of OnHMIStatus</p>
@@ -141,7 +123,7 @@ public class OnHMIStatus extends RPCNotification { * (VRSESSION or MENU), or not (MAIN)
*/
public void setSystemContext( SystemContext systemContext ) {
- setParameters(KEY_SYSTEM_CONTEXT, systemContext);
+ setParameter(KEY_SYSTEM_CONTEXT, systemContext);
}
/**
* <p>Query whether it's the first run</p>
diff --git a/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/OnHashChange.java b/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/OnHashChange.java index ff1fe9e82..5867bb283 100644 --- a/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/OnHashChange.java +++ b/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/OnHashChange.java @@ -55,11 +55,11 @@ public class OnHashChange extends RPCNotification { }
public String getHashID() {
- return (String) parameters.get(KEY_HASH_ID);
+ return getString(KEY_HASH_ID);
}
public void setHashID(String hashID) {
- setParameters(KEY_HASH_ID, hashID);
+ setParameter(KEY_HASH_ID, hashID);
}
}
diff --git a/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/OnKeyboardInput.java b/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/OnKeyboardInput.java index b8d90cc5f..cf7df108e 100644 --- a/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/OnKeyboardInput.java +++ b/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/OnKeyboardInput.java @@ -65,24 +65,18 @@ public class OnKeyboardInput extends RPCNotification { }
public KeyboardEvent getEvent() {
- Object obj = parameters.get(KEY_EVENT);
- if (obj instanceof KeyboardEvent) {
- return (KeyboardEvent) obj;
- } else if (obj instanceof String) {
- return KeyboardEvent.valueForString((String) obj);
- }
- return null;
+ return (KeyboardEvent) getObject(KeyboardEvent.class, KEY_EVENT);
}
public void setEvent(KeyboardEvent event) {
- setParameters(KEY_EVENT, event);
+ setParameter(KEY_EVENT, event);
}
public void setData(String data) {
- setParameters(KEY_DATA, data);
+ setParameter(KEY_DATA, data);
}
public String getData() {
- Object obj = parameters.get(KEY_DATA);
+ Object obj = getParameter(KEY_DATA);
if (obj instanceof String) {
return (String) obj;
}
diff --git a/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/OnLanguageChange.java b/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/OnLanguageChange.java index 279495a93..11d85dbab 100644 --- a/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/OnLanguageChange.java +++ b/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/OnLanguageChange.java @@ -77,39 +77,27 @@ public class OnLanguageChange extends RPCNotification { * @param language language that current SDL voice engine(VR+TTS) use
*/
public void setLanguage(Language language) {
- setParameters(KEY_LANGUAGE, language);
+ setParameter(KEY_LANGUAGE, language);
}
/**
* <p>Returns language that current SDL voice engine(VR+TTS) use</p>
* @return {@linkplain Language} language that current SDL voice engine(VR+TTS) use
*/
public Language getLanguage() {
- Object obj = parameters.get(KEY_LANGUAGE);
- if (obj instanceof Language) {
- return (Language) obj;
- } else if (obj instanceof String) {
- return Language.valueForString((String) obj);
- }
- return null;
+ return (Language) getObject(Language.class, KEY_LANGUAGE);
}
/**
* <p>Sets language that current display use</p>
* @param hmiDisplayLanguage language that current SDL voice engine(VR+TTS) use
*/
public void setHmiDisplayLanguage(Language hmiDisplayLanguage) {
- setParameters(KEY_HMI_DISPLAY_LANGUAGE, hmiDisplayLanguage);
+ setParameter(KEY_HMI_DISPLAY_LANGUAGE, hmiDisplayLanguage);
}
/**
* <p>Returns language that current display use</p>
* @return {@linkplain Language} language that current display use
*/
public Language getHmiDisplayLanguage() {
- Object obj = parameters.get(KEY_HMI_DISPLAY_LANGUAGE);
- if (obj instanceof Language) {
- return (Language) obj;
- } else if (obj instanceof String) {
- return Language.valueForString((String) obj);
- }
- return null;
+ return (Language) getObject(Language.class, KEY_HMI_DISPLAY_LANGUAGE);
}
}
diff --git a/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/OnLockScreenStatus.java b/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/OnLockScreenStatus.java index c143a0948..665350d10 100644 --- a/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/OnLockScreenStatus.java +++ b/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/OnLockScreenStatus.java @@ -29,11 +29,11 @@ public class OnLockScreenStatus extends RPCNotification { */
public Boolean getDriverDistractionStatus() {
- return (Boolean)parameters.get(KEY_DRIVER_DISTRACTION);
+ return getBoolean(KEY_DRIVER_DISTRACTION);
}
public void setDriverDistractionStatus(Boolean driverDistractionStatus) {
- setParameters(KEY_DRIVER_DISTRACTION, driverDistractionStatus);
+ setParameter(KEY_DRIVER_DISTRACTION, driverDistractionStatus);
}
/**
* <p>Get the {@linkplain LockScreenStatus} enumeration, indicating if the lockscreen should be required, optional or off </p>
@@ -41,11 +41,11 @@ public class OnLockScreenStatus extends RPCNotification { */
public LockScreenStatus getShowLockScreen() {
- return (LockScreenStatus)parameters.get(KEY_SHOW_LOCK_SCREEN);
+ return (LockScreenStatus) getParameter(KEY_SHOW_LOCK_SCREEN);
}
public void setShowLockScreen(LockScreenStatus showLockScreen) {
- setParameters(KEY_SHOW_LOCK_SCREEN, showLockScreen);
+ setParameter(KEY_SHOW_LOCK_SCREEN, showLockScreen);
}
/**
* <p>Get user selection status for the application (has the app been selected via hmi or voice command)</p>
@@ -53,11 +53,11 @@ public class OnLockScreenStatus extends RPCNotification { */
public Boolean getUserSelected() {
- return (Boolean)parameters.get(KEY_USER_SELECTED);
+ return getBoolean(KEY_USER_SELECTED);
}
public void setUserSelected(Boolean userSelected) {
- setParameters(KEY_USER_SELECTED, userSelected);
+ setParameter(KEY_USER_SELECTED, userSelected);
}
/**
* <p>Get HMILevel in effect for the application</p>
@@ -65,10 +65,10 @@ public class OnLockScreenStatus extends RPCNotification { */
public HMILevel getHMILevel() {
- return (HMILevel)parameters.get(KEY_HMI_LEVEL);
+ return (HMILevel) getParameter(KEY_HMI_LEVEL);
}
public void setHMILevel(HMILevel setHMILevel) {
- setParameters(KEY_HMI_LEVEL, setHMILevel);
+ setParameter(KEY_HMI_LEVEL, setHMILevel);
}
}
diff --git a/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/OnPermissionsChange.java b/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/OnPermissionsChange.java index ef7335623..c8e9e654a 100644 --- a/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/OnPermissionsChange.java +++ b/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/OnPermissionsChange.java @@ -3,7 +3,6 @@ package com.smartdevicelink.proxy.rpc; import com.smartdevicelink.protocol.enums.FunctionID;
import com.smartdevicelink.proxy.RPCNotification;
-import java.util.ArrayList;
import java.util.Hashtable;
import java.util.List;
@@ -69,26 +68,13 @@ public class OnPermissionsChange extends RPCNotification { */
@SuppressWarnings("unchecked")
public List<PermissionItem> getPermissionItem() {
- List<?> list = (List<?>)parameters.get(KEY_PERMISSION_ITEM);
- if (list != null && list.size()>0) {
- Object obj = list.get(0);
- if(obj instanceof PermissionItem){
- return (List<PermissionItem>) list;
- } else if(obj instanceof Hashtable) {
- List<PermissionItem> newList = new ArrayList<PermissionItem>();
- for (Object hash:list) {
- newList.add(new PermissionItem((Hashtable<String, Object>)hash));
- }
- return newList;
- }
- }
- return null;
+ return (List<PermissionItem>) getObject(PermissionItem.class, KEY_PERMISSION_ITEM);
}
/**
* <p>Sets PermissionItems describing change in permissions for a given set of RPCs</p>
* @param permissionItem an List of PermissionItem describing change in permissions for a given set of RPCs
*/
public void setPermissionItem(List<PermissionItem> permissionItem) {
- setParameters(KEY_PERMISSION_ITEM, permissionItem);
+ setParameter(KEY_PERMISSION_ITEM, permissionItem);
}
}
diff --git a/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/OnSdlChoiceChosen.java b/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/OnSdlChoiceChosen.java index 8f271756d..d531baf4d 100644 --- a/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/OnSdlChoiceChosen.java +++ b/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/OnSdlChoiceChosen.java @@ -144,21 +144,15 @@ public class OnSdlChoiceChosen extends RPCNotification { super(hash);
}
public SdlChoice getSdlChoice() {
- return (SdlChoice) parameters.get(KEY_SDL_CHOICE);
+ return (SdlChoice) getParameter(KEY_SDL_CHOICE);
}
public void setSdlChoice(SdlChoice sdlChoice) {
- setParameters(KEY_SDL_CHOICE, sdlChoice);
+ setParameter(KEY_SDL_CHOICE, sdlChoice);
}
public TriggerSource getTriggerSource() {
- Object obj = parameters.get(KEY_TRIGGER_SOURCE);
- if (obj instanceof TriggerSource) {
- return (TriggerSource) obj;
- } else if (obj instanceof String) {
- return TriggerSource.valueForString((String) obj);
- }
- return null;
+ return (TriggerSource) getObject(TriggerSource.class, KEY_TRIGGER_SOURCE);
}
public void setTriggerSource( TriggerSource triggerSource ) {
- setParameters(KEY_TRIGGER_SOURCE, triggerSource);
+ setParameter(KEY_TRIGGER_SOURCE, triggerSource);
}
}
diff --git a/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/OnStreamRPC.java b/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/OnStreamRPC.java index c31a23a6d..273e32716 100644 --- a/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/OnStreamRPC.java +++ b/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/OnStreamRPC.java @@ -13,23 +13,23 @@ public class OnStreamRPC extends RPCNotification { } public void setFileName(String fileName) { - setParameters(KEY_FILENAME, fileName); + setParameter(KEY_FILENAME, fileName); } public String getFileName() { - return (String) parameters.get(KEY_FILENAME); + return getString(KEY_FILENAME); } public void setBytesComplete(Long bytesComplete) { - setParameters(KEY_BYTESCOMPLETE, bytesComplete); + setParameter(KEY_BYTESCOMPLETE, bytesComplete); } public Long getBytesComplete() { - return (Long) parameters.get(KEY_BYTESCOMPLETE); + return getLong(KEY_BYTESCOMPLETE); } public void setFileSize(Long fileSize) { - setParameters(KEY_FILESIZE, fileSize); + setParameter(KEY_FILESIZE, fileSize); } public Long getFileSize() { - return (Long) parameters.get(KEY_FILESIZE); + return getLong(KEY_FILESIZE); } }
\ No newline at end of file diff --git a/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/OnSystemRequest.java b/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/OnSystemRequest.java index 9503eaaaf..672605155 100644 --- a/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/OnSystemRequest.java +++ b/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/OnSystemRequest.java @@ -199,16 +199,7 @@ public class OnSystemRequest extends RPCNotification { @SuppressWarnings("unchecked")
public List<String> getLegacyData() {
- if (parameters.get(KEY_DATA) instanceof List<?>) {
- List<?> list = (List<?>)parameters.get(KEY_DATA);
- if (list != null && list.size()>0) {
- Object obj = list.get(0);
- if (obj instanceof String) {
- return (List<String>)list;
- }
- }
- }
- return null;
+ return (List<String>) getObject(String.class, KEY_DATA);
}
public String getBody(){
@@ -228,26 +219,19 @@ public class OnSystemRequest extends RPCNotification { }
public RequestType getRequestType() {
- Object obj = parameters.get(KEY_REQUEST_TYPE);
- if (obj == null) return null;
- if (obj instanceof RequestType) {
- return (RequestType) obj;
- } else if (obj instanceof String) {
- return RequestType.valueForString((String) obj);
- }
- return null;
+ return (RequestType) getObject(RequestType.class, KEY_REQUEST_TYPE);
}
public void setRequestType(RequestType requestType) {
- setParameters(KEY_REQUEST_TYPE, requestType);
+ setParameter(KEY_REQUEST_TYPE, requestType);
}
public String getUrl() {
- Object o = parameters.get(KEY_URL);
+ Object o = getParameter(KEY_URL);
if (o == null)
{
//try again for gen 1.1
- o = parameters.get(KEY_URL_V1);
+ o = getParameter(KEY_URL_V1);
}
if (o == null)
return null;
@@ -259,22 +243,15 @@ public class OnSystemRequest extends RPCNotification { }
public void setUrl(String url) {
- setParameters(KEY_URL, url);
+ setParameter(KEY_URL, url);
}
public FileType getFileType() {
- Object obj = parameters.get(KEY_FILE_TYPE);
- if (obj == null) return null;
- if (obj instanceof FileType) {
- return (FileType) obj;
- } else if (obj instanceof String) {
- return FileType.valueForString((String) obj);
- }
- return null;
+ return (FileType) getObject(FileType.class, KEY_FILE_TYPE);
}
public void setFileType(FileType fileType) {
- setParameters(KEY_FILE_TYPE, fileType);
+ setParameter(KEY_FILE_TYPE, fileType);
}
/**
@@ -290,7 +267,7 @@ public class OnSystemRequest extends RPCNotification { }
public Long getOffset() {
- final Object o = parameters.get(KEY_OFFSET);
+ final Object o = getParameter(KEY_OFFSET);
if (o == null){
return null;
@@ -305,14 +282,14 @@ public class OnSystemRequest extends RPCNotification { }
public void setOffset(Long offset) {
- setParameters(KEY_OFFSET, offset);
+ setParameter(KEY_OFFSET, offset);
}
public Integer getTimeout() {
- Object o = parameters.get(KEY_TIMEOUT);
+ Object o = getParameter(KEY_TIMEOUT);
if (o == null){
- o = parameters.get(KEY_TIMEOUT_V1);
+ o = getParameter(KEY_TIMEOUT_V1);
if (o == null) return null;
}
@@ -323,11 +300,11 @@ public class OnSystemRequest extends RPCNotification { }
public void setTimeout(Integer timeout) {
- setParameters(KEY_TIMEOUT, timeout);
+ setParameter(KEY_TIMEOUT, timeout);
}
public Long getLength() {
- final Object o = parameters.get(KEY_LENGTH);
+ final Object o = getParameter(KEY_LENGTH);
if (o == null){
return null;
}
@@ -353,6 +330,6 @@ public class OnSystemRequest extends RPCNotification { }
public void setLength(Long length) {
- setParameters(KEY_LENGTH, length);
+ setParameter(KEY_LENGTH, length);
}
}
diff --git a/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/OnTBTClientState.java b/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/OnTBTClientState.java index c7ff95d0a..9c08aeacf 100644 --- a/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/OnTBTClientState.java +++ b/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/OnTBTClientState.java @@ -58,19 +58,13 @@ public class OnTBTClientState extends RPCNotification { * @return {@linkplain TBTState} the current state of TBT client
*/
public TBTState getState() {
- Object obj = parameters.get(KEY_STATE);
- if (obj instanceof TBTState) {
- return (TBTState)obj;
- } else if(obj instanceof String) {
- return TBTState.valueForString((String) obj);
- }
- return null;
+ return (TBTState) getObject(TBTState.class, KEY_STATE);
}
/**
* <p>Called to set the current state of TBT client</p>
* @param state current state of TBT client
*/
public void setState( TBTState state ) {
- setParameters(KEY_STATE, state);
+ setParameter(KEY_STATE, state);
}
} // end-class
diff --git a/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/OnTouchEvent.java b/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/OnTouchEvent.java index c40f737d7..2ee0a3d5e 100644 --- a/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/OnTouchEvent.java +++ b/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/OnTouchEvent.java @@ -4,7 +4,6 @@ import com.smartdevicelink.protocol.enums.FunctionID; import com.smartdevicelink.proxy.RPCNotification;
import com.smartdevicelink.proxy.rpc.enums.TouchType;
-import java.util.ArrayList;
import java.util.Hashtable;
import java.util.List;
@@ -69,40 +68,19 @@ public class OnTouchEvent extends RPCNotification { }
public void setType(TouchType type) {
- setParameters(KEY_TYPE, type);
+ setParameter(KEY_TYPE, type);
}
public TouchType getType() {
- Object obj = parameters.get(KEY_TYPE);
- if (obj instanceof TouchType) {
- return (TouchType) obj;
- } else if (obj instanceof String) {
- return TouchType.valueForString((String) obj);
- }
- return null;
+ return (TouchType) getObject(TouchType.class, KEY_TYPE);
}
public void setEvent(List<TouchEvent> event) {
- setParameters(KEY_EVENT, event);
+ setParameter(KEY_EVENT, event);
}
@SuppressWarnings("unchecked")
public List<TouchEvent> getEvent() {
- if (parameters.get(KEY_EVENT) instanceof List<?>) {
- List<?> list = (List<?>)parameters.get(KEY_EVENT);
- if (list != null && list.size() > 0) {
- Object obj = list.get(0);
- if (obj instanceof TouchEvent) {
- return (List<TouchEvent>) list;
- } else if (obj instanceof Hashtable) {
- List<TouchEvent> newList = new ArrayList<TouchEvent>();
- for (Object hashObj : list) {
- newList.add(new TouchEvent((Hashtable<String, Object>) hashObj));
- }
- return newList;
- }
- }
- }
- return null;
+ return (List<TouchEvent>) getObject(TouchEvent.class, KEY_EVENT);
}
}
diff --git a/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/OnVehicleData.java b/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/OnVehicleData.java index 35f4ddfec..03649d740 100644 --- a/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/OnVehicleData.java +++ b/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/OnVehicleData.java @@ -280,42 +280,30 @@ public class OnVehicleData extends RPCNotification { super(hash);
}
public void setGps(GPSData gps) {
- setParameters(KEY_GPS, gps);
+ setParameter(KEY_GPS, gps);
}
@SuppressWarnings("unchecked")
public GPSData getGps() {
- Object obj = parameters.get(KEY_GPS);
- if (obj instanceof GPSData) {
- return (GPSData) obj;
- } else if (obj instanceof Hashtable) {
- GPSData theCode = null;
- try {
- theCode = new GPSData((Hashtable<String, Object>) obj);
- } catch (Exception e) {
- DebugTool.logError("Failed to parse " + getClass().getSimpleName() + "." + KEY_GPS, e);
- }
- return theCode;
- }
- return null;
+ return (GPSData) getObject(GPSData.class, KEY_GPS);
}
public void setSpeed(Double speed) {
- setParameters(KEY_SPEED, speed);
+ setParameter(KEY_SPEED, speed);
}
public Double getSpeed() {
- Object object = parameters.get(KEY_SPEED);
+ Object object = getParameter(KEY_SPEED);
return SdlDataTypeConverter.objectToDouble(object);
}
public void setRpm(Integer rpm) {
- setParameters(KEY_RPM, rpm);
+ setParameter(KEY_RPM, rpm);
}
public Integer getRpm() {
- return (Integer) parameters.get(KEY_RPM);
+ return getInteger(KEY_RPM);
}
public void setFuelLevel(Double fuelLevel) {
- setParameters(KEY_FUEL_LEVEL, fuelLevel);
+ setParameter(KEY_FUEL_LEVEL, fuelLevel);
}
public Double getFuelLevel() {
- Object object = parameters.get(KEY_FUEL_LEVEL);
+ Object object = getParameter(KEY_FUEL_LEVEL);
return SdlDataTypeConverter.objectToDouble(object);
}
@Deprecated
@@ -327,274 +315,144 @@ public class OnVehicleData extends RPCNotification { return getFuelLevelState();
}
public void setFuelLevelState(ComponentVolumeStatus fuelLevelState) {
- setParameters(KEY_FUEL_LEVEL_STATE, fuelLevelState);
+ setParameter(KEY_FUEL_LEVEL_STATE, fuelLevelState);
}
public ComponentVolumeStatus getFuelLevelState() {
- Object obj = parameters.get(KEY_FUEL_LEVEL_STATE);
- if (obj instanceof ComponentVolumeStatus) {
- return (ComponentVolumeStatus) obj;
- } else if (obj instanceof String) {
- ComponentVolumeStatus theCode = null;
- try {
- theCode = ComponentVolumeStatus.valueForString((String) obj);
- } catch (Exception e) {
- DebugTool.logError("Failed to parse " + getClass().getSimpleName() + "." + KEY_FUEL_LEVEL_STATE, e);
- }
- return theCode;
- }
- return null;
+ return (ComponentVolumeStatus) getObject(ComponentVolumeStatus.class, KEY_FUEL_LEVEL_STATE);
}
public void setInstantFuelConsumption(Double instantFuelConsumption) {
- setParameters(KEY_INSTANT_FUEL_CONSUMPTION, instantFuelConsumption);
+ setParameter(KEY_INSTANT_FUEL_CONSUMPTION, instantFuelConsumption);
}
public Double getInstantFuelConsumption() {
- Object object = parameters.get(KEY_INSTANT_FUEL_CONSUMPTION);
+ Object object = getParameter(KEY_INSTANT_FUEL_CONSUMPTION);
return SdlDataTypeConverter.objectToDouble(object);
}
public void setExternalTemperature(Double externalTemperature) {
- setParameters(KEY_EXTERNAL_TEMPERATURE, externalTemperature);
+ setParameter(KEY_EXTERNAL_TEMPERATURE, externalTemperature);
}
public Double getExternalTemperature() {
- Object object = parameters.get(KEY_EXTERNAL_TEMPERATURE);
+ Object object = getParameter(KEY_EXTERNAL_TEMPERATURE);
return SdlDataTypeConverter.objectToDouble(object);
}
public void setVin(String vin) {
- setParameters(KEY_VIN, vin);
+ setParameter(KEY_VIN, vin);
}
public String getVin() {
- return (String) parameters.get(KEY_VIN);
+ return getString(KEY_VIN);
}
public void setPrndl(PRNDL prndl) {
- setParameters(KEY_PRNDL, prndl);
+ setParameter(KEY_PRNDL, prndl);
}
public PRNDL getPrndl() {
- Object obj = parameters.get(KEY_PRNDL);
- if (obj instanceof PRNDL) {
- return (PRNDL) obj;
- } else if (obj instanceof String) {
- return PRNDL.valueForString((String) obj);
- }
- return null;
+ return (PRNDL) getObject(PRNDL.class, KEY_PRNDL);
}
public void setTirePressure(TireStatus tirePressure) {
- setParameters(KEY_TIRE_PRESSURE, tirePressure);
+ setParameter(KEY_TIRE_PRESSURE, tirePressure);
}
@SuppressWarnings("unchecked")
public TireStatus getTirePressure() {
- Object obj = parameters.get(KEY_TIRE_PRESSURE);
- if (obj instanceof TireStatus) {
- return (TireStatus) obj;
- } else if (obj instanceof Hashtable) {
- try {
- return new TireStatus((Hashtable<String, Object>) obj);
- } catch (Exception e) {
- DebugTool.logError("Failed to parse " + getClass().getSimpleName() + "." + KEY_TIRE_PRESSURE, e);
- }
- }
- return null;
+ return (TireStatus) getObject(TireStatus.class, KEY_TIRE_PRESSURE);
}
public void setOdometer(Integer odometer) {
- setParameters(KEY_ODOMETER, odometer);
+ setParameter(KEY_ODOMETER, odometer);
}
public Integer getOdometer() {
- return (Integer) parameters.get(KEY_ODOMETER);
+ return getInteger(KEY_ODOMETER);
}
public void setBeltStatus(BeltStatus beltStatus) {
- setParameters(KEY_BELT_STATUS, beltStatus);
+ setParameter(KEY_BELT_STATUS, beltStatus);
}
@SuppressWarnings("unchecked")
public BeltStatus getBeltStatus() {
- Object obj = parameters.get(KEY_BELT_STATUS);
- if (obj instanceof BeltStatus) {
- return (BeltStatus) obj;
- } else if (obj instanceof Hashtable) {
- try {
- return new BeltStatus((Hashtable<String, Object>) obj);
- } catch (Exception e) {
- DebugTool.logError("Failed to parse " + getClass().getSimpleName() + "." + KEY_BELT_STATUS, e);
- }
- }
- return null;
+ return (BeltStatus) getObject(BeltStatus.class, KEY_BELT_STATUS);
}
public void setBodyInformation(BodyInformation bodyInformation) {
- setParameters(KEY_BODY_INFORMATION, bodyInformation);
+ setParameter(KEY_BODY_INFORMATION, bodyInformation);
}
@SuppressWarnings("unchecked")
public BodyInformation getBodyInformation() {
- Object obj = parameters.get(KEY_BODY_INFORMATION);
- if (obj instanceof BodyInformation) {
- return (BodyInformation) obj;
- } else if (obj instanceof Hashtable) {
- try {
- return new BodyInformation((Hashtable<String, Object>) obj);
- } catch (Exception e) {
- DebugTool.logError("Failed to parse " + getClass().getSimpleName() + "." + KEY_BODY_INFORMATION, e);
- }
- }
- return null;
+ return (BodyInformation) getObject(BodyInformation.class, KEY_BODY_INFORMATION);
}
public void setDeviceStatus(DeviceStatus deviceStatus) {
- setParameters(KEY_DEVICE_STATUS, deviceStatus);
+ setParameter(KEY_DEVICE_STATUS, deviceStatus);
}
@SuppressWarnings("unchecked")
public DeviceStatus getDeviceStatus() {
- Object obj = parameters.get(KEY_DEVICE_STATUS);
- if (obj instanceof DeviceStatus) {
- return (DeviceStatus) obj;
- } else if (obj instanceof Hashtable) {
- try {
- return new DeviceStatus((Hashtable<String, Object>) obj);
- } catch (Exception e) {
- DebugTool.logError("Failed to parse " + getClass().getSimpleName() + "." + KEY_DEVICE_STATUS, e);
- }
- }
- return null;
+ return (DeviceStatus) getObject(DeviceStatus.class, KEY_DEVICE_STATUS);
}
public void setDriverBraking(VehicleDataEventStatus driverBraking) {
- setParameters(KEY_DRIVER_BRAKING, driverBraking);
+ setParameter(KEY_DRIVER_BRAKING, driverBraking);
}
public VehicleDataEventStatus getDriverBraking() {
- Object obj = parameters.get(KEY_DRIVER_BRAKING);
- if (obj instanceof VehicleDataEventStatus) {
- return (VehicleDataEventStatus) obj;
- } else if (obj instanceof String) {
- return VehicleDataEventStatus.valueForString((String) obj);
- }
- return null;
+ return (VehicleDataEventStatus) getObject(VehicleDataEventStatus.class, KEY_DRIVER_BRAKING);
}
public void setWiperStatus(WiperStatus wiperStatus) {
- setParameters(KEY_WIPER_STATUS, wiperStatus);
+ setParameter(KEY_WIPER_STATUS, wiperStatus);
}
public WiperStatus getWiperStatus() {
- Object obj = parameters.get(KEY_WIPER_STATUS);
- if (obj instanceof WiperStatus) {
- return (WiperStatus) obj;
- } else if (obj instanceof String) {
- return WiperStatus.valueForString((String) obj);
- }
- return null;
+ return (WiperStatus) getObject(WiperStatus.class, KEY_WIPER_STATUS);
}
public void setHeadLampStatus(HeadLampStatus headLampStatus) {
- setParameters(KEY_HEAD_LAMP_STATUS, headLampStatus);
+ setParameter(KEY_HEAD_LAMP_STATUS, headLampStatus);
}
@SuppressWarnings("unchecked")
public HeadLampStatus getHeadLampStatus() {
- Object obj = parameters.get(KEY_HEAD_LAMP_STATUS);
- if (obj instanceof HeadLampStatus) {
- return (HeadLampStatus) obj;
- } else if (obj instanceof Hashtable) {
- try {
- return new HeadLampStatus((Hashtable<String, Object>) obj);
- } catch (Exception e) {
- DebugTool.logError("Failed to parse " + getClass().getSimpleName() + "." + KEY_HEAD_LAMP_STATUS, e);
- }
- }
- return null;
+ return (HeadLampStatus) getObject(HeadLampStatus.class, KEY_HEAD_LAMP_STATUS);
}
public void setEngineTorque(Double engineTorque) {
- setParameters(KEY_ENGINE_TORQUE, engineTorque);
+ setParameter(KEY_ENGINE_TORQUE, engineTorque);
}
public Double getEngineTorque() {
- Object object = parameters.get(KEY_ENGINE_TORQUE);
+ Object object = getParameter(KEY_ENGINE_TORQUE);
return SdlDataTypeConverter.objectToDouble(object);
}
public void setAccPedalPosition(Double accPedalPosition) {
- setParameters(KEY_ACC_PEDAL_POSITION, accPedalPosition);
+ setParameter(KEY_ACC_PEDAL_POSITION, accPedalPosition);
}
public Double getAccPedalPosition() {
- Object object = parameters.get(KEY_ACC_PEDAL_POSITION);
+ Object object = getParameter(KEY_ACC_PEDAL_POSITION);
return SdlDataTypeConverter.objectToDouble(object);
}
public void setSteeringWheelAngle(Double steeringWheelAngle) {
- setParameters(KEY_STEERING_WHEEL_ANGLE, steeringWheelAngle);
+ setParameter(KEY_STEERING_WHEEL_ANGLE, steeringWheelAngle);
}
public Double getSteeringWheelAngle() {
- Object object = parameters.get(KEY_STEERING_WHEEL_ANGLE);
+ Object object = getParameter(KEY_STEERING_WHEEL_ANGLE);
return SdlDataTypeConverter.objectToDouble(object);
}
public void setECallInfo(ECallInfo eCallInfo) {
- setParameters(KEY_E_CALL_INFO, eCallInfo);
+ setParameter(KEY_E_CALL_INFO, eCallInfo);
}
@SuppressWarnings("unchecked")
public ECallInfo getECallInfo() {
- Object obj = parameters.get(KEY_E_CALL_INFO);
- if (obj instanceof ECallInfo) {
- return (ECallInfo) obj;
- } else if (obj instanceof Hashtable) {
- try {
- return new ECallInfo((Hashtable<String, Object>) obj);
- } catch (Exception e) {
- DebugTool.logError("Failed to parse " + getClass().getSimpleName() + "." + KEY_E_CALL_INFO, e);
- }
- }
- return null;
+ return (ECallInfo) getObject(ECallInfo.class, KEY_E_CALL_INFO);
}
public void setAirbagStatus(AirbagStatus airbagStatus) {
- setParameters(KEY_AIRBAG_STATUS, airbagStatus);
+ setParameter(KEY_AIRBAG_STATUS, airbagStatus);
}
@SuppressWarnings("unchecked")
public AirbagStatus getAirbagStatus() {
- Object obj = parameters.get(KEY_AIRBAG_STATUS);
- if (obj instanceof AirbagStatus) {
- return (AirbagStatus) obj;
- } else if (obj instanceof Hashtable) {
- try {
- return new AirbagStatus((Hashtable<String, Object>) obj);
- } catch (Exception e) {
- DebugTool.logError("Failed to parse " + getClass().getSimpleName() + "." + KEY_AIRBAG_STATUS, e);
- }
- }
- return null;
+ return (AirbagStatus) getObject(AirbagStatus.class, KEY_AIRBAG_STATUS);
}
public void setEmergencyEvent(EmergencyEvent emergencyEvent) {
- setParameters(KEY_EMERGENCY_EVENT, emergencyEvent);
+ setParameter(KEY_EMERGENCY_EVENT, emergencyEvent);
}
@SuppressWarnings("unchecked")
public EmergencyEvent getEmergencyEvent() {
- Object obj = parameters.get(KEY_EMERGENCY_EVENT);
- if (obj instanceof EmergencyEvent) {
- return (EmergencyEvent) obj;
- } else if (obj instanceof Hashtable) {
- try {
- return new EmergencyEvent((Hashtable<String, Object>) obj);
- } catch (Exception e) {
- DebugTool.logError("Failed to parse " + getClass().getSimpleName() + "." + KEY_EMERGENCY_EVENT, e);
- }
- }
- return null;
+ return (EmergencyEvent) getObject(EmergencyEvent.class, KEY_EMERGENCY_EVENT);
}
public void setClusterModeStatus(ClusterModeStatus clusterModeStatus) {
- setParameters(KEY_CLUSTER_MODE_STATUS, clusterModeStatus);
+ setParameter(KEY_CLUSTER_MODE_STATUS, clusterModeStatus);
}
@SuppressWarnings("unchecked")
public ClusterModeStatus getClusterModeStatus() {
- Object obj = parameters.get(KEY_CLUSTER_MODE_STATUS);
- if (obj instanceof ClusterModeStatus) {
- return (ClusterModeStatus) obj;
- } else if (obj instanceof Hashtable) {
- try {
- return new ClusterModeStatus((Hashtable<String, Object>) obj);
- } catch (Exception e) {
- DebugTool.logError("Failed to parse " + getClass().getSimpleName() + "." + KEY_CLUSTER_MODE_STATUS, e);
- }
- }
- return null;
+ return (ClusterModeStatus) getObject(ClusterModeStatus.class, KEY_CLUSTER_MODE_STATUS);
}
public void setMyKey(MyKey myKey) {
- setParameters(KEY_MY_KEY, myKey);
+ setParameter(KEY_MY_KEY, myKey);
}
@SuppressWarnings("unchecked")
public MyKey getMyKey() {
- Object obj = parameters.get(KEY_MY_KEY);
- if (obj instanceof MyKey) {
- return (MyKey) obj;
- } else if (obj instanceof Hashtable) {
- try {
- return new MyKey((Hashtable<String, Object>) obj);
- } catch (Exception e) {
- DebugTool.logError("Failed to parse " + getClass().getSimpleName() + "." + KEY_MY_KEY, e);
- }
- }
- return null;
+ return (MyKey) getObject(MyKey.class, KEY_MY_KEY);
}
}
diff --git a/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/OnWayPointChange.java b/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/OnWayPointChange.java index 86a24338a..66502061a 100644 --- a/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/OnWayPointChange.java +++ b/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/OnWayPointChange.java @@ -3,12 +3,9 @@ package com.smartdevicelink.proxy.rpc; import com.smartdevicelink.protocol.enums.FunctionID; import com.smartdevicelink.proxy.RPCNotification; -import java.util.ArrayList; import java.util.Hashtable; import java.util.List; -import static com.smartdevicelink.proxy.constants.Names.state; - public class OnWayPointChange extends RPCNotification { public static final String KEY_WAY_POINTS = "wayPoints"; @@ -22,25 +19,10 @@ public class OnWayPointChange extends RPCNotification { @SuppressWarnings("unchecked") public List<LocationDetails> getWayPoints() { - if (parameters.get(KEY_WAY_POINTS) instanceof List<?>) { - List<?> list = (List<?>)parameters.get(KEY_WAY_POINTS); - if (list != null && list.size()>0) { - Object obj = list.get(0); - if(obj instanceof LocationDetails){ - return (List<LocationDetails>) list; - } else if(obj instanceof Hashtable) { - List<LocationDetails> newList = new ArrayList<LocationDetails>(); - for (Object hash:list) { - newList.add(new LocationDetails((Hashtable<String, Object>)hash)); - } - return newList; - } - } - } - return null; + return (List<LocationDetails>) getObject(LocationDetails.class, KEY_WAY_POINTS); } public void setWayPoints(List<LocationDetails> wayPoints) { - setParameters(KEY_WAY_POINTS, wayPoints); + setParameter(KEY_WAY_POINTS, wayPoints); } } diff --git a/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/ParameterPermissions.java b/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/ParameterPermissions.java index 996de27ac..244b73b89 100644 --- a/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/ParameterPermissions.java +++ b/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/ParameterPermissions.java @@ -1,10 +1,10 @@ package com.smartdevicelink.proxy.rpc;
+import com.smartdevicelink.proxy.RPCStruct;
+
import java.util.Hashtable;
import java.util.List;
-import com.smartdevicelink.proxy.RPCStruct;
-
/**
* Defining sets of parameters, which are permitted or prohibited for a given RPC.
* <p><b>Parameter List</b></p>
@@ -65,16 +65,7 @@ public class ParameterPermissions extends RPCStruct { */
@SuppressWarnings("unchecked")
public List<String> getAllowed() {
- if (store.get(KEY_ALLOWED) instanceof List<?>) {
- List<?> list = (List<?>)store.get( KEY_ALLOWED);
- if (list != null && list.size() > 0) {
- Object obj = list.get(0);
- if (obj instanceof String) {
- return (List<String>) list;
- }
- }
- }
- return null;
+ return (List<String>) getObject(String.class, KEY_ALLOWED);
}
/**
@@ -82,11 +73,7 @@ public class ParameterPermissions extends RPCStruct { * @param allowed parameter that is permitted for this given RPC
*/
public void setAllowed(List<String> allowed) {
- if (allowed != null) {
- store.put(KEY_ALLOWED, allowed);
- } else {
- store.remove(KEY_ALLOWED);
- }
+ setValue(KEY_ALLOWED, allowed);
}
/**
@@ -95,16 +82,7 @@ public class ParameterPermissions extends RPCStruct { */
@SuppressWarnings("unchecked")
public List<String> getUserDisallowed() {
- if (store.get(KEY_USER_DISALLOWED) instanceof List<?>) {
- List<?> list = (List<?>)store.get( KEY_USER_DISALLOWED);
- if (list != null && list.size() > 0) {
- Object obj = list.get(0);
- if (obj instanceof String) {
- return (List<String>) list;
- }
- }
- }
- return null;
+ return (List<String>) getObject(String.class, KEY_USER_DISALLOWED);
}
/**
@@ -112,10 +90,6 @@ public class ParameterPermissions extends RPCStruct { * @param userDisallowed paramter that is prohibited for this given RPC
*/
public void setUserDisallowed(List<String> userDisallowed) {
- if (userDisallowed != null) {
- store.put(KEY_USER_DISALLOWED, userDisallowed);
- } else {
- store.remove(KEY_USER_DISALLOWED);
- }
+ setValue(KEY_USER_DISALLOWED, userDisallowed);
}
}
diff --git a/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/PerformAudioPassThru.java b/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/PerformAudioPassThru.java index 204ecbc60..fd6ef21b1 100644 --- a/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/PerformAudioPassThru.java +++ b/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/PerformAudioPassThru.java @@ -6,7 +6,6 @@ import com.smartdevicelink.proxy.rpc.enums.AudioType; import com.smartdevicelink.proxy.rpc.enums.BitsPerSample;
import com.smartdevicelink.proxy.rpc.enums.SamplingRate;
-import java.util.ArrayList;
import java.util.Hashtable;
import java.util.List;
@@ -141,7 +140,7 @@ public class PerformAudioPassThru extends RPCRequest { * </ul>
*/
public void setInitialPrompt(List<TTSChunk> initialPrompt) {
- setParameters(KEY_INITIAL_PROMPT, initialPrompt);
+ setParameter(KEY_INITIAL_PROMPT, initialPrompt);
}
/**
@@ -154,22 +153,7 @@ public class PerformAudioPassThru extends RPCRequest { */
@SuppressWarnings("unchecked")
public List<TTSChunk> getInitialPrompt() {
- if (parameters.get(KEY_INITIAL_PROMPT) instanceof List<?>) {
- List<?> list = (List<?>)parameters.get(KEY_INITIAL_PROMPT);
- if (list != null && list.size() > 0) {
- Object obj = list.get(0);
- if (obj instanceof TTSChunk) {
- return (List<TTSChunk>) list;
- } else if (obj instanceof Hashtable) {
- List<TTSChunk> newList = new ArrayList<TTSChunk>();
- for (Object hashObj : list) {
- newList.add(new TTSChunk((Hashtable<String, Object>)hashObj));
- }
- return newList;
- }
- }
- }
- return null;
+ return (List<TTSChunk>) getObject(TTSChunk.class, KEY_INITIAL_PROMPT);
}
/**
@@ -182,7 +166,7 @@ public class PerformAudioPassThru extends RPCRequest { * <b>Notes: </b>Maxlength=500
*/
public void setAudioPassThruDisplayText1(String audioPassThruDisplayText1) {
- setParameters(KEY_AUDIO_PASS_THRU_DISPLAY_TEXT_1, audioPassThruDisplayText1);
+ setParameter(KEY_AUDIO_PASS_THRU_DISPLAY_TEXT_1, audioPassThruDisplayText1);
}
/**
@@ -192,7 +176,7 @@ public class PerformAudioPassThru extends RPCRequest { * displayed during audio capture
*/
public String getAudioPassThruDisplayText1() {
- return (String) parameters.get(KEY_AUDIO_PASS_THRU_DISPLAY_TEXT_1);
+ return getString(KEY_AUDIO_PASS_THRU_DISPLAY_TEXT_1);
}
/**
@@ -205,7 +189,7 @@ public class PerformAudioPassThru extends RPCRequest { * <b>Notes: </b>Maxlength=500
*/
public void setAudioPassThruDisplayText2(String audioPassThruDisplayText2) {
- setParameters(KEY_AUDIO_PASS_THRU_DISPLAY_TEXT_2, audioPassThruDisplayText2);
+ setParameter(KEY_AUDIO_PASS_THRU_DISPLAY_TEXT_2, audioPassThruDisplayText2);
}
/**
@@ -215,7 +199,7 @@ public class PerformAudioPassThru extends RPCRequest { * displayed during audio capture
*/
public String getAudioPassThruDisplayText2() {
- return (String) parameters.get(KEY_AUDIO_PASS_THRU_DISPLAY_TEXT_2);
+ return getString(KEY_AUDIO_PASS_THRU_DISPLAY_TEXT_2);
}
/**
@@ -225,7 +209,7 @@ public class PerformAudioPassThru extends RPCRequest { * a SamplingRate value representing a 8 or 16 or 22 or 24 khz
*/
public void setSamplingRate(SamplingRate samplingRate) {
- setParameters(KEY_SAMPLING_RATE, samplingRate);
+ setParameter(KEY_SAMPLING_RATE, samplingRate);
}
/**
@@ -234,13 +218,7 @@ public class PerformAudioPassThru extends RPCRequest { * @return SamplingRate -a SamplingRate value
*/
public SamplingRate getSamplingRate() {
- Object obj = parameters.get(KEY_SAMPLING_RATE);
- if (obj instanceof SamplingRate) {
- return (SamplingRate) obj;
- } else if (obj instanceof String) {
- return SamplingRate.valueForString((String) obj);
- }
- return null;
+ return (SamplingRate) getObject(SamplingRate.class, KEY_SAMPLING_RATE);
}
/**
@@ -253,7 +231,7 @@ public class PerformAudioPassThru extends RPCRequest { * <b>Notes: </b>Minvalue:1; Maxvalue:1000000
*/
public void setMaxDuration(Integer maxDuration) {
- setParameters(KEY_MAX_DURATION, maxDuration);
+ setParameter(KEY_MAX_DURATION, maxDuration);
}
/**
@@ -263,7 +241,7 @@ public class PerformAudioPassThru extends RPCRequest { * recording in milliseconds
*/
public Integer getMaxDuration() {
- return (Integer) parameters.get(KEY_MAX_DURATION);
+ return getInteger(KEY_MAX_DURATION);
}
/**
@@ -273,7 +251,7 @@ public class PerformAudioPassThru extends RPCRequest { * a BitsPerSample value representing 8 bit or 16 bit
*/
public void setBitsPerSample(BitsPerSample audioQuality) {
- setParameters(KEY_BITS_PER_SAMPLE, audioQuality);
+ setParameter(KEY_BITS_PER_SAMPLE, audioQuality);
}
/**
@@ -282,13 +260,7 @@ public class PerformAudioPassThru extends RPCRequest { * @return BitsPerSample -a BitsPerSample value
*/
public BitsPerSample getBitsPerSample() {
- Object obj = parameters.get(KEY_BITS_PER_SAMPLE);
- if (obj instanceof BitsPerSample) {
- return (BitsPerSample) obj;
- } else if (obj instanceof String) {
- return BitsPerSample.valueForString((String) obj);
- }
- return null;
+ return (BitsPerSample) getObject(BitsPerSample.class, KEY_BITS_PER_SAMPLE);
}
/**
@@ -298,7 +270,7 @@ public class PerformAudioPassThru extends RPCRequest { * an audioType
*/
public void setAudioType(AudioType audioType) {
- setParameters(KEY_AUDIO_TYPE, audioType);
+ setParameter(KEY_AUDIO_TYPE, audioType);
}
/**
@@ -307,13 +279,7 @@ public class PerformAudioPassThru extends RPCRequest { * @return AudioType -an AudioType
*/
public AudioType getAudioType() {
- Object obj = parameters.get(KEY_AUDIO_TYPE);
- if (obj instanceof AudioType) {
- return (AudioType) obj;
- } else if (obj instanceof String) {
- return AudioType.valueForString((String) obj);
- }
- return null;
+ return (AudioType) getObject(AudioType.class, KEY_AUDIO_TYPE);
}
/**
@@ -325,7 +291,7 @@ public class PerformAudioPassThru extends RPCRequest { * should be muted during the APT session
*/
public Boolean getMuteAudio() {
- return (Boolean) parameters.get(KEY_MUTE_AUDIO);
+ return getBoolean(KEY_MUTE_AUDIO);
}
/**
@@ -340,6 +306,6 @@ public class PerformAudioPassThru extends RPCRequest { * should be muted during the APT session
*/
public void setMuteAudio(Boolean muteAudio) {
- setParameters(KEY_MUTE_AUDIO, muteAudio);
+ setParameter(KEY_MUTE_AUDIO, muteAudio);
}
}
diff --git a/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/PerformInteraction.java b/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/PerformInteraction.java index 71eff3219..31fdfc117 100644 --- a/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/PerformInteraction.java +++ b/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/PerformInteraction.java @@ -5,7 +5,6 @@ import com.smartdevicelink.proxy.RPCRequest; import com.smartdevicelink.proxy.rpc.enums.InteractionMode;
import com.smartdevicelink.proxy.rpc.enums.LayoutMode;
-import java.util.ArrayList;
import java.util.Hashtable;
import java.util.List;
@@ -145,7 +144,7 @@ public class PerformInteraction extends RPCRequest { * @return String -the text displayed when the interaction begins
*/
public String getInitialText() {
- return (String) parameters.get(KEY_INITIAL_TEXT);
+ return getString(KEY_INITIAL_TEXT);
}
/**
* Sets the Text that Displayed when the interaction begins. This text may
@@ -157,7 +156,7 @@ public class PerformInteraction extends RPCRequest { * a String value that Displayed when the interaction begins
*/
public void setInitialText(String initialText) {
- setParameters(KEY_INITIAL_TEXT, initialText);
+ setParameter(KEY_INITIAL_TEXT, initialText);
}
/**
* Gets an An array of one or more TTSChunks that, taken together, specify
@@ -168,22 +167,7 @@ public class PerformInteraction extends RPCRequest { */
@SuppressWarnings("unchecked")
public List<TTSChunk> getInitialPrompt() {
- if (parameters.get(KEY_INITIAL_PROMPT) instanceof List<?>) {
- List<?> list = (List<?>)parameters.get(KEY_INITIAL_PROMPT);
- if (list != null && list.size() > 0) {
- Object obj = list.get(0);
- if (obj instanceof TTSChunk) {
- return (List<TTSChunk>) list;
- } else if (obj instanceof Hashtable) {
- List<TTSChunk> newList = new ArrayList<TTSChunk>();
- for (Object hashObj : list) {
- newList.add(new TTSChunk((Hashtable<String, Object>)hashObj));
- }
- return newList;
- }
- }
- }
- return null;
+ return (List<TTSChunk>) getObject(TTSChunk.class, KEY_INITIAL_PROMPT);
}
/**
* Sets An array of one or more TTSChunks that, taken together, specify what
@@ -194,7 +178,7 @@ public class PerformInteraction extends RPCRequest { * user at the start of an interaction
*/
public void setInitialPrompt(List<TTSChunk> initialPrompt) {
- setParameters(KEY_INITIAL_PROMPT, initialPrompt);
+ setParameter(KEY_INITIAL_PROMPT, initialPrompt);
}
/**
* Gets the Indicates mode that indicate how user selects interaction
@@ -205,13 +189,7 @@ public class PerformInteraction extends RPCRequest { * (VR_ONLY, MANUAL_ONLY or BOTH)
*/
public InteractionMode getInteractionMode() {
- Object obj = parameters.get(KEY_INTERACTION_MODE);
- if (obj instanceof InteractionMode) {
- return (InteractionMode) obj;
- } else if (obj instanceof String) {
- return InteractionMode.valueForString((String) obj);
- }
- return null;
+ return (InteractionMode) getObject(InteractionMode.class, KEY_INTERACTION_MODE);
}
/**
* Sets the Indicates mode that indicate how user selects interaction
@@ -223,7 +201,7 @@ public class PerformInteraction extends RPCRequest { * MANUAL_ONLY or BOTH)
*/
public void setInteractionMode(InteractionMode interactionMode) {
- setParameters(KEY_INTERACTION_MODE, interactionMode);
+ setParameter(KEY_INTERACTION_MODE, interactionMode);
}
/**
* Gets a List<Integer> value representing an Array of one or more Choice
@@ -235,16 +213,7 @@ public class PerformInteraction extends RPCRequest { */
@SuppressWarnings("unchecked")
public List<Integer> getInteractionChoiceSetIDList() {
- if(parameters.get(KEY_INTERACTION_CHOICE_SET_ID_LIST) instanceof List<?>){
- List<?> list = (List<?>)parameters.get(KEY_INTERACTION_CHOICE_SET_ID_LIST);
- if(list != null && list.size()>0){
- Object obj = list.get(0);
- if(obj instanceof Integer){
- return (List<Integer>) list;
- }
- }
- }
- return null;
+ return (List<Integer>) getObject(Integer.class, KEY_INTERACTION_CHOICE_SET_ID_LIST);
}
/**
* Sets a List<Integer> representing an Array of one or more Choice Set
@@ -258,7 +227,7 @@ public class PerformInteraction extends RPCRequest { * <b>Notes: </b>Min Value: 0; Max Vlaue: 2000000000
*/
public void setInteractionChoiceSetIDList(List<Integer> interactionChoiceSetIDList) {
- setParameters(KEY_INTERACTION_CHOICE_SET_ID_LIST, interactionChoiceSetIDList);
+ setParameter(KEY_INTERACTION_CHOICE_SET_ID_LIST, interactionChoiceSetIDList);
}
/**
* Gets a List<TTSChunk> which taken together, specify the help phrase to
@@ -270,22 +239,7 @@ public class PerformInteraction extends RPCRequest { */
@SuppressWarnings("unchecked")
public List<TTSChunk> getHelpPrompt() {
- if(parameters.get(KEY_HELP_PROMPT) instanceof List<?>){
- List<?> list = (List<?>)parameters.get(KEY_HELP_PROMPT);
- if (list != null && list.size() > 0) {
- Object obj = list.get(0);
- if (obj instanceof TTSChunk) {
- return (List<TTSChunk>) list;
- } else if (obj instanceof Hashtable) {
- List<TTSChunk> newList = new ArrayList<TTSChunk>();
- for (Object hashObj : list) {
- newList.add(new TTSChunk((Hashtable<String, Object>)hashObj));
- }
- return newList;
- }
- }
- }
- return null;
+ return (List<TTSChunk>) getObject(TTSChunk.class, KEY_HELP_PROMPT);
}
/**
* Sets An array of TTSChunks which, taken together, specify the help phrase
@@ -304,7 +258,7 @@ public class PerformInteraction extends RPCRequest { * session
*/
public void setHelpPrompt(List<TTSChunk> helpPrompt) {
- setParameters(KEY_HELP_PROMPT, helpPrompt);
+ setParameter(KEY_HELP_PROMPT, helpPrompt);
}
/**
* Gets An array of TTSChunks which, taken together, specify the phrase to
@@ -315,22 +269,7 @@ public class PerformInteraction extends RPCRequest { */
@SuppressWarnings("unchecked")
public List<TTSChunk> getTimeoutPrompt() {
- if (parameters.get(KEY_TIMEOUT_PROMPT) instanceof List<?>) {
- List<?> list = (List<?>)parameters.get(KEY_TIMEOUT_PROMPT);
- if (list != null && list.size() > 0) {
- Object obj = list.get(0);
- if (obj instanceof TTSChunk) {
- return (List<TTSChunk>) list;
- } else if (obj instanceof Hashtable) {
- List<TTSChunk> newList = new ArrayList<TTSChunk>();
- for (Object hashObj : list) {
- newList.add(new TTSChunk((Hashtable<String, Object>)hashObj));
- }
- return newList;
- }
- }
- }
- return null;
+ return (List<TTSChunk>) getObject(TTSChunk.class, KEY_TIMEOUT_PROMPT);
}
/**
* Sets An array of TTSChunks which, taken together, specify the phrase to
@@ -344,7 +283,7 @@ public class PerformInteraction extends RPCRequest { * listen times out during the VR session
*/
public void setTimeoutPrompt(List<TTSChunk> timeoutPrompt) {
- setParameters(KEY_TIMEOUT_PROMPT, timeoutPrompt);
+ setParameter(KEY_TIMEOUT_PROMPT, timeoutPrompt);
}
/**
* Gets a Integer value representing the amount of time, in milliseconds,
@@ -355,7 +294,7 @@ public class PerformInteraction extends RPCRequest { * Menu)
*/
public Integer getTimeout() {
- return (Integer) parameters.get(KEY_TIMEOUT);
+ return getInteger(KEY_TIMEOUT);
}
/**
* Sets the amount of time, in milliseconds, SDL will wait for the user to
@@ -374,7 +313,7 @@ public class PerformInteraction extends RPCRequest { * <b>Notes: </b>Min Value: 5000; Max Value: 100000
*/
public void setTimeout(Integer timeout) {
- setParameters(KEY_TIMEOUT, timeout);
+ setParameter(KEY_TIMEOUT, timeout);
}
/**
@@ -387,22 +326,7 @@ public class PerformInteraction extends RPCRequest { */
@SuppressWarnings("unchecked")
public List<VrHelpItem> getVrHelp() {
- if (parameters.get(KEY_VR_HELP) instanceof List<?>) {
- List<?> list = (List<?>)parameters.get(KEY_VR_HELP);
- if (list != null && list.size() > 0) {
- Object obj = list.get(0);
- if (obj instanceof VrHelpItem) {
- return (List<VrHelpItem>) list;
- } else if (obj instanceof Hashtable) {
- List<VrHelpItem> newList = new ArrayList<VrHelpItem>();
- for (Object hashObj : list) {
- newList.add(new VrHelpItem((Hashtable<String, Object>)hashObj));
- }
- return newList;
- }
- }
- }
- return null;
+ return (List<VrHelpItem>) getObject(VrHelpItem.class, KEY_VR_HELP);
}
/**
@@ -417,20 +341,14 @@ public class PerformInteraction extends RPCRequest { * @since SmartDeviceLink 2.0
*/
public void setVrHelp(List<VrHelpItem> vrHelp) {
- setParameters(KEY_VR_HELP, vrHelp);
+ setParameter(KEY_VR_HELP, vrHelp);
}
public LayoutMode getInteractionLayout() {
- Object obj = parameters.get(KEY_INTERACTION_LAYOUT);
- if (obj instanceof LayoutMode) {
- return (LayoutMode) obj;
- } else if (obj instanceof String) {
- return LayoutMode.valueForString((String) obj);
- }
- return null;
+ return (LayoutMode) getObject(LayoutMode.class, KEY_INTERACTION_LAYOUT);
}
public void setInteractionLayout( LayoutMode interactionLayout ) {
- setParameters(KEY_INTERACTION_LAYOUT, interactionLayout);
+ setParameter(KEY_INTERACTION_LAYOUT, interactionLayout);
}
}
diff --git a/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/PerformInteractionResponse.java b/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/PerformInteractionResponse.java index 76a0ebe2d..3a80fbad9 100644 --- a/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/PerformInteractionResponse.java +++ b/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/PerformInteractionResponse.java @@ -39,27 +39,21 @@ public class PerformInteractionResponse extends RPCResponse { * @return choiceID Min: 0 Max: 65535
*/
public Integer getChoiceID() {
- return (Integer) parameters.get( KEY_CHOICE_ID );
+ return getInteger( KEY_CHOICE_ID );
}
/**
* Sets the application-scoped identifier that uniquely identifies this choice.
* @param choiceID Min: 0 Max: 65535
*/
public void setChoiceID( Integer choiceID ) {
- setParameters(KEY_CHOICE_ID, choiceID);
+ setParameter(KEY_CHOICE_ID, choiceID);
}
/**
* <p>Returns a <I>TriggerSource</I> object which will be shown in the HMI</p>
* @return TriggerSource a TriggerSource object
*/
public TriggerSource getTriggerSource() {
- Object obj = parameters.get(KEY_TRIGGER_SOURCE);
- if (obj instanceof TriggerSource) {
- return (TriggerSource) obj;
- } else if (obj instanceof String) {
- return TriggerSource.valueForString((String) obj);
- }
- return null;
+ return (TriggerSource) getObject(TriggerSource.class, KEY_TRIGGER_SOURCE);
}
/**
* <p>Sets TriggerSource
@@ -67,13 +61,13 @@ public class PerformInteractionResponse extends RPCResponse { * @param triggerSource a TriggerSource object
*/
public void setTriggerSource( TriggerSource triggerSource ) {
- setParameters(KEY_TRIGGER_SOURCE, triggerSource);
+ setParameter(KEY_TRIGGER_SOURCE, triggerSource);
}
public void setManualTextEntry(String manualTextEntry) {
- setParameters(KEY_MANUAL_TEXT_ENTRY, manualTextEntry);
+ setParameter(KEY_MANUAL_TEXT_ENTRY, manualTextEntry);
}
public String getManualTextEntry() {
- return (String) parameters.get(KEY_MANUAL_TEXT_ENTRY);
+ return getString(KEY_MANUAL_TEXT_ENTRY);
}
}
diff --git a/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/PermissionItem.java b/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/PermissionItem.java index 7776c12b7..59b6a347a 100644 --- a/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/PermissionItem.java +++ b/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/PermissionItem.java @@ -4,6 +4,7 @@ package com.smartdevicelink.proxy.rpc; import java.util.Hashtable;
import com.smartdevicelink.proxy.RPCStruct;
+import com.smartdevicelink.proxy.rpc.enums.HMILevel;
import com.smartdevicelink.util.DebugTool;
/**
* Change in permissions for a given set of RPCs
@@ -66,55 +67,23 @@ public class PermissionItem extends RPCStruct { super(hash);
}
public String getRpcName() {
- return (String) store.get(KEY_RPC_NAME);
+ return getString(KEY_RPC_NAME);
}
public void setRpcName(String rpcName) {
- if (rpcName != null) {
- store.put(KEY_RPC_NAME, rpcName);
- } else {
- store.remove(KEY_RPC_NAME);
- }
+ setValue(KEY_RPC_NAME, rpcName);
}
@SuppressWarnings("unchecked")
public HMIPermissions getHMIPermissions() {
- Object obj = store.get(KEY_HMI_PERMISSIONS);
- if (obj instanceof HMIPermissions) {
- return (HMIPermissions) obj;
- } else if (obj instanceof Hashtable) {
- try {
- return new HMIPermissions((Hashtable<String, Object>) obj);
- } catch (Exception e) {
- DebugTool.logError("Failed to parse " + getClass().getSimpleName() + "." + KEY_HMI_PERMISSIONS, e);
- }
- }
- return null;
+ return (HMIPermissions) getObject(HMIPermissions.class, KEY_HMI_PERMISSIONS);
}
public void setHMIPermissions(HMIPermissions hmiPermissions) {
- if (hmiPermissions != null) {
- store.put(KEY_HMI_PERMISSIONS, hmiPermissions);
- } else {
- store.remove(KEY_HMI_PERMISSIONS);
- }
+ setValue(KEY_HMI_PERMISSIONS, hmiPermissions);
}
@SuppressWarnings("unchecked")
public ParameterPermissions getParameterPermissions() {
- Object obj = store.get(KEY_PARAMETER_PERMISSIONS);
- if (obj instanceof ParameterPermissions) {
- return (ParameterPermissions) obj;
- } else if (obj instanceof Hashtable) {
- try {
- return new ParameterPermissions((Hashtable<String, Object>) obj);
- } catch (Exception e) {
- DebugTool.logError("Failed to parse " + getClass().getSimpleName() + "." + KEY_PARAMETER_PERMISSIONS, e);
- }
- }
- return null;
+ return (ParameterPermissions) getObject(ParameterPermissions.class, KEY_PARAMETER_PERMISSIONS);
}
public void setParameterPermissions(ParameterPermissions parameterPermissions) {
- if (parameterPermissions != null) {
- store.put(KEY_PARAMETER_PERMISSIONS, parameterPermissions);
- } else {
- store.remove(KEY_PARAMETER_PERMISSIONS);
- }
+ setValue(KEY_PARAMETER_PERMISSIONS, parameterPermissions);
}
}
diff --git a/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/PresetBankCapabilities.java b/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/PresetBankCapabilities.java index df28213c7..211586da9 100644 --- a/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/PresetBankCapabilities.java +++ b/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/PresetBankCapabilities.java @@ -1,9 +1,9 @@ package com.smartdevicelink.proxy.rpc;
-import java.util.Hashtable;
-
import com.smartdevicelink.proxy.RPCStruct;
+import java.util.Hashtable;
+
/**
* Contains information about on-screen preset capabilities.
* <p><b>Parameter List</b></p>
@@ -45,11 +45,7 @@ public class PresetBankCapabilities extends RPCStruct { * @param onScreenPresetsAvailable if Onscreen custom presets are available.
*/
public void setOnScreenPresetsAvailable(Boolean onScreenPresetsAvailable) {
- if (onScreenPresetsAvailable != null) {
- store.put(KEY_ON_SCREEN_PRESETS_AVAILABLE, onScreenPresetsAvailable);
- } else {
- store.remove(KEY_ON_SCREEN_PRESETS_AVAILABLE);
- }
+ setValue(KEY_ON_SCREEN_PRESETS_AVAILABLE, onScreenPresetsAvailable);
}
/**
@@ -57,6 +53,6 @@ public class PresetBankCapabilities extends RPCStruct { * @return if Onscreen custom presets are available
*/
public Boolean onScreenPresetsAvailable() {
- return (Boolean) store.get(KEY_ON_SCREEN_PRESETS_AVAILABLE);
+ return getBoolean(KEY_ON_SCREEN_PRESETS_AVAILABLE);
}
}
diff --git a/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/PutFile.java b/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/PutFile.java index f636ee709..acd3347ad 100644 --- a/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/PutFile.java +++ b/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/PutFile.java @@ -146,7 +146,7 @@ public class PutFile extends RPCRequest { * <b>Notes: </b>Maxlength=500
*/
public void setSdlFileName(String sdlFileName) {
- setParameters(KEY_SDL_FILE_NAME, sdlFileName);
+ setParameter(KEY_SDL_FILE_NAME, sdlFileName);
}
/**
@@ -155,7 +155,7 @@ public class PutFile extends RPCRequest { * @return String - a String value representing a file reference name
*/
public String getSdlFileName() {
- return (String) parameters.get(KEY_SDL_FILE_NAME);
+ return getString(KEY_SDL_FILE_NAME);
}
/**
@@ -165,7 +165,7 @@ public class PutFile extends RPCRequest { * a FileType value representing a selected file type
*/
public void setFileType(FileType fileType) {
- setParameters(KEY_FILE_TYPE, fileType);
+ setParameter(KEY_FILE_TYPE, fileType);
}
/**
@@ -174,13 +174,7 @@ public class PutFile extends RPCRequest { * @return FileType -a FileType value representing a selected file type
*/
public FileType getFileType() {
- Object obj = parameters.get(KEY_FILE_TYPE);
- if (obj instanceof FileType) {
- return (FileType) obj;
- } else if (obj instanceof String) {
- return FileType.valueForString((String) obj);
- }
- return null;
+ return (FileType) getObject(FileType.class, KEY_FILE_TYPE);
}
/**
@@ -197,7 +191,7 @@ public class PutFile extends RPCRequest { * a Boolean value
*/
public void setPersistentFile(Boolean persistentFile) {
- setParameters(KEY_PERSISTENT_FILE, persistentFile);
+ setParameter(KEY_PERSISTENT_FILE, persistentFile);
}
/**
@@ -208,7 +202,7 @@ public class PutFile extends RPCRequest { * persist between sessions / ignition cycles
*/
public Boolean getPersistentFile() {
- return (Boolean) parameters.get(KEY_PERSISTENT_FILE);
+ return getBoolean(KEY_PERSISTENT_FILE);
}
public void setFileData(byte[] fileData) {
setBulkData(fileData);
@@ -230,11 +224,11 @@ public class PutFile extends RPCRequest { }
public void setOffset(Long offset) {
- setParameters(KEY_OFFSET, offset);
+ setParameter(KEY_OFFSET, offset);
}
public Long getOffset() {
- final Object o = parameters.get(KEY_OFFSET);
+ final Object o = getParameter(KEY_OFFSET);
if (o == null){
return null;
}
@@ -261,11 +255,11 @@ public class PutFile extends RPCRequest { }
public void setLength(Long length) {
- setParameters(KEY_LENGTH, length);
+ setParameter(KEY_LENGTH, length);
}
public Long getLength() {
- final Object o = parameters.get(KEY_LENGTH);
+ final Object o = getParameter(KEY_LENGTH);
if (o == null){
return null;
}
@@ -279,11 +273,11 @@ public class PutFile extends RPCRequest { }
public void setSystemFile(Boolean systemFile) {
- setParameters(KEY_SYSTEM_FILE, systemFile);
+ setParameter(KEY_SYSTEM_FILE, systemFile);
}
public Boolean getSystemFile() {
- final Object o = parameters.get(KEY_SYSTEM_FILE);
+ final Object o = getParameter(KEY_SYSTEM_FILE);
if (o instanceof Boolean) {
return (Boolean) o;
}
diff --git a/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/PutFileResponse.java b/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/PutFileResponse.java index 173115b29..f1cefad94 100644 --- a/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/PutFileResponse.java +++ b/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/PutFileResponse.java @@ -32,9 +32,9 @@ public class PutFileResponse extends RPCResponse { super(hash);
}
public void setSpaceAvailable(Integer spaceAvailable) {
- setParameters(KEY_SPACE_AVAILABLE, spaceAvailable);
+ setParameter(KEY_SPACE_AVAILABLE, spaceAvailable);
}
public Integer getSpaceAvailable() {
- return (Integer) parameters.get(KEY_SPACE_AVAILABLE);
+ return getInteger(KEY_SPACE_AVAILABLE);
}
}
diff --git a/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/ReadDID.java b/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/ReadDID.java index 2ecc21ef6..52543fce6 100644 --- a/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/ReadDID.java +++ b/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/ReadDID.java @@ -98,7 +98,7 @@ public class ReadDID extends RPCRequest { * <b>Notes: </b>Minvalue:0; Maxvalue:65535
*/
public void setEcuName(Integer ecuName) {
- setParameters(KEY_ECU_NAME, ecuName);
+ setParameter(KEY_ECU_NAME, ecuName);
}
/**
@@ -108,7 +108,7 @@ public class ReadDID extends RPCRequest { * module
*/
public Integer getEcuName() {
- return (Integer) parameters.get(KEY_ECU_NAME);
+ return getInteger(KEY_ECU_NAME);
}
/**
@@ -125,7 +125,7 @@ public class ReadDID extends RPCRequest { * </ul>
*/
public void setDidLocation(List<Integer> didLocation) {
- setParameters(KEY_DID_LOCATION, didLocation);
+ setParameter(KEY_DID_LOCATION, didLocation);
}
/**
@@ -136,15 +136,6 @@ public class ReadDID extends RPCRequest { */
@SuppressWarnings("unchecked")
public List<Integer> getDidLocation() {
- if (parameters.get(KEY_DID_LOCATION) instanceof List<?>) {
- List<?> list = (List<?>)parameters.get(KEY_DID_LOCATION);
- if (list != null && list.size() > 0) {
- Object obj = list.get(0);
- if (obj instanceof Integer) {
- return (List<Integer>) list;
- }
- }
- }
- return null;
+ return (List<Integer>) getObject(Integer.class, KEY_DID_LOCATION);
}
}
diff --git a/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/ReadDIDResponse.java b/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/ReadDIDResponse.java index 24082bc73..a2ef04585 100644 --- a/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/ReadDIDResponse.java +++ b/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/ReadDIDResponse.java @@ -3,7 +3,6 @@ package com.smartdevicelink.proxy.rpc; import com.smartdevicelink.protocol.enums.FunctionID;
import com.smartdevicelink.proxy.RPCResponse;
-import java.util.ArrayList;
import java.util.Hashtable;
import java.util.List;
@@ -22,25 +21,10 @@ public class ReadDIDResponse extends RPCResponse { super(hash);
}
public void setDidResult(List<DIDResult> didResult) {
- setParameters(KEY_DID_RESULT, didResult);
+ setParameter(KEY_DID_RESULT, didResult);
}
@SuppressWarnings("unchecked")
public List<DIDResult> getDidResult() {
- if (parameters.get(KEY_DID_RESULT) instanceof List<?>) {
- List<?> list = (List<?>)parameters.get(KEY_DID_RESULT);
- if (list != null && list.size() > 0) {
- Object obj = list.get(0);
- if (obj instanceof DIDResult) {
- return (List<DIDResult>) list;
- } else if (obj instanceof Hashtable) {
- List<DIDResult> newList = new ArrayList<DIDResult>();
- for (Object hashObj : list) {
- newList.add(new DIDResult((Hashtable<String, Object>)hashObj));
- }
- return newList;
- }
- }
- }
- return null;
+ return (List<DIDResult>) getObject(DIDResult.class, KEY_DID_RESULT);
}
}
diff --git a/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/RegisterAppInterface.java b/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/RegisterAppInterface.java index 1181e9df9..e6d3c5abc 100644 --- a/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/RegisterAppInterface.java +++ b/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/RegisterAppInterface.java @@ -5,7 +5,6 @@ import com.smartdevicelink.proxy.RPCRequest; import com.smartdevicelink.proxy.rpc.enums.AppHMIType;
import com.smartdevicelink.proxy.rpc.enums.Language;
-import java.util.ArrayList;
import java.util.Hashtable;
import java.util.List;
/**
@@ -252,13 +251,7 @@ public class RegisterAppInterface extends RPCRequest { */
@SuppressWarnings("unchecked")
public SdlMsgVersion getSdlMsgVersion() {
- Object obj = parameters.get(KEY_SDL_MSG_VERSION);
- if (obj instanceof SdlMsgVersion) {
- return (SdlMsgVersion) obj;
- } else if (obj instanceof Hashtable) {
- return new SdlMsgVersion((Hashtable<String, Object>) obj);
- }
- return null;
+ return (SdlMsgVersion) getObject(SdlMsgVersion.class, KEY_SDL_MSG_VERSION);
}
/**
* Sets the version of the SDL® SmartDeviceLink interface
@@ -280,22 +273,16 @@ public class RegisterAppInterface extends RPCRequest { * request) is ignored by SDL®
*/
public void setSdlMsgVersion(SdlMsgVersion sdlMsgVersion) {
- setParameters(KEY_SDL_MSG_VERSION, sdlMsgVersion);
+ setParameter(KEY_SDL_MSG_VERSION, sdlMsgVersion);
}
@SuppressWarnings("unchecked")
public DeviceInfo getDeviceInfo() {
- Object obj = parameters.get(KEY_DEVICE_INFO);
- if (obj instanceof DeviceInfo) {
- return (DeviceInfo) obj;
- } else if (obj instanceof Hashtable) {
- return new DeviceInfo((Hashtable<String, Object>) obj);
- }
- return null;
+ return (DeviceInfo) getObject(DeviceInfo.class, KEY_DEVICE_INFO);
}
public void setDeviceInfo(DeviceInfo deviceInfo) {
- setParameters(KEY_DEVICE_INFO, deviceInfo);
+ setParameter(KEY_DEVICE_INFO, deviceInfo);
}
/**
* Gets Mobile Application's Name
@@ -303,7 +290,7 @@ public class RegisterAppInterface extends RPCRequest { * @return String -a String representing the Mobile Application's Name
*/
public String getAppName() {
- return (String) parameters.get(KEY_APP_NAME);
+ return getString(KEY_APP_NAME);
}
/**
* Sets Mobile Application's Name, This name is displayed in the SDL®
@@ -322,7 +309,7 @@ public class RegisterAppInterface extends RPCRequest { * </ul>
*/
public void setAppName(String appName) {
- setParameters(KEY_APP_NAME, appName);
+ setParameter(KEY_APP_NAME, appName);
}
/**
@@ -333,22 +320,7 @@ public class RegisterAppInterface extends RPCRequest { */
@SuppressWarnings("unchecked")
public List<TTSChunk> getTtsName() {
- if (parameters.get(KEY_TTS_NAME) instanceof List<?>) {
- List<?> list = (List<?>)parameters.get(KEY_TTS_NAME);
- if (list != null && list.size() > 0) {
- Object obj = list.get(0);
- if (obj instanceof TTSChunk) {
- return (List<TTSChunk>) list;
- } else if (obj instanceof Hashtable) {
- List<TTSChunk> newList = new ArrayList<TTSChunk>();
- for (Object hashObj : list) {
- newList.add(new TTSChunk((Hashtable<String, Object>) hashObj));
- }
- return newList;
- }
- }
- }
- return null;
+ return (List<TTSChunk>) getObject(TTSChunk.class, KEY_TTS_NAME);
}
/**
@@ -370,7 +342,7 @@ public class RegisterAppInterface extends RPCRequest { * @since SmartDeviceLink 2.0
*/
public void setTtsName(List<TTSChunk> ttsName) {
- setParameters(KEY_TTS_NAME, ttsName);
+ setParameter(KEY_TTS_NAME, ttsName);
}
/**
* Gets a String representing an abbreviated version of the mobile
@@ -381,7 +353,7 @@ public class RegisterAppInterface extends RPCRequest { * mobile applincation's name
*/
public String getNgnMediaScreenAppName() {
- return (String) parameters.get(KEY_NGN_MEDIA_SCREEN_APP_NAME);
+ return getString(KEY_NGN_MEDIA_SCREEN_APP_NAME);
}
/**
* Sets a String representing an abbreviated version of the mobile
@@ -400,7 +372,7 @@ public class RegisterAppInterface extends RPCRequest { * </ul>
*/
public void setNgnMediaScreenAppName(String ngnMediaScreenAppName) {
- setParameters(KEY_NGN_MEDIA_SCREEN_APP_NAME, ngnMediaScreenAppName);
+ setParameter(KEY_NGN_MEDIA_SCREEN_APP_NAME, ngnMediaScreenAppName);
}
/**
* Gets the List<String> representing the an array of 1-100 elements, each
@@ -412,16 +384,7 @@ public class RegisterAppInterface extends RPCRequest { */
@SuppressWarnings("unchecked")
public List<String> getVrSynonyms() {
- if (parameters.get(KEY_VR_SYNONYMS) instanceof List<?>) {
- List<?> list = (List<?>)parameters.get(KEY_VR_SYNONYMS);
- if (list != null && list.size()>0) {
- Object obj = list.get(0);
- if (obj instanceof String) {
- return (List<String>) list;
- }
- }
- }
- return null;
+ return (List<String>) getObject(String.class, KEY_VR_SYNONYMS);
}
/**
* Sets a vrSynonyms representing the an array of 1-100 elements, each
@@ -441,7 +404,7 @@ public class RegisterAppInterface extends RPCRequest { * </ul>
*/
public void setVrSynonyms(List<String> vrSynonyms) {
- setParameters(KEY_VR_SYNONYMS, vrSynonyms);
+ setParameter(KEY_VR_SYNONYMS, vrSynonyms);
}
/**
* Gets a Boolean representing MediaApplication
@@ -450,7 +413,7 @@ public class RegisterAppInterface extends RPCRequest { * a media application or not
*/
public Boolean getIsMediaApplication() {
- return (Boolean) parameters.get(KEY_IS_MEDIA_APPLICATION);
+ return getBoolean(KEY_IS_MEDIA_APPLICATION);
}
/**
* Sets a Boolean to indicate a mobile application that is a media
@@ -460,7 +423,7 @@ public class RegisterAppInterface extends RPCRequest { * a Boolean value
*/
public void setIsMediaApplication(Boolean isMediaApplication) {
- setParameters(KEY_IS_MEDIA_APPLICATION, isMediaApplication);
+ setParameter(KEY_IS_MEDIA_APPLICATION, isMediaApplication);
}
/**
* Gets a Language enumeration indicating what language the application
@@ -469,13 +432,7 @@ public class RegisterAppInterface extends RPCRequest { * @return Enumeration -a language enumeration
*/
public Language getLanguageDesired() {
- Object obj = parameters.get(KEY_LANGUAGE_DESIRED);
- if (obj instanceof Language) {
- return (Language) obj;
- } else if (obj instanceof String) {
- return Language.valueForString((String) obj);
- }
- return null;
+ return (Language) getObject(Language.class, KEY_LANGUAGE_DESIRED);
}
/**
* Sets an enumeration indicating what language the application intends to
@@ -487,7 +444,7 @@ public class RegisterAppInterface extends RPCRequest { *
*/
public void setLanguageDesired(Language languageDesired) {
- setParameters(KEY_LANGUAGE_DESIRED, languageDesired);
+ setParameter(KEY_LANGUAGE_DESIRED, languageDesired);
}
/**
@@ -500,13 +457,7 @@ public class RegisterAppInterface extends RPCRequest { * @since SmartDeviceLink 2.0
*/
public Language getHmiDisplayLanguageDesired() {
- Object obj = parameters.get(KEY_HMI_DISPLAY_LANGUAGE_DESIRED);
- if (obj instanceof Language) {
- return (Language) obj;
- } else if (obj instanceof String) {
- return Language.valueForString((String) obj);
- }
- return null;
+ return (Language) getObject(Language.class, KEY_HMI_DISPLAY_LANGUAGE_DESIRED);
}
/**
@@ -517,7 +468,7 @@ public class RegisterAppInterface extends RPCRequest { * @since SmartDeviceLink 2.0
*/
public void setHmiDisplayLanguageDesired(Language hmiDisplayLanguageDesired) {
- setParameters(KEY_HMI_DISPLAY_LANGUAGE_DESIRED, hmiDisplayLanguageDesired);
+ setParameter(KEY_HMI_DISPLAY_LANGUAGE_DESIRED, hmiDisplayLanguageDesired);
}
/**
@@ -532,26 +483,7 @@ public class RegisterAppInterface extends RPCRequest { */
@SuppressWarnings("unchecked")
public List<AppHMIType> getAppHMIType() {
- if (parameters.get(KEY_APP_HMI_TYPE) instanceof List<?>) {
- List<?> list = (List<?>)parameters.get(KEY_APP_HMI_TYPE);
- if (list != null && list.size() > 0) {
- Object obj = list.get(0);
- if (obj instanceof AppHMIType) {
- return (List<AppHMIType>) list;
- } else if (obj instanceof String) {
- List<AppHMIType> newList = new ArrayList<AppHMIType>();
- for (Object hashObj : list) {
- String strFormat = (String)hashObj;
- AppHMIType toAdd = AppHMIType.valueForString(strFormat);
- if (toAdd != null) {
- newList.add(toAdd);
- }
- }
- return newList;
- }
- }
- }
- return null;
+ return (List<AppHMIType>) getObject(AppHMIType.class, KEY_APP_HMI_TYPE);
}
/**
@@ -570,15 +502,15 @@ public class RegisterAppInterface extends RPCRequest { * @since SmartDeviceLink 2.0
*/
public void setAppHMIType(List<AppHMIType> appHMIType) {
- setParameters(KEY_APP_HMI_TYPE, appHMIType);
+ setParameter(KEY_APP_HMI_TYPE, appHMIType);
}
public String getHashID() {
- return (String) parameters.get(KEY_HASH_ID);
+ return getString(KEY_HASH_ID);
}
public void setHashID(String hashID) {
- setParameters(KEY_HASH_ID, hashID);
+ setParameter(KEY_HASH_ID, hashID);
}
/**
@@ -589,7 +521,7 @@ public class RegisterAppInterface extends RPCRequest { * @since SmartDeviceLink 2.0
*/
public String getAppID() {
- return (String) parameters.get(KEY_APP_ID);
+ return getString(KEY_APP_ID);
}
/**
@@ -603,6 +535,6 @@ public class RegisterAppInterface extends RPCRequest { * @since SmartDeviceLink 2.0
*/
public void setAppID(String appID) {
- setParameters(KEY_APP_ID, appID);
+ setParameter(KEY_APP_ID, appID);
}
}
diff --git a/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/RegisterAppInterfaceResponse.java b/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/RegisterAppInterfaceResponse.java index 53afdfc15..f913fae60 100644 --- a/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/RegisterAppInterfaceResponse.java +++ b/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/RegisterAppInterfaceResponse.java @@ -9,7 +9,6 @@ import com.smartdevicelink.proxy.rpc.enums.PrerecordedSpeech; import com.smartdevicelink.proxy.rpc.enums.SpeechCapabilities;
import com.smartdevicelink.proxy.rpc.enums.VrCapabilities;
-import java.util.ArrayList;
import java.util.Hashtable;
import java.util.List;
@@ -65,13 +64,7 @@ public class RegisterAppInterfaceResponse extends RPCResponse { */
@SuppressWarnings("unchecked")
public SdlMsgVersion getSdlMsgVersion() {
- Object obj = parameters.get(KEY_SDL_MSG_VERSION);
- if (obj instanceof SdlMsgVersion) {
- return (SdlMsgVersion)obj;
- } else if (obj instanceof Hashtable) {
- return new SdlMsgVersion((Hashtable<String, Object>)obj);
- }
- return null;
+ return (SdlMsgVersion) getObject(SdlMsgVersion.class, KEY_SDL_MSG_VERSION);
}
/**
@@ -94,7 +87,7 @@ public class RegisterAppInterfaceResponse extends RPCResponse { * request) is ignored by SDL®
*/
public void setSdlMsgVersion(SdlMsgVersion sdlMsgVersion) {
- setParameters(KEY_SDL_MSG_VERSION, sdlMsgVersion);
+ setParameter(KEY_SDL_MSG_VERSION, sdlMsgVersion);
}
/**
@@ -104,13 +97,7 @@ public class RegisterAppInterfaceResponse extends RPCResponse { * @return Enumeration -a language enumeration
*/
public Language getLanguage() {
- Object obj = parameters.get(KEY_LANGUAGE);
- if (obj instanceof Language) {
- return (Language) obj;
- } else if (obj instanceof String) {
- return Language.valueForString((String) obj);
- }
- return null;
+ return (Language) getObject(Language.class, KEY_LANGUAGE);
}
/**
@@ -123,7 +110,7 @@ public class RegisterAppInterfaceResponse extends RPCResponse { *
*/
public void setLanguage(Language language) {
- setParameters(KEY_LANGUAGE, language);
+ setParameter(KEY_LANGUAGE, language);
}
/**
@@ -136,13 +123,7 @@ public class RegisterAppInterfaceResponse extends RPCResponse { * @since SmartDeviceLink 2.0
*/
public Language getHmiDisplayLanguage() {
- Object obj = parameters.get(KEY_HMI_DISPLAY_LANGUAGE);
- if (obj instanceof Language) {
- return (Language) obj;
- } else if (obj instanceof String) {
- return Language.valueForString((String) obj);
- }
- return null;
+ return (Language) getObject(Language.class, KEY_HMI_DISPLAY_LANGUAGE);
}
/**
@@ -153,7 +134,7 @@ public class RegisterAppInterfaceResponse extends RPCResponse { * @since SmartDeviceLink 2.0
*/
public void setHmiDisplayLanguage(Language hmiDisplayLanguage) {
- setParameters(KEY_HMI_DISPLAY_LANGUAGE, hmiDisplayLanguage);
+ setParameter(KEY_HMI_DISPLAY_LANGUAGE, hmiDisplayLanguage);
}
/**
@@ -163,20 +144,14 @@ public class RegisterAppInterfaceResponse extends RPCResponse { */
@SuppressWarnings("unchecked")
public DisplayCapabilities getDisplayCapabilities() {
- Object obj = parameters.get(KEY_DISPLAY_CAPABILITIES);
- if (obj instanceof DisplayCapabilities) {
- return (DisplayCapabilities)obj;
- } else if (obj instanceof Hashtable) {
- return new DisplayCapabilities((Hashtable<String, Object>)obj);
- }
- return null;
+ return (DisplayCapabilities) getObject(DisplayCapabilities.class, KEY_DISPLAY_CAPABILITIES);
}
/**
* Sets Display Capabilities
* @param displayCapabilities
*/
public void setDisplayCapabilities(DisplayCapabilities displayCapabilities) {
- setParameters(KEY_DISPLAY_CAPABILITIES, displayCapabilities);
+ setParameter(KEY_DISPLAY_CAPABILITIES, displayCapabilities);
}
/**
@@ -186,29 +161,14 @@ public class RegisterAppInterfaceResponse extends RPCResponse { */
@SuppressWarnings("unchecked")
public List<ButtonCapabilities> getButtonCapabilities() {
- if (parameters.get(KEY_BUTTON_CAPABILITIES) instanceof List<?>) {
- List<?> list = (List<?>)parameters.get(KEY_BUTTON_CAPABILITIES);
- if (list != null && list.size() > 0) {
- Object obj = list.get(0);
- if (obj instanceof ButtonCapabilities) {
- return (List<ButtonCapabilities>) list;
- } else if (obj instanceof Hashtable) {
- List<ButtonCapabilities> newList = new ArrayList<ButtonCapabilities>();
- for (Object hashObj : list) {
- newList.add(new ButtonCapabilities((Hashtable<String, Object>)hashObj));
- }
- return newList;
- }
- }
- }
- return null;
+ return (List<ButtonCapabilities>) getObject(ButtonCapabilities.class, KEY_BUTTON_CAPABILITIES);
}
/**
* Sets Button Capabilities
* @param buttonCapabilities
*/
public void setButtonCapabilities(List<ButtonCapabilities> buttonCapabilities) {
- setParameters(KEY_BUTTON_CAPABILITIES, buttonCapabilities);
+ setParameter(KEY_BUTTON_CAPABILITIES, buttonCapabilities);
}
/**
* Gets getSoftButtonCapabilities set when application interface is registered.
@@ -217,29 +177,14 @@ public class RegisterAppInterfaceResponse extends RPCResponse { */
@SuppressWarnings("unchecked")
public List<SoftButtonCapabilities> getSoftButtonCapabilities() {
- if (parameters.get(KEY_SOFT_BUTTON_CAPABILITIES) instanceof List<?>) {
- List<?> list = (List<?>)parameters.get(KEY_SOFT_BUTTON_CAPABILITIES);
- if (list != null && list.size() > 0) {
- Object obj = list.get(0);
- if (obj instanceof SoftButtonCapabilities) {
- return (List<SoftButtonCapabilities>) list;
- } else if (obj instanceof Hashtable) {
- List<SoftButtonCapabilities> newList = new ArrayList<SoftButtonCapabilities>();
- for (Object hashObj : list) {
- newList.add(new SoftButtonCapabilities((Hashtable<String, Object>)hashObj));
- }
- return newList;
- }
- }
- }
- return null;
+ return (List<SoftButtonCapabilities>) getObject(SoftButtonCapabilities.class, KEY_SOFT_BUTTON_CAPABILITIES);
}
/**
* Sets softButtonCapabilities
* @param softButtonCapabilities
*/
public void setSoftButtonCapabilities(List<SoftButtonCapabilities> softButtonCapabilities) {
- setParameters(KEY_SOFT_BUTTON_CAPABILITIES, softButtonCapabilities);
+ setParameter(KEY_SOFT_BUTTON_CAPABILITIES, softButtonCapabilities);
}
/**
@@ -249,20 +194,14 @@ public class RegisterAppInterfaceResponse extends RPCResponse { */
@SuppressWarnings("unchecked")
public PresetBankCapabilities getPresetBankCapabilities() {
- Object obj = parameters.get(KEY_PRESET_BANK_CAPABILITIES);
- if (obj instanceof PresetBankCapabilities) {
- return (PresetBankCapabilities)obj;
- } else if (obj instanceof Hashtable) {
- return new PresetBankCapabilities((Hashtable<String, Object>)obj);
- }
- return null;
+ return (PresetBankCapabilities) getObject(PresetBankCapabilities.class, KEY_PRESET_BANK_CAPABILITIES);
}
/**
* Sets presetBankCapabilities
* @param presetBankCapabilities
*/
public void setPresetBankCapabilities(PresetBankCapabilities presetBankCapabilities) {
- setParameters(KEY_PRESET_BANK_CAPABILITIES, presetBankCapabilities);
+ setParameter(KEY_PRESET_BANK_CAPABILITIES, presetBankCapabilities);
}
/**
@@ -272,33 +211,14 @@ public class RegisterAppInterfaceResponse extends RPCResponse { */
@SuppressWarnings("unchecked")
public List<HmiZoneCapabilities> getHmiZoneCapabilities() {
- if (parameters.get(KEY_HMI_ZONE_CAPABILITIES) instanceof List<?>) {
- List<?> list = (List<?>)parameters.get(KEY_HMI_ZONE_CAPABILITIES);
- if (list != null && list.size() > 0) {
- Object obj = list.get(0);
- if (obj instanceof HmiZoneCapabilities) {
- return (List<HmiZoneCapabilities>) list;
- } else if (obj instanceof String) {
- List<HmiZoneCapabilities> newList = new ArrayList<HmiZoneCapabilities>();
- for (Object hashObj : list) {
- String strFormat = (String)hashObj;
- HmiZoneCapabilities toAdd = HmiZoneCapabilities.valueForString(strFormat);
- if (toAdd != null) {
- newList.add(toAdd);
- }
- }
- return newList;
- }
- }
- }
- return null;
+ return (List<HmiZoneCapabilities>) getObject(HmiZoneCapabilities.class, KEY_HMI_ZONE_CAPABILITIES);
}
/**
* Sets hmiZoneCapabilities
* @param hmiZoneCapabilities
*/
public void setHmiZoneCapabilities(List<HmiZoneCapabilities> hmiZoneCapabilities) {
- setParameters(KEY_HMI_ZONE_CAPABILITIES, hmiZoneCapabilities);
+ setParameter(KEY_HMI_ZONE_CAPABILITIES, hmiZoneCapabilities);
}
/**
@@ -308,62 +228,24 @@ public class RegisterAppInterfaceResponse extends RPCResponse { */
@SuppressWarnings("unchecked")
public List<SpeechCapabilities> getSpeechCapabilities() {
- if (parameters.get(KEY_SPEECH_CAPABILITIES) instanceof List<?>) {
- List<?> list = (List<?>)parameters.get(KEY_SPEECH_CAPABILITIES);
- if (list != null && list.size() > 0) {
- Object obj = list.get(0);
- if (obj instanceof SpeechCapabilities) {
- return (List<SpeechCapabilities>) list;
- } else if (obj instanceof String) {
- List<SpeechCapabilities> newList = new ArrayList<SpeechCapabilities>();
- for (Object hashObj : list) {
- String strFormat = (String)hashObj;
- SpeechCapabilities toAdd = SpeechCapabilities.valueForString(strFormat);
- if (toAdd != null) {
- newList.add(toAdd);
- }
- }
- return newList;
- }
- }
- }
- return null;
+ return (List<SpeechCapabilities>) getObject(SpeechCapabilities.class, KEY_SPEECH_CAPABILITIES);
}
/**
* Sets speechCapabilities
* @param speechCapabilities
*/
public void setSpeechCapabilities(List<SpeechCapabilities> speechCapabilities) {
- setParameters(KEY_SPEECH_CAPABILITIES, speechCapabilities);
+ setParameter(KEY_SPEECH_CAPABILITIES, speechCapabilities);
}
@SuppressWarnings("unchecked")
public List<PrerecordedSpeech> getPrerecordedSpeech() {
- if (parameters.get(KEY_PRERECORDED_SPEECH) instanceof List<?>) {
- List<?> list = (List<?>)parameters.get(KEY_PRERECORDED_SPEECH);
- if (list != null && list.size() > 0) {
- Object obj = list.get(0);
- if (obj instanceof PrerecordedSpeech) {
- return (List<PrerecordedSpeech>) list;
- } else if (obj instanceof String) {
- List<PrerecordedSpeech> newList = new ArrayList<PrerecordedSpeech>();
- for (Object hashObj : list) {
- String strFormat = (String)hashObj;
- PrerecordedSpeech toAdd = PrerecordedSpeech.valueForString(strFormat);
- if (toAdd != null) {
- newList.add(toAdd);
- }
- }
- return newList;
- }
- }
- }
- return null;
+ return (List<PrerecordedSpeech>) getObject(PrerecordedSpeech.class, KEY_PRERECORDED_SPEECH);
}
public void setPrerecordedSpeech(List<PrerecordedSpeech> prerecordedSpeech) {
- setParameters(KEY_PRERECORDED_SPEECH, prerecordedSpeech);
+ setParameter(KEY_PRERECORDED_SPEECH, prerecordedSpeech);
}
@@ -374,33 +256,14 @@ public class RegisterAppInterfaceResponse extends RPCResponse { */
@SuppressWarnings("unchecked")
public List<VrCapabilities> getVrCapabilities() {
- if (parameters.get(KEY_VR_CAPABILITIES) instanceof List<?>) {
- List<?> list = (List<?>)parameters.get(KEY_VR_CAPABILITIES);
- if (list != null && list.size() > 0) {
- Object obj = list.get(0);
- if (obj instanceof VrCapabilities) {
- return (List<VrCapabilities>) list;
- } else if (obj instanceof String) {
- List<VrCapabilities> newList = new ArrayList<VrCapabilities>();
- for (Object hashObj : list) {
- String strFormat = (String)hashObj;
- VrCapabilities toAdd = VrCapabilities.valueForString(strFormat);
- if (toAdd != null) {
- newList.add(toAdd);
- }
- }
- return newList;
- }
- }
- }
- return null;
+ return (List<VrCapabilities>) getObject(VrCapabilities.class, KEY_VR_CAPABILITIES);
}
/**
* Sets VrCapabilities
* @param vrCapabilities
*/
public void setVrCapabilities(List<VrCapabilities> vrCapabilities) {
- setParameters(KEY_VR_CAPABILITIES, vrCapabilities);
+ setParameter(KEY_VR_CAPABILITIES, vrCapabilities);
}
/**
@@ -410,20 +273,14 @@ public class RegisterAppInterfaceResponse extends RPCResponse { */
@SuppressWarnings("unchecked")
public VehicleType getVehicleType() {
- Object obj = parameters.get(KEY_VEHICLE_TYPE);
- if (obj instanceof VehicleType) {
- return (VehicleType)obj;
- } else if (obj instanceof Hashtable) {
- return new VehicleType((Hashtable<String, Object>)obj);
- }
- return null;
+ return (VehicleType) getObject(VehicleType.class, KEY_VEHICLE_TYPE);
}
/**
* Sets vehicleType
* @param vehicleType
*/
public void setVehicleType(VehicleType vehicleType) {
- setParameters(KEY_VEHICLE_TYPE, vehicleType);
+ setParameter(KEY_VEHICLE_TYPE, vehicleType);
}
/**
@@ -433,29 +290,14 @@ public class RegisterAppInterfaceResponse extends RPCResponse { */
@SuppressWarnings("unchecked")
public List<AudioPassThruCapabilities> getAudioPassThruCapabilities() {
- if (parameters.get(KEY_AUDIO_PASS_THRU_CAPABILITIES) instanceof List<?>) {
- List<?> list = (List<?>)parameters.get(KEY_AUDIO_PASS_THRU_CAPABILITIES);
- if (list != null && list.size() > 0) {
- Object obj = list.get(0);
- if (obj instanceof AudioPassThruCapabilities) {
- return (List<AudioPassThruCapabilities>) list;
- } else if (obj instanceof Hashtable) {
- List<AudioPassThruCapabilities> newList = new ArrayList<AudioPassThruCapabilities>();
- for (Object hashObj : list) {
- newList.add(new AudioPassThruCapabilities((Hashtable<String, Object>)hashObj));
- }
- return newList;
- }
- }
- }
- return null;
+ return (List<AudioPassThruCapabilities>) getObject(AudioPassThruCapabilities.class, KEY_AUDIO_PASS_THRU_CAPABILITIES);
}
/**
* Sets AudioPassThruCapabilities
* @param audioPassThruCapabilities
*/
public void setAudioPassThruCapabilities(List<AudioPassThruCapabilities> audioPassThruCapabilities) {
- setParameters(KEY_AUDIO_PASS_THRU_CAPABILITIES, audioPassThruCapabilities);
+ setParameter(KEY_AUDIO_PASS_THRU_CAPABILITIES, audioPassThruCapabilities);
}
public String getProxyVersionInfo() {
if (Version.VERSION != null)
@@ -464,52 +306,36 @@ public class RegisterAppInterfaceResponse extends RPCResponse { return null;
}
public void setSupportedDiagModes(List<Integer> supportedDiagModes) {
- setParameters(KEY_SUPPORTED_DIAG_MODES, supportedDiagModes);
+ setParameter(KEY_SUPPORTED_DIAG_MODES, supportedDiagModes);
}
@SuppressWarnings("unchecked")
public List<Integer> getSupportedDiagModes() {
-
- if (parameters.get(KEY_SUPPORTED_DIAG_MODES) instanceof List<?>) {
- List<?> list = (List<?>)parameters.get( KEY_SUPPORTED_DIAG_MODES);
- if (list != null && list.size() > 0) {
- Object obj = list.get(0);
- if (obj instanceof Integer) {
- return (List<Integer>) list;
- }
- }
- }
- return null;
+ return (List<Integer>) getObject(Integer.class, KEY_SUPPORTED_DIAG_MODES);
}
public void setHmiCapabilities(HMICapabilities hmiCapabilities) {
- setParameters(KEY_HMI_CAPABILITIES, hmiCapabilities);
+ setParameter(KEY_HMI_CAPABILITIES, hmiCapabilities);
}
@SuppressWarnings("unchecked")
public HMICapabilities getHmiCapabilities() {
- Object obj = parameters.get(KEY_HMI_CAPABILITIES);
- if (obj instanceof HMICapabilities) {
- return (HMICapabilities)obj;
- } else if (obj instanceof Hashtable) {
- return new HMICapabilities((Hashtable<String, Object>)obj);
- }
- return null;
+ return (HMICapabilities) getObject(HMICapabilities.class, KEY_HMI_CAPABILITIES);
}
public void setSdlVersion(String sdlVersion) {
- setParameters(KEY_SDL_VERSION, sdlVersion);
+ setParameter(KEY_SDL_VERSION, sdlVersion);
}
public String getSdlVersion() {
- return (String) parameters.get(KEY_SDL_VERSION);
+ return getString(KEY_SDL_VERSION);
}
public void setSystemSoftwareVersion(String systemSoftwareVersion) {
- setParameters(KEY_SYSTEM_SOFTWARE_VERSION, systemSoftwareVersion);
+ setParameter(KEY_SYSTEM_SOFTWARE_VERSION, systemSoftwareVersion);
}
public String getSystemSoftwareVersion() {
- return (String) parameters.get(KEY_SYSTEM_SOFTWARE_VERSION);
+ return getString(KEY_SYSTEM_SOFTWARE_VERSION);
}
}
diff --git a/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/ResetGlobalProperties.java b/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/ResetGlobalProperties.java index 175fd2281..0e2cd6824 100644 --- a/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/ResetGlobalProperties.java +++ b/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/ResetGlobalProperties.java @@ -4,9 +4,9 @@ import com.smartdevicelink.protocol.enums.FunctionID; import com.smartdevicelink.proxy.RPCRequest;
import com.smartdevicelink.proxy.rpc.enums.GlobalProperty;
-import java.util.ArrayList;
import java.util.Hashtable;
import java.util.List;
+
/**
* Resets the passed global properties to their default values as defined by
* SDL
@@ -85,26 +85,7 @@ public class ResetGlobalProperties extends RPCRequest { */
@SuppressWarnings("unchecked")
public List<GlobalProperty> getProperties() {
- if (parameters.get(KEY_PROPERTIES) instanceof List<?>) {
- List<?> list = (List<?>)parameters.get(KEY_PROPERTIES);
- if (list != null && list.size() > 0) {
- Object obj = list.get(0);
- if (obj instanceof GlobalProperty) {
- return (List<GlobalProperty>) list;
- } else if (obj instanceof String) {
- List<GlobalProperty> newList = new ArrayList<GlobalProperty>();
- for (Object hashObj : list) {
- String strFormat = (String)hashObj;
- GlobalProperty toAdd = GlobalProperty.valueForString(strFormat);
- if (toAdd != null) {
- newList.add(toAdd);
- }
- }
- return newList;
- }
- }
- }
- return null;
+ return (List<GlobalProperty>) getObject(GlobalProperty.class, KEY_PROPERTIES);
}
/**
* Sets an array of one or more GlobalProperty enumeration elements
@@ -118,6 +99,6 @@ public class ResetGlobalProperties extends RPCRequest { * <b>Notes: </b>Array must have at least one element
*/
public void setProperties( List<GlobalProperty> properties ) {
- setParameters(KEY_PROPERTIES, properties);
+ setParameter(KEY_PROPERTIES, properties);
}
}
diff --git a/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/ScreenParams.java b/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/ScreenParams.java index fe2c626a0..a821264e6 100644 --- a/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/ScreenParams.java +++ b/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/ScreenParams.java @@ -1,11 +1,8 @@ package com.smartdevicelink.proxy.rpc;
-import java.util.Hashtable;
-
import com.smartdevicelink.proxy.RPCStruct;
-import com.smartdevicelink.proxy.rpc.ImageResolution;
-import com.smartdevicelink.proxy.rpc.TouchEventCapabilities;
-import com.smartdevicelink.util.DebugTool;
+
+import java.util.Hashtable;
/** The resolution of the prescribed screen area.
*
* <p><b>Parameter List</b></p>
@@ -64,46 +61,16 @@ public class ScreenParams extends RPCStruct { @SuppressWarnings("unchecked")
public ImageResolution getImageResolution() {
- Object obj = store.get(KEY_RESOLUTION);
- if (obj instanceof ImageResolution) {
- return (ImageResolution) obj;
- } else if (obj instanceof Hashtable) {
- try {
- return new ImageResolution((Hashtable<String, Object>) obj);
- } catch (Exception e) {
- DebugTool.logError("Failed to parse " + getClass().getSimpleName() + "." + KEY_RESOLUTION, e);
- }
- }
- return null;
+ return (ImageResolution) getObject(ImageResolution.class, KEY_RESOLUTION);
}
public void setImageResolution( ImageResolution resolution ) {
- if (resolution != null) {
- store.put(KEY_RESOLUTION, resolution );
- }
- else {
- store.remove(KEY_RESOLUTION);
- }
+ setValue(KEY_RESOLUTION, resolution);
}
@SuppressWarnings("unchecked")
public TouchEventCapabilities getTouchEventAvailable() {
- Object obj = store.get(KEY_TOUCH_EVENT_AVAILABLE);
- if (obj instanceof TouchEventCapabilities) {
- return (TouchEventCapabilities) obj;
- } else if (obj instanceof Hashtable) {
- try {
- return new TouchEventCapabilities((Hashtable<String, Object>) obj);
- } catch (Exception e) {
- DebugTool.logError("Failed to parse " + getClass().getSimpleName() + "." + KEY_TOUCH_EVENT_AVAILABLE, e);
- }
- }
- return null;
+ return (TouchEventCapabilities) getObject(TouchEventCapabilities.class, KEY_TOUCH_EVENT_AVAILABLE);
}
public void setTouchEventAvailable( TouchEventCapabilities touchEventAvailable ) {
- if (touchEventAvailable != null) {
- store.put(KEY_TOUCH_EVENT_AVAILABLE, touchEventAvailable );
- }
- else {
- store.remove(KEY_TOUCH_EVENT_AVAILABLE);
- }
+ setValue(KEY_TOUCH_EVENT_AVAILABLE, touchEventAvailable);
}
}
diff --git a/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/ScrollableMessage.java b/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/ScrollableMessage.java index 1c62cb006..892347e45 100644 --- a/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/ScrollableMessage.java +++ b/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/ScrollableMessage.java @@ -1,13 +1,12 @@ package com.smartdevicelink.proxy.rpc;
-import java.util.ArrayList;
-import java.util.Hashtable;
-import java.util.List;
-
import com.smartdevicelink.protocol.enums.FunctionID;
import com.smartdevicelink.proxy.RPCRequest;
+import com.smartdevicelink.proxy.rpc.enums.Language;
-import static com.smartdevicelink.proxy.constants.Names.timeout;
+import java.util.ArrayList;
+import java.util.Hashtable;
+import java.util.List;
/**
* Creates a full screen overlay containing a large block of formatted text that
@@ -103,7 +102,7 @@ public class ScrollableMessage extends RPCRequest { * <b>Notes: </b>Maxlength=500
*/
public void setScrollableMessageBody(String scrollableMessageBody) {
- setParameters(KEY_SCROLLABLE_MESSAGE_BODY, scrollableMessageBody);
+ setParameter(KEY_SCROLLABLE_MESSAGE_BODY, scrollableMessageBody);
}
/**
@@ -112,7 +111,7 @@ public class ScrollableMessage extends RPCRequest { * @return String -a String value
*/
public String getScrollableMessageBody() {
- return (String) parameters.get(KEY_SCROLLABLE_MESSAGE_BODY);
+ return getString(KEY_SCROLLABLE_MESSAGE_BODY);
}
/**
@@ -125,7 +124,7 @@ public class ScrollableMessage extends RPCRequest { * <b>Notes</b>:Minval=0; Maxval=65535;Default=30000
*/
public void setTimeout(Integer timeout) {
- setParameters(KEY_TIMEOUT, timeout);
+ setParameter(KEY_TIMEOUT, timeout);
}
/**
@@ -134,7 +133,7 @@ public class ScrollableMessage extends RPCRequest { * @return Integer -an Integer value representing an App defined timeout
*/
public Integer getTimeout() {
- return (Integer) parameters.get(KEY_TIMEOUT);
+ return getInteger(KEY_TIMEOUT);
}
/**
@@ -148,7 +147,7 @@ public class ScrollableMessage extends RPCRequest { * <b>Notes: </b>Minsize=0, Maxsize=8
*/
public void setSoftButtons(List<SoftButton> softButtons) {
- setParameters(KEY_SOFT_BUTTONS, softButtons);
+ setParameter(KEY_SOFT_BUTTONS, softButtons);
}
/**
@@ -157,21 +156,6 @@ public class ScrollableMessage extends RPCRequest { */
@SuppressWarnings("unchecked")
public List<SoftButton> getSoftButtons() {
- if (parameters.get(KEY_SOFT_BUTTONS) instanceof List<?>) {
- List<?> list = (List<?>)parameters.get(KEY_SOFT_BUTTONS);
- if (list != null && list.size() > 0) {
- Object obj = list.get(0);
- if (obj instanceof SoftButton) {
- return (List<SoftButton>) list;
- } else if (obj instanceof Hashtable) {
- List<SoftButton> newList = new ArrayList<SoftButton>();
- for (Object hashObj : list) {
- newList.add(new SoftButton((Hashtable<String, Object>) hashObj));
- }
- return newList;
- }
- }
- }
- return null;
+ return (List<SoftButton>) getObject(SoftButton.class, KEY_SOFT_BUTTONS);
}
}
diff --git a/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/SdlMsgVersion.java b/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/SdlMsgVersion.java index a2388cc7e..2221972c1 100644 --- a/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/SdlMsgVersion.java +++ b/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/SdlMsgVersion.java @@ -1,9 +1,9 @@ package com.smartdevicelink.proxy.rpc;
-import java.util.Hashtable;
-
import com.smartdevicelink.proxy.RPCStruct;
+import java.util.Hashtable;
+
/**
* Specifies the version number of the SDL V4 interface. This is used by both the application and SDL to declare what interface version each is using.
* <p><b> Parameter List</b></p>
@@ -64,7 +64,7 @@ public class SdlMsgVersion extends RPCStruct { * @return the major version
*/
public Integer getMajorVersion() {
- return (Integer) store.get( KEY_MAJOR_VERSION );
+ return getInteger( KEY_MAJOR_VERSION );
}
/**
* Set major version
@@ -75,11 +75,7 @@ public class SdlMsgVersion extends RPCStruct { * @param majorVersion minvalue="1" and maxvalue="10"
*/
public void setMajorVersion( Integer majorVersion ) {
- if (majorVersion != null) {
- store.put(KEY_MAJOR_VERSION, majorVersion );
- } else {
- store.remove(KEY_MAJOR_VERSION);
- }
+ setValue(KEY_MAJOR_VERSION, majorVersion);
}
/**
* Get minor version
@@ -90,7 +86,7 @@ public class SdlMsgVersion extends RPCStruct { * @return the minor version
*/
public Integer getMinorVersion() {
- return (Integer) store.get( KEY_MINOR_VERSION );
+ return getInteger( KEY_MINOR_VERSION );
}
/**
* Set minor version
@@ -101,11 +97,7 @@ public class SdlMsgVersion extends RPCStruct { * @param minorVersion min: 0; max: 1000
*/
public void setMinorVersion( Integer minorVersion ) {
- if (minorVersion != null) {
- store.put(KEY_MINOR_VERSION, minorVersion );
- } else {
- store.remove(KEY_MINOR_VERSION);
- }
+ setValue(KEY_MINOR_VERSION, minorVersion);
}
/**
@@ -117,7 +109,7 @@ public class SdlMsgVersion extends RPCStruct { * @return the patch version
*/
public Integer getPatchVersion() {
- return (Integer) store.get( KEY_PATCH_VERSION );
+ return getInteger( KEY_PATCH_VERSION );
}
/**
* Set patch version
@@ -128,11 +120,7 @@ public class SdlMsgVersion extends RPCStruct { * @param patchVersion min: 0; max: 1000
*/
public void setPatchVersion( Integer patchVersion ) {
- if (patchVersion != null) {
- store.put(KEY_PATCH_VERSION, patchVersion );
- } else {
- store.remove(KEY_PATCH_VERSION);
- }
+ setValue(KEY_PATCH_VERSION, patchVersion);
}
}
diff --git a/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/SendLocation.java b/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/SendLocation.java index 12f5fca93..93f971cbc 100644 --- a/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/SendLocation.java +++ b/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/SendLocation.java @@ -3,7 +3,6 @@ package com.smartdevicelink.proxy.rpc; import com.smartdevicelink.protocol.enums.FunctionID; import com.smartdevicelink.proxy.RPCRequest; import com.smartdevicelink.proxy.rpc.enums.DeliveryMode; -import com.smartdevicelink.util.DebugTool; import com.smartdevicelink.util.SdlDataTypeConverter; import java.util.Hashtable; @@ -59,7 +58,7 @@ public class SendLocation extends RPCRequest{ * @return The longitude of the location */ public Double getLongitudeDegrees(){ - Object value = parameters.get(KEY_LON_DEGREES); + Object value = getParameter(KEY_LON_DEGREES); return SdlDataTypeConverter.objectToDouble(value); } @@ -68,7 +67,7 @@ public class SendLocation extends RPCRequest{ * @param longitudeDegrees */ public void setLongitudeDegrees(Double longitudeDegrees){ - setParameters(KEY_LON_DEGREES, longitudeDegrees); + setParameter(KEY_LON_DEGREES, longitudeDegrees); } /** @@ -82,7 +81,7 @@ public class SendLocation extends RPCRequest{ * @return The latitude of the location */ public Double getLatitudeDegrees(){ - Object value = parameters.get(KEY_LAT_DEGREES); + Object value = getParameter(KEY_LAT_DEGREES); return SdlDataTypeConverter.objectToDouble(value); } @@ -91,7 +90,7 @@ public class SendLocation extends RPCRequest{ * @param latitudeDegrees */ public void setLatitudeDegrees(Double latitudeDegrees){ - setParameters(KEY_LAT_DEGREES, latitudeDegrees); + setParameter(KEY_LAT_DEGREES, latitudeDegrees); } /** @@ -99,7 +98,7 @@ public class SendLocation extends RPCRequest{ * @return The name of the location */ public String getLocationName(){ - return (String) parameters.get(KEY_LOCATION_NAME); + return getString(KEY_LOCATION_NAME); } /** @@ -107,7 +106,7 @@ public class SendLocation extends RPCRequest{ * @param locationName The name of the location */ public void setLocationName(String locationName){ - setParameters(KEY_LOCATION_NAME, locationName); + setParameter(KEY_LOCATION_NAME, locationName); } /** @@ -115,7 +114,7 @@ public class SendLocation extends RPCRequest{ * @return The description of the location to send */ public String getLocationDescription(){ - return (String) parameters.get(KEY_LOCATION_DESCRIPTION); + return getString(KEY_LOCATION_DESCRIPTION); } /** @@ -123,7 +122,7 @@ public class SendLocation extends RPCRequest{ * @param locationDescription The description of the location */ public void setLocationDescription(String locationDescription){ - setParameters(KEY_LOCATION_DESCRIPTION, locationDescription); + setParameter(KEY_LOCATION_DESCRIPTION, locationDescription); } /** @@ -131,7 +130,7 @@ public class SendLocation extends RPCRequest{ * @return */ public String getPhoneNumber(){ - return (String) parameters.get(KEY_PHONE_NUMBER); + return getString(KEY_PHONE_NUMBER); } /** @@ -139,7 +138,7 @@ public class SendLocation extends RPCRequest{ * @param phoneNumber The phone number of the location */ public void setPhoneNumber(String phoneNumber){ - setParameters(KEY_PHONE_NUMBER, phoneNumber); + setParameter(KEY_PHONE_NUMBER, phoneNumber); } /** @@ -148,16 +147,7 @@ public class SendLocation extends RPCRequest{ */ @SuppressWarnings("unchecked") public List<String> getAddressLines(){ - if(parameters.get(KEY_ADDRESS_LINES) instanceof List<?>){ - List<?> list = (List<?>) parameters.get(KEY_ADDRESS_LINES); - if(list != null && list.size() > 0){ - Object obj = list.get(0); - if(obj instanceof String){ - return (List<String>) list; - } - } - } - return null; + return (List<String>) getObject(String.class, KEY_ADDRESS_LINES); } /** @@ -165,7 +155,7 @@ public class SendLocation extends RPCRequest{ * @param addressLines The address lines of the location */ public void setAddressLines(List<String> addressLines){ - setParameters(KEY_ADDRESS_LINES, addressLines); + setParameter(KEY_ADDRESS_LINES, addressLines); } /** @@ -174,13 +164,7 @@ public class SendLocation extends RPCRequest{ */ @SuppressWarnings("unchecked") public Image getLocationImage(){ - Object obj = parameters.get(KEY_LOCATION_IMAGE); - if (obj instanceof Image) { - return (Image) obj; - } else if (obj instanceof Hashtable) { - return new Image((Hashtable<String, Object>) obj); - } - return null; + return (Image) getObject(Image.class, KEY_LOCATION_IMAGE); } /** @@ -188,58 +172,32 @@ public class SendLocation extends RPCRequest{ * @param locationImage The image of the location to send */ public void setLocationImage(Image locationImage){ - setParameters(KEY_LOCATION_IMAGE, locationImage); + setParameter(KEY_LOCATION_IMAGE, locationImage); } public DeliveryMode getDeliveryMode() { - Object obj = parameters.get(KEY_DELIVERY_MODE); - if (obj instanceof DeliveryMode) { - return (DeliveryMode) obj; - } else if (obj instanceof String) { - return DeliveryMode.valueForString((String) obj); - } - return null; + return (DeliveryMode) getObject(DeliveryMode.class, KEY_DELIVERY_MODE); } public void setDeliveryMode(DeliveryMode deliveryMode) { - setParameters(KEY_DELIVERY_MODE, deliveryMode); + setParameter(KEY_DELIVERY_MODE, deliveryMode); } @SuppressWarnings("unchecked") public DateTime getTimeStamp() { - Object obj = parameters.get(KEY_TIME_STAMP); - if (obj instanceof DateTime) { - return (DateTime) obj; - } else if (obj instanceof Hashtable) { - try { - return new DateTime((Hashtable<String, Object>) obj); - } catch (Exception e) { - DebugTool.logError("Failed to parse " + getClass().getSimpleName() + "." + KEY_TIME_STAMP, e); - } - } - return null; + return (DateTime) getObject(DateTime.class, KEY_TIME_STAMP); } public void setTimeStamp(DateTime timeStamp) { - setParameters(KEY_TIME_STAMP, timeStamp); + setParameter(KEY_TIME_STAMP, timeStamp); } @SuppressWarnings("unchecked") public OasisAddress getAddress() { - Object obj = parameters.get(KEY_ADDRESS); - if (obj instanceof OasisAddress) { - return (OasisAddress) obj; - } else if (obj instanceof Hashtable) { - try { - return new OasisAddress((Hashtable<String, Object>) obj); - } catch (Exception e) { - DebugTool.logError("Failed to parse " + getClass().getSimpleName() + "." + KEY_ADDRESS, e); - } - } - return null; + return (OasisAddress) getObject(OasisAddress.class, KEY_ADDRESS); } public void setAddress(OasisAddress address) { - setParameters(KEY_ADDRESS, address); + setParameter(KEY_ADDRESS, address); } } diff --git a/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/SetAppIcon.java b/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/SetAppIcon.java index 9336a0a70..582a87003 100644 --- a/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/SetAppIcon.java +++ b/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/SetAppIcon.java @@ -74,7 +74,7 @@ public class SetAppIcon extends RPCRequest { * <b>Notes: </b>Maxlength=500
*/
public void setSdlFileName(String sdlFileName) {
- setParameters(KEY_SDL_FILE_NAME, sdlFileName);
+ setParameter(KEY_SDL_FILE_NAME, sdlFileName);
}
/**
@@ -82,6 +82,6 @@ public class SetAppIcon extends RPCRequest { * @return String -a String value
*/
public String getSdlFileName() {
- return (String) parameters.get(KEY_SDL_FILE_NAME);
+ return getString(KEY_SDL_FILE_NAME);
}
}
diff --git a/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/SetDisplayLayout.java b/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/SetDisplayLayout.java index b0a955010..98c676fb7 100644 --- a/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/SetDisplayLayout.java +++ b/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/SetDisplayLayout.java @@ -73,13 +73,13 @@ public class SetDisplayLayout extends RPCRequest { * a String value representing a diaply layout
*/
public void setDisplayLayout(String displayLayout) {
- setParameters(KEY_DISPLAY_LAYOUT, displayLayout);
+ setParameter(KEY_DISPLAY_LAYOUT, displayLayout);
}
/**
* Gets a display layout.
*/
public String getDisplayLayout() {
- return (String) parameters.get(KEY_DISPLAY_LAYOUT);
+ return getString(KEY_DISPLAY_LAYOUT);
}
}
diff --git a/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/SetDisplayLayoutResponse.java b/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/SetDisplayLayoutResponse.java index 863a89d4d..a81a3f36a 100644 --- a/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/SetDisplayLayoutResponse.java +++ b/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/SetDisplayLayoutResponse.java @@ -3,12 +3,9 @@ package com.smartdevicelink.proxy.rpc; import com.smartdevicelink.protocol.enums.FunctionID;
import com.smartdevicelink.proxy.RPCResponse;
-import java.util.ArrayList;
import java.util.Hashtable;
import java.util.List;
-import static com.smartdevicelink.proxy.constants.Names.displayCapabilities;
-
/**
* Set Display Layout Response is sent, when SetDisplayLayout has been called
*
@@ -41,80 +38,38 @@ public class SetDisplayLayoutResponse extends RPCResponse { @SuppressWarnings("unchecked")
public DisplayCapabilities getDisplayCapabilities() {
- Object obj = parameters.get(KEY_DISPLAY_CAPABILITIES);
- if (obj instanceof DisplayCapabilities) {
- return (DisplayCapabilities)obj;
- } else if (obj instanceof Hashtable) {
- return new DisplayCapabilities((Hashtable<String, Object>)obj);
- }
- return null;
+ return (DisplayCapabilities) getObject(DisplayCapabilities.class, KEY_DISPLAY_CAPABILITIES);
}
public void setDisplayCapabilities(DisplayCapabilities displayCapabilities) {
- setParameters(KEY_DISPLAY_CAPABILITIES, displayCapabilities);
+ setParameter(KEY_DISPLAY_CAPABILITIES, displayCapabilities);
}
@SuppressWarnings("unchecked")
public List<ButtonCapabilities> getButtonCapabilities() {
- if (parameters.get(KEY_BUTTON_CAPABILITIES) instanceof List<?>) {
- List<?> list = (List<?>)parameters.get(KEY_BUTTON_CAPABILITIES);
- if (list != null && list.size() > 0) {
- Object obj = list.get(0);
- if (obj instanceof ButtonCapabilities) {
- return (List<ButtonCapabilities>) list;
- } else if (obj instanceof Hashtable) {
- List<ButtonCapabilities> newList = new ArrayList<ButtonCapabilities>();
- for (Object hashObj : list) {
- newList.add(new ButtonCapabilities((Hashtable<String, Object>)hashObj));
- }
- return newList;
- }
- }
- }
- return null;
+ return (List<ButtonCapabilities>) getObject(ButtonCapabilities.class, KEY_BUTTON_CAPABILITIES);
}
public void setButtonCapabilities(List<ButtonCapabilities> buttonCapabilities) {
- setParameters(KEY_BUTTON_CAPABILITIES, buttonCapabilities);
+ setParameter(KEY_BUTTON_CAPABILITIES, buttonCapabilities);
}
@SuppressWarnings("unchecked")
public List<SoftButtonCapabilities> getSoftButtonCapabilities() {
- if (parameters.get(KEY_SOFT_BUTTON_CAPABILITIES) instanceof List<?>) {
- List<?> list = (List<?>)parameters.get(KEY_SOFT_BUTTON_CAPABILITIES);
- if (list != null && list.size() > 0) {
- Object obj = list.get(0);
- if (obj instanceof SoftButtonCapabilities) {
- return (List<SoftButtonCapabilities>) list;
- } else if (obj instanceof Hashtable) {
- List<SoftButtonCapabilities> newList = new ArrayList<SoftButtonCapabilities>();
- for (Object hashObj : list) {
- newList.add(new SoftButtonCapabilities((Hashtable<String, Object>)hashObj));
- }
- return newList;
- }
- }
- }
- return null;
+ return (List<SoftButtonCapabilities>) getObject(SoftButtonCapabilities.class, KEY_SOFT_BUTTON_CAPABILITIES);
}
public void setSoftButtonCapabilities(List<SoftButtonCapabilities> softButtonCapabilities) {
- setParameters(KEY_SOFT_BUTTON_CAPABILITIES, softButtonCapabilities);
+ setParameter(KEY_SOFT_BUTTON_CAPABILITIES, softButtonCapabilities);
}
@SuppressWarnings("unchecked")
public PresetBankCapabilities getPresetBankCapabilities() {
- Object obj = parameters.get(KEY_PRESET_BANK_CAPABILITIES);
- if (obj instanceof PresetBankCapabilities) {
- return (PresetBankCapabilities)obj;
- } else if (obj instanceof Hashtable) {
- return new PresetBankCapabilities((Hashtable<String, Object>)obj);
- }
- return null;
+ return (PresetBankCapabilities) getObject(PresetBankCapabilities.class, KEY_PRESET_BANK_CAPABILITIES);
}
public void setPresetBankCapabilities(PresetBankCapabilities presetBankCapabilities) {
- setParameters(KEY_PRESET_BANK_CAPABILITIES, presetBankCapabilities);
+ setParameter(KEY_PRESET_BANK_CAPABILITIES, presetBankCapabilities);
}
}
diff --git a/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/SetGlobalProperties.java b/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/SetGlobalProperties.java index 43f7db223..d7447dc21 100644 --- a/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/SetGlobalProperties.java +++ b/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/SetGlobalProperties.java @@ -2,11 +2,10 @@ package com.smartdevicelink.proxy.rpc; import com.smartdevicelink.protocol.enums.FunctionID;
import com.smartdevicelink.proxy.RPCRequest;
-import com.smartdevicelink.util.DebugTool;
-import java.util.ArrayList;
import java.util.Hashtable;
import java.util.List;
+
/**
* Sets value(s) for the specified global property(ies)
*
@@ -141,22 +140,7 @@ public class SetGlobalProperties extends RPCRequest { */
@SuppressWarnings("unchecked")
public List<TTSChunk> getHelpPrompt() {
- if (parameters.get(KEY_HELP_PROMPT) instanceof List<?>) {
- List<?> list = (List<?>)parameters.get(KEY_HELP_PROMPT);
- if (list != null && list.size() > 0) {
- Object obj = list.get(0);
- if (obj instanceof TTSChunk) {
- return (List<TTSChunk>) list;
- } else if (obj instanceof Hashtable) {
- List<TTSChunk> newList = new ArrayList<TTSChunk>();
- for (Object hashObj : list) {
- newList.add(new TTSChunk((Hashtable<String, Object>)hashObj));
- }
- return newList;
- }
- }
- }
- return null;
+ return (List<TTSChunk>) getObject(TTSChunk.class, KEY_HELP_PROMPT);
}
/**
* Sets a List<TTSChunk> for Help Prompt that Array of one or more
@@ -173,7 +157,7 @@ public class SetGlobalProperties extends RPCRequest { * </ul>
*/
public void setHelpPrompt(List<TTSChunk> helpPrompt) {
- setParameters(KEY_HELP_PROMPT, helpPrompt);
+ setParameter(KEY_HELP_PROMPT, helpPrompt);
}
/**
* Gets a List<TTSChunk> for Timeout Prompt representing Array of one or
@@ -185,22 +169,7 @@ public class SetGlobalProperties extends RPCRequest { */
@SuppressWarnings("unchecked")
public List<TTSChunk> getTimeoutPrompt() {
- if (parameters.get(KEY_TIMEOUT_PROMPT) instanceof List<?>) {
- List<?> list = (List<?>)parameters.get(KEY_TIMEOUT_PROMPT);
- if (list != null && list.size() > 0) {
- Object obj = list.get(0);
- if (obj instanceof TTSChunk) {
- return (List<TTSChunk>) list;
- } else if (obj instanceof Hashtable) {
- List<TTSChunk> newList = new ArrayList<TTSChunk>();
- for (Object hashObj : list) {
- newList.add(new TTSChunk((Hashtable<String, Object>)hashObj));
- }
- return newList;
- }
- }
- }
- return null;
+ return (List<TTSChunk>) getObject(TTSChunk.class, KEY_TIMEOUT_PROMPT);
}
/**
* Sets a List<TTSChunk> for Timeout Prompt representing Array of one or
@@ -209,7 +178,7 @@ public class SetGlobalProperties extends RPCRequest { *
*/
public void setTimeoutPrompt(List<TTSChunk> timeoutPrompt) {
- setParameters(KEY_TIMEOUT_PROMPT, timeoutPrompt);
+ setParameter(KEY_TIMEOUT_PROMPT, timeoutPrompt);
}
/**
@@ -220,7 +189,7 @@ public class SetGlobalProperties extends RPCRequest { * @since SmartDeviceLink 2.0
*/
public String getVrHelpTitle() {
- return (String) parameters.get(KEY_VR_HELP_TITLE);
+ return getString(KEY_VR_HELP_TITLE);
}
/**
@@ -240,7 +209,7 @@ public class SetGlobalProperties extends RPCRequest { * @since SmartDeviceLink 2.0
*/
public void setVrHelpTitle(String vrHelpTitle) {
- setParameters(KEY_VR_HELP_TITLE, vrHelpTitle);
+ setParameter(KEY_VR_HELP_TITLE, vrHelpTitle);
}
/**
@@ -253,22 +222,7 @@ public class SetGlobalProperties extends RPCRequest { */
@SuppressWarnings("unchecked")
public List<VrHelpItem> getVrHelp() {
- if (parameters.get(KEY_VR_HELP) instanceof List<?>) {
- List<?> list = (List<?>)parameters.get(KEY_VR_HELP);
- if (list != null && list.size() > 0) {
- Object obj = list.get(0);
- if (obj instanceof VrHelpItem) {
- return (List<VrHelpItem>) list;
- } else if (obj instanceof Hashtable) {
- List<VrHelpItem> newList = new ArrayList<VrHelpItem>();
- for (Object hashObj : list) {
- newList.add(new VrHelpItem((Hashtable<String, Object>)hashObj));
- }
- return newList;
- }
- }
- }
- return null;
+ return (List<VrHelpItem>) getObject(VrHelpItem.class, KEY_VR_HELP);
}
/**
@@ -293,53 +247,33 @@ public class SetGlobalProperties extends RPCRequest { * @since SmartDeviceLink 2.0
*/
public void setVrHelp(List<VrHelpItem> vrHelp) {
- setParameters(KEY_VR_HELP, vrHelp);
+ setParameter(KEY_VR_HELP, vrHelp);
}
public String getMenuTitle() {
- return (String) parameters.get(KEY_MENU_TITLE);
+ return getString(KEY_MENU_TITLE);
}
public void setMenuTitle(String menuTitle) {
- setParameters(KEY_MENU_TITLE, menuTitle);
+ setParameter(KEY_MENU_TITLE, menuTitle);
}
public void setMenuIcon(Image menuIcon) {
- setParameters(KEY_MENU_ICON, menuIcon);
+ setParameter(KEY_MENU_ICON, menuIcon);
}
@SuppressWarnings("unchecked")
public Image getMenuIcon() {
- Object obj = parameters.get(KEY_MENU_ICON);
- if (obj instanceof Image) {
- return (Image) obj;
- } else if (obj instanceof Hashtable) {
- try {
- return new Image((Hashtable<String, Object>) obj);
- } catch (Exception e) {
- DebugTool.logError("Failed to parse " + getClass().getSimpleName() + "." + KEY_MENU_ICON, e);
- }
- }
- return null;
+ return (Image) getObject(Image.class, KEY_MENU_ICON);
}
public void setKeyboardProperties(KeyboardProperties keyboardProperties) {
- setParameters(KEY_KEYBOARD_PROPERTIES, keyboardProperties);
+ setParameter(KEY_KEYBOARD_PROPERTIES, keyboardProperties);
}
@SuppressWarnings("unchecked")
public KeyboardProperties getKeyboardProperties() {
- Object obj = parameters.get(KEY_KEYBOARD_PROPERTIES);
- if (obj instanceof KeyboardProperties) {
- return (KeyboardProperties) obj;
- } else if (obj instanceof Hashtable) {
- try {
- return new KeyboardProperties((Hashtable<String, Object>) obj);
- } catch (Exception e) {
- DebugTool.logError("Failed to parse " + getClass().getSimpleName() + "." + KEY_KEYBOARD_PROPERTIES, e);
- }
- }
- return null;
+ return (KeyboardProperties) getObject(KeyboardProperties.class, KEY_KEYBOARD_PROPERTIES);
}
}
diff --git a/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/SetMediaClockTimer.java b/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/SetMediaClockTimer.java index 0c3f46189..84060eb0a 100644 --- a/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/SetMediaClockTimer.java +++ b/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/SetMediaClockTimer.java @@ -99,13 +99,7 @@ public class SetMediaClockTimer extends RPCRequest { */
@SuppressWarnings("unchecked")
public StartTime getStartTime() {
- Object obj = parameters.get(KEY_START_TIME);
- if (obj instanceof StartTime) {
- return (StartTime)obj;
- } else if (obj instanceof Hashtable) {
- return new StartTime((Hashtable<String, Object>)obj);
- }
- return null;
+ return (StartTime) getObject(StartTime.class, KEY_START_TIME);
}
/**
* Sets a Start Time with specifying hour, minute, second values
@@ -121,22 +115,16 @@ public class SetMediaClockTimer extends RPCRequest { * </ul>
*/
public void setStartTime( StartTime startTime ) {
- setParameters(KEY_START_TIME, startTime);
+ setParameter(KEY_START_TIME, startTime);
}
@SuppressWarnings("unchecked")
public StartTime getEndTime() {
- Object obj = parameters.get(KEY_END_TIME);
- if (obj instanceof StartTime) {
- return (StartTime)obj;
- } else if (obj instanceof Hashtable) {
- return new StartTime((Hashtable<String, Object>)obj);
- }
- return null;
+ return (StartTime) getObject(StartTime.class, KEY_END_TIME);
}
public void setEndTime( StartTime endTime ) {
- setParameters(KEY_END_TIME, endTime);
+ setParameter(KEY_END_TIME, endTime);
}
/**
@@ -145,13 +133,7 @@ public class SetMediaClockTimer extends RPCRequest { * @return UpdateMode -a Enumeration value (COUNTUP/COUNTDOWN/PAUSE/RESUME)
*/
public UpdateMode getUpdateMode() {
- Object obj = parameters.get(KEY_UPDATE_MODE);
- if (obj instanceof UpdateMode) {
- return (UpdateMode) obj;
- } else if (obj instanceof String) {
- return UpdateMode.valueForString((String) obj);
- }
- return null;
+ return (UpdateMode) getObject(UpdateMode.class, KEY_UPDATE_MODE);
}
/**
* Sets the media clock/timer update mode (COUNTUP/COUNTDOWN/PAUSE/RESUME)
@@ -168,6 +150,6 @@ public class SetMediaClockTimer extends RPCRequest { * </ul>
*/
public void setUpdateMode( UpdateMode updateMode ) {
- setParameters(KEY_UPDATE_MODE, updateMode);
+ setParameter(KEY_UPDATE_MODE, updateMode);
}
}
diff --git a/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/Show.java b/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/Show.java index e0e0d4534..d616f90ae 100644 --- a/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/Show.java +++ b/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/Show.java @@ -3,9 +3,7 @@ package com.smartdevicelink.proxy.rpc; import com.smartdevicelink.protocol.enums.FunctionID;
import com.smartdevicelink.proxy.RPCRequest;
import com.smartdevicelink.proxy.rpc.enums.TextAlignment;
-import com.smartdevicelink.util.DebugTool;
-import java.util.ArrayList;
import java.util.Hashtable;
import java.util.List;
@@ -191,7 +189,7 @@ public class Show extends RPCRequest { * display
*/
public String getMainField1() {
- return (String) parameters.get(KEY_MAIN_FIELD_1);
+ return getString(KEY_MAIN_FIELD_1);
}
/**
* Sets the text displayed in a single-line display, or in the upper display
@@ -211,7 +209,7 @@ public class Show extends RPCRequest { * </ul>
*/
public void setMainField1(String mainField1) {
- setParameters(KEY_MAIN_FIELD_1, mainField1);
+ setParameter(KEY_MAIN_FIELD_1, mainField1);
}
/**
* Gets the text displayed on the second display line of a two-line display
@@ -220,7 +218,7 @@ public class Show extends RPCRequest { * second display line of a two-line display
*/
public String getMainField2() {
- return (String) parameters.get(KEY_MAIN_FIELD_2);
+ return getString(KEY_MAIN_FIELD_2);
}
/**
* Sets the text displayed on the second display line of a two-line display
@@ -241,7 +239,7 @@ public class Show extends RPCRequest { * </ul>
*/
public void setMainField2(String mainField2) {
- setParameters(KEY_MAIN_FIELD_2, mainField2);
+ setParameter(KEY_MAIN_FIELD_2, mainField2);
}
/**
@@ -252,7 +250,7 @@ public class Show extends RPCRequest { * @since SmartDeviceLink 2.0
*/
public String getMainField3() {
- return (String) parameters.get(KEY_MAIN_FIELD_3);
+ return getString(KEY_MAIN_FIELD_3);
}
/**
@@ -275,7 +273,7 @@ public class Show extends RPCRequest { * @since SmartDeviceLink 2.0
*/
public void setMainField3(String mainField3) {
- setParameters(KEY_MAIN_FIELD_3, mainField3);
+ setParameter(KEY_MAIN_FIELD_3, mainField3);
}
/**
@@ -286,7 +284,7 @@ public class Show extends RPCRequest { * @since SmartDeviceLink 2.0
*/
public String getMainField4() {
- return (String) parameters.get(KEY_MAIN_FIELD_4);
+ return getString(KEY_MAIN_FIELD_4);
}
/**
@@ -309,7 +307,7 @@ public class Show extends RPCRequest { * @since SmartDeviceLink 2.0
*/
public void setMainField4(String mainField4) {
- setParameters(KEY_MAIN_FIELD_4, mainField4);
+ setParameter(KEY_MAIN_FIELD_4, mainField4);
}
/**
* Gets the alignment that Specifies how mainField1 and mainField2 text
@@ -318,13 +316,7 @@ public class Show extends RPCRequest { * @return TextAlignment -an Enumeration value
*/
public TextAlignment getAlignment() {
- Object obj = parameters.get(KEY_ALIGNMENT);
- if (obj instanceof TextAlignment) {
- return (TextAlignment) obj;
- } else if (obj instanceof String) {
- return TextAlignment.valueForString((String) obj);
- }
- return null;
+ return (TextAlignment) getObject(TextAlignment.class, KEY_ALIGNMENT);
}
/**
* Sets the alignment that Specifies how mainField1 and mainField2 text
@@ -343,7 +335,7 @@ public class Show extends RPCRequest { * </ul>
*/
public void setAlignment(TextAlignment alignment) {
- setParameters(KEY_ALIGNMENT, alignment);
+ setParameter(KEY_ALIGNMENT, alignment);
}
/**
* Gets text in the Status Bar
@@ -351,7 +343,7 @@ public class Show extends RPCRequest { * @return String -the value in the Status Bar
*/
public String getStatusBar() {
- return (String) parameters.get(KEY_STATUS_BAR);
+ return getString(KEY_STATUS_BAR);
}
/**
* Sets text in the Status Bar
@@ -372,7 +364,7 @@ public class Show extends RPCRequest { * </ul>
*/
public void setStatusBar(String statusBar) {
- setParameters(KEY_STATUS_BAR, statusBar);
+ setParameter(KEY_STATUS_BAR, statusBar);
}
/**
* Gets the String value of the MediaClock
@@ -381,7 +373,7 @@ public class Show extends RPCRequest { */
@Deprecated
public String getMediaClock() {
- return (String) parameters.get(KEY_MEDIA_CLOCK);
+ return getString(KEY_MEDIA_CLOCK);
}
/**
* Sets the value for the MediaClock field using a format described in the
@@ -401,7 +393,7 @@ public class Show extends RPCRequest { */
@Deprecated
public void setMediaClock(String mediaClock) {
- setParameters(KEY_MEDIA_CLOCK, mediaClock);
+ setParameter(KEY_MEDIA_CLOCK, mediaClock);
}
/**
* Gets the text in the track field
@@ -409,7 +401,7 @@ public class Show extends RPCRequest { * @return String -a String displayed in the track field
*/
public String getMediaTrack() {
- return (String) parameters.get(KEY_MEDIA_TRACK);
+ return getString(KEY_MEDIA_TRACK);
}
/**
* Sets the text in the track field
@@ -425,7 +417,7 @@ public class Show extends RPCRequest { * </ul>
*/
public void setMediaTrack(String mediaTrack) {
- setParameters(KEY_MEDIA_TRACK, mediaTrack);
+ setParameter(KEY_MEDIA_TRACK, mediaTrack);
}
/**
@@ -439,7 +431,7 @@ public class Show extends RPCRequest { * @since SmartDeviceLink 2.0
*/
public void setGraphic(Image graphic) {
- setParameters(KEY_GRAPHIC, graphic);
+ setParameter(KEY_GRAPHIC, graphic);
}
/**
@@ -451,38 +443,18 @@ public class Show extends RPCRequest { */
@SuppressWarnings("unchecked")
public Image getGraphic() {
- Object obj = parameters.get(KEY_GRAPHIC);
- if (obj instanceof Image) {
- return (Image) obj;
- } else if (obj instanceof Hashtable) {
- try {
- return new Image((Hashtable<String, Object>) obj);
- } catch (Exception e) {
- DebugTool.logError("Failed to parse " + getClass().getSimpleName() + "." + KEY_GRAPHIC, e);
- }
- }
- return null;
+ return (Image) getObject(Image.class, KEY_GRAPHIC);
}
public void setSecondaryGraphic(Image secondaryGraphic) {
- setParameters(KEY_SECONDARY_GRAPHIC, secondaryGraphic);
+ setParameter(KEY_SECONDARY_GRAPHIC, secondaryGraphic);
}
@SuppressWarnings("unchecked")
public Image getSecondaryGraphic() {
- Object obj = parameters.get(KEY_SECONDARY_GRAPHIC);
- if (obj instanceof Image) {
- return (Image) obj;
- } else if (obj instanceof Hashtable) {
- try {
- return new Image((Hashtable<String, Object>) obj);
- } catch (Exception e) {
- DebugTool.logError("Failed to parse " + getClass().getSimpleName() + "." + KEY_SECONDARY_GRAPHIC, e);
- }
- }
- return null;
+ return (Image) getObject(Image.class, KEY_SECONDARY_GRAPHIC);
}
@@ -495,22 +467,7 @@ public class Show extends RPCRequest { */
@SuppressWarnings("unchecked")
public List<SoftButton> getSoftButtons() {
- if (parameters.get(KEY_SOFT_BUTTONS) instanceof List<?>) {
- List<?> list = (List<?>)parameters.get(KEY_SOFT_BUTTONS);
- if (list != null && list.size() > 0) {
- Object obj = list.get(0);
- if (obj instanceof SoftButton) {
- return (List<SoftButton>) list;
- } else if (obj instanceof Hashtable) {
- List<SoftButton> newList = new ArrayList<SoftButton>();
- for (Object hashObj : list) {
- newList.add(new SoftButton((Hashtable<String, Object>)hashObj));
- }
- return newList;
- }
- }
- }
- return null;
+ return (List<SoftButton>) getObject(SoftButton.class, KEY_SOFT_BUTTONS);
}
/**
@@ -531,7 +488,7 @@ public class Show extends RPCRequest { * @since SmartDeviceLink 2.0
*/
public void setSoftButtons(List<SoftButton> softButtons) {
- setParameters(KEY_SOFT_BUTTONS, softButtons);
+ setParameter(KEY_SOFT_BUTTONS, softButtons);
}
/**
@@ -543,16 +500,7 @@ public class Show extends RPCRequest { */
@SuppressWarnings("unchecked")
public List<String> getCustomPresets() {
- if (parameters.get(KEY_CUSTOM_PRESETS) instanceof List<?>) {
- List<?> list = (List<?>)parameters.get(KEY_CUSTOM_PRESETS);
- if (list != null && list.size()>0) {
- Object obj = list.get(0);
- if (obj instanceof String) {
- return (List<String>) list;
- }
- }
- }
- return null;
+ return (List<String>) getObject(String.class, KEY_CUSTOM_PRESETS);
}
/**
@@ -570,6 +518,6 @@ public class Show extends RPCRequest { * @since SmartDeviceLink 2.0
*/
public void setCustomPresets(List<String> customPresets) {
- setParameters(KEY_CUSTOM_PRESETS, customPresets);
+ setParameter(KEY_CUSTOM_PRESETS, customPresets);
}
}
diff --git a/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/ShowConstantTbt.java b/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/ShowConstantTbt.java index e964b2992..f2b633923 100644 --- a/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/ShowConstantTbt.java +++ b/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/ShowConstantTbt.java @@ -3,7 +3,6 @@ package com.smartdevicelink.proxy.rpc; import com.smartdevicelink.protocol.enums.FunctionID; import com.smartdevicelink.proxy.RPCRequest; -import java.util.ArrayList; import java.util.Hashtable; import java.util.List; @@ -61,7 +60,7 @@ public class ShowConstantTbt extends RPCRequest{ * <b>Notes: </b>Maxlength=500 */ public void setNavigationText1(String navigationText1){ - setParameters(KEY_TEXT1, navigationText1); + setParameter(KEY_TEXT1, navigationText1); } /** @@ -70,7 +69,7 @@ public class ShowConstantTbt extends RPCRequest{ * @return String -a String value representing a text for navigation text field 1 */ public String getNavigationText1(){ - return (String) parameters.get(KEY_TEXT1); + return getString(KEY_TEXT1); } /** @@ -82,7 +81,7 @@ public class ShowConstantTbt extends RPCRequest{ * <b>Notes: </b>Maxlength=500 */ public void setNavigationText2(String navigationText2){ - setParameters(KEY_TEXT2, navigationText2); + setParameter(KEY_TEXT2, navigationText2); } /** @@ -91,7 +90,7 @@ public class ShowConstantTbt extends RPCRequest{ * @return String -a String value representing a text for navigation text field 2 */ public String getNavigationText2(){ - return (String) parameters.get(KEY_TEXT2); + return getString(KEY_TEXT2); } /** @@ -103,7 +102,7 @@ public class ShowConstantTbt extends RPCRequest{ * <b>Notes: </b>Maxlength=500 */ public void setEta(String eta){ - setParameters(KEY_ETA, eta); + setParameter(KEY_ETA, eta); } /** @@ -112,7 +111,7 @@ public class ShowConstantTbt extends RPCRequest{ * @return String -a String value representing a text field for estimated time of arrival */ public String getEta(){ - return (String) parameters.get(KEY_ETA); + return getString(KEY_ETA); } /** @@ -124,7 +123,7 @@ public class ShowConstantTbt extends RPCRequest{ * <b>Notes: </b>Maxlength=500 */ public void setTotalDistance(String totalDistance){ - setParameters(KEY_TOTAL_DISTANCE, totalDistance); + setParameter(KEY_TOTAL_DISTANCE, totalDistance); } /** @@ -133,7 +132,7 @@ public class ShowConstantTbt extends RPCRequest{ * @return String -a String value representing a text field for total distance */ public String getTotalDistance(){ - return (String) parameters.get(KEY_TOTAL_DISTANCE); + return getString(KEY_TOTAL_DISTANCE); } /** @@ -143,7 +142,7 @@ public class ShowConstantTbt extends RPCRequest{ * an Image value */ public void setTurnIcon(Image turnIcon){ - setParameters(KEY_MANEUVER_IMAGE, turnIcon); + setParameter(KEY_MANEUVER_IMAGE, turnIcon); } /** @@ -153,13 +152,7 @@ public class ShowConstantTbt extends RPCRequest{ */ @SuppressWarnings("unchecked") public Image getTurnIcon(){ - Object obj = parameters.get(KEY_MANEUVER_IMAGE); - if (obj instanceof Image) { - return (Image) obj; - } else if (obj instanceof Hashtable) { - return new Image((Hashtable<String, Object>) obj); - } - return null; + return (Image) getObject(Image.class, KEY_MANEUVER_IMAGE); } /** @@ -169,7 +162,7 @@ public class ShowConstantTbt extends RPCRequest{ * an Image value */ public void setNextTurnIcon(Image nextTurnIcon){ - setParameters(KEY_NEXT_MANEUVER_IMAGE, nextTurnIcon); + setParameter(KEY_NEXT_MANEUVER_IMAGE, nextTurnIcon); } /** @@ -179,13 +172,7 @@ public class ShowConstantTbt extends RPCRequest{ */ @SuppressWarnings("unchecked") public Image getNextTurnIcon(){ - Object obj = parameters.get(KEY_NEXT_MANEUVER_IMAGE); - if (obj instanceof Image) { - return (Image) obj; - } else if (obj instanceof Hashtable) { - return new Image((Hashtable<String, Object>) obj); - } - return null; + return (Image) getObject(Image.class, KEY_NEXT_MANEUVER_IMAGE); } /** @@ -197,7 +184,7 @@ public class ShowConstantTbt extends RPCRequest{ * <b>Notes: </b>Minvalue=0; Maxvalue=1000000000 */ public void setDistanceToManeuver(Double distanceToManeuver){ - setParameters(KEY_MANEUVER_DISTANCE, distanceToManeuver); + setParameter(KEY_MANEUVER_DISTANCE, distanceToManeuver); } /** @@ -206,7 +193,7 @@ public class ShowConstantTbt extends RPCRequest{ * @return Double -a Double value representing a Fraction of distance till next maneuver */ public Double getDistanceToManeuver(){ - return (Double) parameters.get(KEY_MANEUVER_DISTANCE); + return getDouble(KEY_MANEUVER_DISTANCE); } /** @@ -218,7 +205,7 @@ public class ShowConstantTbt extends RPCRequest{ * <b>Notes: </b>Minvalue=0; Maxvalue=1000000000 */ public void setDistanceToManeuverScale(Double distanceToManeuverScale){ - setParameters(KEY_MANEUVER_DISTANCE_SCALE, distanceToManeuverScale); + setParameter(KEY_MANEUVER_DISTANCE_SCALE, distanceToManeuverScale); } /** @@ -227,7 +214,7 @@ public class ShowConstantTbt extends RPCRequest{ * @return Double -a Double value representing a Distance till next maneuver (starting from) from previous maneuver */ public Double getDistanceToManeuverScale(){ - return (Double) parameters.get(KEY_MANEUVER_DISTANCE_SCALE); + return getDouble(KEY_MANEUVER_DISTANCE_SCALE); } /** @@ -240,7 +227,7 @@ public class ShowConstantTbt extends RPCRequest{ * a Boolean value */ public void setManeuverComplete(Boolean maneuverComplete){ - setParameters(KEY_MANEUVER_COMPLETE, maneuverComplete); + setParameter(KEY_MANEUVER_COMPLETE, maneuverComplete); } /** @@ -249,7 +236,7 @@ public class ShowConstantTbt extends RPCRequest{ * @return Boolean -a Boolean value */ public Boolean getManeuverComplete(){ - return (Boolean) parameters.get(KEY_MANEUVER_COMPLETE); + return getBoolean(KEY_MANEUVER_COMPLETE); } /** @@ -262,7 +249,7 @@ public class ShowConstantTbt extends RPCRequest{ * a List<SoftButton> value */ public void setSoftButtons(List<SoftButton> softButtons){ - setParameters(KEY_SOFT_BUTTONS, softButtons); + setParameter(KEY_SOFT_BUTTONS, softButtons); } /** @@ -273,29 +260,14 @@ public class ShowConstantTbt extends RPCRequest{ */ @SuppressWarnings("unchecked") public List<SoftButton> getSoftButtons(){ - if (parameters.get(KEY_SOFT_BUTTONS) instanceof List<?>) { - List<?> list = (List<?>)parameters.get(KEY_SOFT_BUTTONS); - if (list != null && list.size() > 0) { - Object obj = list.get(0); - if (obj instanceof SoftButton) { - return (List<SoftButton>) list; - } else if (obj instanceof Hashtable) { - List<SoftButton> newList = new ArrayList<SoftButton>(); - for (Object hashObj : list) { - newList.add(new SoftButton((Hashtable<String, Object>)hashObj)); - } - return newList; - } - } - } - return null; + return (List<SoftButton>) getObject(SoftButton.class, KEY_SOFT_BUTTONS); } public void setTimeToDestination(String timeToDestination){ - setParameters(KEY_TIME_TO_DESTINATION, timeToDestination); + setParameter(KEY_TIME_TO_DESTINATION, timeToDestination); } public String getTimeToDestination(){ - return (String) parameters.get(KEY_TIME_TO_DESTINATION); + return getString(KEY_TIME_TO_DESTINATION); } } diff --git a/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/SingleTireStatus.java b/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/SingleTireStatus.java index ab30ff365..4b8722ea5 100644 --- a/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/SingleTireStatus.java +++ b/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/SingleTireStatus.java @@ -1,10 +1,10 @@ package com.smartdevicelink.proxy.rpc;
-import java.util.Hashtable;
-
import com.smartdevicelink.proxy.RPCStruct;
import com.smartdevicelink.proxy.rpc.enums.ComponentVolumeStatus;
+import java.util.Hashtable;
+
/**
* Tire pressure status of a single tire.
* <p><b>Parameter List</b></p>
@@ -47,11 +47,7 @@ public class SingleTireStatus extends RPCStruct { * @param status the volume status of a single tire
*/
public void setStatus(ComponentVolumeStatus status) {
- if (status != null) {
- store.put(KEY_STATUS, status);
- } else {
- store.remove(KEY_STATUS);
- }
+ setValue(KEY_STATUS, status);
}
/**
@@ -59,12 +55,6 @@ public class SingleTireStatus extends RPCStruct { * @return the volume status of a single tire
*/
public ComponentVolumeStatus getStatus() {
- Object obj = store.get(KEY_STATUS);
- if (obj instanceof ComponentVolumeStatus) {
- return (ComponentVolumeStatus) obj;
- } else if (obj instanceof String) {
- return ComponentVolumeStatus.valueForString((String) obj);
- }
- return null;
+ return (ComponentVolumeStatus) getObject(ComponentVolumeStatus.class, KEY_STATUS);
}
}
diff --git a/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/Slider.java b/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/Slider.java index 1298f29fe..56603da0c 100644 --- a/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/Slider.java +++ b/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/Slider.java @@ -119,7 +119,7 @@ public class Slider extends RPCRequest { * <b>Notes: </b>Minvalue=2; Maxvalue=26
*/
public void setNumTicks(Integer numTicks) {
- setParameters(KEY_NUM_TICKS, numTicks);
+ setParameter(KEY_NUM_TICKS, numTicks);
}
/**
@@ -129,7 +129,7 @@ public class Slider extends RPCRequest { * items on a horizontal axis
*/
public Integer getNumTicks() {
- return (Integer) parameters.get(KEY_NUM_TICKS);
+ return getInteger(KEY_NUM_TICKS);
}
/**
@@ -142,7 +142,7 @@ public class Slider extends RPCRequest { * <b>Notes: </b>Minvalue=1; Maxvalue=26
*/
public void setPosition(Integer position) {
- setParameters(KEY_POSITION, position);
+ setParameter(KEY_POSITION, position);
}
/**
@@ -152,7 +152,7 @@ public class Slider extends RPCRequest { * slider control
*/
public Integer getPosition() {
- return (Integer) parameters.get(KEY_POSITION);
+ return getInteger(KEY_POSITION);
}
/**
@@ -164,7 +164,7 @@ public class Slider extends RPCRequest { * <b>Notes: </b>Maxlength=500
*/
public void setSliderHeader(String sliderHeader) {
- setParameters(KEY_SLIDER_HEADER, sliderHeader);
+ setParameter(KEY_SLIDER_HEADER, sliderHeader);
}
/**
@@ -173,7 +173,7 @@ public class Slider extends RPCRequest { * @return String -a String value representing a text header to display
*/
public String getSliderHeader() {
- return (String) parameters.get(KEY_SLIDER_HEADER);
+ return getString(KEY_SLIDER_HEADER);
}
/**
@@ -185,7 +185,7 @@ public class Slider extends RPCRequest { * <b>Notes: </b>Maxlength=500; Minvalue=1; Maxvalue=26
*/
public void setSliderFooter(List<String> sliderFooter) {
- setParameters(KEY_SLIDER_FOOTER, sliderFooter);
+ setParameter(KEY_SLIDER_FOOTER, sliderFooter);
}
/**
@@ -195,16 +195,7 @@ public class Slider extends RPCRequest { */
@SuppressWarnings("unchecked")
public List<String> getSliderFooter() {
- if (parameters.get(KEY_SLIDER_FOOTER) instanceof List<?>) {
- List<?> list = (List<?>)parameters.get(KEY_SLIDER_FOOTER);
- if (list != null && list.size()>0) {
- Object obj = list.get(0);
- if (obj instanceof String) {
- return (List<String>) list;
- }
- }
- }
- return null;
+ return (List<String>) getObject(String.class, KEY_SLIDER_FOOTER);
}
/**
@@ -216,7 +207,7 @@ public class Slider extends RPCRequest { * <b>Notes: </b>Minvalue=0; Maxvalue=65535; Defvalue=10000
*/
public void setTimeout(Integer timeout) {
- setParameters(KEY_TIMEOUT, timeout);
+ setParameter(KEY_TIMEOUT, timeout);
}
/**
@@ -224,6 +215,6 @@ public class Slider extends RPCRequest { * @return Integer -an Integer value representing an App defined timeout
*/
public Integer getTimeout() {
- return (Integer) parameters.get(KEY_TIMEOUT);
+ return getInteger(KEY_TIMEOUT);
}
}
diff --git a/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/SliderResponse.java b/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/SliderResponse.java index 4a99a6581..02a99b279 100644 --- a/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/SliderResponse.java +++ b/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/SliderResponse.java @@ -36,13 +36,13 @@ public class SliderResponse extends RPCResponse { * @param sliderPosition
*/
public void setSliderPosition(Integer sliderPosition) {
- setParameters(KEY_SLIDER_POSITION, sliderPosition);
+ setParameter(KEY_SLIDER_POSITION, sliderPosition);
}
/**
* Gets an Initial position of slider control
* @return Integer
*/
public Integer getSliderPosition() {
- return (Integer) parameters.get(KEY_SLIDER_POSITION);
+ return getInteger(KEY_SLIDER_POSITION);
}
}
diff --git a/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/SoftButton.java b/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/SoftButton.java index e010a08da..23e31316d 100644 --- a/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/SoftButton.java +++ b/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/SoftButton.java @@ -95,86 +95,40 @@ public class SoftButton extends RPCStruct { super(hash);
}
public void setType(SoftButtonType type) {
- if (type != null) {
- store.put(KEY_TYPE, type);
- } else {
- store.remove(KEY_TYPE);
- }
+ setValue(KEY_TYPE, type);
}
public SoftButtonType getType() {
- Object obj = store.get(KEY_TYPE);
- if (obj instanceof SoftButtonType) {
- return (SoftButtonType) obj;
- } else if (obj instanceof String) {
- return SoftButtonType.valueForString((String) obj);
- }
- return null;
+ return (SoftButtonType) getObject(SoftButtonType.class, KEY_TYPE);
}
public void setText(String text) {
- if (text != null) {
- store.put(KEY_TEXT, text);
- } else {
- store.remove(KEY_TEXT);
- }
+ setValue(KEY_TEXT, text);
}
public String getText() {
- return (String) store.get(KEY_TEXT);
+ return getString(KEY_TEXT);
}
public void setImage(Image image) {
- if (image != null) {
- store.put(KEY_IMAGE, image);
- } else {
- store.remove(KEY_IMAGE);
- }
+ setValue(KEY_IMAGE, image);
}
@SuppressWarnings("unchecked")
public Image getImage() {
- Object obj = store.get(KEY_IMAGE);
- if (obj instanceof Image) {
- return (Image) obj;
- } else if (obj instanceof Hashtable) {
- try {
- return new Image((Hashtable<String, Object>) obj);
- } catch (Exception e) {
- DebugTool.logError("Failed to parse " + getClass().getSimpleName() + "." + KEY_IMAGE, e);
- }
- }
- return null;
+ return (Image) getObject(Image.class, KEY_IMAGE);
}
public void setIsHighlighted(Boolean isHighlighted) {
- if (isHighlighted != null) {
- store.put(KEY_IS_HIGHLIGHTED, isHighlighted);
- } else {
- store.remove(KEY_IS_HIGHLIGHTED);
- }
+ setValue(KEY_IS_HIGHLIGHTED, isHighlighted);
}
public Boolean getIsHighlighted() {
- return (Boolean) store.get(KEY_IS_HIGHLIGHTED);
+ return getBoolean(KEY_IS_HIGHLIGHTED);
}
public void setSoftButtonID(Integer softButtonID) {
- if (softButtonID != null) {
- store.put(KEY_SOFT_BUTTON_ID, softButtonID);
- } else {
- store.remove(KEY_SOFT_BUTTON_ID);
- }
+ setValue(KEY_SOFT_BUTTON_ID, softButtonID);
}
public Integer getSoftButtonID() {
- return (Integer) store.get(KEY_SOFT_BUTTON_ID);
+ return getInteger(KEY_SOFT_BUTTON_ID);
}
public void setSystemAction(SystemAction systemAction) {
- if (systemAction != null) {
- store.put(KEY_SYSTEM_ACTION, systemAction);
- } else {
- store.remove(KEY_SYSTEM_ACTION);
- }
+ setValue(KEY_SYSTEM_ACTION, systemAction);
}
public SystemAction getSystemAction() {
- Object obj = store.get(KEY_SYSTEM_ACTION);
- if (obj instanceof SystemAction) {
- return (SystemAction) obj;
- } else if (obj instanceof String) {
- return SystemAction.valueForString((String) obj);
- }
- return null;
+ return (SystemAction) getObject(SystemAction.class, KEY_SYSTEM_ACTION);
}
}
diff --git a/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/SoftButtonCapabilities.java b/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/SoftButtonCapabilities.java index e2849086c..205dfe74c 100644 --- a/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/SoftButtonCapabilities.java +++ b/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/SoftButtonCapabilities.java @@ -1,9 +1,9 @@ package com.smartdevicelink.proxy.rpc;
-import java.util.Hashtable;
-
import com.smartdevicelink.proxy.RPCStruct;
+import java.util.Hashtable;
+
/**
* <p>Contains information about a SoftButton's capabilities.</p>
* <p><b>Parameter List</b></p>
@@ -72,11 +72,7 @@ public class SoftButtonCapabilities extends RPCStruct { * @param shortPressAvailable whether the button supports a short press.
*/
public void setShortPressAvailable(Boolean shortPressAvailable) {
- if (shortPressAvailable != null) {
- store.put(KEY_SHORT_PRESS_AVAILABLE, shortPressAvailable);
- } else {
- store.remove(KEY_SHORT_PRESS_AVAILABLE);
- }
+ setValue(KEY_SHORT_PRESS_AVAILABLE, shortPressAvailable);
}
/**
@@ -84,7 +80,7 @@ public class SoftButtonCapabilities extends RPCStruct { * @return whether the button supports a short press
*/
public Boolean getShortPressAvailable() {
- return (Boolean) store.get( KEY_SHORT_PRESS_AVAILABLE);
+ return getBoolean( KEY_SHORT_PRESS_AVAILABLE);
}
/**
@@ -92,11 +88,7 @@ public class SoftButtonCapabilities extends RPCStruct { * @param longPressAvailable whether the button supports a long press
*/
public void setLongPressAvailable(Boolean longPressAvailable) {
- if (longPressAvailable != null) {
- store.put(KEY_LONG_PRESS_AVAILABLE, longPressAvailable);
- } else {
- store.remove(KEY_LONG_PRESS_AVAILABLE);
- }
+ setValue(KEY_LONG_PRESS_AVAILABLE, longPressAvailable);
}
/**
@@ -104,7 +96,7 @@ public class SoftButtonCapabilities extends RPCStruct { * @return whether the button supports a LONG press
*/
public Boolean getLongPressAvailable() {
- return (Boolean) store.get( KEY_LONG_PRESS_AVAILABLE);
+ return getBoolean( KEY_LONG_PRESS_AVAILABLE);
}
/**
@@ -112,11 +104,7 @@ public class SoftButtonCapabilities extends RPCStruct { * @param upDownAvailable the button supports "button down" and "button up".
*/
public void setUpDownAvailable(Boolean upDownAvailable) {
- if (upDownAvailable != null) {
- store.put(KEY_UP_DOWN_AVAILABLE, upDownAvailable);
- } else {
- store.remove(KEY_UP_DOWN_AVAILABLE);
- }
+ setValue(KEY_UP_DOWN_AVAILABLE, upDownAvailable);
}
/**
@@ -124,7 +112,7 @@ public class SoftButtonCapabilities extends RPCStruct { * @return the button supports "button down" and "button up".
*/
public Boolean getUpDownAvailable() {
- return (Boolean) store.get( KEY_UP_DOWN_AVAILABLE);
+ return getBoolean( KEY_UP_DOWN_AVAILABLE);
}
/**
@@ -132,11 +120,7 @@ public class SoftButtonCapabilities extends RPCStruct { * @param imageSupported whether the button supports referencing a static or dynamic image.
*/
public void setImageSupported(Boolean imageSupported) {
- if (imageSupported != null) {
- store.put(KEY_IMAGE_SUPPORTED, imageSupported);
- } else {
- store.remove(KEY_IMAGE_SUPPORTED);
- }
+ setValue(KEY_IMAGE_SUPPORTED, imageSupported);
}
/**
@@ -144,6 +128,6 @@ public class SoftButtonCapabilities extends RPCStruct { * @return the button supports referencing a static or dynamic image.
*/
public Boolean getImageSupported() {
- return (Boolean) store.get( KEY_IMAGE_SUPPORTED);
+ return getBoolean( KEY_IMAGE_SUPPORTED);
}
}
diff --git a/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/Speak.java b/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/Speak.java index 83e0d7e66..b78cdd237 100644 --- a/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/Speak.java +++ b/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/Speak.java @@ -3,12 +3,9 @@ package com.smartdevicelink.proxy.rpc; import com.smartdevicelink.protocol.enums.FunctionID;
import com.smartdevicelink.proxy.RPCRequest;
-import java.util.ArrayList;
import java.util.Hashtable;
import java.util.List;
-import static com.smartdevicelink.proxy.constants.Names.timeout;
-
/**
* Speaks a phrase over the vehicle audio system using SDL's TTS
* (text-to-speech) engine. The provided text to be spoken can be simply a text
@@ -137,22 +134,7 @@ public class Speak extends RPCRequest { */
@SuppressWarnings("unchecked")
public List<TTSChunk> getTtsChunks() {
- if (parameters.get(KEY_TTS_CHUNKS) instanceof List<?>) {
- List<?> list = (List<?>)parameters.get(KEY_TTS_CHUNKS);
- if (list != null && list.size() > 0) {
- Object obj = list.get(0);
- if (obj instanceof TTSChunk) {
- return (List<TTSChunk>) list;
- } else if (obj instanceof Hashtable) {
- List<TTSChunk> newList = new ArrayList<TTSChunk>();
- for (Object hashObj : list) {
- newList.add(new TTSChunk((Hashtable<String, Object>)hashObj));
- }
- return newList;
- }
- }
- }
- return null;
+ return (List<TTSChunk>) getObject(TTSChunk.class, KEY_TTS_CHUNKS);
}
/**
* Sets a List<TTSChunk> representing an array of 1-100 TTSChunk structs
@@ -171,6 +153,6 @@ public class Speak extends RPCRequest { * </ul>
*/
public void setTtsChunks( List<TTSChunk> ttsChunks ) {
- setParameters(KEY_TTS_CHUNKS, ttsChunks);
+ setParameter(KEY_TTS_CHUNKS, ttsChunks);
}
}
diff --git a/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/StartTime.java b/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/StartTime.java index bce0b9fc1..ec515ad46 100644 --- a/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/StartTime.java +++ b/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/StartTime.java @@ -1,9 +1,9 @@ package com.smartdevicelink.proxy.rpc;
-import java.util.Hashtable;
-
import com.smartdevicelink.proxy.RPCStruct;
+import java.util.Hashtable;
+
/**
* Describes the hour, minute and second values used to set the media clock.
* <p><b> Parameter List</b></p>
@@ -59,7 +59,7 @@ public class StartTime extends RPCStruct { * @return hours Minvalue="0", maxvalue="59"
*/
public Integer getHours() {
- return (Integer) store.get( KEY_HOURS );
+ return getInteger( KEY_HOURS );
}
/**
* Set the hour. Minvalue="0", maxvalue="59"
@@ -67,46 +67,34 @@ public class StartTime extends RPCStruct { * @param hours min: 0; max: 59
*/
public void setHours( Integer hours ) {
- if (hours != null) {
- store.put(KEY_HOURS, hours );
- } else {
- store.remove(KEY_HOURS);
- }
+ setValue(KEY_HOURS, hours);
}
/**
* Get the minute. Minvalue="0", maxvalue="59".
* @return minutes Minvalue="0", maxvalue="59"
*/
public Integer getMinutes() {
- return (Integer) store.get( KEY_MINUTES );
+ return getInteger( KEY_MINUTES );
}
/**
* Set the minute. Minvalue="0", maxvalue="59".
* @param minutes min: 0; max: 59
*/
public void setMinutes( Integer minutes ) {
- if (minutes != null) {
- store.put(KEY_MINUTES, minutes );
- } else {
- store.remove(KEY_MINUTES);
- }
+ setValue(KEY_MINUTES, minutes);
}
/**
* Get the second. Minvalue="0", maxvalue="59".
* @return seconds. Minvalue="0", maxvalue="59".
*/
public Integer getSeconds() {
- return (Integer) store.get( KEY_SECONDS );
+ return getInteger( KEY_SECONDS );
}
/**
* Set the second. Minvalue="0", maxvalue="59".
* @param seconds min: 0 max: 59
*/
public void setSeconds( Integer seconds ) {
- if (seconds != null) {
- store.put(KEY_SECONDS, seconds );
- } else {
- store.remove(KEY_SECONDS);
- }
+ setValue(KEY_SECONDS, seconds);
}
}
diff --git a/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/StreamRPCResponse.java b/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/StreamRPCResponse.java index 7507c5d49..d9f20d5dc 100644 --- a/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/StreamRPCResponse.java +++ b/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/StreamRPCResponse.java @@ -5,8 +5,6 @@ import com.smartdevicelink.proxy.RPCResponse; import java.util.Hashtable; -import static com.smartdevicelink.proxy.constants.Names.timeout; - public class StreamRPCResponse extends RPCResponse { public static final String KEY_FILENAME = "fileName"; public static final String KEY_FILESIZE = "fileSize"; @@ -19,17 +17,17 @@ public class StreamRPCResponse extends RPCResponse { } public void setFileName(String fileName) { - setParameters(KEY_FILENAME, fileName); + setParameter(KEY_FILENAME, fileName); } public String getFileName() { - return (String) parameters.get(KEY_FILENAME); + return getString(KEY_FILENAME); } public void setFileSize(Long fileSize) { - setParameters(KEY_FILESIZE, fileSize); + setParameter(KEY_FILESIZE, fileSize); } public Long getFileSize() { - return (Long) parameters.get(KEY_FILESIZE); + return getLong(KEY_FILESIZE); } } diff --git a/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/SubscribeButton.java b/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/SubscribeButton.java index a22b1795b..75b2649fa 100644 --- a/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/SubscribeButton.java +++ b/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/SubscribeButton.java @@ -99,19 +99,13 @@ public class SubscribeButton extends RPCRequest { * @return ButtonName -an enum value, see <i>{@linkplain com.smartdevicelink.proxy.rpc.enums.ButtonName}</i>
*/
public ButtonName getButtonName() {
- Object obj = parameters.get(KEY_BUTTON_NAME);
- if (obj instanceof ButtonName) {
- return (ButtonName) obj;
- } else if (obj instanceof String) {
- return ButtonName.valueForString((String) obj);
- }
- return null;
+ return (ButtonName) getObject(ButtonName.class, KEY_BUTTON_NAME);
}
/**
* Sets a name of the button to subscribe to
* @param buttonName a <i>{@linkplain com.smartdevicelink.proxy.rpc.enums.ButtonName}</i> value
*/
public void setButtonName( ButtonName buttonName ) {
- setParameters(KEY_BUTTON_NAME, buttonName);
+ setParameter(KEY_BUTTON_NAME, buttonName);
}
}
diff --git a/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/SubscribeVehicleData.java b/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/SubscribeVehicleData.java index ec6e576d0..f4dbc31c6 100644 --- a/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/SubscribeVehicleData.java +++ b/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/SubscribeVehicleData.java @@ -289,7 +289,7 @@ public class SubscribeVehicleData extends RPCRequest { * a boolean value
*/
public void setGps(Boolean gps) {
- setParameters(KEY_GPS, gps);
+ setParameter(KEY_GPS, gps);
}
/**
@@ -299,7 +299,7 @@ public class SubscribeVehicleData extends RPCRequest { * subscribed.
*/
public Boolean getGps() {
- return (Boolean) parameters.get(KEY_GPS);
+ return getBoolean(KEY_GPS);
}
/**
@@ -309,7 +309,7 @@ public class SubscribeVehicleData extends RPCRequest { * a boolean value
*/
public void setSpeed(Boolean speed) {
- setParameters(KEY_SPEED, speed);
+ setParameter(KEY_SPEED, speed);
}
/**
@@ -319,7 +319,7 @@ public class SubscribeVehicleData extends RPCRequest { * subscribed.
*/
public Boolean getSpeed() {
- return (Boolean) parameters.get(KEY_SPEED);
+ return getBoolean(KEY_SPEED);
}
/**
@@ -329,7 +329,7 @@ public class SubscribeVehicleData extends RPCRequest { * a boolean value
*/
public void setRpm(Boolean rpm) {
- setParameters(KEY_RPM, rpm);
+ setParameter(KEY_RPM, rpm);
}
/**
@@ -339,7 +339,7 @@ public class SubscribeVehicleData extends RPCRequest { * subscribed.
*/
public Boolean getRpm() {
- return (Boolean) parameters.get(KEY_RPM);
+ return getBoolean(KEY_RPM);
}
/**
@@ -349,7 +349,7 @@ public class SubscribeVehicleData extends RPCRequest { * a boolean value
*/
public void setFuelLevel(Boolean fuelLevel) {
- setParameters(KEY_FUEL_LEVEL, fuelLevel);
+ setParameter(KEY_FUEL_LEVEL, fuelLevel);
}
/**
@@ -360,7 +360,7 @@ public class SubscribeVehicleData extends RPCRequest { * been subscribed.
*/
public Boolean getFuelLevel() {
- return (Boolean) parameters.get(KEY_FUEL_LEVEL);
+ return getBoolean(KEY_FUEL_LEVEL);
}
/**
@@ -393,7 +393,7 @@ public class SubscribeVehicleData extends RPCRequest { * a boolean value
*/
public void setFuelLevelState(Boolean fuelLevelState) {
- setParameters(KEY_FUEL_LEVEL_STATE, fuelLevelState);
+ setParameter(KEY_FUEL_LEVEL_STATE, fuelLevelState);
}
/**
@@ -404,7 +404,7 @@ public class SubscribeVehicleData extends RPCRequest { * has been subscribed.
*/
public Boolean getFuelLevelState() {
- return (Boolean) parameters.get(KEY_FUEL_LEVEL_STATE);
+ return getBoolean(KEY_FUEL_LEVEL_STATE);
}
/**
@@ -414,7 +414,7 @@ public class SubscribeVehicleData extends RPCRequest { * a boolean value
*/
public void setInstantFuelConsumption(Boolean instantFuelConsumption) {
- setParameters(KEY_INSTANT_FUEL_CONSUMPTION, instantFuelConsumption);
+ setParameter(KEY_INSTANT_FUEL_CONSUMPTION, instantFuelConsumption);
}
/**
@@ -425,7 +425,7 @@ public class SubscribeVehicleData extends RPCRequest { * has been subscribed.
*/
public Boolean getInstantFuelConsumption() {
- return (Boolean) parameters.get(KEY_INSTANT_FUEL_CONSUMPTION);
+ return getBoolean(KEY_INSTANT_FUEL_CONSUMPTION);
}
/**
@@ -435,7 +435,7 @@ public class SubscribeVehicleData extends RPCRequest { * a boolean value
*/
public void setExternalTemperature(Boolean externalTemperature) {
- setParameters(KEY_EXTERNAL_TEMPERATURE, externalTemperature);
+ setParameter(KEY_EXTERNAL_TEMPERATURE, externalTemperature);
}
/**
@@ -446,7 +446,7 @@ public class SubscribeVehicleData extends RPCRequest { * has been subscribed.
*/
public Boolean getExternalTemperature() {
- return (Boolean) parameters.get(KEY_EXTERNAL_TEMPERATURE);
+ return getBoolean(KEY_EXTERNAL_TEMPERATURE);
}
/**
@@ -456,7 +456,7 @@ public class SubscribeVehicleData extends RPCRequest { * a boolean value
*/
public void setPrndl(Boolean prndl) {
- setParameters(KEY_PRNDL, prndl);
+ setParameter(KEY_PRNDL, prndl);
}
/**
@@ -467,7 +467,7 @@ public class SubscribeVehicleData extends RPCRequest { * has been subscribed.
*/
public Boolean getPrndl() {
- return (Boolean) parameters.get(KEY_PRNDL);
+ return getBoolean(KEY_PRNDL);
}
/**
@@ -477,7 +477,7 @@ public class SubscribeVehicleData extends RPCRequest { * a boolean value
*/
public void setTirePressure(Boolean tirePressure) {
- setParameters(KEY_TIRE_PRESSURE, tirePressure);
+ setParameter(KEY_TIRE_PRESSURE, tirePressure);
}
/**
@@ -488,7 +488,7 @@ public class SubscribeVehicleData extends RPCRequest { * has been subscribed.
*/
public Boolean getTirePressure() {
- return (Boolean) parameters.get(KEY_TIRE_PRESSURE);
+ return getBoolean(KEY_TIRE_PRESSURE);
}
/**
@@ -498,7 +498,7 @@ public class SubscribeVehicleData extends RPCRequest { * a boolean value
*/
public void setOdometer(Boolean odometer) {
- setParameters(KEY_ODOMETER, odometer);
+ setParameter(KEY_ODOMETER, odometer);
}
/**
@@ -509,7 +509,7 @@ public class SubscribeVehicleData extends RPCRequest { * has been subscribed.
*/
public Boolean getOdometer() {
- return (Boolean) parameters.get(KEY_ODOMETER);
+ return getBoolean(KEY_ODOMETER);
}
/**
@@ -519,7 +519,7 @@ public class SubscribeVehicleData extends RPCRequest { * a boolean value
*/
public void setBeltStatus(Boolean beltStatus) {
- setParameters(KEY_BELT_STATUS, beltStatus);
+ setParameter(KEY_BELT_STATUS, beltStatus);
}
/**
@@ -530,7 +530,7 @@ public class SubscribeVehicleData extends RPCRequest { * has been subscribed.
*/
public Boolean getBeltStatus() {
- return (Boolean) parameters.get(KEY_BELT_STATUS);
+ return getBoolean(KEY_BELT_STATUS);
}
/**
@@ -540,7 +540,7 @@ public class SubscribeVehicleData extends RPCRequest { * a boolean value
*/
public void setBodyInformation(Boolean bodyInformation) {
- setParameters(KEY_BODY_INFORMATION, bodyInformation);
+ setParameter(KEY_BODY_INFORMATION, bodyInformation);
}
/**
@@ -551,7 +551,7 @@ public class SubscribeVehicleData extends RPCRequest { * has been subscribed.
*/
public Boolean getBodyInformation() {
- return (Boolean) parameters.get(KEY_BODY_INFORMATION);
+ return getBoolean(KEY_BODY_INFORMATION);
}
/**
@@ -561,7 +561,7 @@ public class SubscribeVehicleData extends RPCRequest { * a boolean value
*/
public void setDeviceStatus(Boolean deviceStatus) {
- setParameters(KEY_DEVICE_STATUS, deviceStatus);
+ setParameter(KEY_DEVICE_STATUS, deviceStatus);
}
/**
@@ -572,7 +572,7 @@ public class SubscribeVehicleData extends RPCRequest { * has been subscribed.
*/
public Boolean getDeviceStatus() {
- return (Boolean) parameters.get(KEY_DEVICE_STATUS);
+ return getBoolean(KEY_DEVICE_STATUS);
}
/**
@@ -582,7 +582,7 @@ public class SubscribeVehicleData extends RPCRequest { * a boolean value
*/
public void setDriverBraking(Boolean driverBraking) {
- setParameters(KEY_DRIVER_BRAKING, driverBraking);
+ setParameter(KEY_DRIVER_BRAKING, driverBraking);
}
/**
@@ -593,7 +593,7 @@ public class SubscribeVehicleData extends RPCRequest { * has been subscribed.
*/
public Boolean getDriverBraking() {
- return (Boolean) parameters.get(KEY_DRIVER_BRAKING);
+ return getBoolean(KEY_DRIVER_BRAKING);
}
/**
@@ -603,7 +603,7 @@ public class SubscribeVehicleData extends RPCRequest { * a boolean value
*/
public void setWiperStatus(Boolean wiperStatus) {
- setParameters(KEY_WIPER_STATUS, wiperStatus);
+ setParameter(KEY_WIPER_STATUS, wiperStatus);
}
/**
@@ -614,7 +614,7 @@ public class SubscribeVehicleData extends RPCRequest { * has been subscribed.
*/
public Boolean getWiperStatus() {
- return (Boolean) parameters.get(KEY_WIPER_STATUS);
+ return getBoolean(KEY_WIPER_STATUS);
}
/**
@@ -624,7 +624,7 @@ public class SubscribeVehicleData extends RPCRequest { * a boolean value
*/
public void setHeadLampStatus(Boolean headLampStatus) {
- setParameters(KEY_HEAD_LAMP_STATUS, headLampStatus);
+ setParameter(KEY_HEAD_LAMP_STATUS, headLampStatus);
}
/**
@@ -635,7 +635,7 @@ public class SubscribeVehicleData extends RPCRequest { * has been subscribed.
*/
public Boolean getHeadLampStatus() {
- return (Boolean) parameters.get(KEY_HEAD_LAMP_STATUS);
+ return getBoolean(KEY_HEAD_LAMP_STATUS);
}
/**
@@ -645,7 +645,7 @@ public class SubscribeVehicleData extends RPCRequest { * a boolean value
*/
public void setEngineTorque(Boolean engineTorque) {
- setParameters(KEY_ENGINE_TORQUE, engineTorque);
+ setParameter(KEY_ENGINE_TORQUE, engineTorque);
}
/**
@@ -656,7 +656,7 @@ public class SubscribeVehicleData extends RPCRequest { * has been subscribed.
*/
public Boolean getEngineTorque() {
- return (Boolean) parameters.get(KEY_ENGINE_TORQUE);
+ return getBoolean(KEY_ENGINE_TORQUE);
}
/**
@@ -666,7 +666,7 @@ public class SubscribeVehicleData extends RPCRequest { * a boolean value
*/
public void setAccPedalPosition(Boolean accPedalPosition) {
- setParameters(KEY_ACC_PEDAL_POSITION, accPedalPosition);
+ setParameter(KEY_ACC_PEDAL_POSITION, accPedalPosition);
}
/**
@@ -677,45 +677,45 @@ public class SubscribeVehicleData extends RPCRequest { * has been subscribed.
*/
public Boolean getAccPedalPosition() {
- return (Boolean) parameters.get(KEY_ACC_PEDAL_POSITION);
+ return getBoolean(KEY_ACC_PEDAL_POSITION);
}
public void setSteeringWheelAngle(Boolean steeringWheelAngle) {
- setParameters(KEY_STEERING_WHEEL_ANGLE, steeringWheelAngle);
+ setParameter(KEY_STEERING_WHEEL_ANGLE, steeringWheelAngle);
}
public Boolean getSteeringWheelAngle() {
- return (Boolean) parameters.get(KEY_STEERING_WHEEL_ANGLE);
+ return getBoolean(KEY_STEERING_WHEEL_ANGLE);
}
public void setECallInfo(Boolean eCallInfo) {
- setParameters(KEY_E_CALL_INFO, eCallInfo);
+ setParameter(KEY_E_CALL_INFO, eCallInfo);
}
public Boolean getECallInfo() {
- return (Boolean) parameters.get(KEY_E_CALL_INFO);
+ return getBoolean(KEY_E_CALL_INFO);
}
public void setAirbagStatus(Boolean airbagStatus) {
- setParameters(KEY_AIRBAG_STATUS, airbagStatus);
+ setParameter(KEY_AIRBAG_STATUS, airbagStatus);
}
public Boolean getAirbagStatus() {
- return (Boolean) parameters.get(KEY_AIRBAG_STATUS);
+ return getBoolean(KEY_AIRBAG_STATUS);
}
public void setEmergencyEvent(Boolean emergencyEvent) {
- setParameters(KEY_EMERGENCY_EVENT, emergencyEvent);
+ setParameter(KEY_EMERGENCY_EVENT, emergencyEvent);
}
public Boolean getEmergencyEvent() {
- return (Boolean) parameters.get(KEY_EMERGENCY_EVENT);
+ return getBoolean(KEY_EMERGENCY_EVENT);
}
public void setClusterModeStatus(Boolean clusterModeStatus) {
- setParameters(KEY_CLUSTER_MODE_STATUS, clusterModeStatus);
+ setParameter(KEY_CLUSTER_MODE_STATUS, clusterModeStatus);
}
public Boolean getClusterModeStatus() {
- return (Boolean) parameters.get(KEY_CLUSTER_MODE_STATUS);
+ return getBoolean(KEY_CLUSTER_MODE_STATUS);
}
public void setMyKey(Boolean myKey) {
- setParameters(KEY_MY_KEY, myKey);
+ setParameter(KEY_MY_KEY, myKey);
}
public Boolean getMyKey() {
- return (Boolean) parameters.get(KEY_MY_KEY);
+ return getBoolean(KEY_MY_KEY);
}
}
diff --git a/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/SubscribeVehicleDataResponse.java b/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/SubscribeVehicleDataResponse.java index 45149d26a..7ee115cb5 100644 --- a/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/SubscribeVehicleDataResponse.java +++ b/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/SubscribeVehicleDataResponse.java @@ -2,7 +2,6 @@ package com.smartdevicelink.proxy.rpc; import com.smartdevicelink.protocol.enums.FunctionID;
import com.smartdevicelink.proxy.RPCResponse;
-import com.smartdevicelink.util.DebugTool;
import java.util.Hashtable;
@@ -60,7 +59,7 @@ public class SubscribeVehicleDataResponse extends RPCResponse { * @param gps
*/
public void setGps(VehicleDataResult gps) {
- setParameters(KEY_GPS, gps);
+ setParameter(KEY_GPS, gps);
}
/**
* Gets gps
@@ -68,24 +67,14 @@ public class SubscribeVehicleDataResponse extends RPCResponse { */
@SuppressWarnings("unchecked")
public VehicleDataResult getGps() {
- Object obj = parameters.get(KEY_GPS);
- if (obj instanceof VehicleDataResult) {
- return (VehicleDataResult) obj;
- } else if (obj instanceof Hashtable) {
- try {
- return new VehicleDataResult((Hashtable<String, Object>) obj);
- } catch (Exception e) {
- DebugTool.logError("Failed to parse " + getClass().getSimpleName() + "." + KEY_GPS, e);
- }
- }
- return null;
+ return (VehicleDataResult) getObject(VehicleDataResult.class, KEY_GPS);
}
/**
* Sets speed
* @param speed
*/
public void setSpeed(VehicleDataResult speed) {
- setParameters(KEY_SPEED, speed);
+ setParameter(KEY_SPEED, speed);
}
/**
* Gets speed
@@ -93,24 +82,14 @@ public class SubscribeVehicleDataResponse extends RPCResponse { */
@SuppressWarnings("unchecked")
public VehicleDataResult getSpeed() {
- Object obj = parameters.get(KEY_SPEED);
- if (obj instanceof VehicleDataResult) {
- return (VehicleDataResult) obj;
- } else if (obj instanceof Hashtable) {
- try {
- return new VehicleDataResult((Hashtable<String, Object>) obj);
- } catch (Exception e) {
- DebugTool.logError("Failed to parse " + getClass().getSimpleName() + "." + KEY_SPEED, e);
- }
- }
- return null;
+ return (VehicleDataResult) getObject(VehicleDataResult.class, KEY_SPEED);
}
/**
* Sets rpm
* @param rpm
*/
public void setRpm(VehicleDataResult rpm) {
- setParameters(KEY_RPM, rpm);
+ setParameter(KEY_RPM, rpm);
}
/**
* Gets rpm
@@ -118,24 +97,14 @@ public class SubscribeVehicleDataResponse extends RPCResponse { */
@SuppressWarnings("unchecked")
public VehicleDataResult getRpm() {
- Object obj = parameters.get(KEY_RPM);
- if (obj instanceof VehicleDataResult) {
- return (VehicleDataResult) obj;
- } else if (obj instanceof Hashtable) {
- try {
- return new VehicleDataResult((Hashtable<String, Object>) obj);
- } catch (Exception e) {
- DebugTool.logError("Failed to parse " + getClass().getSimpleName() + "." + KEY_RPM, e);
- }
- }
- return null;
+ return (VehicleDataResult) getObject(VehicleDataResult.class, KEY_RPM);
}
/**
* Sets Fuel Level
* @param fuelLevel
*/
public void setFuelLevel(VehicleDataResult fuelLevel) {
- setParameters(KEY_FUEL_LEVEL, fuelLevel);
+ setParameter(KEY_FUEL_LEVEL, fuelLevel);
}
/**
* Gets Fuel Level
@@ -143,17 +112,7 @@ public class SubscribeVehicleDataResponse extends RPCResponse { */
@SuppressWarnings("unchecked")
public VehicleDataResult getFuelLevel() {
- Object obj = parameters.get(KEY_FUEL_LEVEL);
- if (obj instanceof VehicleDataResult) {
- return (VehicleDataResult) obj;
- } else if (obj instanceof Hashtable) {
- try {
- return new VehicleDataResult((Hashtable<String, Object>) obj);
- } catch (Exception e) {
- DebugTool.logError("Failed to parse " + getClass().getSimpleName() + "." + KEY_FUEL_LEVEL, e);
- }
- }
- return null;
+ return (VehicleDataResult) getObject(VehicleDataResult.class, KEY_FUEL_LEVEL);
}
/**
* Sets Fuel Level State
@@ -176,7 +135,7 @@ public class SubscribeVehicleDataResponse extends RPCResponse { * @param fuelLevelState
*/
public void setFuelLevelState(VehicleDataResult fuelLevelState) {
- setParameters(KEY_FUEL_LEVEL_STATE, fuelLevelState);
+ setParameter(KEY_FUEL_LEVEL_STATE, fuelLevelState);
}
/**
* Gets Fuel Level State
@@ -184,20 +143,14 @@ public class SubscribeVehicleDataResponse extends RPCResponse { */
@SuppressWarnings("unchecked")
public VehicleDataResult getFuelLevelState() {
- Object obj = parameters.get(KEY_FUEL_LEVEL_STATE);
- if (obj instanceof VehicleDataResult) {
- return (VehicleDataResult) obj;
- } else if (obj instanceof Hashtable) {
- return new VehicleDataResult((Hashtable<String, Object>) obj);
- }
- return null;
+ return (VehicleDataResult) getObject(VehicleDataResult.class, KEY_FUEL_LEVEL_STATE);
}
/**
* Sets Instant Fuel Comsumption
* @param instantFuelConsumption
*/
public void setInstantFuelConsumption(VehicleDataResult instantFuelConsumption) {
- setParameters(KEY_INSTANT_FUEL_CONSUMPTION, instantFuelConsumption);
+ setParameter(KEY_INSTANT_FUEL_CONSUMPTION, instantFuelConsumption);
}
/**
* Gets Instant Fuel Consumption
@@ -205,24 +158,14 @@ public class SubscribeVehicleDataResponse extends RPCResponse { */
@SuppressWarnings("unchecked")
public VehicleDataResult getInstantFuelConsumption() {
- Object obj = parameters.get(KEY_INSTANT_FUEL_CONSUMPTION);
- if (obj instanceof VehicleDataResult) {
- return (VehicleDataResult) obj;
- } else if (obj instanceof Hashtable) {
- try {
- return new VehicleDataResult((Hashtable<String, Object>) obj);
- } catch (Exception e) {
- DebugTool.logError("Failed to parse " + getClass().getSimpleName() + "." + KEY_INSTANT_FUEL_CONSUMPTION, e);
- }
- }
- return null;
+ return (VehicleDataResult) getObject(VehicleDataResult.class, KEY_INSTANT_FUEL_CONSUMPTION);
}
/**
* Sets External Temperature
* @param externalTemperature
*/
public void setExternalTemperature(VehicleDataResult externalTemperature) {
- setParameters(KEY_EXTERNAL_TEMPERATURE, externalTemperature);
+ setParameter(KEY_EXTERNAL_TEMPERATURE, externalTemperature);
}
/**
* Gets External Temperature
@@ -230,24 +173,14 @@ public class SubscribeVehicleDataResponse extends RPCResponse { */
@SuppressWarnings("unchecked")
public VehicleDataResult getExternalTemperature() {
- Object obj = parameters.get(KEY_EXTERNAL_TEMPERATURE);
- if (obj instanceof VehicleDataResult) {
- return (VehicleDataResult) obj;
- } else if (obj instanceof Hashtable) {
- try {
- return new VehicleDataResult((Hashtable<String, Object>) obj);
- } catch (Exception e) {
- DebugTool.logError("Failed to parse " + getClass().getSimpleName() + "." + KEY_EXTERNAL_TEMPERATURE, e);
- }
- }
- return null;
+ return (VehicleDataResult) getObject(VehicleDataResult.class, KEY_EXTERNAL_TEMPERATURE);
}
/**
* Sets currently selected gear data
* @param prndl
*/
public void setPrndl(VehicleDataResult prndl) {
- setParameters(KEY_PRNDL, prndl);
+ setParameter(KEY_PRNDL, prndl);
}
/**
* Gets currently selected gear data
@@ -255,24 +188,14 @@ public class SubscribeVehicleDataResponse extends RPCResponse { */
@SuppressWarnings("unchecked")
public VehicleDataResult getPrndl() {
- Object obj = parameters.get(KEY_PRNDL);
- if (obj instanceof VehicleDataResult) {
- return (VehicleDataResult) obj;
- } else if (obj instanceof Hashtable) {
- try {
- return new VehicleDataResult((Hashtable<String, Object>) obj);
- } catch (Exception e) {
- DebugTool.logError("Failed to parse " + getClass().getSimpleName() + "." + KEY_PRNDL, e);
- }
- }
- return null;
+ return (VehicleDataResult) getObject(VehicleDataResult.class, KEY_PRNDL);
}
/**
* Sets Tire Pressure
* @param tirePressure
*/
public void setTirePressure(VehicleDataResult tirePressure) {
- setParameters(KEY_TIRE_PRESSURE, tirePressure);
+ setParameter(KEY_TIRE_PRESSURE, tirePressure);
}
/**
* Gets Tire Pressure
@@ -280,24 +203,14 @@ public class SubscribeVehicleDataResponse extends RPCResponse { */
@SuppressWarnings("unchecked")
public VehicleDataResult getTirePressure() {
- Object obj = parameters.get(KEY_TIRE_PRESSURE);
- if (obj instanceof VehicleDataResult) {
- return (VehicleDataResult) obj;
- } else if (obj instanceof Hashtable) {
- try {
- return new VehicleDataResult((Hashtable<String, Object>) obj);
- } catch (Exception e) {
- DebugTool.logError("Failed to parse " + getClass().getSimpleName() + "." + KEY_TIRE_PRESSURE, e);
- }
- }
- return null;
+ return (VehicleDataResult) getObject(VehicleDataResult.class, KEY_TIRE_PRESSURE);
}
/**
* Sets Odometer
* @param odometer
*/
public void setOdometer(VehicleDataResult odometer) {
- setParameters(KEY_ODOMETER, odometer);
+ setParameter(KEY_ODOMETER, odometer);
}
/**
* Gets Odometer
@@ -305,24 +218,14 @@ public class SubscribeVehicleDataResponse extends RPCResponse { */
@SuppressWarnings("unchecked")
public VehicleDataResult getOdometer() {
- Object obj = parameters.get(KEY_ODOMETER);
- if (obj instanceof VehicleDataResult) {
- return (VehicleDataResult) obj;
- } else if (obj instanceof Hashtable) {
- try {
- return new VehicleDataResult((Hashtable<String, Object>) obj);
- } catch (Exception e) {
- DebugTool.logError("Failed to parse " + getClass().getSimpleName() + "." + KEY_ODOMETER, e);
- }
- }
- return null;
+ return (VehicleDataResult) getObject(VehicleDataResult.class, KEY_ODOMETER);
}
/**
* Sets Belt Status
* @param beltStatus
*/
public void setBeltStatus(VehicleDataResult beltStatus) {
- setParameters(KEY_BELT_STATUS, beltStatus);
+ setParameter(KEY_BELT_STATUS, beltStatus);
}
/**
* Gets Belt Status
@@ -330,24 +233,14 @@ public class SubscribeVehicleDataResponse extends RPCResponse { */
@SuppressWarnings("unchecked")
public VehicleDataResult getBeltStatus() {
- Object obj = parameters.get(KEY_BELT_STATUS);
- if (obj instanceof VehicleDataResult) {
- return (VehicleDataResult) obj;
- } else if (obj instanceof Hashtable) {
- try {
- return new VehicleDataResult((Hashtable<String, Object>) obj);
- } catch (Exception e) {
- DebugTool.logError("Failed to parse " + getClass().getSimpleName() + "." + KEY_BELT_STATUS, e);
- }
- }
- return null;
+ return (VehicleDataResult) getObject(VehicleDataResult.class, KEY_BELT_STATUS);
}
/**
* Sets Body Information
* @param bodyInformation
*/
public void setBodyInformation(VehicleDataResult bodyInformation) {
- setParameters(KEY_BODY_INFORMATION, bodyInformation);
+ setParameter(KEY_BODY_INFORMATION, bodyInformation);
}
/**
* Gets Body Information
@@ -355,24 +248,14 @@ public class SubscribeVehicleDataResponse extends RPCResponse { */
@SuppressWarnings("unchecked")
public VehicleDataResult getBodyInformation() {
- Object obj = parameters.get(KEY_BODY_INFORMATION);
- if (obj instanceof VehicleDataResult) {
- return (VehicleDataResult) obj;
- } else if (obj instanceof Hashtable) {
- try {
- return new VehicleDataResult((Hashtable<String, Object>) obj);
- } catch (Exception e) {
- DebugTool.logError("Failed to parse " + getClass().getSimpleName() + "." + KEY_BODY_INFORMATION, e);
- }
- }
- return null;
+ return (VehicleDataResult) getObject(VehicleDataResult.class, KEY_BODY_INFORMATION);
}
/**
* Sets Device Status
* @param deviceStatus
*/
public void setDeviceStatus(VehicleDataResult deviceStatus) {
- setParameters(KEY_DEVICE_STATUS, deviceStatus);
+ setParameter(KEY_DEVICE_STATUS, deviceStatus);
}
/**
* Gets Device Status
@@ -380,24 +263,14 @@ public class SubscribeVehicleDataResponse extends RPCResponse { */
@SuppressWarnings("unchecked")
public VehicleDataResult getDeviceStatus() {
- Object obj = parameters.get(KEY_DEVICE_STATUS);
- if (obj instanceof VehicleDataResult) {
- return (VehicleDataResult) obj;
- } else if (obj instanceof Hashtable) {
- try {
- return new VehicleDataResult((Hashtable<String, Object>) obj);
- } catch (Exception e) {
- DebugTool.logError("Failed to parse " + getClass().getSimpleName() + "." + KEY_DEVICE_STATUS, e);
- }
- }
- return null;
+ return (VehicleDataResult) getObject(VehicleDataResult.class, KEY_DEVICE_STATUS);
}
/**
* Sets Driver Barking
* @param driverBraking
*/
public void setDriverBraking(VehicleDataResult driverBraking) {
- setParameters(KEY_DRIVER_BRAKING, driverBraking);
+ setParameter(KEY_DRIVER_BRAKING, driverBraking);
}
/**
* Gets Driver Barking
@@ -405,24 +278,14 @@ public class SubscribeVehicleDataResponse extends RPCResponse { */
@SuppressWarnings("unchecked")
public VehicleDataResult getDriverBraking() {
- Object obj = parameters.get(KEY_DRIVER_BRAKING);
- if (obj instanceof VehicleDataResult) {
- return (VehicleDataResult) obj;
- } else if (obj instanceof Hashtable) {
- try {
- return new VehicleDataResult((Hashtable<String, Object>) obj);
- } catch (Exception e) {
- DebugTool.logError("Failed to parse " + getClass().getSimpleName() + "." + KEY_DRIVER_BRAKING, e);
- }
- }
- return null;
+ return (VehicleDataResult) getObject(VehicleDataResult.class, KEY_DRIVER_BRAKING);
}
/**
* Sets wiper Status
* @param wiperStatus
*/
public void setWiperStatus(VehicleDataResult wiperStatus) {
- setParameters(KEY_WIPER_STATUS, wiperStatus);
+ setParameter(KEY_WIPER_STATUS, wiperStatus);
}
/**
* Gets Wiper Status
@@ -430,24 +293,14 @@ public class SubscribeVehicleDataResponse extends RPCResponse { */
@SuppressWarnings("unchecked")
public VehicleDataResult getWiperStatus() {
- Object obj = parameters.get(KEY_WIPER_STATUS);
- if (obj instanceof VehicleDataResult) {
- return (VehicleDataResult) obj;
- } else if (obj instanceof Hashtable) {
- try {
- return new VehicleDataResult((Hashtable<String, Object>) obj);
- } catch (Exception e) {
- DebugTool.logError("Failed to parse " + getClass().getSimpleName() + "." + KEY_WIPER_STATUS, e);
- }
- }
- return null;
+ return (VehicleDataResult) getObject(VehicleDataResult.class, KEY_WIPER_STATUS);
}
/**
* Sets Head Lamp Status
* @param headLampStatus
*/
public void setHeadLampStatus(VehicleDataResult headLampStatus) {
- setParameters(KEY_HEAD_LAMP_STATUS, headLampStatus);
+ setParameter(KEY_HEAD_LAMP_STATUS, headLampStatus);
}
/**
* Gets Head Lamp Status
@@ -455,24 +308,14 @@ public class SubscribeVehicleDataResponse extends RPCResponse { */
@SuppressWarnings("unchecked")
public VehicleDataResult getHeadLampStatus() {
- Object obj = parameters.get(KEY_HEAD_LAMP_STATUS);
- if (obj instanceof VehicleDataResult) {
- return (VehicleDataResult) obj;
- } else if (obj instanceof Hashtable) {
- try {
- return new VehicleDataResult((Hashtable<String, Object>) obj);
- } catch (Exception e) {
- DebugTool.logError("Failed to parse " + getClass().getSimpleName() + "." + KEY_HEAD_LAMP_STATUS, e);
- }
- }
- return null;
+ return (VehicleDataResult) getObject(VehicleDataResult.class, KEY_HEAD_LAMP_STATUS);
}
/**
* Sets Engine Torque
* @param engineTorque
*/
public void setEngineTorque(VehicleDataResult engineTorque) {
- setParameters(KEY_ENGINE_TORQUE, engineTorque);
+ setParameter(KEY_ENGINE_TORQUE, engineTorque);
}
/**
* Gets Engine Torque
@@ -480,24 +323,14 @@ public class SubscribeVehicleDataResponse extends RPCResponse { */
@SuppressWarnings("unchecked")
public VehicleDataResult getEngineTorque() {
- Object obj = parameters.get(KEY_ENGINE_TORQUE);
- if (obj instanceof VehicleDataResult) {
- return (VehicleDataResult) obj;
- } else if (obj instanceof Hashtable) {
- try {
- return new VehicleDataResult((Hashtable<String, Object>) obj);
- } catch (Exception e) {
- DebugTool.logError("Failed to parse " + getClass().getSimpleName() + "." + KEY_ENGINE_TORQUE, e);
- }
- }
- return null;
+ return (VehicleDataResult) getObject(VehicleDataResult.class, KEY_ENGINE_TORQUE);
}
/**
* Sets AccPedal Position
* @param accPedalPosition
*/
public void setAccPedalPosition(VehicleDataResult accPedalPosition) {
- setParameters(KEY_ACC_PEDAL_POSITION, accPedalPosition);
+ setParameter(KEY_ACC_PEDAL_POSITION, accPedalPosition);
}
/**
* Gets AccPedal Position
@@ -505,121 +338,51 @@ public class SubscribeVehicleDataResponse extends RPCResponse { */
@SuppressWarnings("unchecked")
public VehicleDataResult getAccPedalPosition() {
- Object obj = parameters.get(KEY_ACC_PEDAL_POSITION);
- if (obj instanceof VehicleDataResult) {
- return (VehicleDataResult) obj;
- } else if (obj instanceof Hashtable) {
- try {
- return new VehicleDataResult((Hashtable<String, Object>) obj);
- } catch (Exception e) {
- DebugTool.logError("Failed to parse " + getClass().getSimpleName() + "." + KEY_ACC_PEDAL_POSITION, e);
- }
- }
- return null;
+ return (VehicleDataResult) getObject(VehicleDataResult.class, KEY_ACC_PEDAL_POSITION);
}
public void setSteeringWheelAngle(VehicleDataResult steeringWheelAngle) {
- setParameters(KEY_STEERING_WHEEL_ANGLE, steeringWheelAngle);
+ setParameter(KEY_STEERING_WHEEL_ANGLE, steeringWheelAngle);
}
@SuppressWarnings("unchecked")
public VehicleDataResult getSteeringWheelAngle() {
- Object obj = parameters.get(KEY_STEERING_WHEEL_ANGLE);
- if (obj instanceof VehicleDataResult) {
- return (VehicleDataResult) obj;
- } else if (obj instanceof Hashtable) {
- try {
- return new VehicleDataResult((Hashtable<String, Object>) obj);
- } catch (Exception e) {
- DebugTool.logError("Failed to parse " + getClass().getSimpleName() + "." + KEY_STEERING_WHEEL_ANGLE, e);
- }
- }
- return null;
+ return (VehicleDataResult) getObject(VehicleDataResult.class, KEY_STEERING_WHEEL_ANGLE);
}
public void setECallInfo(VehicleDataResult eCallInfo) {
- setParameters(KEY_E_CALL_INFO, eCallInfo);
+ setParameter(KEY_E_CALL_INFO, eCallInfo);
}
@SuppressWarnings("unchecked")
public VehicleDataResult getECallInfo() {
- Object obj = parameters.get(KEY_E_CALL_INFO);
- if (obj instanceof VehicleDataResult) {
- return (VehicleDataResult) obj;
- } else if (obj instanceof Hashtable) {
- try {
- return new VehicleDataResult((Hashtable<String, Object>) obj);
- } catch (Exception e) {
- DebugTool.logError("Failed to parse " + getClass().getSimpleName() + "." + KEY_E_CALL_INFO, e);
- }
- }
- return null;
+ return (VehicleDataResult) getObject(VehicleDataResult.class, KEY_E_CALL_INFO);
}
public void setAirbagStatus(VehicleDataResult airbagStatus) {
- setParameters(KEY_AIRBAG_STATUS, airbagStatus);
+ setParameter(KEY_AIRBAG_STATUS, airbagStatus);
}
@SuppressWarnings("unchecked")
public VehicleDataResult getAirbagStatus() {
- Object obj = parameters.get(KEY_AIRBAG_STATUS);
- if (obj instanceof VehicleDataResult) {
- return (VehicleDataResult) obj;
- } else if (obj instanceof Hashtable) {
- try {
- return new VehicleDataResult((Hashtable<String, Object>) obj);
- } catch (Exception e) {
- DebugTool.logError("Failed to parse " + getClass().getSimpleName() + "." + KEY_AIRBAG_STATUS, e);
- }
- }
- return null;
+ return (VehicleDataResult) getObject(VehicleDataResult.class, KEY_AIRBAG_STATUS);
}
public void setEmergencyEvent(VehicleDataResult emergencyEvent) {
- setParameters(KEY_EMERGENCY_EVENT, emergencyEvent);
+ setParameter(KEY_EMERGENCY_EVENT, emergencyEvent);
}
@SuppressWarnings("unchecked")
public VehicleDataResult getEmergencyEvent() {
- Object obj = parameters.get(KEY_EMERGENCY_EVENT);
- if (obj instanceof VehicleDataResult) {
- return (VehicleDataResult) obj;
- } else if (obj instanceof Hashtable) {
- try {
- return new VehicleDataResult((Hashtable<String, Object>) obj);
- } catch (Exception e) {
- DebugTool.logError("Failed to parse " + getClass().getSimpleName() + "." + KEY_EMERGENCY_EVENT, e);
- }
- }
- return null;
+ return (VehicleDataResult) getObject(VehicleDataResult.class, KEY_EMERGENCY_EVENT);
}
public void setClusterModeStatus(VehicleDataResult clusterModeStatus) {
- setParameters(KEY_CLUSTER_MODE_STATUS, clusterModeStatus);
+ setParameter(KEY_CLUSTER_MODE_STATUS, clusterModeStatus);
}
@SuppressWarnings("unchecked")
public VehicleDataResult getClusterModeStatus() {
- Object obj = parameters.get(KEY_CLUSTER_MODE_STATUS);
- if (obj instanceof VehicleDataResult) {
- return (VehicleDataResult) obj;
- } else if (obj instanceof Hashtable) {
- try {
- return new VehicleDataResult((Hashtable<String, Object>) obj);
- } catch (Exception e) {
- DebugTool.logError("Failed to parse " + getClass().getSimpleName() + "." + KEY_CLUSTER_MODE_STATUS, e);
- }
- }
- return null;
+ return (VehicleDataResult) getObject(VehicleDataResult.class, KEY_CLUSTER_MODE_STATUS);
}
public void setMyKey(VehicleDataResult myKey) {
- setParameters(KEY_MY_KEY, myKey);
+ setParameter(KEY_MY_KEY, myKey);
}
@SuppressWarnings("unchecked")
public VehicleDataResult getMyKey() {
- Object obj = parameters.get(KEY_MY_KEY);
- if (obj instanceof VehicleDataResult) {
- return (VehicleDataResult) obj;
- } else if (obj instanceof Hashtable) {
- try {
- return new VehicleDataResult((Hashtable<String, Object>) obj);
- } catch (Exception e) {
- DebugTool.logError("Failed to parse " + getClass().getSimpleName() + "." + KEY_MY_KEY, e);
- }
- }
- return null;
+ return (VehicleDataResult) getObject(VehicleDataResult.class, KEY_MY_KEY);
}
}
diff --git a/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/SystemRequest.java b/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/SystemRequest.java index 9d1b4e08e..39a3ee7e0 100644 --- a/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/SystemRequest.java +++ b/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/SystemRequest.java @@ -65,41 +65,26 @@ public class SystemRequest extends RPCRequest { @SuppressWarnings("unchecked")
public List<String> getLegacyData() {
- if (parameters.get(KEY_DATA) instanceof List<?>) {
- List<?> list = (List<?>)parameters.get(KEY_DATA);
- if (list != null && list.size()>0) {
- Object obj = list.get(0);
- if (obj instanceof String) {
- return (List<String>) list;
- }
- }
- }
- return null;
+ return (List<String>) getObject(String.class, KEY_DATA);
}
public void setLegacyData( List<String> data ) {
- setParameters(KEY_DATA, data);
+ setParameter(KEY_DATA, data);
}
public String getFileName() {
- return (String) parameters.get(KEY_FILE_NAME);
+ return getString(KEY_FILE_NAME);
}
public void setFileName(String fileName) {
- setParameters(KEY_FILE_NAME, fileName);
+ setParameter(KEY_FILE_NAME, fileName);
}
public RequestType getRequestType() {
- Object obj = parameters.get(KEY_REQUEST_TYPE);
- if (obj instanceof RequestType) {
- return (RequestType) obj;
- } else if (obj instanceof String) {
- return RequestType.valueForString((String) obj);
- }
- return null;
+ return (RequestType) getObject(RequestType.class, KEY_REQUEST_TYPE);
}
public void setRequestType(RequestType requestType) {
- setParameters(KEY_REQUEST_TYPE, requestType);
+ setParameter(KEY_REQUEST_TYPE, requestType);
}
}
diff --git a/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/TTSChunk.java b/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/TTSChunk.java index 97f865903..d98bb8a5c 100644 --- a/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/TTSChunk.java +++ b/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/TTSChunk.java @@ -1,10 +1,10 @@ package com.smartdevicelink.proxy.rpc;
-import java.util.Hashtable;
-
import com.smartdevicelink.proxy.RPCStruct;
import com.smartdevicelink.proxy.rpc.enums.SpeechCapabilities;
+import java.util.Hashtable;
+
/**
* <p>Specifies what is to be spoken. This can be simply a text phrase, which SDL will speak according to its own rules.
* It can also be phonemes from either the Microsoft SAPI phoneme set, or from the LHPLUS phoneme set.
@@ -56,41 +56,27 @@ public class TTSChunk extends RPCStruct { * @return text to be spoken, or a phoneme specification, or the name of a pre-recorded sound
*/
public String getText() {
- return (String) store.get( KEY_TEXT );
+ return getString( KEY_TEXT );
}
/**
* Set the text to be spoken, or a phoneme specification, or the name of a pre-recorded sound. The contents of this field are indicated by the "type" field.
* @param text to be spoken, or a phoneme specification, or the name of a pre-recorded sound.
*/
public void setText( String text ) {
- if (text != null) {
- store.put(KEY_TEXT, text );
- } else {
- store.remove(KEY_TEXT);
- }
+ setValue(KEY_TEXT, text);
}
/**
* Get the type of information in the "text" field (e.g. phrase to be spoken, phoneme specification, name of pre-recorded sound).
* @return the type of information in the "text" field
*/
public SpeechCapabilities getType() {
- Object obj = store.get(KEY_TYPE);
- if (obj instanceof SpeechCapabilities) {
- return (SpeechCapabilities) obj;
- } else if (obj instanceof String) {
- return SpeechCapabilities.valueForString((String) obj);
- }
- return null;
+ return (SpeechCapabilities) getObject(SpeechCapabilities.class, KEY_TYPE);
}
/**
* Set the type of information in the "text" field (e.g. phrase to be spoken, phoneme specification, name of pre-recorded sound).
* @param type the type of information in the "text" field
*/
public void setType( SpeechCapabilities type ) {
- if (type != null) {
- store.put(KEY_TYPE, type );
- } else {
- store.remove(KEY_TYPE);
- }
+ setValue(KEY_TYPE, type);
}
}
diff --git a/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/TextField.java b/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/TextField.java index 918f0eb2f..28e283e9f 100644 --- a/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/TextField.java +++ b/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/TextField.java @@ -6,6 +6,8 @@ import com.smartdevicelink.proxy.RPCStruct; import com.smartdevicelink.proxy.rpc.enums.CharacterSet;
import com.smartdevicelink.proxy.rpc.enums.TextFieldName;
+import static com.smartdevicelink.proxy.rpc.TireStatus.KEY_INNER_RIGHT_REAR;
+
/**
* Struct defining the characteristics of a displayed field on the HMI.
* <p><b> Parameter List</b></p>
@@ -83,48 +85,28 @@ public class TextField extends RPCStruct { * @return the name of TextField
*/
public TextFieldName getName() {
- Object obj = store.get(KEY_NAME);
- if (obj instanceof TextFieldName) {
- return (TextFieldName) obj;
- } else if (obj instanceof String) {
- return TextFieldName.valueForString((String) obj);
- }
- return null;
+ return (TextFieldName) getObject(TextFieldName.class, KEY_NAME);
}
/**
* Set the enumeration identifying the field.
* @param name the name of TextField
*/
public void setName( TextFieldName name ) {
- if (name != null) {
- store.put(KEY_NAME, name );
- } else {
- store.remove(KEY_NAME);
- }
+ setValue(KEY_NAME, name);
}
/**
* Get the character set that is supported in this field.
* @return the character set
*/
public CharacterSet getCharacterSet() {
- Object obj = store.get(KEY_CHARACTER_SET);
- if (obj instanceof CharacterSet) {
- return (CharacterSet) obj;
- } else if (obj instanceof String) {
- return CharacterSet.valueForString((String) obj);
- }
- return null;
+ return (CharacterSet) getObject(CharacterSet.class, KEY_CHARACTER_SET);
}
/**
* Set the character set that is supported in this field.
* @param characterSet - the character set
*/
public void setCharacterSet( CharacterSet characterSet ) {
- if (characterSet != null) {
- store.put(KEY_CHARACTER_SET, characterSet );
- } else {
- store.remove(KEY_CHARACTER_SET);
- }
+ setValue(KEY_CHARACTER_SET, characterSet);
}
/**
* Get the number of characters in one row of this field.
@@ -135,7 +117,7 @@ public class TextField extends RPCStruct { * @return the number of characters in one row of this field
*/
public Integer getWidth() {
- return (Integer) store.get( KEY_WIDTH );
+ return getInteger( KEY_WIDTH );
}
/**
* Set the number of characters in one row of this field.
@@ -146,11 +128,7 @@ public class TextField extends RPCStruct { * @param width the number of characters in one row of this field
*/
public void setWidth( Integer width ) {
- if (width != null) {
- store.put(KEY_WIDTH, width );
- } else {
- store.remove(KEY_WIDTH);
- }
+ setValue(KEY_WIDTH, width);
}
/**
*Get the number of rows for this text field.
@@ -161,13 +139,9 @@ public class TextField extends RPCStruct { * @return the number of rows for this text field
*/
public Integer getRows() {
- return (Integer) store.get( KEY_ROWS );
+ return getInteger( KEY_ROWS );
}
public void setRows( Integer rows ) {
- if (rows != null) {
- store.put(KEY_ROWS, rows );
- } else {
- store.remove(KEY_ROWS);
- }
+ setValue(KEY_ROWS, rows);
}
}
diff --git a/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/TireStatus.java b/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/TireStatus.java index f853d673c..4b2169215 100644 --- a/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/TireStatus.java +++ b/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/TireStatus.java @@ -1,10 +1,14 @@ package com.smartdevicelink.proxy.rpc;
-import java.util.Hashtable;
-
import com.smartdevicelink.proxy.RPCStruct;
+import com.smartdevicelink.proxy.rpc.enums.VehicleDataNotificationStatus;
import com.smartdevicelink.proxy.rpc.enums.WarningLightStatus;
import com.smartdevicelink.util.DebugTool;
+
+import java.util.Hashtable;
+
+import static com.smartdevicelink.proxy.rpc.ECallInfo.KEY_E_CALL_NOTIFICATION_STATUS;
+
/** <p>The status and pressure of the tires.</p>
* <p><b> Parameter List:</b></p>
*
@@ -89,145 +93,51 @@ public class TireStatus extends RPCStruct { super(hash);
}
public void setPressureTellTale(WarningLightStatus pressureTellTale) {
- if (pressureTellTale != null) {
- store.put(KEY_PRESSURE_TELL_TALE, pressureTellTale);
- } else {
- store.remove(KEY_PRESSURE_TELL_TALE);
- }
+ setValue(KEY_PRESSURE_TELL_TALE, pressureTellTale);
}
public WarningLightStatus getPressureTellTale() {
- Object obj = store.get(KEY_PRESSURE_TELL_TALE);
- if (obj instanceof WarningLightStatus) {
- return (WarningLightStatus) obj;
- } else if (obj instanceof String) {
- return WarningLightStatus.valueForString((String) obj);
- }
- return null;
+ return (WarningLightStatus) getObject(WarningLightStatus.class, KEY_PRESSURE_TELL_TALE);
}
public void setLeftFront(SingleTireStatus leftFront) {
- if (leftFront != null) {
- store.put(KEY_LEFT_FRONT, leftFront);
- } else {
- store.remove(KEY_LEFT_FRONT);
- }
+ setValue(KEY_LEFT_FRONT, leftFront);
}
@SuppressWarnings("unchecked")
public SingleTireStatus getLeftFront() {
- Object obj = store.get(KEY_LEFT_FRONT);
- if (obj instanceof SingleTireStatus) {
- return (SingleTireStatus) obj;
- } else if (obj instanceof Hashtable) {
- try {
- return new SingleTireStatus((Hashtable<String, Object>) obj);
- } catch (Exception e) {
- DebugTool.logError("Failed to parse " + getClass().getSimpleName() + "." + KEY_LEFT_FRONT, e);
- }
- }
- return null;
+ return (SingleTireStatus) getObject(SingleTireStatus.class, KEY_LEFT_FRONT);
}
public void setRightFront(SingleTireStatus rightFront) {
- if (rightFront != null) {
- store.put(KEY_RIGHT_FRONT, rightFront);
- } else {
- store.remove(KEY_RIGHT_FRONT);
- }
+ setValue(KEY_RIGHT_FRONT, rightFront);
}
@SuppressWarnings("unchecked")
public SingleTireStatus getRightFront() {
- Object obj = store.get(KEY_RIGHT_FRONT);
- if (obj instanceof SingleTireStatus) {
- return (SingleTireStatus) obj;
- } else if (obj instanceof Hashtable) {
- try {
- return new SingleTireStatus((Hashtable<String, Object>) obj);
- } catch (Exception e) {
- DebugTool.logError("Failed to parse " + getClass().getSimpleName() + "." + KEY_RIGHT_FRONT, e);
- }
- }
- return null;
+ return (SingleTireStatus) getObject(SingleTireStatus.class, KEY_RIGHT_FRONT);
}
public void setLeftRear(SingleTireStatus leftRear) {
- if (leftRear != null) {
- store.put(KEY_LEFT_REAR, leftRear);
- } else {
- store.remove(KEY_LEFT_REAR);
- }
+ setValue(KEY_LEFT_REAR, leftRear);
}
@SuppressWarnings("unchecked")
public SingleTireStatus getLeftRear() {
- Object obj = store.get(KEY_LEFT_REAR);
- if (obj instanceof SingleTireStatus) {
- return (SingleTireStatus) obj;
- } else if (obj instanceof Hashtable) {
- try {
- return new SingleTireStatus((Hashtable<String, Object>) obj);
- } catch (Exception e) {
- DebugTool.logError("Failed to parse " + getClass().getSimpleName() + "." + KEY_LEFT_REAR, e);
- }
- }
- return null;
+ return (SingleTireStatus) getObject(SingleTireStatus.class, KEY_LEFT_REAR);
}
public void setRightRear(SingleTireStatus rightRear) {
- if (rightRear != null) {
- store.put(KEY_RIGHT_REAR, rightRear);
- } else {
- store.remove(KEY_RIGHT_REAR);
- }
+ setValue(KEY_RIGHT_REAR, rightRear);
}
@SuppressWarnings("unchecked")
public SingleTireStatus getRightRear() {
- Object obj = store.get(KEY_RIGHT_REAR);
- if (obj instanceof SingleTireStatus) {
- return (SingleTireStatus) obj;
- } else if (obj instanceof Hashtable) {
- try {
- return new SingleTireStatus((Hashtable<String, Object>) obj);
- } catch (Exception e) {
- DebugTool.logError("Failed to parse " + getClass().getSimpleName() + "." + KEY_RIGHT_REAR, e);
- }
- }
- return null;
+ return (SingleTireStatus) getObject(SingleTireStatus.class, KEY_RIGHT_REAR);
}
public void setInnerLeftRear(SingleTireStatus innerLeftRear) {
- if (innerLeftRear != null) {
- store.put(KEY_INNER_LEFT_REAR, innerLeftRear);
- } else {
- store.remove(KEY_INNER_LEFT_REAR);
- }
+ setValue(KEY_INNER_LEFT_REAR, innerLeftRear);
}
@SuppressWarnings("unchecked")
public SingleTireStatus getInnerLeftRear() {
- Object obj = store.get(KEY_INNER_LEFT_REAR);
- if (obj instanceof SingleTireStatus) {
- return (SingleTireStatus) obj;
- } else if (obj instanceof Hashtable) {
- try {
- return new SingleTireStatus((Hashtable<String, Object>) obj);
- } catch (Exception e) {
- DebugTool.logError("Failed to parse " + getClass().getSimpleName() + "." + KEY_INNER_LEFT_REAR, e);
- }
- }
- return null;
+ return (SingleTireStatus) getObject(SingleTireStatus.class, KEY_INNER_LEFT_REAR);
}
public void setInnerRightRear(SingleTireStatus innerRightRear) {
- if (innerRightRear != null) {
- store.put(KEY_INNER_RIGHT_REAR, innerRightRear);
- } else {
- store.remove(KEY_INNER_RIGHT_REAR);
- }
+ setValue(KEY_INNER_RIGHT_REAR, innerRightRear);
}
@SuppressWarnings("unchecked")
public SingleTireStatus getInnerRightRear() {
- Object obj = store.get(KEY_INNER_RIGHT_REAR);
- if (obj instanceof SingleTireStatus) {
- return (SingleTireStatus) obj;
- } else if (obj instanceof Hashtable) {
- try {
- return new SingleTireStatus((Hashtable<String, Object>) obj);
- } catch (Exception e) {
- DebugTool.logError("Failed to parse " + getClass().getSimpleName() + "." + KEY_INNER_RIGHT_REAR, e);
- }
- }
- return null;
+ return (SingleTireStatus) getObject(SingleTireStatus.class, KEY_INNER_RIGHT_REAR);
}
}
diff --git a/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/TouchCoord.java b/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/TouchCoord.java index 95f793fe6..2c0a1a260 100644 --- a/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/TouchCoord.java +++ b/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/TouchCoord.java @@ -60,27 +60,19 @@ public class TouchCoord extends RPCStruct { }
public void setX(Integer x) {
- if (x != null) {
- store.put(KEY_X, x);
- } else {
- store.remove(KEY_X);
- }
+ setValue(KEY_X, x);
}
public Integer getX() {
- return (Integer) store.get(KEY_X);
+ return getInteger(KEY_X);
}
public void setY(Integer y) {
- if (y != null) {
- store.put(KEY_Y, y);
- } else {
- store.remove(KEY_Y);
- }
+ setValue(KEY_Y, y);
}
public Integer getY() {
- return (Integer) store.get(KEY_Y);
+ return getInteger(KEY_Y);
}
}
diff --git a/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/TouchEvent.java b/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/TouchEvent.java index 76e3c4207..58433f26c 100644 --- a/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/TouchEvent.java +++ b/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/TouchEvent.java @@ -1,10 +1,11 @@ package com.smartdevicelink.proxy.rpc;
+import com.smartdevicelink.proxy.RPCStruct;
+
import java.util.ArrayList;
import java.util.Hashtable;
import java.util.List;
-import com.smartdevicelink.proxy.RPCStruct;
/**
* <p>For touchscreen interactions, the mode of how the choices are presented.</p>
*
@@ -73,15 +74,11 @@ public class TouchEvent extends RPCStruct { }
public void setId(Integer id) {
- if (id != null) {
- store.put(KEY_ID, id);
- } else {
- store.remove(KEY_ID);
- }
+ setValue(KEY_ID, id);
}
public Integer getId() {
- return (Integer) store.get(KEY_ID);
+ return getInteger(KEY_ID);
}
/**
@@ -96,8 +93,8 @@ public class TouchEvent extends RPCStruct { @SuppressWarnings("unchecked")
public List<Long> getTimestamps() {
- if(store.get(KEY_TS) instanceof List<?>){
- List<?> list = (List<?>)store.get(KEY_TS);
+ if(getValue(KEY_TS) instanceof List<?>){
+ List<?> list = (List<?>) getValue(KEY_TS);
if(list != null && list.size()>0){
Object obj = list.get(0);
if(obj instanceof Integer){ //Backwards case
@@ -117,11 +114,7 @@ public class TouchEvent extends RPCStruct { }
public void setTimestamps(List<Long> ts){
- if (ts != null) {
- store.put(KEY_TS, ts);
- } else {
- store.remove(KEY_TS);
- }
+ setValue(KEY_TS, ts);
}
/**
@@ -145,22 +138,7 @@ public class TouchEvent extends RPCStruct { }
@SuppressWarnings("unchecked")
public List<TouchCoord> getTouchCoordinates() {
- if (store.get(KEY_C) instanceof List<?>) {
- List<?> list = (List<?>)store.get(KEY_C);
- if (list != null && list.size() > 0) {
- Object obj = list.get(0);
- if (obj instanceof TouchCoord) {
- return (List<TouchCoord>) list;
- } else if (obj instanceof Hashtable) {
- List<TouchCoord> newList = new ArrayList<TouchCoord>();
- for (Object hashObj : list) {
- newList.add(new TouchCoord((Hashtable<String, Object>) hashObj));
- }
- return newList;
- }
- }
- }
- return null;
+ return (List<TouchCoord>) getObject(TouchCoord.class, KEY_C);
}
/**
@@ -174,10 +152,6 @@ public class TouchEvent extends RPCStruct { }
public void setTouchCoordinates( List<TouchCoord> c ) {
- if (c != null) {
- store.put(KEY_C, c );
- } else {
- store.remove(KEY_C);
- }
+ setValue(KEY_C, c);
}
}
diff --git a/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/TouchEventCapabilities.java b/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/TouchEventCapabilities.java index b67e5b61a..668c81e0d 100644 --- a/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/TouchEventCapabilities.java +++ b/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/TouchEventCapabilities.java @@ -54,38 +54,26 @@ public class TouchEventCapabilities extends RPCStruct { }
public void setPressAvailable(Boolean pressAvailable) {
- if (pressAvailable != null) {
- store.put(KEY_PRESS_AVAILABLE, pressAvailable);
- } else {
- store.remove(KEY_PRESS_AVAILABLE);
- }
+ setValue(KEY_PRESS_AVAILABLE, pressAvailable);
}
public Boolean getPressAvailable() {
- return (Boolean) store.get(KEY_PRESS_AVAILABLE);
+ return getBoolean(KEY_PRESS_AVAILABLE);
}
public void setMultiTouchAvailable(Boolean multiTouchAvailable) {
- if (multiTouchAvailable != null) {
- store.put(KEY_MULTI_TOUCH_AVAILABLE, multiTouchAvailable);
- } else {
- store.remove(KEY_MULTI_TOUCH_AVAILABLE);
- }
+ setValue(KEY_MULTI_TOUCH_AVAILABLE, multiTouchAvailable);
}
public Boolean getMultiTouchAvailable() {
- return (Boolean) store.get(KEY_MULTI_TOUCH_AVAILABLE);
+ return getBoolean(KEY_MULTI_TOUCH_AVAILABLE);
}
public void setDoublePressAvailable(Boolean doublePressAvailable) {
- if (doublePressAvailable != null) {
- store.put(KEY_DOUBLE_PRESS_AVAILABLE, doublePressAvailable);
- } else {
- store.remove(KEY_DOUBLE_PRESS_AVAILABLE);
- }
+ setValue(KEY_DOUBLE_PRESS_AVAILABLE, doublePressAvailable);
}
public Boolean getDoublePressAvailable() {
- return (Boolean) store.get(KEY_DOUBLE_PRESS_AVAILABLE);
+ return getBoolean(KEY_DOUBLE_PRESS_AVAILABLE);
}
}
diff --git a/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/Turn.java b/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/Turn.java index 437e176a5..6cebac7f1 100644 --- a/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/Turn.java +++ b/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/Turn.java @@ -1,8 +1,9 @@ package com.smartdevicelink.proxy.rpc; -import java.util.Hashtable; - import com.smartdevicelink.proxy.RPCStruct; +import com.smartdevicelink.proxy.rpc.enums.VehicleDataResultCode; + +import java.util.Hashtable; /** * Describes a navigation turn including an optional icon @@ -51,12 +52,7 @@ public class Turn extends RPCStruct{ * the text to describe the turn (e.g. streetname) */ public void setNavigationText(String navigationText){ - if(navigationText != null){ - store.put(KEY_NAVIGATION_TEXT, navigationText); - } - else{ - store.remove(KEY_NAVIGATION_TEXT); - } + setValue(KEY_NAVIGATION_TEXT, navigationText); } /** @@ -65,7 +61,7 @@ public class Turn extends RPCStruct{ * @return the text to describe the turn (e.g. streetname) */ public String getNavigationText(){ - return (String) store.get(KEY_NAVIGATION_TEXT); + return getString(KEY_NAVIGATION_TEXT); } /** @@ -75,11 +71,7 @@ public class Turn extends RPCStruct{ * the image to be shown for a turn */ public void setTurnIcon(Image turnIcon){ - if (turnIcon != null) { - store.put(KEY_TURN_IMAGE, turnIcon); - } else { - store.remove(KEY_TURN_IMAGE); - } + setValue(KEY_TURN_IMAGE, turnIcon); } /** @@ -89,13 +81,7 @@ public class Turn extends RPCStruct{ */ @SuppressWarnings("unchecked") public Image getTurnIcon(){ - Object obj = store.get(KEY_TURN_IMAGE); - if (obj instanceof Image) { - return (Image) obj; - } else if (obj instanceof Hashtable) { - return new Image((Hashtable<String, Object>) obj); - } - return null; + return (Image) getObject(Image.class, KEY_TURN_IMAGE); } } diff --git a/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/UnsubscribeButton.java b/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/UnsubscribeButton.java index e08802182..983902cc9 100644 --- a/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/UnsubscribeButton.java +++ b/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/UnsubscribeButton.java @@ -76,13 +76,7 @@ public class UnsubscribeButton extends RPCRequest { * {@linkplain com.smartdevicelink.proxy.rpc.enums.ButtonName}</i>
*/
public ButtonName getButtonName() {
- Object obj = parameters.get(KEY_BUTTON_NAME);
- if (obj instanceof ButtonName) {
- return (ButtonName) obj;
- } else if (obj instanceof String) {
- return ButtonName.valueForString((String) obj);
- }
- return null;
+ return (ButtonName) getObject(ButtonName.class, KEY_BUTTON_NAME);
}
/**
* Sets the name of the button to unsubscribe from
@@ -92,6 +86,6 @@ public class UnsubscribeButton extends RPCRequest { * {@linkplain com.smartdevicelink.proxy.rpc.enums.ButtonName}</i>
*/
public void setButtonName( ButtonName buttonName ) {
- setParameters(KEY_BUTTON_NAME, buttonName);
+ setParameter(KEY_BUTTON_NAME, buttonName);
}
}
diff --git a/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/UnsubscribeVehicleData.java b/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/UnsubscribeVehicleData.java index c506cc319..cbfc4f3bb 100644 --- a/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/UnsubscribeVehicleData.java +++ b/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/UnsubscribeVehicleData.java @@ -283,7 +283,7 @@ public class UnsubscribeVehicleData extends RPCRequest { * a boolean value
*/
public void setGps(Boolean gps) {
- setParameters(KEY_GPS, gps);
+ setParameter(KEY_GPS, gps);
}
/**
@@ -293,7 +293,7 @@ public class UnsubscribeVehicleData extends RPCRequest { * unsubscribed.
*/
public Boolean getGps() {
- return (Boolean) parameters.get(KEY_GPS);
+ return getBoolean(KEY_GPS);
}
/**
@@ -303,7 +303,7 @@ public class UnsubscribeVehicleData extends RPCRequest { * a boolean value
*/
public void setSpeed(Boolean speed) {
- setParameters(KEY_SPEED, speed);
+ setParameter(KEY_SPEED, speed);
}
/**
@@ -313,7 +313,7 @@ public class UnsubscribeVehicleData extends RPCRequest { * unsubscribed.
*/
public Boolean getSpeed() {
- return (Boolean) parameters.get(KEY_SPEED);
+ return getBoolean(KEY_SPEED);
}
/**
@@ -323,7 +323,7 @@ public class UnsubscribeVehicleData extends RPCRequest { * a boolean value
*/
public void setRpm(Boolean rpm) {
- setParameters(KEY_RPM, rpm);
+ setParameter(KEY_RPM, rpm);
}
/**
@@ -333,7 +333,7 @@ public class UnsubscribeVehicleData extends RPCRequest { * unsubscribed.
*/
public Boolean getRpm() {
- return (Boolean) parameters.get(KEY_RPM);
+ return getBoolean(KEY_RPM);
}
/**
@@ -343,7 +343,7 @@ public class UnsubscribeVehicleData extends RPCRequest { * a boolean value
*/
public void setFuelLevel(Boolean fuelLevel) {
- setParameters(KEY_FUEL_LEVEL, fuelLevel);
+ setParameter(KEY_FUEL_LEVEL, fuelLevel);
}
/**
@@ -354,7 +354,7 @@ public class UnsubscribeVehicleData extends RPCRequest { * been unsubscribed.
*/
public Boolean getFuelLevel() {
- return (Boolean) parameters.get(KEY_FUEL_LEVEL);
+ return getBoolean(KEY_FUEL_LEVEL);
}
/**
@@ -387,7 +387,7 @@ public class UnsubscribeVehicleData extends RPCRequest { * a boolean value
*/
public void setFuelLevelState(Boolean fuelLevelState) {
- setParameters(KEY_FUEL_LEVEL_STATE, fuelLevelState);
+ setParameter(KEY_FUEL_LEVEL_STATE, fuelLevelState);
}
/**
@@ -398,7 +398,7 @@ public class UnsubscribeVehicleData extends RPCRequest { * has been unsubscribed.
*/
public Boolean getFuelLevelState() {
- return (Boolean) parameters.get(KEY_FUEL_LEVEL_STATE);
+ return getBoolean(KEY_FUEL_LEVEL_STATE);
}
/**
@@ -408,7 +408,7 @@ public class UnsubscribeVehicleData extends RPCRequest { * a boolean value
*/
public void setInstantFuelConsumption(Boolean instantFuelConsumption) {
- setParameters(KEY_INSTANT_FUEL_CONSUMPTION, instantFuelConsumption);
+ setParameter(KEY_INSTANT_FUEL_CONSUMPTION, instantFuelConsumption);
}
/**
@@ -419,7 +419,7 @@ public class UnsubscribeVehicleData extends RPCRequest { * has been unsubscribed.
*/
public Boolean getInstantFuelConsumption() {
- return (Boolean) parameters.get(KEY_INSTANT_FUEL_CONSUMPTION);
+ return getBoolean(KEY_INSTANT_FUEL_CONSUMPTION);
}
/**
@@ -429,7 +429,7 @@ public class UnsubscribeVehicleData extends RPCRequest { * a boolean value
*/
public void setExternalTemperature(Boolean externalTemperature) {
- setParameters(KEY_EXTERNAL_TEMPERATURE, externalTemperature);
+ setParameter(KEY_EXTERNAL_TEMPERATURE, externalTemperature);
}
/**
@@ -440,7 +440,7 @@ public class UnsubscribeVehicleData extends RPCRequest { * has been unsubscribed.
*/
public Boolean getExternalTemperature() {
- return (Boolean) parameters.get(KEY_EXTERNAL_TEMPERATURE);
+ return getBoolean(KEY_EXTERNAL_TEMPERATURE);
}
/**
@@ -450,7 +450,7 @@ public class UnsubscribeVehicleData extends RPCRequest { * a boolean value
*/
public void setPrndl(Boolean prndl) {
- setParameters(KEY_PRNDL, prndl);
+ setParameter(KEY_PRNDL, prndl);
}
/**
@@ -461,7 +461,7 @@ public class UnsubscribeVehicleData extends RPCRequest { * has been unsubscribed.
*/
public Boolean getPrndl() {
- return (Boolean) parameters.get(KEY_PRNDL);
+ return getBoolean(KEY_PRNDL);
}
/**
@@ -471,7 +471,7 @@ public class UnsubscribeVehicleData extends RPCRequest { * a boolean value
*/
public void setTirePressure(Boolean tirePressure) {
- setParameters(KEY_TIRE_PRESSURE, tirePressure);
+ setParameter(KEY_TIRE_PRESSURE, tirePressure);
}
/**
@@ -482,7 +482,7 @@ public class UnsubscribeVehicleData extends RPCRequest { * has been unsubscribed.
*/
public Boolean getTirePressure() {
- return (Boolean) parameters.get(KEY_TIRE_PRESSURE);
+ return getBoolean(KEY_TIRE_PRESSURE);
}
/**
@@ -492,7 +492,7 @@ public class UnsubscribeVehicleData extends RPCRequest { * a boolean value
*/
public void setOdometer(Boolean odometer) {
- setParameters(KEY_ODOMETER, odometer);
+ setParameter(KEY_ODOMETER, odometer);
}
/**
@@ -503,7 +503,7 @@ public class UnsubscribeVehicleData extends RPCRequest { * has been unsubscribed.
*/
public Boolean getOdometer() {
- return (Boolean) parameters.get(KEY_ODOMETER);
+ return getBoolean(KEY_ODOMETER);
}
/**
@@ -513,7 +513,7 @@ public class UnsubscribeVehicleData extends RPCRequest { * a boolean value
*/
public void setBeltStatus(Boolean beltStatus) {
- setParameters(KEY_BELT_STATUS, beltStatus);
+ setParameter(KEY_BELT_STATUS, beltStatus);
}
/**
@@ -524,7 +524,7 @@ public class UnsubscribeVehicleData extends RPCRequest { * has been unsubscribed.
*/
public Boolean getBeltStatus() {
- return (Boolean) parameters.get(KEY_BELT_STATUS);
+ return getBoolean(KEY_BELT_STATUS);
}
/**
@@ -534,7 +534,7 @@ public class UnsubscribeVehicleData extends RPCRequest { * a boolean value
*/
public void setBodyInformation(Boolean bodyInformation) {
- setParameters(KEY_BODY_INFORMATION, bodyInformation);
+ setParameter(KEY_BODY_INFORMATION, bodyInformation);
}
/**
@@ -545,7 +545,7 @@ public class UnsubscribeVehicleData extends RPCRequest { * has been unsubscribed.
*/
public Boolean getBodyInformation() {
- return (Boolean) parameters.get(KEY_BODY_INFORMATION);
+ return getBoolean(KEY_BODY_INFORMATION);
}
/**
@@ -555,7 +555,7 @@ public class UnsubscribeVehicleData extends RPCRequest { * a boolean value
*/
public void setDeviceStatus(Boolean deviceStatus) {
- setParameters(KEY_DEVICE_STATUS, deviceStatus);
+ setParameter(KEY_DEVICE_STATUS, deviceStatus);
}
/**
@@ -566,7 +566,7 @@ public class UnsubscribeVehicleData extends RPCRequest { * has been unsubscribed.
*/
public Boolean getDeviceStatus() {
- return (Boolean) parameters.get(KEY_DEVICE_STATUS);
+ return getBoolean(KEY_DEVICE_STATUS);
}
/**
@@ -576,7 +576,7 @@ public class UnsubscribeVehicleData extends RPCRequest { * a boolean value
*/
public void setDriverBraking(Boolean driverBraking) {
- setParameters(KEY_DRIVER_BRAKING, driverBraking);
+ setParameter(KEY_DRIVER_BRAKING, driverBraking);
}
/**
@@ -587,7 +587,7 @@ public class UnsubscribeVehicleData extends RPCRequest { * has been unsubscribed.
*/
public Boolean getDriverBraking() {
- return (Boolean) parameters.get(KEY_DRIVER_BRAKING);
+ return getBoolean(KEY_DRIVER_BRAKING);
}
/**
@@ -597,7 +597,7 @@ public class UnsubscribeVehicleData extends RPCRequest { * a boolean value
*/
public void setWiperStatus(Boolean wiperStatus) {
- setParameters(KEY_WIPER_STATUS, wiperStatus);
+ setParameter(KEY_WIPER_STATUS, wiperStatus);
}
/**
@@ -608,7 +608,7 @@ public class UnsubscribeVehicleData extends RPCRequest { * has been unsubscribed.
*/
public Boolean getWiperStatus() {
- return (Boolean) parameters.get(KEY_WIPER_STATUS);
+ return getBoolean(KEY_WIPER_STATUS);
}
/**
@@ -618,7 +618,7 @@ public class UnsubscribeVehicleData extends RPCRequest { * a boolean value
*/
public void setHeadLampStatus(Boolean headLampStatus) {
- setParameters(KEY_HEAD_LAMP_STATUS, headLampStatus);
+ setParameter(KEY_HEAD_LAMP_STATUS, headLampStatus);
}
/**
@@ -629,7 +629,7 @@ public class UnsubscribeVehicleData extends RPCRequest { * has been unsubscribed.
*/
public Boolean getHeadLampStatus() {
- return (Boolean) parameters.get(KEY_HEAD_LAMP_STATUS);
+ return getBoolean(KEY_HEAD_LAMP_STATUS);
}
/**
@@ -639,7 +639,7 @@ public class UnsubscribeVehicleData extends RPCRequest { * a boolean value
*/
public void setEngineTorque(Boolean engineTorque) {
- setParameters(KEY_ENGINE_TORQUE, engineTorque);
+ setParameter(KEY_ENGINE_TORQUE, engineTorque);
}
/**
@@ -650,7 +650,7 @@ public class UnsubscribeVehicleData extends RPCRequest { * has been unsubscribed.
*/
public Boolean getEngineTorque() {
- return (Boolean) parameters.get(KEY_ENGINE_TORQUE);
+ return getBoolean(KEY_ENGINE_TORQUE);
}
/**
@@ -660,7 +660,7 @@ public class UnsubscribeVehicleData extends RPCRequest { * a boolean value
*/
public void setAccPedalPosition(Boolean accPedalPosition) {
- setParameters(KEY_ACC_PEDAL_POSITION, accPedalPosition);
+ setParameter(KEY_ACC_PEDAL_POSITION, accPedalPosition);
}
/**
@@ -671,45 +671,45 @@ public class UnsubscribeVehicleData extends RPCRequest { * has been unsubscribed.
*/
public Boolean getAccPedalPosition() {
- return (Boolean) parameters.get(KEY_ACC_PEDAL_POSITION);
+ return getBoolean(KEY_ACC_PEDAL_POSITION);
}
public void setSteeringWheelAngle(Boolean steeringWheelAngle) {
- setParameters(KEY_STEERING_WHEEL_ANGLE, steeringWheelAngle);
+ setParameter(KEY_STEERING_WHEEL_ANGLE, steeringWheelAngle);
}
public Boolean getSteeringWheelAngle() {
- return (Boolean) parameters.get(KEY_STEERING_WHEEL_ANGLE);
+ return getBoolean(KEY_STEERING_WHEEL_ANGLE);
}
public void setECallInfo(Boolean eCallInfo) {
- setParameters(KEY_E_CALL_INFO, eCallInfo);
+ setParameter(KEY_E_CALL_INFO, eCallInfo);
}
public Boolean getECallInfo() {
- return (Boolean) parameters.get(KEY_E_CALL_INFO);
+ return getBoolean(KEY_E_CALL_INFO);
}
public void setAirbagStatus(Boolean airbagStatus) {
- setParameters(KEY_AIRBAG_STATUS, airbagStatus);
+ setParameter(KEY_AIRBAG_STATUS, airbagStatus);
}
public Boolean getAirbagStatus() {
- return (Boolean) parameters.get(KEY_AIRBAG_STATUS);
+ return getBoolean(KEY_AIRBAG_STATUS);
}
public void setEmergencyEvent(Boolean emergencyEvent) {
- setParameters(KEY_EMERGENCY_EVENT, emergencyEvent);
+ setParameter(KEY_EMERGENCY_EVENT, emergencyEvent);
}
public Boolean getEmergencyEvent() {
- return (Boolean) parameters.get(KEY_EMERGENCY_EVENT);
+ return getBoolean(KEY_EMERGENCY_EVENT);
}
public void setClusterModeStatus(Boolean clusterModeStatus) {
- setParameters(KEY_CLUSTER_MODE_STATUS, clusterModeStatus);
+ setParameter(KEY_CLUSTER_MODE_STATUS, clusterModeStatus);
}
public Boolean getClusterModeStatus() {
- return (Boolean) parameters.get(KEY_CLUSTER_MODE_STATUS);
+ return getBoolean(KEY_CLUSTER_MODE_STATUS);
}
public void setMyKey(Boolean myKey) {
- setParameters(KEY_MY_KEY, myKey);
+ setParameter(KEY_MY_KEY, myKey);
}
public Boolean getMyKey() {
- return (Boolean) parameters.get(KEY_MY_KEY);
+ return getBoolean(KEY_MY_KEY);
}
}
diff --git a/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/UnsubscribeVehicleDataResponse.java b/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/UnsubscribeVehicleDataResponse.java index 754399a10..f5a1c9c01 100644 --- a/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/UnsubscribeVehicleDataResponse.java +++ b/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/UnsubscribeVehicleDataResponse.java @@ -6,6 +6,8 @@ import com.smartdevicelink.protocol.enums.FunctionID; import com.smartdevicelink.proxy.RPCResponse;
import com.smartdevicelink.util.DebugTool;
+import static android.provider.Contacts.SettingsColumns.KEY;
+
/**
* Unsubscribe Vehicle Data Response is sent, when UnsubscribeVehicleData has been called.
*
@@ -60,7 +62,7 @@ public class UnsubscribeVehicleDataResponse extends RPCResponse { * @param gps
*/
public void setGps(VehicleDataResult gps) {
- setParameters(KEY_GPS, gps);
+ setParameter(KEY_GPS, gps);
}
/**
* Gets Gps
@@ -68,24 +70,14 @@ public class UnsubscribeVehicleDataResponse extends RPCResponse { */
@SuppressWarnings("unchecked")
public VehicleDataResult getGps() {
- Object obj = parameters.get(KEY_GPS);
- if (obj instanceof VehicleDataResult) {
- return (VehicleDataResult) obj;
- } else if (obj instanceof Hashtable) {
- try {
- return new VehicleDataResult((Hashtable<String, Object>) obj);
- } catch (Exception e) {
- DebugTool.logError("Failed to parse " + getClass().getSimpleName() + "." + KEY_GPS, e);
- }
- }
- return null;
+ return (VehicleDataResult) getObject(VehicleDataResult.class, KEY_GPS);
}
/**
* Sets Speed
* @param speed
*/
public void setSpeed(VehicleDataResult speed) {
- setParameters(KEY_SPEED, speed);
+ setParameter(KEY_SPEED, speed);
}
/**
* Gets Speed
@@ -93,24 +85,14 @@ public class UnsubscribeVehicleDataResponse extends RPCResponse { */
@SuppressWarnings("unchecked")
public VehicleDataResult getSpeed() {
- Object obj = parameters.get(KEY_SPEED);
- if (obj instanceof VehicleDataResult) {
- return (VehicleDataResult) obj;
- } else if (obj instanceof Hashtable) {
- try {
- return new VehicleDataResult((Hashtable<String, Object>) obj);
- } catch (Exception e) {
- DebugTool.logError("Failed to parse " + getClass().getSimpleName() + "." + KEY_SPEED, e);
- }
- }
- return null;
+ return (VehicleDataResult) getObject(VehicleDataResult.class, KEY_SPEED);
}
/**
* Sets rpm
* @param rpm
*/
public void setRpm(VehicleDataResult rpm) {
- setParameters(KEY_RPM, rpm);
+ setParameter(KEY_RPM, rpm);
}
/**
* Gets rpm
@@ -118,24 +100,14 @@ public class UnsubscribeVehicleDataResponse extends RPCResponse { */
@SuppressWarnings("unchecked")
public VehicleDataResult getRpm() {
- Object obj = parameters.get(KEY_RPM);
- if (obj instanceof VehicleDataResult) {
- return (VehicleDataResult) obj;
- } else if (obj instanceof Hashtable) {
- try {
- return new VehicleDataResult((Hashtable<String, Object>) obj);
- } catch (Exception e) {
- DebugTool.logError("Failed to parse " + getClass().getSimpleName() + "." + KEY_RPM, e);
- }
- }
- return null;
+ return (VehicleDataResult) getObject(VehicleDataResult.class, KEY_RPM);
}
/**
* Sets Fuel Level
* @param fuelLevel
*/
public void setFuelLevel(VehicleDataResult fuelLevel) {
- setParameters(KEY_FUEL_LEVEL, fuelLevel);
+ setParameter(KEY_FUEL_LEVEL, fuelLevel);
}
/**
* Gets Fuel Level
@@ -143,17 +115,7 @@ public class UnsubscribeVehicleDataResponse extends RPCResponse { */
@SuppressWarnings("unchecked")
public VehicleDataResult getFuelLevel() {
- Object obj = parameters.get(KEY_FUEL_LEVEL);
- if (obj instanceof VehicleDataResult) {
- return (VehicleDataResult) obj;
- } else if (obj instanceof Hashtable) {
- try {
- return new VehicleDataResult((Hashtable<String, Object>) obj);
- } catch (Exception e) {
- DebugTool.logError("Failed to parse " + getClass().getSimpleName() + "." + KEY_FUEL_LEVEL, e);
- }
- }
- return null;
+ return (VehicleDataResult) getObject(VehicleDataResult.class, KEY_FUEL_LEVEL);
}
/**
* Sets Fuel Level State
@@ -176,7 +138,7 @@ public class UnsubscribeVehicleDataResponse extends RPCResponse { * @param fuelLevel_State
*/
public void setFuelLevelState(VehicleDataResult fuelLevelState) {
- setParameters(KEY_FUEL_LEVEL_STATE, fuelLevelState);
+ setParameter(KEY_FUEL_LEVEL_STATE, fuelLevelState);
}
/**
* Gets Fuel Level State
@@ -184,20 +146,14 @@ public class UnsubscribeVehicleDataResponse extends RPCResponse { */
@SuppressWarnings("unchecked")
public VehicleDataResult getFuelLevelState() {
- Object obj = parameters.get(KEY_FUEL_LEVEL_STATE);
- if (obj instanceof VehicleDataResult) {
- return (VehicleDataResult) obj;
- } else if (obj instanceof Hashtable) {
- return new VehicleDataResult((Hashtable<String, Object>) obj);
- }
- return null;
+ return (VehicleDataResult) getObject(VehicleDataResult.class, KEY_FUEL_LEVEL_STATE);
}
/**
* Sets Instant Fuel Comsumption
* @param instantFuelConsumption
*/
public void setInstantFuelConsumption(VehicleDataResult instantFuelConsumption) {
- setParameters(KEY_INSTANT_FUEL_CONSUMPTION, instantFuelConsumption);
+ setParameter(KEY_INSTANT_FUEL_CONSUMPTION, instantFuelConsumption);
}
/**
* Gets Instant Fuel Comsumption
@@ -205,24 +161,14 @@ public class UnsubscribeVehicleDataResponse extends RPCResponse { */
@SuppressWarnings("unchecked")
public VehicleDataResult getInstantFuelConsumption() {
- Object obj = parameters.get(KEY_INSTANT_FUEL_CONSUMPTION);
- if (obj instanceof VehicleDataResult) {
- return (VehicleDataResult) obj;
- } else if (obj instanceof Hashtable) {
- try {
- return new VehicleDataResult((Hashtable<String, Object>) obj);
- } catch (Exception e) {
- DebugTool.logError("Failed to parse " + getClass().getSimpleName() + "." + KEY_INSTANT_FUEL_CONSUMPTION, e);
- }
- }
- return null;
+ return (VehicleDataResult) getObject(VehicleDataResult.class, KEY_INSTANT_FUEL_CONSUMPTION);
}
/**
* Sets External Temperature
* @param externalTemperature
*/
public void setExternalTemperature(VehicleDataResult externalTemperature) {
- setParameters(KEY_EXTERNAL_TEMPERATURE, externalTemperature);
+ setParameter(KEY_EXTERNAL_TEMPERATURE, externalTemperature);
}
/**
* Gets External Temperature
@@ -230,24 +176,14 @@ public class UnsubscribeVehicleDataResponse extends RPCResponse { */
@SuppressWarnings("unchecked")
public VehicleDataResult getExternalTemperature() {
- Object obj = parameters.get(KEY_EXTERNAL_TEMPERATURE);
- if (obj instanceof VehicleDataResult) {
- return (VehicleDataResult) obj;
- } else if (obj instanceof Hashtable) {
- try {
- return new VehicleDataResult((Hashtable<String, Object>) obj);
- } catch (Exception e) {
- DebugTool.logError("Failed to parse " + getClass().getSimpleName() + "." + KEY_EXTERNAL_TEMPERATURE, e);
- }
- }
- return null;
+ return (VehicleDataResult) getObject(VehicleDataResult.class, KEY_EXTERNAL_TEMPERATURE);
}
/**
* Gets currently selected gear data
* @param prndl
*/
public void setPrndl(VehicleDataResult prndl) {
- setParameters(KEY_PRNDL, prndl);
+ setParameter(KEY_PRNDL, prndl);
}
/**
* Gets currently selected gear data
@@ -255,24 +191,14 @@ public class UnsubscribeVehicleDataResponse extends RPCResponse { */
@SuppressWarnings("unchecked")
public VehicleDataResult getPrndl() {
- Object obj = parameters.get(KEY_PRNDL);
- if (obj instanceof VehicleDataResult) {
- return (VehicleDataResult) obj;
- } else if (obj instanceof Hashtable) {
- try {
- return new VehicleDataResult((Hashtable<String, Object>) obj);
- } catch (Exception e) {
- DebugTool.logError("Failed to parse " + getClass().getSimpleName() + "." + KEY_PRNDL, e);
- }
- }
- return null;
+ return (VehicleDataResult) getObject(VehicleDataResult.class, KEY_PRNDL);
}
/**
* Sets Tire Pressure
* @param tirePressure
*/
public void setTirePressure(VehicleDataResult tirePressure) {
- setParameters(KEY_TIRE_PRESSURE, tirePressure);
+ setParameter(KEY_TIRE_PRESSURE, tirePressure);
}
/**
* Gets Tire Pressure
@@ -280,24 +206,14 @@ public class UnsubscribeVehicleDataResponse extends RPCResponse { */
@SuppressWarnings("unchecked")
public VehicleDataResult getTirePressure() {
- Object obj = parameters.get(KEY_TIRE_PRESSURE);
- if (obj instanceof VehicleDataResult) {
- return (VehicleDataResult) obj;
- } else if (obj instanceof Hashtable) {
- try {
- return new VehicleDataResult((Hashtable<String, Object>) obj);
- } catch (Exception e) {
- DebugTool.logError("Failed to parse " + getClass().getSimpleName() + "." + KEY_TIRE_PRESSURE, e);
- }
- }
- return null;
+ return (VehicleDataResult) getObject(VehicleDataResult.class, KEY_TIRE_PRESSURE);
}
/**
* Sets Odometer
* @param odometer
*/
public void setOdometer(VehicleDataResult odometer) {
- setParameters(KEY_ODOMETER, odometer);
+ setParameter(KEY_ODOMETER, odometer);
}
/**
* Gets Odometer
@@ -305,24 +221,14 @@ public class UnsubscribeVehicleDataResponse extends RPCResponse { */
@SuppressWarnings("unchecked")
public VehicleDataResult getOdometer() {
- Object obj = parameters.get(KEY_ODOMETER);
- if (obj instanceof VehicleDataResult) {
- return (VehicleDataResult) obj;
- } else if (obj instanceof Hashtable) {
- try {
- return new VehicleDataResult((Hashtable<String, Object>) obj);
- } catch (Exception e) {
- DebugTool.logError("Failed to parse " + getClass().getSimpleName() + "." + KEY_ODOMETER, e);
- }
- }
- return null;
+ return (VehicleDataResult) getObject(VehicleDataResult.class, KEY_ODOMETER);
}
/**
* Sets Belt Status
* @param beltStatus
*/
public void setBeltStatus(VehicleDataResult beltStatus) {
- setParameters(KEY_BELT_STATUS, beltStatus);
+ setParameter(KEY_BELT_STATUS, beltStatus);
}
/**
* Gets Belt Status
@@ -330,24 +236,14 @@ public class UnsubscribeVehicleDataResponse extends RPCResponse { */
@SuppressWarnings("unchecked")
public VehicleDataResult getBeltStatus() {
- Object obj = parameters.get(KEY_BELT_STATUS);
- if (obj instanceof VehicleDataResult) {
- return (VehicleDataResult) obj;
- } else if (obj instanceof Hashtable) {
- try {
- return new VehicleDataResult((Hashtable<String, Object>) obj);
- } catch (Exception e) {
- DebugTool.logError("Failed to parse " + getClass().getSimpleName() + "." + KEY_BELT_STATUS, e);
- }
- }
- return null;
+ return (VehicleDataResult) getObject(VehicleDataResult.class, KEY_BELT_STATUS);
}
/**
* Sets Body Information
* @param bodyInformation
*/
public void setBodyInformation(VehicleDataResult bodyInformation) {
- setParameters(KEY_BODY_INFORMATION, bodyInformation);
+ setParameter(KEY_BODY_INFORMATION, bodyInformation);
}
/**
* Gets Body Information
@@ -355,24 +251,14 @@ public class UnsubscribeVehicleDataResponse extends RPCResponse { */
@SuppressWarnings("unchecked")
public VehicleDataResult getBodyInformation() {
- Object obj = parameters.get(KEY_BODY_INFORMATION);
- if (obj instanceof VehicleDataResult) {
- return (VehicleDataResult) obj;
- } else if (obj instanceof Hashtable) {
- try {
- return new VehicleDataResult((Hashtable<String, Object>) obj);
- } catch (Exception e) {
- DebugTool.logError("Failed to parse " + getClass().getSimpleName() + "." + KEY_BODY_INFORMATION, e);
- }
- }
- return null;
+ return (VehicleDataResult) getObject(VehicleDataResult.class, KEY_BODY_INFORMATION);
}
/**
* Sets Device Status
* @param deviceStatus
*/
public void setDeviceStatus(VehicleDataResult deviceStatus) {
- setParameters(KEY_DEVICE_STATUS, deviceStatus);
+ setParameter(KEY_DEVICE_STATUS, deviceStatus);
}
/**
* Gets Device Status
@@ -380,24 +266,14 @@ public class UnsubscribeVehicleDataResponse extends RPCResponse { */
@SuppressWarnings("unchecked")
public VehicleDataResult getDeviceStatus() {
- Object obj = parameters.get(KEY_DEVICE_STATUS);
- if (obj instanceof VehicleDataResult) {
- return (VehicleDataResult) obj;
- } else if (obj instanceof Hashtable) {
- try {
- return new VehicleDataResult((Hashtable<String, Object>) obj);
- } catch (Exception e) {
- DebugTool.logError("Failed to parse " + getClass().getSimpleName() + "." + KEY_DEVICE_STATUS, e);
- }
- }
- return null;
+ return (VehicleDataResult) getObject(VehicleDataResult.class, KEY_DEVICE_STATUS);
}
/**
* Sets Driver Braking
* @param driverBraking
*/
public void setDriverBraking(VehicleDataResult driverBraking) {
- setParameters(KEY_DRIVER_BRAKING, driverBraking);
+ setParameter(KEY_DRIVER_BRAKING, driverBraking);
}
/**
* Gets Driver Braking
@@ -405,24 +281,14 @@ public class UnsubscribeVehicleDataResponse extends RPCResponse { */
@SuppressWarnings("unchecked")
public VehicleDataResult getDriverBraking() {
- Object obj = parameters.get(KEY_DRIVER_BRAKING);
- if (obj instanceof VehicleDataResult) {
- return (VehicleDataResult) obj;
- } else if (obj instanceof Hashtable) {
- try {
- return new VehicleDataResult((Hashtable<String, Object>) obj);
- } catch (Exception e) {
- DebugTool.logError("Failed to parse " + getClass().getSimpleName() + "." + KEY_DRIVER_BRAKING, e);
- }
- }
- return null;
+ return (VehicleDataResult) getObject(VehicleDataResult.class, KEY_DRIVER_BRAKING);
}
/**
* Sets Wiper Status
* @param wiperStatus
*/
public void setWiperStatus(VehicleDataResult wiperStatus) {
- setParameters(KEY_WIPER_STATUS, wiperStatus);
+ setParameter(KEY_WIPER_STATUS, wiperStatus);
}
/**
* Gets Wiper Status
@@ -430,24 +296,14 @@ public class UnsubscribeVehicleDataResponse extends RPCResponse { */
@SuppressWarnings("unchecked")
public VehicleDataResult getWiperStatus() {
- Object obj = parameters.get(KEY_WIPER_STATUS);
- if (obj instanceof VehicleDataResult) {
- return (VehicleDataResult) obj;
- } else if (obj instanceof Hashtable) {
- try {
- return new VehicleDataResult((Hashtable<String, Object>) obj);
- } catch (Exception e) {
- DebugTool.logError("Failed to parse " + getClass().getSimpleName() + "." + KEY_WIPER_STATUS, e);
- }
- }
- return null;
+ return (VehicleDataResult) getObject(VehicleDataResult.class, KEY_WIPER_STATUS);
}
/**
* Sets Head Lamp Status
* @param headLampStatus
*/
public void setHeadLampStatus(VehicleDataResult headLampStatus) {
- setParameters(KEY_HEAD_LAMP_STATUS, headLampStatus);
+ setParameter(KEY_HEAD_LAMP_STATUS, headLampStatus);
}
/**
* Gets Head Lamp Status
@@ -455,24 +311,14 @@ public class UnsubscribeVehicleDataResponse extends RPCResponse { */
@SuppressWarnings("unchecked")
public VehicleDataResult getHeadLampStatus() {
- Object obj = parameters.get(KEY_HEAD_LAMP_STATUS);
- if (obj instanceof VehicleDataResult) {
- return (VehicleDataResult) obj;
- } else if (obj instanceof Hashtable) {
- try {
- return new VehicleDataResult((Hashtable<String, Object>) obj);
- } catch (Exception e) {
- DebugTool.logError("Failed to parse " + getClass().getSimpleName() + "." + KEY_HEAD_LAMP_STATUS, e);
- }
- }
- return null;
+ return (VehicleDataResult) getObject(VehicleDataResult.class, KEY_HEAD_LAMP_STATUS);
}
/**
* Sets Engine Torque
* @param engineTorque
*/
public void setEngineTorque(VehicleDataResult engineTorque) {
- setParameters(KEY_ENGINE_TORQUE, engineTorque);
+ setParameter(KEY_ENGINE_TORQUE, engineTorque);
}
/**
* Gets Engine Torque
@@ -480,24 +326,14 @@ public class UnsubscribeVehicleDataResponse extends RPCResponse { */
@SuppressWarnings("unchecked")
public VehicleDataResult getEngineTorque() {
- Object obj = parameters.get(KEY_ENGINE_TORQUE);
- if (obj instanceof VehicleDataResult) {
- return (VehicleDataResult) obj;
- } else if (obj instanceof Hashtable) {
- try {
- return new VehicleDataResult((Hashtable<String, Object>) obj);
- } catch (Exception e) {
- DebugTool.logError("Failed to parse " + getClass().getSimpleName() + "." + KEY_ENGINE_TORQUE, e);
- }
- }
- return null;
+ return (VehicleDataResult) getObject(VehicleDataResult.class, KEY_ENGINE_TORQUE);
}
/**
* Sets AccPedal Position
* @param accPedalPosition
*/
public void setAccPedalPosition(VehicleDataResult accPedalPosition) {
- setParameters(KEY_ACC_PEDAL_POSITION, accPedalPosition);
+ setParameter(KEY_ACC_PEDAL_POSITION, accPedalPosition);
}
/**
* Gets AccPedal Position
@@ -505,121 +341,51 @@ public class UnsubscribeVehicleDataResponse extends RPCResponse { */
@SuppressWarnings("unchecked")
public VehicleDataResult getAccPedalPosition() {
- Object obj = parameters.get(KEY_ACC_PEDAL_POSITION);
- if (obj instanceof VehicleDataResult) {
- return (VehicleDataResult) obj;
- } else if (obj instanceof Hashtable) {
- try {
- return new VehicleDataResult((Hashtable<String, Object>) obj);
- } catch (Exception e) {
- DebugTool.logError("Failed to parse " + getClass().getSimpleName() + "." + KEY_ACC_PEDAL_POSITION, e);
- }
- }
- return null;
+ return (VehicleDataResult) getObject(VehicleDataResult.class, KEY_ACC_PEDAL_POSITION);
}
public void setSteeringWheelAngle(VehicleDataResult steeringWheelAngle) {
- setParameters(KEY_STEERING_WHEEL_ANGLE, steeringWheelAngle);
+ setParameter(KEY_STEERING_WHEEL_ANGLE, steeringWheelAngle);
}
@SuppressWarnings("unchecked")
public VehicleDataResult getSteeringWheelAngle() {
- Object obj = parameters.get(KEY_STEERING_WHEEL_ANGLE);
- if (obj instanceof VehicleDataResult) {
- return (VehicleDataResult) obj;
- } else if (obj instanceof Hashtable) {
- try {
- return new VehicleDataResult((Hashtable<String, Object>) obj);
- } catch (Exception e) {
- DebugTool.logError("Failed to parse " + getClass().getSimpleName() + "." + KEY_STEERING_WHEEL_ANGLE, e);
- }
- }
- return null;
+ return (VehicleDataResult) getObject(VehicleDataResult.class, KEY_STEERING_WHEEL_ANGLE);
}
public void setECallInfo(VehicleDataResult eCallInfo) {
- setParameters(KEY_E_CALL_INFO, eCallInfo);
+ setParameter(KEY_E_CALL_INFO, eCallInfo);
}
@SuppressWarnings("unchecked")
public VehicleDataResult getECallInfo() {
- Object obj = parameters.get(KEY_E_CALL_INFO);
- if (obj instanceof VehicleDataResult) {
- return (VehicleDataResult) obj;
- } else if (obj instanceof Hashtable) {
- try {
- return new VehicleDataResult((Hashtable<String, Object>) obj);
- } catch (Exception e) {
- DebugTool.logError("Failed to parse " + getClass().getSimpleName() + "." + KEY_E_CALL_INFO, e);
- }
- }
- return null;
+ return (VehicleDataResult) getObject(VehicleDataResult.class, KEY_E_CALL_INFO);
}
public void setAirbagStatus(VehicleDataResult airbagStatus) {
- setParameters(KEY_AIRBAG_STATUS, airbagStatus);
+ setParameter(KEY_AIRBAG_STATUS, airbagStatus);
}
@SuppressWarnings("unchecked")
public VehicleDataResult getAirbagStatus() {
- Object obj = parameters.get(KEY_AIRBAG_STATUS);
- if (obj instanceof VehicleDataResult) {
- return (VehicleDataResult) obj;
- } else if (obj instanceof Hashtable) {
- try {
- return new VehicleDataResult((Hashtable<String, Object>) obj);
- } catch (Exception e) {
- DebugTool.logError("Failed to parse " + getClass().getSimpleName() + "." + KEY_AIRBAG_STATUS, e);
- }
- }
- return null;
+ return (VehicleDataResult) getObject(VehicleDataResult.class, KEY_AIRBAG_STATUS);
}
public void setEmergencyEvent(VehicleDataResult emergencyEvent) {
- setParameters(KEY_EMERGENCY_EVENT, emergencyEvent);
+ setParameter(KEY_EMERGENCY_EVENT, emergencyEvent);
}
@SuppressWarnings("unchecked")
public VehicleDataResult getEmergencyEvent() {
- Object obj = parameters.get(KEY_EMERGENCY_EVENT);
- if (obj instanceof VehicleDataResult) {
- return (VehicleDataResult) obj;
- } else if (obj instanceof Hashtable) {
- try {
- return new VehicleDataResult((Hashtable<String, Object>) obj);
- } catch (Exception e) {
- DebugTool.logError("Failed to parse " + getClass().getSimpleName() + "." + KEY_EMERGENCY_EVENT, e);
- }
- }
- return null;
+ return (VehicleDataResult) getObject(VehicleDataResult.class, KEY_EMERGENCY_EVENT);
}
public void setClusterModeStatus(VehicleDataResult clusterModeStatus) {
- setParameters(KEY_CLUSTER_MODE_STATUS, clusterModeStatus);
+ setParameter(KEY_CLUSTER_MODE_STATUS, clusterModeStatus);
}
@SuppressWarnings("unchecked")
public VehicleDataResult getClusterModeStatus() {
- Object obj = parameters.get(KEY_CLUSTER_MODE_STATUS);
- if (obj instanceof VehicleDataResult) {
- return (VehicleDataResult) obj;
- } else if (obj instanceof Hashtable) {
- try {
- return new VehicleDataResult((Hashtable<String, Object>) obj);
- } catch (Exception e) {
- DebugTool.logError("Failed to parse " + getClass().getSimpleName() + "." + KEY_CLUSTER_MODE_STATUS, e);
- }
- }
- return null;
+ return (VehicleDataResult) getObject(VehicleDataResult.class, KEY_CLUSTER_MODE_STATUS);
}
public void setMyKey(VehicleDataResult myKey) {
- setParameters(KEY_MY_KEY, myKey);
+ setParameter(KEY_MY_KEY, myKey);
}
@SuppressWarnings("unchecked")
public VehicleDataResult getMyKey() {
- Object obj = parameters.get(KEY_MY_KEY);
- if (obj instanceof VehicleDataResult) {
- return (VehicleDataResult) obj;
- } else if (obj instanceof Hashtable) {
- try {
- return new VehicleDataResult((Hashtable<String, Object>) obj);
- } catch (Exception e) {
- DebugTool.logError("Failed to parse " + getClass().getSimpleName() + "." + KEY_MY_KEY, e);
- }
- }
- return null;
+ return (VehicleDataResult) getObject(VehicleDataResult.class, KEY_MY_KEY);
}
}
diff --git a/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/UpdateTurnList.java b/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/UpdateTurnList.java index 78d43dc9c..d92f0b774 100644 --- a/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/UpdateTurnList.java +++ b/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/UpdateTurnList.java @@ -3,7 +3,6 @@ package com.smartdevicelink.proxy.rpc; import com.smartdevicelink.protocol.enums.FunctionID; import com.smartdevicelink.proxy.RPCRequest; -import java.util.ArrayList; import java.util.Hashtable; import java.util.List; @@ -52,7 +51,7 @@ public class UpdateTurnList extends RPCRequest{ * <b>Notes: </b>Minsize=1; Maxsize=100</p> */ public void setTurnList(List<Turn> turnList){ - setParameters(KEY_TURN_LIST, turnList); + setParameter(KEY_TURN_LIST, turnList); } /** @@ -62,23 +61,7 @@ public class UpdateTurnList extends RPCRequest{ */ @SuppressWarnings("unchecked") public List<Turn> getTurnList(){ - if(parameters.get(KEY_TURN_LIST) instanceof List<?>){ - List<?> list = (List<?>) parameters.get(KEY_TURN_LIST); - if(list != null && list.size() > 0){ - Object obj = list.get(0); - if(obj instanceof Turn){ - return (List<Turn>) list; - } - else if(obj instanceof Hashtable){ - List<Turn> newList = new ArrayList<Turn>(); - for(Object hashObj : list){ - newList.add(new Turn((Hashtable<String, Object>) hashObj)); - } - return newList; - } - } - } - return null; + return (List<Turn>) getObject(Turn.class, KEY_TURN_LIST); } /** @@ -89,23 +72,7 @@ public class UpdateTurnList extends RPCRequest{ */ @SuppressWarnings("unchecked") public List<SoftButton> getSoftButtons(){ - if(parameters.get(KEY_SOFT_BUTTONS) instanceof List<?>){ - List<?> list = (List<?>) parameters.get(KEY_SOFT_BUTTONS); - if(list != null && list.size() > 0){ - Object obj = list.get(0); - if(obj instanceof SoftButton){ - return (List<SoftButton>) list; - } - else if(obj instanceof Hashtable){ - List<SoftButton> newList = new ArrayList<SoftButton>(); - for(Object hashObj : list){ - newList.add(new SoftButton((Hashtable<String, Object>) hashObj)); - } - return newList; - } - } - } - return null; + return (List<SoftButton>) getObject(SoftButton.class, KEY_SOFT_BUTTONS); } /** @@ -124,7 +91,7 @@ public class UpdateTurnList extends RPCRequest{ */ public void setSoftButtons(List<SoftButton> softButtons){ - setParameters(KEY_SOFT_BUTTONS, softButtons); + setParameter(KEY_SOFT_BUTTONS, softButtons); } } diff --git a/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/VehicleDataResult.java b/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/VehicleDataResult.java index ef466d727..c0965cd39 100644 --- a/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/VehicleDataResult.java +++ b/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/VehicleDataResult.java @@ -57,35 +57,15 @@ public class VehicleDataResult extends RPCStruct { super(hash);
}
public void setDataType(VehicleDataType dataType) {
- if (dataType != null) {
- store.put(KEY_DATA_TYPE, dataType);
- } else {
- store.remove(KEY_DATA_TYPE);
- }
+ setValue(KEY_DATA_TYPE, dataType);
}
public VehicleDataType getDataType() {
- Object obj = store.get(KEY_DATA_TYPE);
- if (obj instanceof VehicleDataType) {
- return (VehicleDataType) obj;
- } else if (obj instanceof String) {
- return VehicleDataType.valueForString((String) obj);
- }
- return null;
+ return (VehicleDataType) getObject(VehicleDataType.class, KEY_DATA_TYPE);
}
public void setResultCode(VehicleDataResultCode resultCode) {
- if (resultCode != null) {
- store.put(KEY_RESULT_CODE, resultCode);
- } else {
- store.remove(KEY_RESULT_CODE);
- }
+ setValue(KEY_RESULT_CODE, resultCode);
}
public VehicleDataResultCode getResultCode() {
- Object obj = store.get(KEY_RESULT_CODE);
- if (obj instanceof VehicleDataResultCode) {
- return (VehicleDataResultCode) obj;
- } else if (obj instanceof String) {
- return VehicleDataResultCode.valueForString((String) obj);
- }
- return null;
+ return (VehicleDataResultCode) getObject(VehicleDataResultCode.class, KEY_RESULT_CODE);
}
}
diff --git a/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/VehicleType.java b/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/VehicleType.java index 3f30774c4..e6f860007 100644 --- a/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/VehicleType.java +++ b/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/VehicleType.java @@ -1,9 +1,9 @@ package com.smartdevicelink.proxy.rpc;
-import java.util.Hashtable;
-
import com.smartdevicelink.proxy.RPCStruct;
+import java.util.Hashtable;
+
/**
* Describes the type of vehicle the mobile phone is connected with.
* <p><b>Parameter List</b></p>
@@ -81,7 +81,7 @@ public class VehicleType extends RPCStruct { * @return the make of the vehicle
*/
public String getMake() {
- return (String) store.get(KEY_MAKE);
+ return getString(KEY_MAKE);
}
/**
@@ -89,11 +89,7 @@ public class VehicleType extends RPCStruct { *@param make the make of the vehicle
*/
public void setMake(String make) {
- if (make != null) {
- store.put(KEY_MAKE, make);
- } else {
- store.remove(KEY_MAKE);
- }
+ setValue(KEY_MAKE, make);
}
/**
@@ -101,7 +97,7 @@ public class VehicleType extends RPCStruct { * @return the model of the vehicle
*/
public String getModel() {
- return (String) store.get(KEY_MODEL);
+ return getString(KEY_MODEL);
}
/**
@@ -109,11 +105,7 @@ public class VehicleType extends RPCStruct { * @param model the model of the vehicle
*/
public void setModel(String model) {
- if (model != null) {
- store.put(KEY_MODEL, model);
- } else {
- store.remove(KEY_MODEL);
- }
+ setValue(KEY_MODEL, model);
}
/**
@@ -121,7 +113,7 @@ public class VehicleType extends RPCStruct { * @return the model year of the vehicle
*/
public String getModelYear() {
- return (String) store.get(KEY_MODEL_YEAR);
+ return getString(KEY_MODEL_YEAR);
}
/**
@@ -129,11 +121,7 @@ public class VehicleType extends RPCStruct { * @param modelYear the model year of the vehicle
*/
public void setModelYear(String modelYear) {
- if (modelYear != null) {
- store.put(KEY_MODEL_YEAR, modelYear);
- } else {
- store.remove(KEY_MODEL_YEAR);
- }
+ setValue(KEY_MODEL_YEAR, modelYear);
}
/**
@@ -141,7 +129,7 @@ public class VehicleType extends RPCStruct { * @return the trim of the vehicle
*/
public String getTrim() {
- return (String) store.get(KEY_TRIM);
+ return getString(KEY_TRIM);
}
/**
@@ -149,10 +137,6 @@ public class VehicleType extends RPCStruct { * @param trim the trim of the vehicle
*/
public void setTrim(String trim) {
- if (trim != null) {
- store.put(KEY_TRIM, trim);
- } else {
- store.remove(KEY_TRIM);
- }
+ setValue(KEY_TRIM, trim);
}
}
diff --git a/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/VrHelpItem.java b/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/VrHelpItem.java index f195b4cae..00474cd06 100644 --- a/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/VrHelpItem.java +++ b/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/VrHelpItem.java @@ -65,44 +65,22 @@ public class VrHelpItem extends RPCStruct { super(hash);
}
public void setText(String text) {
- if (text != null) {
- store.put(KEY_TEXT, text);
- } else {
- store.remove(KEY_TEXT);
- }
+ setValue(KEY_TEXT, text);
}
public String getText() {
- return (String) store.get(KEY_TEXT);
+ return getString(KEY_TEXT);
}
public void setImage(Image image) {
- if (image != null) {
- store.put(KEY_IMAGE, image);
- } else {
- store.remove(KEY_IMAGE);
- }
+ setValue(KEY_IMAGE, image);
}
@SuppressWarnings("unchecked")
public Image getImage() {
- Object obj = store.get(KEY_IMAGE);
- if (obj instanceof Image) {
- return (Image) obj;
- } else if (obj instanceof Hashtable) {
- try {
- return new Image((Hashtable<String, Object>) obj);
- } catch (Exception e) {
- DebugTool.logError("Failed to parse " + getClass().getSimpleName() + "." + KEY_IMAGE, e);
- }
- }
- return null;
+ return (Image) getObject(Image.class, KEY_IMAGE);
}
public void setPosition(Integer position) {
- if (position != null) {
- store.put(KEY_POSITION, position);
- } else {
- store.remove(KEY_POSITION);
- }
+ setValue(KEY_POSITION, position);
}
public Integer getPosition() {
- return (Integer) store.get(KEY_POSITION);
+ return getInteger(KEY_POSITION);
}
}
|