#30 WIP - broadcastify multi-channel streaming is functional.

src/alias/AliasList.java

@@ -212,6 +212,7 @@ public class AliasList implements Listener<AliasEvent>
                             mTalkgroup.put(tgid, alias);
                         }
                         break;
+                    case BROADCAST_CHANNEL:
                     case NON_RECORDABLE:
                     case PRIORITY:
                         //We don't maintain lookups for these items

src/alias/id/broadcast/BroadcastChannel.java

@@ -23,16 +23,42 @@ import alias.id.AliasIDType;
 
 import javax.xml.bind.annotation.XmlAttribute;
 
-public class BroadcastChannel extends AliasID
+public class BroadcastChannel extends AliasID implements Comparable<BroadcastChannel>
 {
 	private String mChannelName;
 
 	public BroadcastChannel()
 	{
+		//JAXB Constructor
+	}
+
+	@Override
+	public int compareTo(BroadcastChannel other)
+	{
+		if(mChannelName != null && other.getChannelName() != null)
+		{
+			return mChannelName.compareTo(other.getChannelName());
+		}
+		else if(mChannelName != null)
+		{
+			return -1;
+		}
+		else
+		{
+			return 1;
+		}
 	}
 
 	/**
-	 * Name of the broadcast channel configuration
+	 * Creates a named broadcast channel
+	 */
+	public BroadcastChannel(String channelName)
+	{
+		mChannelName = channelName;
+	}
+
+	/**
+	 * Name of the broadcastAudio channel configuration
 	 */
 	@XmlAttribute(name="channel")
 	public String getChannelName()
@@ -41,7 +67,7 @@ public class BroadcastChannel extends AliasID
 	}
 
 	/**
-	 * Sets the name of the broadcast channel configuration
+	 * Sets the name of the broadcastAudio channel configuration
 	 */
 	public void setChannelName(String channel)
 	{

src/alias/id/broadcast/BroadcastChannelEditor.java

@@ -19,12 +19,15 @@
 package alias.id.broadcast;
 
 import alias.id.AliasID;
+import audio.broadcast.BroadcastConfiguration;
 import audio.broadcast.BroadcastModel;
 import gui.editor.DocumentListenerEditor;
 import net.miginfocom.swing.MigLayout;
 
 import javax.swing.*;
 import java.awt.*;
+import java.awt.event.ActionEvent;
+import java.awt.event.ActionListener;
 import java.awt.event.MouseAdapter;
 import java.awt.event.MouseEvent;
 import java.util.List;
@@ -40,16 +43,14 @@ public class BroadcastChannelEditor extends DocumentListenerEditor<AliasID>
 			+ "streaming server";
 
 	private JComboBox<String> mBroadcastConfigurations;
+	private BroadcastModel mBroadcastModel;
 
 	public BroadcastChannelEditor(AliasID aliasID, BroadcastModel broadcastModel)
 	{
-        List<String> channelNames = broadcastModel.getBroadcastConfigurationNames();
-
-        mBroadcastConfigurations = new JComboBox<String>(channelNames.toArray(new String[channelNames.size()]));
-
-        setItem( aliasID );
+		mBroadcastModel = broadcastModel;
 
 		initGUI();
+		setItem( aliasID );
 	}
 	
 	private void initGUI()
@@ -58,15 +59,20 @@ public class BroadcastChannelEditor extends DocumentListenerEditor<AliasID>
 
 		add( new JLabel( "Broadcast Channel" ), "grow" );
 
+		List<String> channelNames = mBroadcastModel.getBroadcastConfigurationNames();
+
+		mBroadcastConfigurations = new JComboBox<String>(channelNames.toArray(new String[channelNames.size()]));
+		mBroadcastConfigurations.addActionListener(new ActionListener()
+		{
+			@Override
+			public void actionPerformed(ActionEvent e)
+			{
+				setModified(true);
+			}
+		});
+
         add(mBroadcastConfigurations, "grow");
 
-        BroadcastChannel channel = (BroadcastChannel)getItem();
-
-        if(channel.isValid())
-        {
-            mBroadcastConfigurations.setSelectedItem(channel.getChannelName());
-        }
-
 		JLabel help = new JLabel( "Help ..." );
 		help.setForeground( Color.BLUE.brighter() );
 		help.setCursor( new Cursor( Cursor.HAND_CURSOR ) );
@@ -82,10 +88,42 @@ public class BroadcastChannelEditor extends DocumentListenerEditor<AliasID>
 
 		add( help, "align left" );
 	}
-	
+
+	@Override
+	public void setItem(AliasID item)
+	{
+		super.setItem(item);
+
+		if(item instanceof BroadcastChannel)
+		{
+            BroadcastChannel channel = (BroadcastChannel)item;
+
+            if(channel.isValid())
+            {
+                mBroadcastConfigurations.setSelectedItem(channel.getChannelName());
+            }
+		}
+
+		setModified(false);
+	}
+
 	@Override
 	public void save()
 	{
-        ((BroadcastChannel)getItem()).setChannelName((String)mBroadcastConfigurations.getSelectedItem());
+        String channel = (String)mBroadcastConfigurations.getSelectedItem();
+
+        BroadcastConfiguration selectedConfiguration = mBroadcastModel.getBroadcastConfiguration(channel);
+
+
+		if(selectedConfiguration != null)
+		{
+			((BroadcastChannel)getItem()).setChannelName(selectedConfiguration.getName());
+		}
+		else
+		{
+			((BroadcastChannel)getItem()).setChannelName(null);
+		}
 	}
+
+
 }