Merges #34 Major redesign of Tuner, Channel and Alias management.

Changes to model, view and controller components and updates all gui
editors.  Removes the configuration panel and tree and replaces with 3
new panels.  Updates playlist.xml to a new playlist_v2.xml format.

src/playlist/version1/AliasDirectory.java

@@ -0,0 +1,91 @@
+/*******************************************************************************
+ *     SDR Trunk 
+ *     Copyright (C) 2014 Dennis Sheirer
+ * 
+ *     This program is free software: you can redistribute it and/or modify
+ *     it under the terms of the GNU General Public License as published by
+ *     the Free Software Foundation, either version 3 of the License, or
+ *     (at your option) any later version.
+ * 
+ *     This program is distributed in the hope that it will be useful,
+ *     but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *     GNU General Public License for more details.
+ * 
+ *     You should have received a copy of the GNU General Public License
+ *     along with this program.  If not, see <http://www.gnu.org/licenses/>
+ ******************************************************************************/
+package playlist.version1;
+
+import java.util.ArrayList;
+
+import javax.xml.bind.annotation.XmlElement;
+import javax.xml.bind.annotation.XmlRootElement;
+import javax.xml.bind.annotation.XmlSeeAlso;
+
+import alias.AliasList;
+
+@XmlSeeAlso( { AliasList.class} )
+@XmlRootElement( name = "alias_directory" )
+@Deprecated
+public class AliasDirectory
+{
+	private ArrayList<AliasListOld> mAliasList = new ArrayList<>();
+	
+	public AliasDirectory()
+	{
+	}
+	
+	public void refresh()
+	{
+	}
+	
+	public void clearAliasLists()
+	{
+		mAliasList.clear();
+	}
+
+	@XmlElement( name = "alias_list" )
+	public ArrayList<AliasListOld> getAliasList()
+	{
+		return mAliasList;
+	}
+	
+	public void setAliasList( ArrayList<AliasListOld> lists )
+	{
+		mAliasList = lists;
+		
+		if( mAliasList == null )
+		{
+			mAliasList = new ArrayList<AliasListOld>();
+		}
+	}
+	
+	public void addAliasList( AliasListOld list )
+	{
+		mAliasList.add( list );
+	}
+	
+	public void removeAliasList( AliasListOld list )
+	{
+		mAliasList.remove( list );
+	}
+	
+	/**
+	 * Gets the named alias list, or returns an empty alias list
+	 */
+	public AliasListOld getAliasList( String name )
+	{
+		AliasListOld retVal = new AliasListOld( name );
+		
+		for( AliasListOld list: mAliasList )
+		{
+			if( list.getName().equalsIgnoreCase( name ) )
+			{
+				return list;
+			}
+		}
+		
+		return retVal;
+	}
+}

src/playlist/version1/AliasListOld.java

