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

1 files changed, 2 insertions, 8 deletions

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);

     }

 }