Adds AliasModel and AliasEvent and support for conversion from legacy

playlist format.

Renames PlaylistEditor to ChannelController

src/alias/Alias.java

@@ -29,6 +29,8 @@ import audio.inverted.AudioType;
 
 public class Alias
 {
+	private String mList;
+	private String mGroup;
 	private String mName;
 	private int mColor;
 	private String mIconName;
@@ -44,7 +46,7 @@ public class Alias
 		return getName();
 	}
 
-	@XmlAttribute
+	@XmlAttribute( name="name" )
 	public String getName()
 	{
 		return mName;
@@ -55,6 +57,38 @@ public class Alias
 		mName = name;
 	}
 
+	@XmlAttribute( name="list" )
+	public String getList()
+	{
+		return mList;
+	}
+	
+	public void setList( String list )
+	{
+		mList = list;
+	}
+	
+	public boolean hasList()
+	{
+		return mList != null;
+	}
+
+	@XmlAttribute( name="group" )
+	public String getGroup()
+	{
+		return mGroup;
+	}
+	
+	public void setGroup( String group )
+	{
+		mGroup = group;
+	}
+	
+	public boolean hasGroup()
+	{
+		return mGroup != null;
+	}
+
 	@XmlAttribute
 	public int getColor()
 	{

src/alias/AliasDirectory.java

@@ -40,6 +40,11 @@ public class AliasDirectory
 			list.update();
 		}
 	}
+	
+	public void clearAliasLists()
+	{
+		mAliasList.clear();
+	}
 
 	@XmlElement( name = "alias_list" )
 	public ArrayList<AliasList> getAliasList()

src/alias/AliasEvent.java

@@ -0,0 +1,55 @@
+/*******************************************************************************
+ *     SDR Trunk 
+ *     Copyright (C) 2014-2016 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 alias;
+
+public class AliasEvent
+{
+	private Alias mAlias;
+	private Event mEvent;
+
+	/**
+	 * AliasEvent - event describing any changes to an alias
+	 * @param alias - alias that changed
+	 * @param event - change event
+	 */
+	public AliasEvent( Alias alias, Event event )
+	{
+		mAlias = alias;
+		mEvent = event;
+	}
+	
+	public Alias getAlias()
+	{
+		return mAlias;
+	}
+	
+	public Event getEvent()
+	{
+		return mEvent;
+	}
+	
+	/**
+	 * Channel events to describe the specific event
+	 */
+	public enum Event
+	{
+		ADD,
+		CHANGE,
+		DELETE;
+	}
+}

src/alias/AliasModel.java