@@ -0,0 +1,583 @@
+/*******************************************************************************
+ *     SDR Trunk 
+ *     Copyright (C) 2014,2015 Dennis Sheirer
+ * 
+ *     This program is free software: you can redistribute it and/or modify
+ *     it under the terms of the GNU General Public License as published by
+ *     the Free Software Foundation, either version 3 of the License, or
+ *     (at your option) any later version.
+ * 
+ *     This program is distributed in the hope that it will be useful,
+ *     but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *     GNU General Public License for more details.
+ * 
+ *     You should have received a copy of the GNU General Public License
+ *     along with this program.  If not, see <http://www.gnu.org/licenses/>
+ ******************************************************************************/
+package playlist.version1;
+
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.Map;
+
+import javax.xml.bind.annotation.XmlAttribute;
+import javax.xml.bind.annotation.XmlRootElement;
+import javax.xml.bind.annotation.XmlSeeAlso;
+
+import module.decode.lj1200.LJ1200Message.Function;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import alias.Alias;
+import alias.action.AliasAction;
+import alias.action.beep.BeepAction;
+import alias.action.clip.ClipAction;
+import alias.action.script.ScriptAction;
+import alias.id.AliasID;
+import alias.id.esn.Esn;
+import alias.id.fleetsync.FleetsyncID;
+import alias.id.lojack.LoJackFunctionAndID;
+import alias.id.mdc.MDC1200ID;
+import alias.id.mobileID.Min;
+import alias.id.mpt1327.MPT1327ID;
+import alias.id.nonrecordable.NonRecordable;
+import alias.id.priority.Priority;
+import alias.id.siteID.SiteID;
+import alias.id.status.StatusID;
+import alias.id.talkgroup.TalkgroupID;
+import alias.id.uniqueID.UniqueID;
+import audio.metadata.MetadataType;
+
+@XmlSeeAlso( { Alias.class,
+	
+			   /* Alias ID's */
+			   AliasID.class,
+			   FleetsyncID.class,
+			   Esn.class,
+			   Group.class,
+			   LoJackFunctionAndID.class,
+			   MDC1200ID.class,
+			   Min.class,
+			   MPT1327ID.class,
+			   UniqueID.class,
+			   SiteID.class,
+			   StatusID.class,
+			   TalkgroupID.class,
+			   
+			   /* Alias Attributes */
+			   NonRecordable.class,
+			   Priority.class,
+			   
+			   /* Alias Actions */
+			   AliasAction.class,
+			   BeepAction.class,
+			   ClipAction.class,
+			   ScriptAction.class } )
+
+@Deprecated
+@XmlRootElement( name = "alias_list" )
+public class AliasListOld implements Comparable<AliasListOld>
+{
+	private final static Logger mLog = LoggerFactory.getLogger( AliasListOld.class );
+
+	private String mName;
+	private ArrayList<Group> mGroups = new ArrayList<Group>();
+	
+	private Map<String,Alias> mESN = new HashMap<>();
+	private Map<String,Alias> mFleetsync = new HashMap<>();
+	private Map<LoJackFunctionAndID,Alias> mLoJack = new HashMap<>();
+	private Map<String,Alias> mMDC1200 = new HashMap<>();
+	private Map<String,Alias> mMobileID = new HashMap<>();
+	private Map<String,Alias> mMPT1327 = new HashMap<>();
+	private Map<String, Alias> mSiteID = new HashMap<>();
+	private Map<Integer, Alias> mStatus = new HashMap<>();
+	private Map<String,Alias> mTalkgroup = new HashMap<>();
+	private Map<Integer,Alias> mUniqueID = new HashMap<>();
+	
+	private boolean mESNWildcard = false;
+	private boolean mMobileIDWildcard = false;
+	private boolean mFleetsyncWildcard = false;
+	private boolean mMDC1200Wildcard = false;
+	private boolean mMPT1327Wildcard = false;
+	private boolean mSiteWildcard = false;
+	private boolean mTalkgroupWildcard = false;
+	
+	public AliasListOld()
+	{
+		this( null );
+	}
+	
+	public AliasListOld( String name )
+	{
+		mName = name;
+		update();
+	}
+	
+	/**
+	 * Load/Reload all lookup hashmaps
+	 */
+	public void update()
+	{
+		//Clear hashmaps
+		mESN.clear();
+		mFleetsync.clear();
+		mLoJack.clear();
+		mMDC1200.clear();
+		mMobileID.clear();
+		mMPT1327.clear();
+		mSiteID.clear();
+		mStatus.clear();
+		mTalkgroup.clear();
+		mUniqueID.clear();
+		
+		for( Group group: mGroups )
+		{
+			for( Alias alias: group.getAlias() )
+			{
+				for( AliasID id: alias.getId() )
+				{
+					switch( id.getType() )
+					{
+						case ESN:
+							Esn esn = (Esn)id;
+							if( esn.getEsn().contains( "*" ) )
+							{
+								mESNWildcard = true;
+
+								mESN.put( fixWildcard( esn.getEsn() ), alias );
+							}
+							else
+							{
+								mESN.put( esn.getEsn(), alias );
+							}
+							break;
+						case Fleetsync:
+							FleetsyncID fs = (FleetsyncID)id;
+							
+							if( fs.getIdent().contains( "*" ) )
+							{
+								mFleetsyncWildcard = true;
+								
+								mFleetsync.put( fixWildcard( fs.getIdent() ), alias );
+							}
+							else
+							{
+								mFleetsync.put( fs.getIdent(), alias );
+							}
+							break;
+						case LoJack:
+							mLoJack.put( (LoJackFunctionAndID)id, alias );
+							break;
+						case MDC1200:
+							MDC1200ID mdc = (MDC1200ID)id;
+							
+							if( mdc.getIdent().contains( "*" ) )
+							{
+								mMDC1200Wildcard = true;
+								
+								//Replace (*) wildcard with regex wildcard (.)
+								mMDC1200.put( fixWildcard( mdc.getIdent() ), alias );
+							}
+							else
+							{
+								mMDC1200.put( mdc.getIdent(), alias );
+							}
+							break;
+						case MPT1327:
+							MPT1327ID mpt = (MPT1327ID)id;
+							
+							String ident = mpt.getIdent();
+							
+							if( ident != null )
+							{
+								if( ident.contains( "*" ) )
+								{
+									mMPT1327Wildcard = true;
+									
+									//Replace (*) wildcard with regex wildcard (.)
+									mMPT1327.put( fixWildcard( ident ), alias );
+								}
+								else
+								{
+									mMPT1327.put( ident, alias );
+								}
+							}
+							break;
+						case MIN:
+							Min min = (Min)id;
+							
+							if( min.getMin().contains( "*" ) )
+							{
+								mMobileIDWildcard = true;
+								mMobileID.put( fixWildcard( min.getMin() ), alias );
+							}
+							else
+							{
+								mMobileID.put( min.getMin(), alias );
+							}
+							break;
+						case LTRNetUID:
+							UniqueID uid = (UniqueID)id;
+							
+							mUniqueID.put( uid.getUid(), alias );
+							break;
+						case Site:
+							SiteID siteID = (SiteID)id;
+
+							if( siteID.getSite().contains( "*" ) )
+							{
+								mSiteWildcard = true;
+								mSiteID.put( fixWildcard( siteID.getSite() ), alias );
+							}
+							else
+							{
+								mSiteID.put( siteID.getSite(), alias );
+							}
+							
+							break;
+						case Status:
+							mStatus.put( ((StatusID)id).getStatus(), alias );
+							break;
+						case Talkgroup:
+							TalkgroupID tgid = (TalkgroupID)id;
+							
+							if( tgid.getTalkgroup().contains( "*" ) )
+							{
+								mTalkgroupWildcard = true;
+								
+								//Replace (*) wildcard with regex wildcard (.)
+								mTalkgroup.put( fixWildcard( tgid.getTalkgroup() ), alias );
+							}
+							else
+							{
+								mTalkgroup.put( tgid.getTalkgroup(), alias );
+							}
+							break;
+						case NonRecordable:
+						case Priority:
+							//We don't maintain lookups for these items
+							break;
+						default:
+							mLog.warn( "Unrecognized Alias ID Type:" + id.getType().name() );
+							break;
+					}
+				}
+			}
+		}
+	}
+
+	/**
+	 * Converts user wildcard character (*) to regex single character wildcard (.)
+	 * but ignores a regex multi-character wildcard (.*)
+	 */
+	private String fixWildcard( String value )
+	{
+		if( value.contains( "*" ) && !value.contains( ".*" ) )
+		{
+			return value.replace( "*", "." );
+		}
+
+		return value;
+	}
+	
+	public Alias getSiteID( String siteID )
+	{
+		if( siteID != null )
+		{
+			if( mSiteWildcard )
+			{
+				for( String regex: mSiteID.keySet() )
+				{
+					if( siteID.matches( regex ) )
+					{
+						return mSiteID.get( regex );
+					}
+				}
+			}
+			else
+			{
+				return mSiteID.get( siteID );
+			}
+		}
+		
+		return null;
+	}
+	
+	public Alias getStatus( int status )
+	{
+		return mStatus.get( status );
+	}
+	
+	public Alias getUniqueID( int uniqueID )
+	{
+		return mUniqueID.get( uniqueID );
+	}
+	
+	public Alias getESNAlias( String esn )
+	{
+		if( esn != null )
+		{
+			if( mESNWildcard )
+			{
+				for( String regex: mESN.keySet() )
+				{
+					if( esn.matches( regex ) )
+					{
+						return mESN.get( regex );
+					}
+				}
+			}
+			else
+			{
+				return mESN.get( esn );
+			}
+		}
+		
+		return null;
+	}
+	
+
+	public Alias getFleetsyncAlias( String ident )
+	{
+		if( ident != null )
+		{
+			if( mFleetsyncWildcard )
+			{
+				for( String regex: mFleetsync.keySet() )
+				{
+					if( ident.matches( regex ) )
+					{
+						return mFleetsync.get( regex );
+					}
+				}
+			}
+			else
+			{
+				return mFleetsync.get( ident );
+			}
+		}
+		
+		return null;
+	}
+	
+	public Alias getLoJackAlias( Function function, String id )
+	{
+		if( id != null )
+		{
+			for( LoJackFunctionAndID lojack: mLoJack.keySet() )
+			{
+				if( lojack.matches( function, id ) )
+				{
+					return mLoJack.get( lojack );
+				}
+			}
+		}
+		
+		return null;
+	}
+	
+	public Alias getMDC1200Alias( String ident )
+	{
+		if( ident != null )
+		{
+			if( mMDC1200Wildcard )
+			{
+				for( String regex: mMDC1200.keySet() )
+				{
+					if( ident.matches( regex ) )
+					{
+						return mMDC1200.get( regex );
+					}
+				}
+			}
+			else
+			{
+				return mMDC1200.get( ident );
+			}
+		}
+		
+		return null;
+	}
+	
+	public Alias getMPT1327Alias( String ident )
+	{
+		if( ident != null )
+		{
+			if( mMPT1327Wildcard )
+			{
+				for( String regex: mMPT1327.keySet() )
+				{
+					if( ident.matches( regex ) )
+					{
+						return mMPT1327.get( regex );
+					}
+				}
+			}
+			else
+			{
+				return mMPT1327.get( ident );
+			}
+		}
+		
+		return null;
+	}
+	
+	public Group getGroup( Alias alias )
+	{
+		if( alias != null )
+		{
+			for( Group group: mGroups )
+			{
+				if( group.contains( alias ) )
+				{
+					return group;
+				}
+			}
+		}
+		
+		return null;
+	}
+	
+	public Alias getMobileIDNumberAlias( String ident )
+	{
+		if( ident != null )
+		{
+			if( mMobileIDWildcard )
+			{
+				for( String regex: mMobileID.keySet() )
+				{
+					if( ident.matches( regex ) )
+					{
+						return mMobileID.get( regex );
+					}
+				}
+			}
+			else
+			{
+				return mMobileID.get( ident );
+			}
+		}
+		
+		return null;
+	}
+	
+	public Alias getTalkgroupAlias( String tgid )
+	{
+		if( tgid != null )
+		{
+			if( mTalkgroupWildcard )
+			{
+				for( String regex: mTalkgroup.keySet() )
+				{
+					if( tgid.matches( regex ) )
+					{
+						return mTalkgroup.get( regex );
+					}
+				}
+			}
+			else
+			{
+				return mTalkgroup.get( tgid );
+			}
+		}
+		
+		return null;
+	}
+	
+	public String toString()
+	{
+		return mName;
+	}
+
+	@XmlAttribute
+	public String getName()
+	{
+		return mName;
+	}
+	
+	public void setName( String name )
+	{
+		mName = name;
+	}
+	
+	public ArrayList<Group> getGroup()
+	{
+		return mGroups;
+	}
+	
+	public void setGroup( ArrayList<Group> groups )
+	{
+		mGroups = groups;
+	}
+	
+	public void addGroup( Group group )
+	{
+		mGroups.add( group );
+	}
+
+	public void removeGroup( Group group )
+	{
+		mGroups.remove( group );
+	}
+
+	@Override
+    public int compareTo( AliasListOld otherAliasList )
+    {
+	    return getName().compareTo( otherAliasList.getName() );
+    }
+
+	public Alias getAlias( String value, MetadataType type )
+	{
+		switch( type )
+		{
+			case ESN:
+				return getESNAlias( value );
+			case FLEETSYNC:
+				return getFleetsyncAlias( value );
+			case MDC1200:
+				return getMDC1200Alias( value );
+			case MOBILE_ID:
+				return getMobileIDNumberAlias( value );
+			case MPT1327:
+				return getMPT1327Alias( value );
+			case SITE_ID:
+				return getSiteID( value );
+			case STATUS:
+				if( value != null )
+				{
+					try
+					{
+						return getStatus( Integer.valueOf( value ) );
+					}
+					catch( Exception e )
+					{
+						//do nothing, we couldn't parse the int value
+					}
+				}
+				break;
+			case FROM:
+			case TO:
+				return getTalkgroupAlias( value );
+			case UNIQUE_ID:
+				if( value != null )
+				{
+					try
+					{
+						return getUniqueID( Integer.valueOf( value ) );
+					}
+					catch( Exception e )
+					{
+						//do nothing, we couldn't parse the int value
+					}
+				}
+				break;
+			default:
+				break;
+		}
+		
+		return null;
+	}
+	
+}

