start of rename/refactor

3 files changed, 28 insertions, 19 deletions

diff --git a/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/HapticRect.java b/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/HapticRect.java
new file mode 100644
index 000000000..19118f1ef
--- /dev/null
+++ b/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/HapticRect.java
@@ -0,0 +1,21 @@
+package com.smartdevicelink.proxy.rpc;
+
+import com.smartdevicelink.proxy.RPCStruct;
+
+import java.util.Hashtable;
+
+/**
+ * Created by brettywhite on 8/24/17.
+ */
+
+public class HapticRect extends RPCStruct {
+	public static final String KEY_ID = "id";
+	public static final String KEY_RECT = "rect";
+
+	public HapticRect() {}
+	public HapticRect(Hashtable<String, Object> hash) {
+		super(hash);
+	}
+
+
+}
diff --git a/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/SpatialStruct.java b/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/Rectangle.java
index b83134862..7a624c049 100644
--- a/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/SpatialStruct.java
+++ b/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/Rectangle.java
@@ -5,33 +5,21 @@ import com.smartdevicelink.proxy.RPCStruct;
 import java.util.Hashtable;
 
 /**
- * Defines spatial for each user control object for video streaming application
+ * Defines Rectangle for each user control object for video streaming application
  */
 
-public class SpatialStruct extends RPCStruct {
-	public static final String KEY_ID = "id";
+public class Rectangle extends RPCStruct {
 	public static final String KEY_X = "x";
 	public static final String KEY_Y = "y";
 	public static final String KEY_WIDTH = "width";
 	public static final String KEY_HEIGHT = "height";
 
-	public SpatialStruct() {}
-	public SpatialStruct(Hashtable<String, Object> hash) {
+	public Rectangle() {}
+	public Rectangle(Hashtable<String, Object> hash) {
 		super(hash);
 	}
 
 	/**
-	 * A user control spatial identifier
-	 */
-	public void setID(Integer id) {
-		setValue(KEY_ID, id);
-	}
-
-	public Integer getID() {
-		return getInteger(KEY_ID);
-	}
-
-	/**
 	 * The X-coordinate of the user control
 	 */
 	public void setX(Float x) {
diff --git a/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/SendHapticData.java b/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/SendHapticData.java
index b839eb30b..3e6bbb350 100644
--- a/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/SendHapticData.java
+++ b/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/SendHapticData.java
@@ -25,12 +25,12 @@ public class SendHapticData extends RPCRequest {
 		super(hash);
 	}
 
-	public void setHapticSpatialData(SpatialStruct hapticSpatialData) {
+	public void setHapticSpatialData(Rectangle hapticSpatialData) {
 		setParameters(KEY_HAPTIC_SPATIAL_DATA, hapticSpatialData);
 	}
 
-	public SpatialStruct getHapticSpatialData() {
-		return (SpatialStruct) getObject(SpatialStruct.class, KEY_HAPTIC_SPATIAL_DATA);
+	public Rectangle getHapticSpatialData() {
+		return (Rectangle) getObject(Rectangle.class, KEY_HAPTIC_SPATIAL_DATA);
 	}
 
 }