Fixed warnings in merge conflicts

Mike Burke · Mike Burke · commit 62d8dd75e581 · 2014-10-23T15:49:36.000-04:00
Signed-off-by: Mike Burke &lt;mike@livioconnect.com&gt;
diff --git a/sdl_android_lib/src/com/smartdevicelink/proxy/rpc/DisplayCapabilities.java b/sdl_android_lib/src/com/smartdevicelink/proxy/rpc/DisplayCapabilities.java
@@ -125,6 +125,7 @@ public void setTextFields( Vector<TextField> textFields ) {
     
     
     
+    @SuppressWarnings("unchecked")
     public Vector<ImageField> getImageFields() {
         if (store.get(Names.imageFields) instanceof Vector<?>) {
 	    	Vector<?> list = (Vector<?>)store.get(Names.imageFields);
diff --git a/sdl_android_lib/src/com/smartdevicelink/proxy/rpc/Show.java b/sdl_android_lib/src/com/smartdevicelink/proxy/rpc/Show.java
@@ -383,6 +383,7 @@ public void setSecondaryGraphic(Image secondaryGraphic) {
     }
 
 
+    @SuppressWarnings("unchecked")
     public Image getSecondaryGraphic() {
     	Object obj = parameters.get(Names.secondaryGraphic);
         if (obj instanceof Image) {

Original file line number	Diff line number	Diff line change
`@@ -383,6 +383,7 @@ public void setSecondaryGraphic(Image secondaryGraphic) {`
`383`	`383`	`}`
`384`	`384`
`385`	`385`
	`386`	`+ @SuppressWarnings("unchecked")`
`386`	`387`	`public Image getSecondaryGraphic() {`
`387`	`388`	`Object obj = parameters.get(Names.secondaryGraphic);`
`388`	`389`	`if (obj instanceof Image) {`