src/playlist/version1/ChannelMapList.java

@@ -0,0 +1,79 @@
+/*******************************************************************************
+ *     SDR Trunk 
+ *     Copyright (C) 2014 Dennis Sheirer
+ * 
+ *     This program is free software: you can redistribute it and/or modify
+ *     it under the terms of the GNU General Public License as published by
+ *     the Free Software Foundation, either version 3 of the License, or
+ *     (at your option) any later version.
+ * 
+ *     This program is distributed in the hope that it will be useful,
+ *     but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *     GNU General Public License for more details.
+ * 
+ *     You should have received a copy of the GNU General Public License
+ *     along with this program.  If not, see <http://www.gnu.org/licenses/>
+ ******************************************************************************/
+package playlist.version1;
+
+import java.util.ArrayList;
+
+import javax.xml.bind.annotation.XmlElement;
+import javax.xml.bind.annotation.XmlSeeAlso;
+
+import controller.channel.map.ChannelMap;
+
+@XmlSeeAlso( ChannelMap.class )
+@Deprecated
+public class ChannelMapList
+{
+    private ArrayList<ChannelMap> mChannelMap = new ArrayList<ChannelMap>();
+
+    public ChannelMapList()
+    {
+    	/* Empty constructor for JAXB */
+    }
+    
+	@XmlElement( name = "channel_map" )
+    public ArrayList<ChannelMap> getChannelMap()
+    {
+        return mChannelMap;
+    }
+    
+    public void setChannelMap( ArrayList<ChannelMap> ChannelMaps )
+    {
+    	mChannelMap = ChannelMaps;
+    }
+    
+    public void addChannelMap( ChannelMap ChannelMap )
+    {
+        mChannelMap.add( ChannelMap );
+    }
+    
+    public void removeChannelMap( ChannelMap ChannelMap )
+    {
+        mChannelMap.remove( ChannelMap );
+    }
+    
+    public void clearChannelMaps()
+    {
+        mChannelMap.clear();
+    }
+    
+	/**
+	 * Gets the named channel map, or returns an empty map
+	 */
+	public ChannelMap getChannelMap( String name )
+	{
+		for( ChannelMap map: mChannelMap )
+		{
+			if( map.getName().equalsIgnoreCase( name ) )
+			{
+				return map;
+			}
+		}
+		
+		return new ChannelMap();
+	}
+}

