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/ltrnet/LTRCallEvent.java

@@ -51,16 +51,22 @@ public class LTRCallEvent extends CallEvent
 	 */
 	public boolean isMatchingTalkgroup( LTRNetMessage message )
 	{
+		String talkgroup = message.getTalkgroupID();
+		
+		if( talkgroup != null && getToID() != null &&
+			talkgroup.contentEquals( getToID() ) )
+		{
+			return true;
+		}
+		
 		return isMatchingTalkgroup( message.getTalkgroupID() );
 	}
 	
 	public boolean isMatchingTalkgroup( String talkgroup )
 	{
-		return talkgroup != null && 
-			   getToID() != null &&
-			   talkgroup.contentEquals( getToID() );
+		return talkgroup != null && getToID() != null && talkgroup.contentEquals( getToID() );		
 	}
-
+	
 	private Alias getAlias( String talkgroup )
 	{
 		if( hasAliasList() )

src/module/decode/ltrnet/LTRNetDecoder.java

@@ -23,19 +23,21 @@ import instrument.tap.TapGroup;
 
 import java.util.ArrayList;
 import java.util.List;
+import java.util.concurrent.ScheduledExecutorService;
 
 import message.MessageDirection;
 import module.decode.Decoder;
 import module.decode.DecoderType;
 import sample.Listener;
-import sample.real.IRealBufferListener;
+import sample.real.IUnFilteredRealBufferListener;
 import sample.real.RealBuffer;
 import alias.AliasList;
 import bits.MessageFramer;
 import bits.SyncPattern;
 import dsp.fsk.LTRFSKDecoder;
 
-public class LTRNetDecoder extends Decoder implements IRealBufferListener, Instrumentable
+public class LTRNetDecoder extends Decoder 
+			implements IUnFilteredRealBufferListener, Instrumentable
 {
 	public static final int LTR_STANDARD_MESSAGE_LENGTH = 40;
 	private LTRFSKDecoder mLTRFSKDecoder;
@@ -44,6 +46,10 @@ public class LTRNetDecoder extends Decoder implements IRealBufferListener, Instr
 
     private List<TapGroup> mAvailableTaps;
     
+    /**
+     * LTR-Net Decoder.  Decodes unfiltered (e.g. demodulated but with no DC or
+     * audio filtering) samples and produces LTR-Net messages.
+     */
 	public LTRNetDecoder( DecodeConfigLTRNet config, AliasList aliasList )
 	{
 		mLTRFSKDecoder = new LTRFSKDecoder();
@@ -69,7 +75,7 @@ public class LTRNetDecoder extends Decoder implements IRealBufferListener, Instr
 		
 		mLTRMessageFramer.addMessageListener( mLTRMessageProcessor );
 		
-		mLTRMessageProcessor.setMessageListener( mMessageBroadcaster );
+		mLTRMessageProcessor.setMessageListener( this );
 	}
 
 	@Override
@@ -79,7 +85,7 @@ public class LTRNetDecoder extends Decoder implements IRealBufferListener, Instr
 	}
 
 	@Override
-	public Listener<RealBuffer> getRealBufferListener()
+	public Listener<RealBuffer> getUnFilteredRealBufferListener()
 	{
 		return mLTRFSKDecoder;
 	}
@@ -116,7 +122,7 @@ public class LTRNetDecoder extends Decoder implements IRealBufferListener, Instr
 	}
 
 	@Override
-	public void start()
+	public void start( ScheduledExecutorService executor )
 	{
 	}
 

src/module/decode/ltrnet/LTRNetDecoderEditor.java