@@ -0,0 +1,273 @@
+/*******************************************************************************
+ *     SDR Trunk 
+ *     Copyright (C) 2014-2016 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 alias;
+
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.List;
+import java.util.concurrent.CopyOnWriteArrayList;
+
+import javax.swing.event.TableModelEvent;
+import javax.swing.event.TableModelListener;
+import javax.swing.table.TableModel;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import alias.AliasEvent.Event;
+import sample.Broadcaster;
+import sample.Listener;
+
+/**
+ * Alias Model
+ */
+public class AliasModel implements TableModel
+{
+	private final static Logger mLog = LoggerFactory.getLogger( AliasModel.class );
+
+	private List<Alias> mAliases = new ArrayList<>();
+	private List<TableModelListener> mTableModelListeners = new CopyOnWriteArrayList<>();
+	private Broadcaster<AliasEvent> mAliasEventBroadcaster = new Broadcaster<>();
+
+	public AliasModel()
+	{
+	}
+
+	/**
+	 * Unmodifiable list of all aliases currently in the model
+	 */
+	public List<Alias> getAliases()
+	{
+		return Collections.unmodifiableList( mAliases );
+	}
+	
+	public Alias getAliasAtIndex( int row )
+	{
+		if( mAliases.size() >= row )
+		{
+			return mAliases.get( row );
+		}
+		
+		return null;
+	}
+	
+	/**
+	 * Returns a list of unique alias list names from across the alias set
+	 */
+	public List<String> getListNames()
+	{
+		List<String> listNames = new ArrayList<>();
+		
+		for( Alias alias: mAliases )
+		{
+			if( alias.hasList() && !listNames.contains( alias.getList() ) )
+			{
+				listNames.add( alias.getList() );
+			}
+		}
+		
+		Collections.sort( listNames );
+		
+		return listNames;
+	}
+	
+	/**
+	 * Returns a list of alias group names for all aliases that have a matching
+	 * list name value
+	 */
+	public List<String> getGroupNames( String listName )
+	{
+		List<String> groupNames = new ArrayList<>();
+
+		if( listName != null )
+		{
+			for( Alias alias: mAliases )
+			{
+				if( alias.hasList() && 
+					alias.hasGroup() &&
+					listName.equals( alias.getList() ) &&
+					!groupNames.contains( alias.getGroup() ) )
+				{
+					groupNames.add( alias.getGroup() );
+				}
+			}
+		}
+
+		Collections.sort( groupNames );
+		
+		return groupNames;
+	}
+
+	/**
+	 * Bulk loading of aliases
+	 */
+	public void addAliases( List<Alias> aliases )
+	{
+		for( Alias alias: aliases )
+		{
+			addAlias( alias );
+		}
+	}
+
+	/**
+	 * Adds the alias to the model
+	 */
+	public int addAlias( Alias alias )
+	{
+		if( alias != null )
+		{
+			mAliases.add( alias );
+
+			int index = mAliases.size() - 1;
+
+			broadcast( new TableModelEvent( this, index, index, 
+				TableModelEvent.ALL_COLUMNS, TableModelEvent.INSERT ) );
+			
+			broadcast( new AliasEvent( alias, Event.ADD ) );
+
+			return index;
+		}
+		
+		return -1;
+	}
+	
+	/**
+	 * Removes the channel from the model and broadcasts a channel remove event
+	 */
+	public void removeAlias( Alias alias )
+	{
+		if( alias != null )
+		{
+			int index = mAliases.indexOf( alias );
+			
+			mAliases.remove( alias );
+			
+			broadcast( new TableModelEvent( this, index, index, 
+				TableModelEvent.ALL_COLUMNS, TableModelEvent.DELETE ) );
+			
+			broadcast( new AliasEvent( alias, Event.DELETE ) );
+		}
+	}
+
+	@Override
+	public int getRowCount()
+	{
+		return mAliases.size();
+	}
+
+	@Override
+	public int getColumnCount()
+	{
+		return 5;
+	}
+
+	@Override
+	public String getColumnName( int columnIndex )
+	{
+		switch( columnIndex )
+		{
+			case 0:
+				return "List";
+			case 1:
+				return "Group";
+			case 2:
+				return "Name";
+			case 3:
+				return "Icon";
+			case 4:
+				return "Color";
+		}
+		
+		return null;
+	}
+
+	@Override
+	public Class<?> getColumnClass( int columnIndex )
+	{
+		return String.class;
+	}
+
+	@Override
+	public boolean isCellEditable( int rowIndex, int columnIndex )
+	{
+		return false;
+	}
+
+	@Override
+	public Object getValueAt( int rowIndex, int columnIndex )
+	{
+		Alias alias = mAliases.get( rowIndex );
+		
+		switch( columnIndex )
+		{
+			case 0:
+				return alias.getList();
+			case 1:
+				return alias.getGroup();
+			case 2:
+				return alias.getName();
+			case 3:
+				return alias.getIconName();
+			case 4:
+				return alias.getColor();
+		}
+		
+		return null;
+	}
+
+	@Override
+	public void setValueAt( Object aValue, int rowIndex, int columnIndex )
+	{
+		throw new IllegalArgumentException( "Not yet implemented" );
+	}
+	
+	private void broadcast( TableModelEvent event )
+	{
+		for( TableModelListener listener: mTableModelListeners )
+		{
+			listener.tableChanged( event );
+		}
+	}
+
+	@Override
+	public void addTableModelListener( TableModelListener listener )
+	{
+		mTableModelListeners.add( listener );
+	}
+
+	@Override
+	public void removeTableModelListener( TableModelListener listener )
+	{
+		mTableModelListeners.remove( listener );
+	}
+	
+	public void broadcast( AliasEvent event )
+	{
+		mAliasEventBroadcaster.broadcast( event );
+	}
+	
+	public void addAliasEventListener( Listener<AliasEvent> listener )
+	{
+		mAliasEventBroadcaster.addListener( listener );
+	}
+	
+	public void removeAliasEventListener( Listener<AliasEvent> listener )
+	{
+		mAliasEventBroadcaster.removeListener( listener );
+	}
+}

src/alias/id/talkgroup/TalkgroupID.java

@@ -43,11 +43,6 @@ public class TalkgroupID extends AliasID
 		mTalkgroup = talkgroup;
 	}
 
-	public boolean hasAudioType()
-	{
-		return false;
-	}
-	
 	public String toString()
 	{
 		StringBuilder sb = new StringBuilder();

src/alias/id/talkgroup/TalkgroupIDEditor.java

@@ -36,6 +36,10 @@ public class TalkgroupIDEditor extends JPanel implements ActionListener
     private TalkgroupIDNode mTalkgroupIDNode;
     
     private JTextField mTextTalkgroupID;
+<<<<<<< Upstream, based on origin/master
+=======
+    private JLabel mLabelAudio;
+>>>>>>> 92e63f7 Adds AliasModel and AliasEvent and support for conversion from legacy playlist format.
     
     private String mHelpText = "Enter a formatted talkgroup identifier.\n\n"
     		+ "P25 Talkgroup Format: hexadecimal value, 4 characters for "