From 9273f679f4634a60f50f38b08e7e1563194be1ef Mon Sep 17 00:00:00 2001 From: denny Date: Mon, 7 Mar 2016 19:05:34 -0500 Subject: [PATCH] Resolves issue with loading of channel map ranges from playlist_v2.xml --- src/controller/channel/map/ChannelMap.java | 11 +++-------- src/controller/channel/map/ChannelRangeModel.java | 2 +- 2 files changed, 4 insertions(+), 9 deletions(-) diff --git a/src/controller/channel/map/ChannelMap.java b/src/controller/channel/map/ChannelMap.java index a7359a16..107280f8 100644 --- a/src/controller/channel/map/ChannelMap.java +++ b/src/controller/channel/map/ChannelMap.java @@ -66,20 +66,15 @@ public class ChannelMap return mName + ( mInvalid ? " - Error" : "" ); } + @XmlElement( name = "range" ) public List getRanges() { return mRanges; } - @XmlElement( name = "range" ) public void setRanges( List ranges ) { - mRanges.clear(); - - for( ChannelRange range: ranges ) - { - mRanges.add( range ); - } + mRanges = ranges; validate(); } @@ -140,7 +135,7 @@ public class ChannelMap validate(); } - public void deleteRange( ChannelRange range ) + public void removeRange( ChannelRange range ) { mRanges.remove( range ); diff --git a/src/controller/channel/map/ChannelRangeModel.java b/src/controller/channel/map/ChannelRangeModel.java index d5269c1d..f2be227f 100644 --- a/src/controller/channel/map/ChannelRangeModel.java +++ b/src/controller/channel/map/ChannelRangeModel.java @@ -79,7 +79,7 @@ public class ChannelRangeModel extends AbstractTableModel public List getChannelRanges() { - return Collections.unmodifiableList( mRanges ); + return mRanges; } public void addRanges( List ranges )