@@ -0,0 +1,179 @@
+/*******************************************************************************
+ *     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 module.decode.ltrnet;
+
+import gui.editor.Editor;
+import gui.editor.EditorValidationException;
+import gui.editor.ValidatingEditor;
+
+import java.awt.event.ActionEvent;
+import java.awt.event.ActionListener;
+
+import javax.swing.DefaultComboBoxModel;
+import javax.swing.JCheckBox;
+import javax.swing.JComboBox;
+import javax.swing.JLabel;
+import javax.swing.JSlider;
+import javax.swing.event.ChangeEvent;
+import javax.swing.event.ChangeListener;
+
+import message.MessageDirection;
+import module.decode.config.DecodeConfiguration;
+import net.miginfocom.swing.MigLayout;
+import controller.channel.Channel;
+
+public class LTRNetDecoderEditor extends ValidatingEditor<Channel>
+{
+    private static final long serialVersionUID = 1L;
+
+    private JCheckBox mAFC;
+    private JSlider mAFCMaximumCorrection;
+    private JComboBox<MessageDirection> mComboDirection;
+    
+	public LTRNetDecoderEditor()
+	{
+		init();
+	}
+	
+	private void init()
+	{
+		setLayout( new MigLayout( "insets 0 0 0 0,wrap 4", "[right][grow,fill][right][grow,fill]", "" ) );
+		
+        mAFC = new JCheckBox( "AFC: 3000 Hz" );
+        mAFC.setEnabled( false );
+        mAFC.setToolTipText( "AFC automatically adjusts the center frequency of the channel to "
+    		+ "correct/compensate for inaccuracies and frequency drift in the tuner" );
+        mAFC.addActionListener( new ActionListener()
+        {
+            @Override
+            public void actionPerformed( ActionEvent arg0 )
+            {
+            	setModified( true );
+            	
+            	if( mAFC.isSelected() && !mAFCMaximumCorrection.isEnabled() )
+            	{
+            		mAFCMaximumCorrection.setEnabled( true );
+            	}
+            	else if( !mAFC.isSelected() && mAFCMaximumCorrection.isEnabled() )
+            	{
+            		mAFCMaximumCorrection.setEnabled( false );
+            	}
+            }
+        } );
+
+        add( mAFC );
+        
+        mAFCMaximumCorrection = new JSlider( 0, 7000, 3000 );
+        mAFCMaximumCorrection.setEnabled( false );
+        mAFCMaximumCorrection.setToolTipText( "Maximum AFC frequency correction (0 - 15kHz)" );
+        mAFCMaximumCorrection.setMajorTickSpacing( 2000 );
+        mAFCMaximumCorrection.setMinorTickSpacing( 1000 );
+        mAFCMaximumCorrection.setPaintTicks( true );
+
+		mAFCMaximumCorrection.addChangeListener( new ChangeListener()
+		{
+			@Override
+			public void stateChanged( ChangeEvent e )
+			{
+				mAFC.setText( "AFC: " + mAFCMaximumCorrection.getValue() + " Hz" );
+				setModified( true );
+			}
+		} );
+        add( mAFCMaximumCorrection );
+		
+		mComboDirection = new JComboBox<MessageDirection>();
+		mComboDirection.setModel( new DefaultComboBoxModel<MessageDirection>( MessageDirection.values() ) );
+		mComboDirection.setSelectedItem( MessageDirection.OSW );
+		mComboDirection.setEnabled( false );
+		mComboDirection.addActionListener( new ActionListener() 
+		{
+			@Override
+            public void actionPerformed( ActionEvent e )
+            {
+				setModified( true );
+            }
+		} );
+
+		add( new JLabel( "Format:" ) );
+		add( mComboDirection );
+	}
+
+	@Override
+	public void validate( Editor<Channel> editor ) throws EditorValidationException
+	{
+		//No validation
+	}
+
+	
+	@Override
+	public void setItem( Channel item )
+	{
+		super.setItem( item );
+		
+		if( hasItem() )
+		{
+			mAFC.setEnabled( true );
+			mComboDirection.setEnabled( true );
+			
+			DecodeConfiguration config = getItem().getDecodeConfiguration();
+			
+			if( config instanceof DecodeConfigLTRNet )
+			{
+				DecodeConfigLTRNet ltr = (DecodeConfigLTRNet)config;
+				mComboDirection.setSelectedItem( ltr.getMessageDirection() );
+		        mAFC.setSelected( ltr.isAFCEnabled() );
+		        mAFCMaximumCorrection.setValue( ltr.getAFCMaximumCorrection() );
+		        mAFCMaximumCorrection.setEnabled( ltr.isAFCEnabled() );
+
+		        setModified( false );
+			}
+			else
+			{
+				mComboDirection.setSelectedItem( MessageDirection.OSW );
+		        mAFC.setSelected( false );
+		        mAFCMaximumCorrection.setValue( DecodeConfiguration.DEFAULT_AFC_MAX_CORRECTION );
+		        mAFCMaximumCorrection.setEnabled( false );
+		        
+				setModified( true );
+			}
+		}
+		else
+		{
+			mAFC.setEnabled( false );
+			mComboDirection.setEnabled( false );
+			setModified( false );
+		}
+	}
+
+	@Override
+	public void save()
+	{
+		if( hasItem() && isModified() )
+		{
+			DecodeConfigLTRNet ltr = new DecodeConfigLTRNet();
+			
+			ltr.setAFC( mAFC.isSelected() );                
+			ltr.setAFCMaximumCorrection( mAFCMaximumCorrection.getValue() );
+			ltr.setMessageDirection( (MessageDirection)mComboDirection.getSelectedItem() );
+			
+			getItem().setDecodeConfiguration( ltr );
+		}
+		
+		setModified( false );
+	}
+}

src/module/decode/ltrnet/LTRNetDecoderState.java

@@ -21,6 +21,7 @@ import java.text.DecimalFormat;
 import java.util.HashMap;
 import java.util.Iterator;
 import java.util.TreeSet;
+import java.util.concurrent.ScheduledExecutorService;
 
 import message.Message;
 import module.decode.DecoderType;
@@ -777,7 +778,7 @@ public class LTRNetDecoderState extends DecoderState
 	}
 
 	@Override
-	public void start()
+	public void start( ScheduledExecutorService executor )
 	{
 	}
 

src/module/decode/ltrnet/LTRNetEditor.java

@@ -1,71 +0,0 @@
-/*******************************************************************************
- *     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 module.decode.ltrnet;
-
-import java.awt.event.ActionEvent;
-import java.awt.event.ActionListener;
-
-import javax.swing.DefaultComboBoxModel;
-import javax.swing.JComboBox;
-import javax.swing.JLabel;
-
-import message.MessageDirection;
-import module.decode.DecodeEditor;
-import module.decode.config.DecodeConfiguration;
-
-public class LTRNetEditor extends DecodeEditor
-{
-    private static final long serialVersionUID = 1L;
-
-    private JComboBox<MessageDirection> mComboDirection;
-    
-	public LTRNetEditor( DecodeConfiguration config )
-	{
-		super( config );
-		
-		initGUI();
-	}
-	
-	private void initGUI()
-	{
-		mComboDirection = new JComboBox<MessageDirection>();
-
-		mComboDirection.setModel( 
-				new DefaultComboBoxModel<MessageDirection>( MessageDirection.values() ) );
-		
-		mComboDirection.setSelectedItem( ((DecodeConfigLTRNet)mConfig).getMessageDirection() );
-		
-		mComboDirection.addActionListener( new ActionListener() 
-		{
-			@Override
-            public void actionPerformed( ActionEvent e )
-            {
-				MessageDirection selected = mComboDirection
-						.getItemAt( mComboDirection.getSelectedIndex() );
-				
-				if( selected != null )
-				{
-					((DecodeConfigLTRNet)mConfig).setMessageDirection( selected );
-				}
-            }
-		} );
-		
-		add( new JLabel( "Format:" ) );
-		add( mComboDirection, "wrap" );
-	}
-}