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/module/decode/event/CallEventAliasCellRenderer.java

@@ -20,9 +20,6 @@ package module.decode.event;
 import javax.swing.ImageIcon;
 import javax.swing.table.DefaultTableCellRenderer;
 
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
 import settings.SettingsManager;
 import alias.Alias;
 
@@ -35,9 +32,6 @@ public class CallEventAliasCellRenderer extends DefaultTableCellRenderer
 {
 	private static final long serialVersionUID = 1L;
 
-	private final static Logger mLog = LoggerFactory
-			.getLogger( CallEventAliasCellRenderer.class );
-
 	private SettingsManager mSettingsManager;
 	
 	public CallEventAliasCellRenderer( SettingsManager settingsManager )

src/module/decode/event/CallEventModel.java

@@ -25,20 +25,13 @@ import java.util.List;
 import javax.swing.table.AbstractTableModel;
 
 import module.decode.event.CallEvent.CallEventType;
-
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
 import sample.Listener;
 
 public class CallEventModel extends AbstractTableModel implements Listener<CallEvent>
 {
     private static final long serialVersionUID = 1L;
 
-	private final static Logger mLog = LoggerFactory.getLogger( CallEventModel.class );
-
-	private static DecimalFormat mFrequencyFormatter = 
-			new DecimalFormat( "0.000000" );
+	private static DecimalFormat mFrequencyFormatter = new DecimalFormat( "0.000000" );
     
     public static final int TIME = 0;
     public static final int EVENT = 1;

src/module/decode/event/CallEventPanel.java

@@ -23,12 +23,14 @@ import javax.swing.JPanel;
 import javax.swing.JScrollPane;
 import javax.swing.JTable;
 
+import module.ProcessingChain;
 import net.miginfocom.swing.MigLayout;
 import settings.SettingsManager;
 import controller.channel.Channel;
 import controller.channel.ChannelEvent;
 import controller.channel.ChannelEvent.Event;
 import controller.channel.ChannelEventListener;
+import controller.channel.ChannelProcessingManager;
 
 public class CallEventPanel extends JPanel implements ChannelEventListener
 {
@@ -37,9 +39,13 @@ public class CallEventPanel extends JPanel implements ChannelEventListener
     private JScrollPane mEmptyScroller;
     private Channel mDisplayedChannel;
     private CallEventAliasCellRenderer mRenderer;
+    private ChannelProcessingManager mChannelProcessingManager;
 
-	public CallEventPanel( SettingsManager settingsManager )
+	public CallEventPanel( SettingsManager settingsManager, 
+						   ChannelProcessingManager channelProcessingManager )
 	{
+		mChannelProcessingManager = channelProcessingManager;
+		
     	setLayout( new MigLayout("insets 0 0 0 0 ", "[grow,fill]", "[grow,fill]") );
 
     	JTable table = new JTable( new CallEventModel() );
@@ -62,45 +68,54 @@ public class CallEventPanel extends JPanel implements ChannelEventListener
 	@Override
     public void channelChanged( final ChannelEvent event )
     {
-		if( event.getEvent() == Event.CHANGE_SELECTED && 
+		if( event.getEvent() == Event.NOTIFICATION_SELECTION_CHANGE && 
 			event.getChannel().isSelected() )
 		{
 			if( mDisplayedChannel == null || 
 				( mDisplayedChannel != null && 
 				  mDisplayedChannel != event.getChannel() ) )
 			{
-				EventQueue.invokeLater( new Runnable()
-				{
-					@Override
-					public void run()
-					{
-						removeAll();
-						
-						JTable table = new JTable(
-								event.getChannel().getCallEventModel() );
-
-						table.setAutoCreateRowSorter( true );
-				    	table.setAutoResizeMode( JTable.AUTO_RESIZE_LAST_COLUMN );
-						
-						table.getColumnModel().getColumn( CallEventModel.FROM_ALIAS )
-						.setCellRenderer( mRenderer );
-
-						table.getColumnModel().getColumn( CallEventModel.TO_ALIAS )
-						.setCellRenderer( mRenderer );
-						
-						add( new JScrollPane( table ) );
-						
-						mDisplayedChannel = event.getChannel();
-						
-						revalidate();
-						repaint();
-					}
-				} );
+				ProcessingChain chain = mChannelProcessingManager
+						.getProcessingChain( event.getChannel() );
 				
+				if( chain != null )
+				{
+					final CallEventModel model = chain.getCallEventModel();
+					
+					if( model != null )
+					{
+						EventQueue.invokeLater( new Runnable()
+						{
+							@Override
+							public void run()
+							{
+								removeAll();
+								
+								JTable table = new JTable( model );
+
+								table.setAutoCreateRowSorter( true );
+						    	table.setAutoResizeMode( JTable.AUTO_RESIZE_LAST_COLUMN );
+								
+								table.getColumnModel().getColumn( CallEventModel.FROM_ALIAS )
+								.setCellRenderer( mRenderer );
+
+								table.getColumnModel().getColumn( CallEventModel.TO_ALIAS )
+								.setCellRenderer( mRenderer );
+								
+								add( new JScrollPane( table ) );
+								
+								mDisplayedChannel = event.getChannel();
+								
+								revalidate();
+								repaint();
+							}
+						} );
+					}
+				}
 			}
 		}
-		else if( event.getEvent() == Event.CHANNEL_PROCESSING_STOPPED ||
-				 event.getEvent() == Event.CHANNEL_DISABLED )
+		else if( event.getEvent() == Event.NOTIFICATION_PROCESSING_STOP ||
+				 event.getEvent() == Event.REQUEST_DISABLE )
 		{
 			if( mDisplayedChannel != null && 
 				mDisplayedChannel == event.getChannel() )

src/module/decode/event/MessageActivityModel.java

@@ -1,6 +1,6 @@
 /*******************************************************************************
  *     SDR Trunk 
- *     Copyright (C) 2014 Dennis Sheirer
+ *     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
@@ -32,11 +32,11 @@ public class MessageActivityModel extends AbstractTableModel
 								  implements Listener<Message>
 {
     private static final long serialVersionUID = 1L;
-    private static final int sTIME = 0;
-    private static final int sPROTOCOL = 1;
-    private static final int sERROR_STATUS = 2;
-    private static final int sMESSAGE = 3;
-    private static final int sMESSAGE_BITS = 4;
+    private static final int TIME = 0;
+    private static final int PROTOCOL = 1;
+    private static final int ERROR_STATUS = 2;
+    private static final int MESSAGE = 3;
+    private static final int MESSAGE_BITS = 4;
 
 	protected int mMaxMessages = 500;
 	protected LinkedList<Message> mMessages = new LinkedList<Message>();
@@ -174,18 +174,18 @@ public class MessageActivityModel extends AbstractTableModel
 		
 		switch( columnIndex )
 		{
-			case sTIME:
+			case TIME:
 				return mSDFTime.format( new Date( message.getTimeReceived() ) );
-			case sPROTOCOL:
+			case PROTOCOL:
 				return message.getProtocol();
-			case sERROR_STATUS:
+			case ERROR_STATUS:
 				return message.getErrorStatus();
-			case sMESSAGE:
+			case MESSAGE:
 				return message.getMessage();
-			case sMESSAGE_BITS:
+			case MESSAGE_BITS:
 				return message.getBinaryMessage();
 		}
 		
 		return null;
     }
-}
+}

src/module/decode/event/MessageActivityPanel.java

@@ -1,6 +1,6 @@
 /*******************************************************************************
  *     SDR Trunk 
- *     Copyright (C) 2014 Dennis Sheirer
+ *     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
@@ -36,6 +36,7 @@ import javax.swing.event.ChangeEvent;
 import javax.swing.event.ChangeListener;
 
 import message.Message;
+import module.ProcessingChain;
 import net.miginfocom.swing.MigLayout;
 
 import org.slf4j.Logger;
@@ -48,6 +49,7 @@ import controller.channel.Channel;
 import controller.channel.ChannelEvent;
 import controller.channel.ChannelEvent.Event;
 import controller.channel.ChannelEventListener;
+import controller.channel.ChannelProcessingManager;
 import filter.FilterEditorPanel;
 import filter.FilterSet;
 
@@ -63,16 +65,21 @@ public class MessageActivityPanel extends JPanel implements ChannelEventListener
     private JTable mMessageTable;
     
     private Channel mDisplayedChannel;
+    private MessageActivityModel mDisplayedModel = EMPTY_MODEL;
     
     private MessageManagementPanel mManagementPanel = new MessageManagementPanel();
+    
+    private ChannelProcessingManager mChannelProcessingManager;
 
-	public MessageActivityPanel()
+	public MessageActivityPanel( ChannelProcessingManager channelProcessingManager )
 	{
+		mChannelProcessingManager = channelProcessingManager;
+		
     	setLayout( new MigLayout("insets 0 0 0 0", "[][grow,fill]", "[]0[grow,fill]") );
 
     	add( mManagementPanel, "span,growx" );
 
-    	mMessageTable = new JTable( EMPTY_MODEL );
+    	mMessageTable = new JTable( mDisplayedModel );
     	
     	add( new JScrollPane( mMessageTable ), "span,grow" );
 	}
@@ -82,7 +89,7 @@ public class MessageActivityPanel extends JPanel implements ChannelEventListener
     {
 		boolean changed = false;
 		
-		if( event.getEvent() == Event.CHANGE_SELECTED && 
+		if( event.getEvent() == Event.NOTIFICATION_SELECTION_CHANGE && 
 			event.getChannel().isSelected() )
 		{
 			if( mDisplayedChannel == null || 
@@ -91,7 +98,19 @@ public class MessageActivityPanel extends JPanel implements ChannelEventListener
 			{
 				mDisplayedChannel = event.getChannel();
 
-				mMessageTable.setModel( event.getChannel().getMessageActivityModel() );
+				ProcessingChain chain = mChannelProcessingManager
+						.getProcessingChain( mDisplayedChannel );
+
+				if( chain != null )
+				{
+					mDisplayedModel = chain.getMessageActivityModel();
+				}
+				else
+				{
+					mDisplayedModel = EMPTY_MODEL;
+				}
+
+				mMessageTable.setModel( mDisplayedModel );
 
 				if( mDisplayedChannel != null )
 				{
@@ -105,8 +124,8 @@ public class MessageActivityPanel extends JPanel implements ChannelEventListener
 				changed = true;
 			}
 		}
-		else if( event.getEvent() == Event.CHANNEL_PROCESSING_STOPPED ||
-				 event.getEvent() == Event.CHANNEL_DISABLED )
+		else if( event.getEvent() == Event.NOTIFICATION_PROCESSING_STOP ||
+				 event.getEvent() == Event.REQUEST_DISABLE )
 		{
 			if( mDisplayedChannel != null && 
 				mDisplayedChannel == event.getChannel() )
@@ -195,10 +214,9 @@ public class MessageActivityPanel extends JPanel implements ChannelEventListener
                 public void mouseReleased( MouseEvent arg0 ) {}
         	} );
         	
-        	if( mDisplayedChannel != null )
+        	if( mDisplayedModel != null )
         	{
-            	slider.setValue( mDisplayedChannel.getMessageActivityModel()
-            			.getMaxMessageCount() );
+            	slider.setValue( mDisplayedModel.getMaxMessageCount() );
         	}
         	else
         	{
@@ -210,10 +228,9 @@ public class MessageActivityPanel extends JPanel implements ChannelEventListener
 				@Override
                 public void stateChanged( ChangeEvent arg0 )
                 {
-					if( mDisplayedChannel != null )
+					if( mDisplayedModel != null )
 					{
-						mDisplayedChannel.getMessageActivityModel()
-						.setMaxMessageCount( slider.getValue() );
+						mDisplayedModel.setMaxMessageCount( slider.getValue() );
 					}
                 }
         	});
@@ -228,9 +245,9 @@ public class MessageActivityPanel extends JPanel implements ChannelEventListener
 				@Override
 				public void actionPerformed( ActionEvent e )
 				{
-					if( mDisplayedChannel != null )
+					if( mDisplayedModel != null )
 					{
-						mDisplayedChannel.getMessageActivityModel().clear();
+						mDisplayedModel.clear();
 					}
 				}
 			} );
@@ -258,50 +275,52 @@ public class MessageActivityPanel extends JPanel implements ChannelEventListener
 					}
 					else
 					{
-						final JFrame editor = new JFrame();
-						
-						editor.setTitle( "Message Filter Editor" );
-						editor.setSize( 600, 400 );
-						editor.setLocationRelativeTo( MessageFilterButton.this );
-						editor.setDefaultCloseOperation( JFrame.DISPOSE_ON_CLOSE );
-						editor.setLayout( new MigLayout( "", "[grow,fill]", 
-								"[grow,fill][][]" ) );
-
-						@SuppressWarnings( "unchecked" )
-                        FilterSet<Message> filter = (FilterSet<Message>)
-								mDisplayedChannel.getMessageActivityModel()
-									.getMessageFilter();
-						
-						FilterEditorPanel<Message> panel = 
-								new FilterEditorPanel<Message>( filter );
-						
-						JScrollPane scroller = new JScrollPane( panel );
-						scroller.setViewportView( panel );
-						
-						editor.add( scroller, "wrap" );
-						
-						editor.add( new JLabel( "Right-click to select/deselect "
-								+ "all nodes" ), "wrap" );
-						
-						JButton close = new JButton( "Close" );
-						close.addActionListener( new ActionListener() 
+						if( mDisplayedModel != null )
 						{
-							@Override
-				            public void actionPerformed( ActionEvent e )
-				            {
-								editor.dispose();
-				            }
-						} );
-						
-						editor.add( close );
+							final JFrame editor = new JFrame();
+							
+							editor.setTitle( "Message Filter Editor" );
+							editor.setSize( 600, 400 );
+							editor.setLocationRelativeTo( MessageFilterButton.this );
+							editor.setDefaultCloseOperation( JFrame.DISPOSE_ON_CLOSE );
+							editor.setLayout( new MigLayout( "", "[grow,fill]", 
+									"[grow,fill][][]" ) );
 
-						EventQueue.invokeLater( new Runnable() 
-				        {
-				            public void run()
-				            {
-				            	editor.setVisible( true );
-				            }
-				        } );
+							@SuppressWarnings( "unchecked" )
+	                        FilterSet<Message> filter = (FilterSet<Message>)
+									mDisplayedModel.getMessageFilter();
+							
+							FilterEditorPanel<Message> panel = 
+									new FilterEditorPanel<Message>( filter );
+							
+							JScrollPane scroller = new JScrollPane( panel );
+							scroller.setViewportView( panel );
+							
+							editor.add( scroller, "wrap" );
+							
+							editor.add( new JLabel( "Right-click to select/deselect "
+									+ "all nodes" ), "wrap" );
+							
+							JButton close = new JButton( "Close" );
+							close.addActionListener( new ActionListener() 
+							{
+								@Override
+					            public void actionPerformed( ActionEvent e )
+					            {
+									editor.dispose();
+					            }
+							} );
+							
+							editor.add( close );
+
+							EventQueue.invokeLater( new Runnable() 
+					        {
+					            public void run()
+					            {
+					            	editor.setVisible( true );
+					            }
+					        } );
+						}
 					}
 				}
 			} );