src/playlist/version1/Group.java

@@ -0,0 +1,76 @@
+/*******************************************************************************
+ *     SDR Trunk 
+ *     Copyright (C) 2014 Dennis Sheirer
+ * 
+ *     This program is free software: you can redistribute it and/or modify
+ *     it under the terms of the GNU General Public License as published by
+ *     the Free Software Foundation, either version 3 of the License, or
+ *     (at your option) any later version.
+ * 
+ *     This program is distributed in the hope that it will be useful,
+ *     but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *     GNU General Public License for more details.
+ * 
+ *     You should have received a copy of the GNU General Public License
+ *     along with this program.  If not, see <http://www.gnu.org/licenses/>
+ ******************************************************************************/
+package playlist.version1;
+
+import java.util.ArrayList;
+
+import javax.xml.bind.annotation.XmlAttribute;
+
+import alias.Alias;
+
+@Deprecated
+public class Group
+{
+	private String mName;
+	private ArrayList<Alias> mAliases = new ArrayList<Alias>();
+	
+	public Group()
+	{
+	}
+	
+	public String toString()
+	{
+		return "Group: " + mName;
+	}
+
+	@XmlAttribute
+	public String getName()
+	{
+		return mName;
+	}
+	
+	public void setName( String name )
+	{
+		mName = name;
+	}
+	
+	public ArrayList<Alias> getAlias()
+	{
+		return mAliases;
+	}
+	
+	public void setAlias( ArrayList<Alias> aliases )
+	{
+		mAliases = aliases;
+	}
+
+	public void addAlias( Alias alias )
+	{
+		mAliases.add( alias );
+	}
+	
+	public void removeAlias( Alias alias )
+	{
+		mAliases.remove( alias );
+	}
+	
+	public boolean contains( Alias alias )
+	{
+		return mAliases.contains( alias );
+	}
+}

