Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update Video.java #8

Open
wants to merge 3 commits into
base: master
Choose a base branch
from
Open

Update Video.java #8

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
7679e73
Update Video.java
rehanmurtaza Feb 19, 2014
905c834
Update Video.java
rehanmurtaza Feb 19, 2014
0dd08c0
Update Video.java
rehanmurtaza Feb 24, 2014
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 9 additions & 9 deletions bc-catalog-objects/src/com/brightcove/commons/catalog/objects/Video.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -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);
}

Expand Down Expand Up @@ -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);
}
}
Expand Down Expand Up @@ -1068,7 +1068,7 @@ public void setRenditions(List<Rendition> renditions){
* @return List of renditions for this Video
*/
public List<Rendition> getIOSRenditions(){
return renditions;
return iosRenditions;
}

/**
Expand All @@ -1087,7 +1087,7 @@ public List<Rendition> getIOSRenditions(){
*
* @param renditions List of renditions for this Video
*/
public void setIOSRenditions(List<iosRendition> renditions){
public void setIOSRenditions(List<Rendition> renditions){
this.iosRenditions = renditions;
}

Expand Down Expand Up @@ -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);
}
Expand Down Expand Up @@ -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");
}
}
Expand Down