[0257]

    - Rollback of formatting changes

8 files changed, 117 insertions, 119 deletions

diff --git a/base/src/main/java/com/smartdevicelink/proxy/rpc/GetVehicleData.java b/base/src/main/java/com/smartdevicelink/proxy/rpc/GetVehicleData.java
index 01a84e993..efd4dd6ac 100644
--- a/base/src/main/java/com/smartdevicelink/proxy/rpc/GetVehicleData.java
+++ b/base/src/main/java/com/smartdevicelink/proxy/rpc/GetVehicleData.java
@@ -14,7 +14,7 @@
  * distribution.
  *
  * Neither the name of the SmartDeviceLink Consortium, Inc. nor the names of its
- * contributors may be used to endorse or promote products derived from this
+ * contributors may be used to endorse or promote products derived from this 
  * software without specific prior written permission.
  *
  * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
@@ -40,7 +40,6 @@ import java.util.Hashtable;
  * Non periodic vehicle data read request.
  *
  * <p><b>Parameter List</b></p>
- *
  * <table border="1" rules="all">
  *  <tr>
  *      <th>Param Name</th>
@@ -314,7 +313,7 @@ public class GetVehicleData extends RPCRequest {
 	* Constructs a new GetVehicleDta object indicated by the Hashtable
 	* parameter
 	* </p>
-	*
+	* 
 	* @param hash
 	*            The Hashtable to use
 	*/
@@ -372,14 +371,14 @@ public class GetVehicleData extends RPCRequest {
     public Boolean getExternalTemperature() {
         return getBoolean(KEY_EXTERNAL_TEMPERATURE);
     }
-
+    
     public void setVin(Boolean vin) {
         setParameters(KEY_VIN, vin);
     }
     public Boolean getVin() {
         return getBoolean(KEY_VIN);
     }
-
+    
     public void setPrndl(Boolean prndl) {
         setParameters(KEY_PRNDL, prndl);
     }
@@ -452,21 +451,21 @@ public class GetVehicleData extends RPCRequest {
     public Boolean getAccPedalPosition() {
         return getBoolean(KEY_ACC_PEDAL_POSITION);
     }
-
+        
     public void setSteeringWheelAngle(Boolean steeringWheelAngle) {
         setParameters(KEY_STEERING_WHEEL_ANGLE, steeringWheelAngle);
     }
     public Boolean getSteeringWheelAngle() {
         return getBoolean(KEY_STEERING_WHEEL_ANGLE);
-    }
+    }                
     public void setECallInfo(Boolean eCallInfo) {
         setParameters(KEY_E_CALL_INFO, eCallInfo);
     }
     public Boolean getECallInfo() {
         return getBoolean(KEY_E_CALL_INFO);
-    }
-
-
+    }    
+    
+    
     public void setAirbagStatus(Boolean airbagStatus) {
         setParameters(KEY_AIRBAG_STATUS, airbagStatus);
     }
diff --git a/base/src/main/java/com/smartdevicelink/proxy/rpc/GetVehicleDataResponse.java b/base/src/main/java/com/smartdevicelink/proxy/rpc/GetVehicleDataResponse.java
index c2872079e..bf902365e 100644
--- a/base/src/main/java/com/smartdevicelink/proxy/rpc/GetVehicleDataResponse.java
+++ b/base/src/main/java/com/smartdevicelink/proxy/rpc/GetVehicleDataResponse.java
@@ -14,7 +14,7 @@
  * distribution.
  *
  * Neither the name of the SmartDeviceLink Consortium, Inc. nor the names of its
- * contributors may be used to endorse or promote products derived from this
+ * contributors may be used to endorse or promote products derived from this 
  * software without specific prior written permission.
  *
  * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
@@ -50,7 +50,7 @@ import java.util.List;
 
 /**
  * Get Vehicle Data Response is sent, when GetVehicleData has been called.
- *
+ * 
  * @since SmartDeviceLink 2.0
  */
 public class GetVehicleDataResponse extends RPCResponse {
@@ -86,7 +86,7 @@ public class GetVehicleDataResponse extends RPCResponse {
     public static final String KEY_CLOUD_APP_VEHICLE_ID = "cloudAppVehicleID";
     public static final String KEY_HANDS_OFF_STEERING = "handsOffSteering";
 
-	/**
+	/** 
 	 * Constructs a new GetVehicleDataResponse object
 	 */
 
@@ -219,7 +219,7 @@ public class GetVehicleDataResponse extends RPCResponse {
     public WiperStatus getWiperStatus() {
         return (WiperStatus) getObject(WiperStatus.class, KEY_WIPER_STATUS);
     }
-
+  
     public void setHeadLampStatus(HeadLampStatus headLampStatus) {
         setParameters(KEY_HEAD_LAMP_STATUS, headLampStatus);
     }
@@ -249,14 +249,14 @@ public class GetVehicleDataResponse extends RPCResponse {
     	Object object = getParameters(KEY_ACC_PEDAL_POSITION);
     	return SdlDataTypeConverter.objectToDouble(object);
     }
-
+        
     public void setSteeringWheelAngle(Double steeringWheelAngle) {
         setParameters(KEY_STEERING_WHEEL_ANGLE, steeringWheelAngle);
     }
     public Double getSteeringWheelAngle() {
     	Object object = getParameters(KEY_STEERING_WHEEL_ANGLE);
     	return SdlDataTypeConverter.objectToDouble(object);
-    }
+    }    
 
     public void setECallInfo(ECallInfo eCallInfo) {
         setParameters(KEY_E_CALL_INFO, eCallInfo);
@@ -264,15 +264,15 @@ public class GetVehicleDataResponse extends RPCResponse {
     @SuppressWarnings("unchecked")
     public ECallInfo getECallInfo() {
         return (ECallInfo) getObject(ECallInfo.class, KEY_E_CALL_INFO);
-    }
-
+    }	
+	
     public void setAirbagStatus(AirbagStatus airbagStatus) {
         setParameters(KEY_AIRBAG_STATUS, airbagStatus);
     }
     @SuppressWarnings("unchecked")
     public AirbagStatus getAirbagStatus() {
         return (AirbagStatus) getObject(AirbagStatus.class, KEY_AIRBAG_STATUS);
-    }
+    }	
 
     public void setEmergencyEvent(EmergencyEvent emergencyEvent) {
         setParameters(KEY_EMERGENCY_EVENT, emergencyEvent);
diff --git a/base/src/main/java/com/smartdevicelink/proxy/rpc/OnVehicleData.java b/base/src/main/java/com/smartdevicelink/proxy/rpc/OnVehicleData.java
index 1ca895b11..f0dae0fa0 100644
--- a/base/src/main/java/com/smartdevicelink/proxy/rpc/OnVehicleData.java
+++ b/base/src/main/java/com/smartdevicelink/proxy/rpc/OnVehicleData.java
@@ -14,7 +14,7 @@
  * distribution.
  *
  * Neither the name of the SmartDeviceLink Consortium, Inc. nor the names of its
- * contributors may be used to endorse or promote products derived from this
+ * contributors may be used to endorse or promote products derived from this 
  * software without specific prior written permission.
  *
  * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
@@ -277,7 +277,7 @@ import java.util.List;
  * </table>
  *
  * @since SmartDeviceLink 1.0
- *
+ * 
  * @see SubscribeVehicleData
  * @see UnsubscribeVehicleData
  *
diff --git a/base/src/main/java/com/smartdevicelink/proxy/rpc/SubscribeVehicleData.java b/base/src/main/java/com/smartdevicelink/proxy/rpc/SubscribeVehicleData.java
index 215bcb751..c1040b56f 100644
--- a/base/src/main/java/com/smartdevicelink/proxy/rpc/SubscribeVehicleData.java
+++ b/base/src/main/java/com/smartdevicelink/proxy/rpc/SubscribeVehicleData.java
@@ -14,7 +14,7 @@
  * distribution.
  *
  * Neither the name of the SmartDeviceLink Consortium, Inc. nor the names of its
- * contributors may be used to endorse or promote products derived from this
+ * contributors may be used to endorse or promote products derived from this 
  * software without specific prior written permission.
  *
  * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
@@ -42,13 +42,12 @@ import java.util.Hashtable;
  * onVehicleData notification whenever new data is available. The update rate is
  * very much dependent on sensors, vehicle architecture and vehicle type. Be
  * also prepared for the situation that a signal is not available on a vehicle
- *
+ * 
  * <p>Function Group: Location, VehicleInfo and DrivingChara</p>
- *
+ * 
  * <p><b>HMILevel needs to be FULL, LIMITED or BACKGROUND</b></p>
- *
+ * 
  * <p><b>Parameter List</b></p>
- *
  * <table border="1" rules="all">
  *  <tr>
  *      <th>Param Name</th>
@@ -313,8 +312,8 @@ public class SubscribeVehicleData extends RPCRequest {
 	/**
 	 * <p>Constructs a new SubscribeVehicleData object indicated by the Hashtable
 	 * parameter</p>
-	 *
-	 *
+	 * 
+	 * 
 	 * @param hash
 	 *            The Hashtable to use
 	 */
@@ -324,7 +323,7 @@ public class SubscribeVehicleData extends RPCRequest {
 
 	/**
 	 * Sets a boolean value. If true, subscribes Gps data
-	 *
+	 * 
 	 * @param gps
 	 *            a boolean value
 	 */
@@ -334,7 +333,7 @@ public class SubscribeVehicleData extends RPCRequest {
 
 	/**
 	 * Gets a boolean value. If true, means the Gps data has been subscribed.
-	 *
+	 * 
 	 * @return Boolean -a Boolean value. If true, means the Gps data has been
 	 *         subscribed.
 	 */
@@ -344,7 +343,7 @@ public class SubscribeVehicleData extends RPCRequest {
 
 	/**
 	 * Sets a boolean value. If true, subscribes speed data
-	 *
+	 * 
 	 * @param speed
 	 *            a boolean value
 	 */
@@ -354,7 +353,7 @@ public class SubscribeVehicleData extends RPCRequest {
 
 	/**
 	 * Gets a boolean value. If true, means the Speed data has been subscribed.
-	 *
+	 * 
 	 * @return Boolean -a Boolean value. If true, means the Speed data has been
 	 *         subscribed.
 	 */
@@ -364,7 +363,7 @@ public class SubscribeVehicleData extends RPCRequest {
 
 	/**
 	 * Sets a boolean value. If true, subscribes rpm data
-	 *
+	 * 
 	 * @param rpm
 	 *            a boolean value
 	 */
@@ -374,7 +373,7 @@ public class SubscribeVehicleData extends RPCRequest {
 
 	/**
 	 * Gets a boolean value. If true, means the rpm data has been subscribed.
-	 *
+	 * 
 	 * @return Boolean -a Boolean value. If true, means the rpm data has been
 	 *         subscribed.
 	 */
@@ -384,7 +383,7 @@ public class SubscribeVehicleData extends RPCRequest {
 
 	/**
 	 * Sets a boolean value. If true, subscribes FuelLevel data
-	 *
+	 * 
 	 * @param fuelLevel
 	 *            a boolean value
 	 */
@@ -395,7 +394,7 @@ public class SubscribeVehicleData extends RPCRequest {
 	/**
 	 * Gets a boolean value. If true, means the FuelLevel data has been
 	 * subscribed.
-	 *
+	 * 
 	 * @return Boolean -a Boolean value. If true, means the FuelLevel data has
 	 *         been subscribed.
 	 */
@@ -405,7 +404,7 @@ public class SubscribeVehicleData extends RPCRequest {
 
     /**
      * Sets a boolean value. If true, subscribes fuelLevel_State data
-     *
+     * 
      * @param fuelLevel_State
      *            a boolean value
      */
@@ -417,7 +416,7 @@ public class SubscribeVehicleData extends RPCRequest {
     /**
      * Gets a boolean value. If true, means the fuelLevel_State data has been
      * subscribed.
-     *
+     * 
      * @return Boolean -a Boolean value. If true, means the fuelLevel_State data
      *         has been subscribed.
      */
@@ -428,7 +427,7 @@ public class SubscribeVehicleData extends RPCRequest {
 
     /**
      * Sets a boolean value. If true, subscribes fuelLevelState data
-     *
+     * 
      * @param fuelLevelState
      *            a boolean value
      */
@@ -439,7 +438,7 @@ public class SubscribeVehicleData extends RPCRequest {
     /**
      * Gets a boolean value. If true, means the fuelLevelState data has been
      * subscribed.
-     *
+     * 
      * @return Boolean -a Boolean value. If true, means the fuelLevelState data
      *         has been subscribed.
      */
@@ -449,7 +448,7 @@ public class SubscribeVehicleData extends RPCRequest {
 
 	/**
 	 * Sets a boolean value. If true, subscribes instantFuelConsumption data
-	 *
+	 * 
 	 * @param instantFuelConsumption
 	 *            a boolean value
 	 */
@@ -460,7 +459,7 @@ public class SubscribeVehicleData extends RPCRequest {
 	/**
 	 * Gets a boolean value. If true, means the getInstantFuelConsumption data has been
 	 * subscribed.
-	 *
+	 * 
 	 * @return Boolean -a Boolean value. If true, means the getInstantFuelConsumption data
 	 *         has been subscribed.
 	 */
@@ -470,7 +469,7 @@ public class SubscribeVehicleData extends RPCRequest {
 
 	/**
 	 * Sets a boolean value. If true, subscribes externalTemperature data
-	 *
+	 * 
 	 * @param externalTemperature
 	 *            a boolean value
 	 */
@@ -481,7 +480,7 @@ public class SubscribeVehicleData extends RPCRequest {
 	/**
 	 * Gets a boolean value. If true, means the externalTemperature data has been
 	 * subscribed.
-	 *
+	 * 
 	 * @return Boolean -a Boolean value. If true, means the externalTemperature data
 	 *         has been subscribed.
 	 */
@@ -491,7 +490,7 @@ public class SubscribeVehicleData extends RPCRequest {
 
 	/**
 	 * Sets a boolean value. If true, subscribes Currently selected gear data
-	 *
+	 * 
 	 * @param prndl
 	 *            a boolean value
 	 */
@@ -502,7 +501,7 @@ public class SubscribeVehicleData extends RPCRequest {
 	/**
 	 * Gets a boolean value. If true, means the Currently selected gear data has been
 	 * subscribed.
-	 *
+	 * 
 	 * @return Boolean -a Boolean value. If true, means the Currently selected gear data
 	 *         has been subscribed.
 	 */
@@ -512,7 +511,7 @@ public class SubscribeVehicleData extends RPCRequest {
 
 	/**
 	 * Sets a boolean value. If true, subscribes tire pressure status data
-	 *
+	 * 
 	 * @param tirePressure
 	 *            a boolean value
 	 */
@@ -523,7 +522,7 @@ public class SubscribeVehicleData extends RPCRequest {
 	/**
 	 * Gets a boolean value. If true, means the tire pressure status data has been
 	 * subscribed.
-	 *
+	 * 
 	 * @return Boolean -a Boolean value. If true, means the tire pressure status data
 	 *         has been subscribed.
 	 */
@@ -533,7 +532,7 @@ public class SubscribeVehicleData extends RPCRequest {
 
 	/**
 	 * Sets a boolean value. If true, subscribes odometer data
-	 *
+	 * 
 	 * @param odometer
 	 *            a boolean value
 	 */
@@ -544,7 +543,7 @@ public class SubscribeVehicleData extends RPCRequest {
 	/**
 	 * Gets a boolean value. If true, means the odometer data has been
 	 * subscribed.
-	 *
+	 * 
 	 * @return Boolean -a Boolean value. If true, means the odometer data
 	 *         has been subscribed.
 	 */
@@ -554,7 +553,7 @@ public class SubscribeVehicleData extends RPCRequest {
 
 	/**
 	 * Sets a boolean value. If true, subscribes belt Status data
-	 *
+	 * 
 	 * @param beltStatus
 	 *            a boolean value
 	 */
@@ -565,7 +564,7 @@ public class SubscribeVehicleData extends RPCRequest {
 	/**
 	 * Gets a boolean value. If true, means the belt Status data has been
 	 * subscribed.
-	 *
+	 * 
 	 * @return Boolean -a Boolean value. If true, means the belt Status data
 	 *         has been subscribed.
 	 */
@@ -575,7 +574,7 @@ public class SubscribeVehicleData extends RPCRequest {
 
 	/**
 	 * Sets a boolean value. If true, subscribes body Information data
-	 *
+	 * 
 	 * @param bodyInformation
 	 *            a boolean value
 	 */
@@ -586,7 +585,7 @@ public class SubscribeVehicleData extends RPCRequest {
 	/**
 	 * Gets a boolean value. If true, means the body Information data has been
 	 * subscribed.
-	 *
+	 * 
 	 * @return Boolean -a Boolean value. If true, means the body Information data
 	 *         has been subscribed.
 	 */
@@ -596,7 +595,7 @@ public class SubscribeVehicleData extends RPCRequest {
 
 	/**
 	 * Sets a boolean value. If true, subscribes device Status data
-	 *
+	 * 
 	 * @param deviceStatus
 	 *            a boolean value
 	 */
@@ -607,7 +606,7 @@ public class SubscribeVehicleData extends RPCRequest {
 	/**
 	 * Gets a boolean value. If true, means the device Status data has been
 	 * subscribed.
-	 *
+	 * 
 	 * @return Boolean -a Boolean value. If true, means the device Status data
 	 *         has been subscribed.
 	 */
@@ -617,7 +616,7 @@ public class SubscribeVehicleData extends RPCRequest {
 
 	/**
 	 * Sets a boolean value. If true, subscribes driver Braking data
-	 *
+	 * 
 	 * @param driverBraking
 	 *            a boolean value
 	 */
@@ -628,7 +627,7 @@ public class SubscribeVehicleData extends RPCRequest {
 	/**
 	 * Gets a boolean value. If true, means the driver Braking data has been
 	 * subscribed.
-	 *
+	 * 
 	 * @return Boolean -a Boolean value. If true, means the driver Braking data
 	 *         has been subscribed.
 	 */
@@ -638,7 +637,7 @@ public class SubscribeVehicleData extends RPCRequest {
 
 	/**
 	 * Sets a boolean value. If true, subscribes wiper Status data
-	 *
+	 * 
 	 * @param wiperStatus
 	 *            a boolean value
 	 */
@@ -649,7 +648,7 @@ public class SubscribeVehicleData extends RPCRequest {
 	/**
 	 * Gets a boolean value. If true, means the wiper Status data has been
 	 * subscribed.
-	 *
+	 * 
 	 * @return Boolean -a Boolean value. If true, means the wiper Status data
 	 *         has been subscribed.
 	 */
@@ -659,7 +658,7 @@ public class SubscribeVehicleData extends RPCRequest {
 
 	/**
 	 * Sets a boolean value. If true, subscribes Head Lamp Status data
-	 *
+	 * 
 	 * @param headLampStatus
 	 *            a boolean value
 	 */
@@ -670,7 +669,7 @@ public class SubscribeVehicleData extends RPCRequest {
 	/**
 	 * Gets a boolean value. If true, means the Head Lamp Status data has been
 	 * subscribed.
-	 *
+	 * 
 	 * @return Boolean -a Boolean value. If true, means the Head Lamp Status data
 	 *         has been subscribed.
 	 */
@@ -733,21 +732,21 @@ public class SubscribeVehicleData extends RPCRequest {
 	/**
 	 * Gets a boolean value. If true, means the accPedalPosition data has been
 	 * subscribed.
-	 *
+	 * 
 	 * @return Boolean -a Boolean value. If true, means the accPedalPosition data
 	 *         has been subscribed.
 	 */
     public Boolean getAccPedalPosition() {
         return getBoolean(KEY_ACC_PEDAL_POSITION);
     }
-
+  
     public void setSteeringWheelAngle(Boolean steeringWheelAngle) {
 		setParameters(KEY_STEERING_WHEEL_ANGLE, steeringWheelAngle);
     }
 
     public Boolean getSteeringWheelAngle() {
         return getBoolean(KEY_STEERING_WHEEL_ANGLE);
-    }
+    }    
     public void setECallInfo(Boolean eCallInfo) {
 		setParameters(KEY_E_CALL_INFO, eCallInfo);
     }
diff --git a/base/src/main/java/com/smartdevicelink/proxy/rpc/SubscribeVehicleDataResponse.java b/base/src/main/java/com/smartdevicelink/proxy/rpc/SubscribeVehicleDataResponse.java
index 95a0f4066..8dff9e3e0 100644
--- a/base/src/main/java/com/smartdevicelink/proxy/rpc/SubscribeVehicleDataResponse.java
+++ b/base/src/main/java/com/smartdevicelink/proxy/rpc/SubscribeVehicleDataResponse.java
@@ -14,7 +14,7 @@
  * distribution.
  *
  * Neither the name of the SmartDeviceLink Consortium, Inc. nor the names of its
- * contributors may be used to endorse or promote products derived from this
+ * contributors may be used to endorse or promote products derived from this 
  * software without specific prior written permission.
  *
  * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
@@ -86,8 +86,8 @@ public class SubscribeVehicleDataResponse extends RPCResponse {
 	/**
 	 * <p>Constructs a new SubscribeVehicleDataResponse object indicated by the Hashtable
 	 * parameter</p>
-	 *
-	 *
+	 * 
+	 * 
 	 * @param hash The Hashtable to use
 	 */
     public SubscribeVehicleDataResponse(Hashtable<String, Object> hash) {
diff --git a/base/src/main/java/com/smartdevicelink/proxy/rpc/UnsubscribeVehicleData.java b/base/src/main/java/com/smartdevicelink/proxy/rpc/UnsubscribeVehicleData.java
index 7b73d75fa..d079fff56 100644
--- a/base/src/main/java/com/smartdevicelink/proxy/rpc/UnsubscribeVehicleData.java
+++ b/base/src/main/java/com/smartdevicelink/proxy/rpc/UnsubscribeVehicleData.java
@@ -14,7 +14,7 @@
  * distribution.
  *
  * Neither the name of the SmartDeviceLink Consortium, Inc. nor the names of its
- * contributors may be used to endorse or promote products derived from this
+ * contributors may be used to endorse or promote products derived from this 
  * software without specific prior written permission.
  *
  * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
@@ -309,7 +309,7 @@ public class UnsubscribeVehicleData extends RPCRequest {
 	 * Constructs a new UnsubscribeVehicleData object indicated by the Hashtable
 	 * parameter
 	 * <p></p>
-	 *
+	 * 
 	 * @param hash
 	 *            The Hashtable to use
 	 */
@@ -319,7 +319,7 @@ public class UnsubscribeVehicleData extends RPCRequest {
 
 	/**
 	 * Sets a boolean value. If true, unsubscribes from Gps data
-	 *
+	 * 
 	 * @param gps
 	 *            a boolean value
 	 */
@@ -329,7 +329,7 @@ public class UnsubscribeVehicleData extends RPCRequest {
 
 	/**
 	 * Gets a boolean value. If true, means the Gps data has been unsubscribed.
-	 *
+	 * 
 	 * @return Boolean -a Boolean value. If true, means the Gps data has been
 	 *         unsubscribed.
 	 */
@@ -339,7 +339,7 @@ public class UnsubscribeVehicleData extends RPCRequest {
 
 	/**
 	 * Sets a boolean value. If true, unsubscribes from speed data
-	 *
+	 * 
 	 * @param speed
 	 *            a boolean value
 	 */
@@ -349,7 +349,7 @@ public class UnsubscribeVehicleData extends RPCRequest {
 
 	/**
 	 * Gets a boolean value. If true, means the Speed data has been unsubscribed.
-	 *
+	 * 
 	 * @return Boolean -a Boolean value. If true, means the Speed data has been
 	 *         unsubscribed.
 	 */
@@ -359,7 +359,7 @@ public class UnsubscribeVehicleData extends RPCRequest {
 
 	/**
 	 * Sets a boolean value. If true, unsubscribe data
-	 *
+	 * 
 	 * @param rpm
 	 *            a boolean value
 	 */
@@ -369,7 +369,7 @@ public class UnsubscribeVehicleData extends RPCRequest {
 
 	/**
 	 * Gets a boolean value. If true, means the rpm data has been unsubscribed.
-	 *
+	 * 
 	 * @return Boolean -a Boolean value. If true, means the rpm data has been
 	 *         unsubscribed.
 	 */
@@ -379,7 +379,7 @@ public class UnsubscribeVehicleData extends RPCRequest {
 
 	/**
 	 * Sets a boolean value. If true, unsubscribes from FuelLevel data
-	 *
+	 * 
 	 * @param fuelLevel
 	 *            a boolean value
 	 */
@@ -390,7 +390,7 @@ public class UnsubscribeVehicleData extends RPCRequest {
 	/**
 	 * Gets a boolean value. If true, means the FuelLevel data has been
 	 * unsubscribed.
-	 *
+	 * 
 	 * @return Boolean -a Boolean value. If true, means the FuelLevel data has
 	 *         been unsubscribed.
 	 */
@@ -400,7 +400,7 @@ public class UnsubscribeVehicleData extends RPCRequest {
 
     /**
      * Sets a boolean value. If true, unsubscribes from fuelLevel_State data
-     *
+     * 
      * @param fuelLevel_State
      *            a boolean value
      */
@@ -412,7 +412,7 @@ public class UnsubscribeVehicleData extends RPCRequest {
     /**
      * Gets a boolean value. If true, means the fuelLevel_State data has been
      * unsubscribed.
-     *
+     * 
      * @return Boolean -a Boolean value. If true, means the fuelLevel_State data
      *         has been unsubscribed.
      */
@@ -423,7 +423,7 @@ public class UnsubscribeVehicleData extends RPCRequest {
 
     /**
      * Sets a boolean value. If true, unsubscribes from fuelLevelState data
-     *
+     * 
      * @param fuelLevelState
      *            a boolean value
      */
@@ -434,7 +434,7 @@ public class UnsubscribeVehicleData extends RPCRequest {
     /**
      * Gets a boolean value. If true, means the fuelLevel_State data has been
      * unsubscribed.
-     *
+     * 
      * @return Boolean -a Boolean value. If true, means the fuelLevelState data
      *         has been unsubscribed.
      */
@@ -444,7 +444,7 @@ public class UnsubscribeVehicleData extends RPCRequest {
 
 	/**
 	 * Sets a boolean value. If true, unsubscribes from instantFuelConsumption data
-	 *
+	 * 
 	 * @param instantFuelConsumption
 	 *            a boolean value
 	 */
@@ -455,7 +455,7 @@ public class UnsubscribeVehicleData extends RPCRequest {
 	/**
 	 * Gets a boolean value. If true, means the getInstantFuelConsumption data has been
 	 * unsubscribed.
-	 *
+	 * 
 	 * @return Boolean -a Boolean value. If true, means the getInstantFuelConsumption data
 	 *         has been unsubscribed.
 	 */
@@ -465,7 +465,7 @@ public class UnsubscribeVehicleData extends RPCRequest {
 
 	/**
 	 * Sets a boolean value. If true, unsubscribes from externalTemperature data
-	 *
+	 * 
 	 * @param externalTemperature
 	 *            a boolean value
 	 */
@@ -476,7 +476,7 @@ public class UnsubscribeVehicleData extends RPCRequest {
 	/**
 	 * Gets a boolean value. If true, means the externalTemperature data has been
 	 * unsubscribed.
-	 *
+	 * 
 	 * @return Boolean -a Boolean value. If true, means the externalTemperature data
 	 *         has been unsubscribed.
 	 */
@@ -486,7 +486,7 @@ public class UnsubscribeVehicleData extends RPCRequest {
 
 	/**
 	 * Sets a boolean value. If true, unsubscribes Currently selected gear data
-	 *
+	 * 
 	 * @param prndl
 	 *            a boolean value
 	 */
@@ -497,7 +497,7 @@ public class UnsubscribeVehicleData extends RPCRequest {
 	/**
 	 * Gets a boolean value. If true, means the Currently selected gear data has been
 	 * unsubscribed.
-	 *
+	 * 
 	 * @return Boolean -a Boolean value. If true, means the Currently selected gear data
 	 *         has been unsubscribed.
 	 */
@@ -507,7 +507,7 @@ public class UnsubscribeVehicleData extends RPCRequest {
 
 	/**
 	 * Sets a boolean value. If true, unsubscribes from tire pressure status data
-	 *
+	 * 
 	 * @param tirePressure
 	 *            a boolean value
 	 */
@@ -518,7 +518,7 @@ public class UnsubscribeVehicleData extends RPCRequest {
 	/**
 	 * Gets a boolean value. If true, means the tire pressure status data has been
 	 * unsubscribed.
-	 *
+	 * 
 	 * @return Boolean -a Boolean value. If true, means the tire pressure status data
 	 *         has been unsubscribed.
 	 */
@@ -528,7 +528,7 @@ public class UnsubscribeVehicleData extends RPCRequest {
 
 	/**
 	 * Sets a boolean value. If true, unsubscribes from odometer data
-	 *
+	 * 
 	 * @param odometer
 	 *            a boolean value
 	 */
@@ -539,7 +539,7 @@ public class UnsubscribeVehicleData extends RPCRequest {
 	/**
 	 * Gets a boolean value. If true, means the odometer data has been
 	 * unsubscribed.
-	 *
+	 * 
 	 * @return Boolean -a Boolean value. If true, means the odometer data
 	 *         has been unsubscribed.
 	 */
@@ -549,7 +549,7 @@ public class UnsubscribeVehicleData extends RPCRequest {
 
 	/**
 	 * Sets a boolean value. If true, unsubscribes from belt Status data
-	 *
+	 * 
 	 * @param beltStatus
 	 *            a boolean value
 	 */
@@ -560,7 +560,7 @@ public class UnsubscribeVehicleData extends RPCRequest {
 	/**
 	 * Gets a boolean value. If true, means the belt Status data has been
 	 * unsubscribed.
-	 *
+	 * 
 	 * @return Boolean -a Boolean value. If true, means the belt Status data
 	 *         has been unsubscribed.
 	 */
@@ -570,7 +570,7 @@ public class UnsubscribeVehicleData extends RPCRequest {
 
 	/**
 	 * Sets a boolean value. If true, unsubscribes from body Information data
-	 *
+	 * 
 	 * @param bodyInformation
 	 *            a boolean value
 	 */
@@ -581,7 +581,7 @@ public class UnsubscribeVehicleData extends RPCRequest {
 	/**
 	 * Gets a boolean value. If true, means the body Information data has been
 	 * unsubscribed.
-	 *
+	 * 
 	 * @return Boolean -a Boolean value. If true, means the body Information data
 	 *         has been unsubscribed.
 	 */
@@ -591,7 +591,7 @@ public class UnsubscribeVehicleData extends RPCRequest {
 
 	/**
 	 * Sets a boolean value. If true, unsubscribes from device Status data
-	 *
+	 * 
 	 * @param deviceStatus
 	 *            a boolean value
 	 */
@@ -602,7 +602,7 @@ public class UnsubscribeVehicleData extends RPCRequest {
 	/**
 	 * Gets a boolean value. If true, means the device Status data has been
 	 * unsubscribed.
-	 *
+	 * 
 	 * @return Boolean -a Boolean value. If true, means the device Status data
 	 *         has been unsubscribed.
 	 */
@@ -612,7 +612,7 @@ public class UnsubscribeVehicleData extends RPCRequest {
 
 	/**
 	 * Sets a boolean value. If true, unsubscribes from driver Braking data
-	 *
+	 * 
 	 * @param driverBraking
 	 *            a boolean value
 	 */
@@ -623,7 +623,7 @@ public class UnsubscribeVehicleData extends RPCRequest {
 	/**
 	 * Gets a boolean value. If true, means the driver Braking data has been
 	 * unsubscribed.
-	 *
+	 * 
 	 * @return Boolean -a Boolean value. If true, means the driver Braking data
 	 *         has been unsubscribed.
 	 */
@@ -633,7 +633,7 @@ public class UnsubscribeVehicleData extends RPCRequest {
 
 	/**
 	 * Sets a boolean value. If true, unsubscribes from wiper Status data
-	 *
+	 * 
 	 * @param wiperStatus
 	 *            a boolean value
 	 */
@@ -644,7 +644,7 @@ public class UnsubscribeVehicleData extends RPCRequest {
 	/**
 	 * Gets a boolean value. If true, means the wiper Status data has been
 	 * unsubscribed.
-	 *
+	 * 
 	 * @return Boolean -a Boolean value. If true, means the wiper Status data
 	 *         has been unsubscribed.
 	 */
@@ -654,7 +654,7 @@ public class UnsubscribeVehicleData extends RPCRequest {
 
 	/**
 	 * Sets a boolean value. If true, unsubscribes from Head Lamp Status data
-	 *
+	 * 
 	 * @param headLampStatus
 	 *            a boolean value
 	 */
@@ -665,7 +665,7 @@ public class UnsubscribeVehicleData extends RPCRequest {
 	/**
 	 * Gets a boolean value. If true, means the Head Lamp Status data has been
 	 * unsubscribed.
-	 *
+	 * 
 	 * @return Boolean -a Boolean value. If true, means the Head Lamp Status data
 	 *         has been unsubscribed.
 	 */
@@ -718,7 +718,7 @@ public class UnsubscribeVehicleData extends RPCRequest {
 
 	/**
 	 * Sets a boolean value. If true, unsubscribes from accPedalPosition data
-	 *
+	 * 
 	 * @param accPedalPosition
 	 *            a boolean value
 	 */
@@ -729,7 +729,7 @@ public class UnsubscribeVehicleData extends RPCRequest {
 	/**
 	 * Gets a boolean value. If true, means the accPedalPosition data has been
 	 * unsubscribed.
-	 *
+	 * 
 	 * @return Boolean -a Boolean value. If true, means the accPedalPosition data
 	 *         has been unsubscribed.
 	 */
@@ -743,8 +743,8 @@ public class UnsubscribeVehicleData extends RPCRequest {
 
     public Boolean getSteeringWheelAngle() {
         return getBoolean(KEY_STEERING_WHEEL_ANGLE);
-    }
-
+    }    
+        
     public void setECallInfo(Boolean eCallInfo) {
 		setParameters(KEY_E_CALL_INFO, eCallInfo);
     }
@@ -827,7 +827,7 @@ public class UnsubscribeVehicleData extends RPCRequest {
 
 	/**
 	 * Sets a boolean value. If true, unsubscribes from cloudAppVehicleID data
-	 * @param cloudAppVehicleID a boolean value.
+	 * @param cloudAppVehicleID a boolean value. 
 	 */
 	public void setCloudAppVehicleID(boolean cloudAppVehicleID){
 		setParameters(KEY_CLOUD_APP_VEHICLE_ID, cloudAppVehicleID);
diff --git a/base/src/main/java/com/smartdevicelink/proxy/rpc/UnsubscribeVehicleDataResponse.java b/base/src/main/java/com/smartdevicelink/proxy/rpc/UnsubscribeVehicleDataResponse.java
index fdf7415d7..14e8ff166 100644
--- a/base/src/main/java/com/smartdevicelink/proxy/rpc/UnsubscribeVehicleDataResponse.java
+++ b/base/src/main/java/com/smartdevicelink/proxy/rpc/UnsubscribeVehicleDataResponse.java
@@ -14,7 +14,7 @@
  * distribution.
  *
  * Neither the name of the SmartDeviceLink Consortium, Inc. nor the names of its
- * contributors may be used to endorse or promote products derived from this
+ * contributors may be used to endorse or promote products derived from this 
  * software without specific prior written permission.
  *
  * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
@@ -41,7 +41,7 @@ import java.util.Hashtable;
 
 /**
  * Unsubscribe Vehicle Data Response is sent, when UnsubscribeVehicleData has been called.
- *
+ * 
  * @since SmartDeviceLink 2.0
  */
 public class UnsubscribeVehicleDataResponse extends RPCResponse {
@@ -98,7 +98,7 @@ public class UnsubscribeVehicleDataResponse extends RPCResponse {
 	 * Constructs a new UnsubscribeVehicleDataResponse object indicated by the Hashtable
 	 * parameter
 	 * <p></p>
-	 *
+	 * 
 	 * @param hash The Hashtable to use to build this RPC
 	 *
 	 */
@@ -405,8 +405,8 @@ public class UnsubscribeVehicleDataResponse extends RPCResponse {
     @SuppressWarnings("unchecked")
     public VehicleDataResult getAccPedalPosition() {
         return (VehicleDataResult) getObject(VehicleDataResult.class, KEY_ACC_PEDAL_POSITION);
-    }
-
+    }  
+    
     public void setSteeringWheelAngle(VehicleDataResult steeringWheelAngle) {
         setParameters(KEY_STEERING_WHEEL_ANGLE, steeringWheelAngle);
     }
@@ -414,8 +414,8 @@ public class UnsubscribeVehicleDataResponse extends RPCResponse {
     @SuppressWarnings("unchecked")
     public VehicleDataResult getSteeringWheelAngle() {
         return (VehicleDataResult) getObject(VehicleDataResult.class, KEY_STEERING_WHEEL_ANGLE);
-    }
-
+    }    
+    
     public void setECallInfo(VehicleDataResult eCallInfo) {
         setParameters(KEY_E_CALL_INFO, eCallInfo);
     }
diff --git a/base/src/main/java/com/smartdevicelink/proxy/rpc/enums/VehicleDataType.java b/base/src/main/java/com/smartdevicelink/proxy/rpc/enums/VehicleDataType.java
index ee3979fa4..5ee172b80 100644
--- a/base/src/main/java/com/smartdevicelink/proxy/rpc/enums/VehicleDataType.java
+++ b/base/src/main/java/com/smartdevicelink/proxy/rpc/enums/VehicleDataType.java
@@ -14,7 +14,7 @@
  * distribution.
  *
  * Neither the name of the SmartDeviceLink Consortium, Inc. nor the names of its
- * contributors may be used to endorse or promote products derived from this
+ * contributors may be used to endorse or promote products derived from this 
  * software without specific prior written permission.
  *
  * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
@@ -33,7 +33,7 @@ package com.smartdevicelink.proxy.rpc.enums;
 
 /**
  * Defines the vehicle data types that can be published and subscribed to.
- *
+ * 
  */
 public enum VehicleDataType {
 	/**
@@ -79,7 +79,7 @@ public enum VehicleDataType {
     /**
      * Notifies ODOMETERData may be subscribed
      */
-    VEHICLEDATA_ODOMETER,
+    VEHICLEDATA_ODOMETER,   
     /**
      * Notifies BELTSTATUSData may be subscribed
      */