src/playlist/version1/PlaylistConverterV1ToV2.java

@@ -0,0 +1,168 @@
+package playlist.version1;
+
+import java.io.FileInputStream;
+import java.io.IOException;
+import java.io.InputStream;
+import java.nio.file.Files;
+import java.nio.file.Path;
+import java.util.ArrayList;
+import java.util.List;
+
+import javax.xml.bind.JAXBContext;
+import javax.xml.bind.JAXBException;
+import javax.xml.bind.Unmarshaller;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import playlist.PlaylistV2;
+import alias.Alias;
+import controller.channel.Channel;
+import controller.channel.map.ChannelMap;
+
+public class PlaylistConverterV1ToV2
+{
+	private final static Logger mLog = 
+			LoggerFactory.getLogger( PlaylistConverterV1ToV2.class );
+
+	private PlaylistV2 mConvertedPlaylist;
+	private List<String> mErrors = new ArrayList<>();
+	
+    @SuppressWarnings( "deprecation" )
+	public PlaylistConverterV1ToV2( Path path )
+	{
+		PlaylistV1 playlistVersion1 = null;
+        
+        if( path != null && Files.exists( path ) )
+		{
+			mLog.info( "attempting playlist v1 to v2 conversion [" + 
+							path.toString() + "]" );
+			
+			JAXBContext context = null;
+			
+			InputStream in = null;
+			
+			try
+	        {
+		        in = new FileInputStream( path.toString() );
+
+				try
+		        {
+			        context = JAXBContext.newInstance( PlaylistV1.class );
+
+			        Unmarshaller m = context.createUnmarshaller();
+
+			        playlistVersion1 = (PlaylistV1)m.unmarshal( in );
+		        }
+		        catch ( JAXBException e )
+		        {
+		        	mErrors.add( "Couldn't unmarshall version 1 playlist - " + 
+		        				e.getLocalizedMessage() );
+		        }
+	        }
+	        catch ( Exception e )
+	        {
+	        	mErrors.add( "Couldn't open version 1 playlist - [" + 
+	        			path.toString() + "] - " + e.getLocalizedMessage() );
+	        }
+			finally
+			{
+				if( in != null )
+				{
+					try
+	                {
+		                in.close();
+	                }
+	                catch ( IOException e )
+	                {
+	                	mLog.error( "exception while closing " +
+	                			"the playlist file inputstream reader", e );
+	                }
+				}
+			}
+		}
+		else
+		{
+			mErrors.add( "version 1 playlist is null or not found [" + 
+					path.toString() + "]" );
+		}
+
+		if( playlistVersion1 != null )
+		{
+			mConvertedPlaylist = new PlaylistV2();
+			
+			if( playlistVersion1.hasSystemList() )
+			{
+				SystemList systemList = playlistVersion1.getSystemList();
+				
+				for( playlist.version1.System system: systemList.getSystem() )
+				{
+					for( Site site: system.getSite() )
+					{
+						for( Channel channel: site.getChannel() )
+						{
+							channel.setSystem( system.getName() );
+							channel.setSite( site.getName() );
+							
+							mConvertedPlaylist.getChannels().add( channel );
+						}
+					}
+				}
+			}
+
+			if( playlistVersion1.hasAliasDirectory() )
+			{
+				AliasDirectory aliasDirectory = playlistVersion1.getAliasDirectory();
+				
+				for( AliasListOld list: aliasDirectory.getAliasList() )
+				{
+					for( Group group: list.getGroup() )
+					{
+						for( Alias alias: group.getAlias() )
+						{
+							alias.setList( list.getName() );
+							alias.setGroup( group.getName() );
+							
+							mConvertedPlaylist.getAliases().add( alias );
+						}
+					}
+				}
+			}
+			
+			if( playlistVersion1.hasChannelMapList() )
+			{
+				//Move the channel maps out of the channel map list
+				ChannelMapList channelMapList = playlistVersion1.getChannelMapList();
+				
+				List<ChannelMap> channelMaps = channelMapList.getChannelMap();
+				
+				if( channelMaps != null && !channelMaps.isEmpty() )
+				{
+					mConvertedPlaylist.getChannelMaps().addAll( channelMaps );
+				}
+			}
+			
+			mLog.info( "Converted [" + mConvertedPlaylist.getChannels().size() + 
+					"] channels to new playlist format" );
+			mLog.info( "Converted [" + mConvertedPlaylist.getAliases().size() + 
+					"] aliases to new playlist format" );
+			mLog.info( "Converted [" + mConvertedPlaylist.getChannelMaps().size() + 
+					"] channel maps to new playlist format" );
+		}
+	}
+	
+	public PlaylistV2 getConvertedPlaylist()
+	{
+		return mConvertedPlaylist;
+	}
+	
+	public List<String> getErrorMessages()
+	{
+		return mErrors;
+	}
+	
+	public boolean hasErrorMessages()
+	{
+		return !mErrors.isEmpty();
+	}
+}

