1 files changed, 9 insertions, 6 deletions
diff --git a/base/src/main/java/com/smartdevicelink/proxy/rpc/OnButtonPress.java b/base/src/main/java/com/smartdevicelink/proxy/rpc/OnButtonPress.java
index 8c0003db8..e214e8b96 100644
--- a/base/src/main/java/com/smartdevicelink/proxy/rpc/OnButtonPress.java
+++ b/base/src/main/java/com/smartdevicelink/proxy/rpc/OnButtonPress.java
@@ -160,11 +160,12 @@ public class OnButtonPress extends RPCNotification {
         return (ButtonName) getObject(ButtonName.class, KEY_BUTTON_NAME);
     }
     /**
-     * <p>Set the button's name</p>    
+     * <p>Set the button's name</p>
      * @param buttonName name of the button
-     */    
-    public void setButtonName( @NonNull ButtonName buttonName ) {
+     */
+    public OnButtonPress setButtonName(@NonNull ButtonName buttonName) {
         setParameters(KEY_BUTTON_NAME, buttonName);
+        return this;
     }
     /**<p>Returns <i>{@linkplain ButtonPressMode}</i></p>
      * @return ButtonPressMode whether this is a long or short button press event
@@ -175,9 +176,10 @@ public class OnButtonPress extends RPCNotification {
     /**
      * <p>Set the button press mode of the event</p>
      * @param buttonPressMode indicates whether this is a short or long press
-     */    
-    public void setButtonPressMode( @NonNull ButtonPressMode buttonPressMode ) {
+     */
+    public OnButtonPress setButtonPressMode(@NonNull ButtonPressMode buttonPressMode) {
         setParameters(KEY_BUTTON_PRESS_MODE, buttonPressMode);
+        return this;
     }
 
     /**
@@ -185,8 +187,9 @@ public class OnButtonPress extends RPCNotification {
      * If ButtonName is "CUSTOM_BUTTON", this references the integer ID passed by a custom button. (e.g. softButton ID)
      * @param customButtonID CustomButtonID of the button
      */
-    public void setCustomButtonID(Integer customButtonID) {
+    public OnButtonPress setCustomButtonID( Integer customButtonID) {
         setParameters(KEY_CUSTOM_BUTTON_ID, customButtonID);
+        return this;
     }
 
     /**