From 7679e7368374747ba92a0839937b0fdfb4f39e80 Mon Sep 17 00:00:00 2001
From: Rehan Murtaza <rehanmurtaza@gmail.com>
Date: Wed, 19 Feb 2014 14:23:45 -0500
Subject: [PATCH 1/3] Update Video.java

getIOSRenditions() should return the list iosRendition instead of renditions.
---
 .../src/com/brightcove/commons/catalog/objects/Video.java     | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/bc-catalog-objects/src/com/brightcove/commons/catalog/objects/Video.java b/bc-catalog-objects/src/com/brightcove/commons/catalog/objects/Video.java
index 3412f452..c460ef60 100755
--- a/bc-catalog-objects/src/com/brightcove/commons/catalog/objects/Video.java
+++ b/bc-catalog-objects/src/com/brightcove/commons/catalog/objects/Video.java
@@ -1067,8 +1067,8 @@ public void setRenditions(List<Rendition> renditions){
 	 * 
 	 * @return List of renditions for this Video 
 	 */
-	public List<Rendition> getIOSRenditions(){
-		return renditions;
+	public List<iosRendition> getIOSRenditions(){
+		return iosRendition;
 	}
 	
 	/**

From 905c834f495b21ddc491598ee06510c1350db975 Mon Sep 17 00:00:00 2001
From: Rehan Murtaza <rehanmurtaza@gmail.com>
Date: Wed, 19 Feb 2014 14:54:12 -0500
Subject: [PATCH 2/3] Update Video.java

---
 .../src/com/brightcove/commons/catalog/objects/Video.java       | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/bc-catalog-objects/src/com/brightcove/commons/catalog/objects/Video.java b/bc-catalog-objects/src/com/brightcove/commons/catalog/objects/Video.java
index c460ef60..107f8eb7 100755
--- a/bc-catalog-objects/src/com/brightcove/commons/catalog/objects/Video.java
+++ b/bc-catalog-objects/src/com/brightcove/commons/catalog/objects/Video.java
@@ -1068,7 +1068,7 @@ public void setRenditions(List<Rendition> renditions){
 	 * @return List of renditions for this Video 
 	 */
 	public List<iosRendition> getIOSRenditions(){
-		return iosRendition;
+		return iosRenditions;
 	}
 	
 	/**

From 0dd08c04c8b1a45768d5c800d830575cef1b46dd Mon Sep 17 00:00:00 2001
From: Rehan Murtaza <rehanmurtaza@gmail.com>
Date: Mon, 24 Feb 2014 12:38:58 -0500
Subject: [PATCH 3/3] Update Video.java

More updates for the iosRendtions fix.
---
 .../commons/catalog/objects/Video.java         | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/bc-catalog-objects/src/com/brightcove/commons/catalog/objects/Video.java b/bc-catalog-objects/src/com/brightcove/commons/catalog/objects/Video.java
index 107f8eb7..165a0bc3 100755
--- a/bc-catalog-objects/src/com/brightcove/commons/catalog/objects/Video.java
+++ b/bc-catalog-objects/src/com/brightcove/commons/catalog/objects/Video.java
@@ -66,7 +66,7 @@ public class Video {
 	private String  adKeys;
 	
 	private List<Rendition>    renditions;
-	private List<iosRendition> iosRenditions;
+	private List<Rendition> iosRenditions;
 	private Rendition          videoFullLength;
 	
 	private ItemStateEnum itemState;
@@ -299,12 +299,12 @@ else if(nodeName.equals("renditions")){
 					}
 				}
 				else if(nodeName.equals("IOSRenditions")){
-					iosRenditions = new ArrayList<iosRendition>();
+					iosRenditions = new ArrayList<Rendition>();
 					
 					Element renditionElement = W3CXMLUtils.getFirstElementChild(child);
 					while(renditionElement != null){
 						if("iosRendition".equals(renditionElement.getNodeName())){
-							iosRendition iosRendition = new iosRendition(renditionElement);
+							Rendition iosRendition = new Rendition(renditionElement);
 							iosRenditions.add(iosRendition);
 						}
 						
@@ -585,12 +585,12 @@ else if("renditions".equals(rootKey)){
 				}
 			}
 			else if("IOSRenditions".equals(rootKey)){
-				iosRenditions = new ArrayList<iosRendition>();
+				iosRenditions = new ArrayList<Rendition>();
 				
 				JSONArray rendArray = jsonObj.getJSONArray(rootKey);
 				for(int rendIdx=0;rendIdx<rendArray.length();rendIdx++){
 					String    rend      = rendArray.get(rendIdx).toString();
-					iosRendition iosRendition = new iosRendition(rend);
+					Rendition iosRendition = new Rendition(rend);
 					iosRenditions.add(iosRendition);
 				}
 			}
@@ -1067,7 +1067,7 @@ public void setRenditions(List<Rendition> renditions){
 	 * 
 	 * @return List of renditions for this Video 
 	 */
-	public List<iosRendition> getIOSRenditions(){
+	public List<Rendition> getIOSRenditions(){
 		return iosRenditions;
 	}
 	
@@ -1087,7 +1087,7 @@ public List<iosRendition> getIOSRenditions(){
 	 * 
 	 * @param renditions List of renditions for this Video 
 	 */
-	public void setIOSRenditions(List<iosRendition> renditions){
+	public void setIOSRenditions(List<Rendition> renditions){
 		this.iosRenditions = renditions;
 	}
 	
@@ -2279,7 +2279,7 @@ public JSONObject toJson(EnumSet<VideoFieldEnum> includeNullFields) throws JSONE
 		}
 		if(iosRenditions != null){
 			JSONArray jsonRenditions = new JSONArray();
-			for(iosRendition iosRendition : iosRenditions){
+			for(Rendition iosRendition : iosRenditions){
 				JSONObject renditionJson = iosRendition.toJson();
 				jsonRenditions.put(renditionJson);
 			}
@@ -2531,7 +2531,7 @@ public Element appendXml(Element root) {
 			Element renditionsElement = doc.createElement("IOSRenditions");
 			videoElement.appendChild(renditionsElement);
 			
-			for(iosRendition rendition : iosRenditions){
+			for(Rendition rendition : iosRenditions){
 				rendition.appendXml(renditionsElement, "iosRendition");
 			}
 		}