src/playlist/version1/PlaylistV1.java

@@ -0,0 +1,106 @@
+/*******************************************************************************
+ *     SDR Trunk 
+ *     Copyright (C) 2014 Dennis Sheirer
+ * 
+ *     This program is free software: you can redistribute it and/or modify
+ *     it under the terms of the GNU General Public License as published by
+ *     the Free Software Foundation, either version 3 of the License, or
+ *     (at your option) any later version.
+ * 
+ *     This program is distributed in the hope that it will be useful,
+ *     but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *     GNU General Public License for more details.
+ * 
+ *     You should have received a copy of the GNU General Public License
+ *     along with this program.  If not, see <http://www.gnu.org/licenses/>
+ ******************************************************************************/
+package playlist.version1;
+
+import javax.xml.bind.annotation.XmlElement;
+import javax.xml.bind.annotation.XmlRootElement;
+import javax.xml.bind.annotation.XmlSeeAlso;
+
+import alias.Alias;
+import controller.channel.Channel;
+
+@XmlSeeAlso( { AliasDirectory.class,
+			   Alias.class,
+			   Channel.class,
+			   ChannelMapList.class,
+			   SystemList.class } )
+
+@Deprecated
+@XmlRootElement( name = "playlist" )
+public class PlaylistV1
+{
+	//Note: these are for legacy version 1 format playlists
+	private AliasDirectory mAliasDirectory = new AliasDirectory();
+	private ChannelMapList mChannelMapList = new ChannelMapList();
+	private SystemList mSystemList = new SystemList();
+
+	public PlaylistV1()
+	{
+	}
+	
+	@XmlElement( name = "alias_directory" )
+	public AliasDirectory getAliasDirectory()
+	{
+		mAliasDirectory.refresh();
+		
+		return mAliasDirectory;
+	}
+	
+	
+	public void setAliasDirectory( AliasDirectory directory )
+	{
+		mAliasDirectory = directory;
+	}
+
+	public boolean hasAliasDirectory()
+	{
+		return mAliasDirectory != null && 
+			   mAliasDirectory.getAliasList() != null && 
+			   !mAliasDirectory.getAliasList().isEmpty();
+	}
+
+	
+	@XmlElement( name = "system_list" )
+	public SystemList getSystemList()
+	{
+		return mSystemList;
+	}
+
+	
+	public void setSystemList( SystemList list )
+	{
+		mSystemList = list;
+	}
+	
+	public boolean hasSystemList()
+	{
+		return mSystemList != null && 
+			   mSystemList.getSystem() != null && 
+			   !mSystemList.getSystem().isEmpty();
+	}
+	
+	
+	@XmlElement( name = "channel_maps" )
+	public ChannelMapList getChannelMapList()
+	{
+		return mChannelMapList;
+	}
+	
+	public boolean hasChannelMapList()
+	{
+		return mChannelMapList != null &&
+			   mChannelMapList.getChannelMap() != null &&
+			   !mChannelMapList.getChannelMap().isEmpty();
+	}
+	
+	
+	public void setChannelMapList( ChannelMapList list )
+	{
+		mChannelMapList = list;
+	}
+}

src/playlist/version1/Site.java

@@ -0,0 +1,87 @@
+/*******************************************************************************
+ *     SDR Trunk 
+ *     Copyright (C) 2014 Dennis Sheirer
+ * 
+ *     This program is free software: you can redistribute it and/or modify
+ *     it under the terms of the GNU General Public License as published by
+ *     the Free Software Foundation, either version 3 of the License, or
+ *     (at your option) any later version.
+ * 
+ *     This program is distributed in the hope that it will be useful,
+ *     but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *     GNU General Public License for more details.
+ * 
+ *     You should have received a copy of the GNU General Public License
+ *     along with this program.  If not, see <http://www.gnu.org/licenses/>
+ ******************************************************************************/
+package playlist.version1;
+
+import java.util.ArrayList;
+
+import javax.xml.bind.annotation.XmlAttribute;
+import javax.xml.bind.annotation.XmlRootElement;
+import javax.xml.bind.annotation.XmlSeeAlso;
+
+import controller.channel.Channel;
+
+@XmlSeeAlso( { Channel.class } )
+@XmlRootElement( name = "site" )
+@Deprecated
+public class Site
+{
+    private String mName;
+    
+    private ArrayList<Channel> mChannel = new ArrayList<Channel>();
+
+    public Site()
+    {
+        this( "New Site" );
+    }
+    
+    public Site( String name )
+    {
+        mName = name;
+    }
+    
+    public String toString()
+    {
+        return mName;
+    }
+
+	@XmlAttribute
+    public String getName()
+    {
+        return mName;
+    }
+    
+    public void setName( String name )
+    {
+        mName = name;
+    }
+
+    public ArrayList<Channel> getChannel()
+    {
+        return mChannel;
+    }
+    
+    public void setChannel( ArrayList<Channel> configs )
+    {
+    	mChannel = configs;
+    }
+    
+    public void addChannel( Channel channel )
+    {
+        mChannel.add( channel );
+    }
+    
+    public void removeChannel( Channel channel )
+    {
+        mChannel.remove( channel );
+    }
+    
+    public void removeAllChannels()
+    {
+        mChannel.clear();
+    }
+}

src/playlist/version1/System.java

@@ -0,0 +1,84 @@
+/*******************************************************************************
+ *     SDR Trunk 
+ *     Copyright (C) 2014 Dennis Sheirer
+ * 
+ *     This program is free software: you can redistribute it and/or modify
+ *     it under the terms of the GNU General Public License as published by
+ *     the Free Software Foundation, either version 3 of the License, or
+ *     (at your option) any later version.
+ * 
+ *     This program is distributed in the hope that it will be useful,
+ *     but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *     GNU General Public License for more details.
+ * 
+ *     You should have received a copy of the GNU General Public License
+ *     along with this program.  If not, see <http://www.gnu.org/licenses/>
+ ******************************************************************************/
+package playlist.version1;
+
+import java.util.ArrayList;
+
+import javax.xml.bind.annotation.XmlAttribute;
+import javax.xml.bind.annotation.XmlRootElement;
+import javax.xml.bind.annotation.XmlSeeAlso;
+
+@XmlSeeAlso( { Site.class } )
+@XmlRootElement( name = "system" )
+@Deprecated
+public class System
+{
+    private String mName;
+    private ArrayList<Site> mSite = new ArrayList<Site>();
+
+    public System()
+    {
+        this( "New System" );
+    }
+    
+    public System( String name )
+    {
+        mName = name;
+    }
+    
+	@XmlAttribute
+    public String getName()
+    {
+        return mName;
+    }
+    
+    public void setName( String name )
+    {
+        mName = name;
+    }
+    
+    public ArrayList<Site> getSite()
+    {
+        return mSite;
+    }
+    
+    public void setSite( ArrayList<Site> sites )
+    {
+    	mSite = sites;
+    }
+    
+    public void addSite( Site site )
+    {
+        mSite.add( site );
+    }
+    
+    public void removeSite( Site site )
+    {
+        mSite.remove( site );
+    }
+    
+    public void clearSites()
+    {
+        mSite.clear();
+    }
+    
+    public String toString()
+    {
+        return mName;
+    }
+}

src/playlist/version1/SystemList.java

@@ -0,0 +1,62 @@
+/*******************************************************************************
+ *     SDR Trunk 
+ *     Copyright (C) 2014 Dennis Sheirer
+ * 
+ *     This program is free software: you can redistribute it and/or modify
+ *     it under the terms of the GNU General Public License as published by
+ *     the Free Software Foundation, either version 3 of the License, or
+ *     (at your option) any later version.
+ * 
+ *     This program is distributed in the hope that it will be useful,
+ *     but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *     GNU General Public License for more details.
+ * 
+ *     You should have received a copy of the GNU General Public License
+ *     along with this program.  If not, see <http://www.gnu.org/licenses/>
+ ******************************************************************************/
+package playlist.version1;
+
+import java.util.ArrayList;
+
+import javax.xml.bind.annotation.XmlRootElement;
+import javax.xml.bind.annotation.XmlSeeAlso;
+
+@SuppressWarnings( "deprecation" )
+@XmlSeeAlso( { playlist.version1.System.class } )
+
+@XmlRootElement( name = "system_list" )
+@Deprecated
+public class SystemList
+{
+    private ArrayList<System> mSystem = new ArrayList<System>();
+
+    public SystemList()
+    {
+    }
+    
+    public ArrayList<System> getSystem()
+    {
+        return mSystem;
+    }
+    
+    public void setSystem( ArrayList<System> systems )
+    {
+    	mSystem = systems;
+    }
+    
+    public void addSystem( System system )
+    {
+        mSystem.add( system );
+    }
+    
+    public void removeSystem( System system )
+    {
+        mSystem.remove( system );
+    }
+    
+    public void clearSystems()
+    {
+        mSystem.clear();
+    }
+}