Merge branch 'master' into 39-polyphase-channelizer

README.md

@@ -2,18 +2,10 @@
 A cross-platform java application for decoding, monitoring, recording and streaming trunked mobile and related radio protocols using Software Defined Radios (SDR).
 
 * [Getting Started](https://github.com/DSheirer/sdrtrunk/wiki/GettingStarted)
-* [User's Manual](https://github.com/DSheirer/sdrtrunk/wiki/UserManual)
+* [User's Manual Version 0.2.0](https://github.com/DSheirer/sdrtrunk/wiki/UserManual)
+* [User's Manual Version 0.3.0](https://github.com/DSheirer/sdrtrunk/wiki/UserManual_Version0.3.0)
 * [Download](https://github.com/DSheirer/sdrtrunk/releases)
 * [Support](https://groups.google.com/forum/#!forum/sdrtrunk)
 
-![](https://github.com/DSheirer/sdrtrunk/wiki/images/SDRTrunk_application.png)
+![sdrtrunk Application Overview - Version 0.3.0](https://github.com/DSheirer/sdrtrunk/wiki/images/ApplicationOverview_V0.3.0.png)
-<script>
+**Figure 1:** sdrtrunk **Version 0.3.0** Application Screenshot
-  (function(i,s,o,g,r,a,m){i['GoogleAnalyticsObject']=r;i[r]=i[r]||function(){
-  (i[r].q=i[r].q||[]).push(arguments)},i[r].l=1*new Date();a=s.createElement(o),
-  m=s.getElementsByTagName(o)[0];a.async=1;a.src=g;m.parentNode.insertBefore(a,m)
-  })(window,document,'script','//www.google-analytics.com/analytics.js','ga');
-
-  ga('create', 'UA-67489234-1', 'auto');
-  ga('send', 'pageview');
-
-</script>

build/build.xml

@@ -7,7 +7,7 @@
   <property name="major" value="0"/>
   <property name="minor" value="3"/>
   <property name="patch" value="0"/>
-  <property name="release" value="-beta4"/>
+  <property name="release" value="-beta6"/>
   <property name="filename" value="sdrtrunk_${major}.${minor}.${patch}${release}"/>
     
   <!-- Build properties -->

src/alias/AliasModel.java

@@ -17,6 +17,12 @@
  ******************************************************************************/
 package alias;
 
+import alias.AliasEvent.Event;
+import alias.id.broadcast.BroadcastChannel;
+import sample.Broadcaster;
+import sample.Listener;
+
+import javax.swing.table.AbstractTableModel;
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.HashMap;
@@ -24,13 +30,6 @@ import java.util.List;
 import java.util.Map;
 import java.util.concurrent.CopyOnWriteArrayList;
 
-import javax.swing.table.AbstractTableModel;
-
-import alias.id.broadcast.BroadcastChannel;
-import sample.Broadcaster;
-import sample.Listener;
-import alias.AliasEvent.Event;
-
 /**
  * Alias Model
  */
@@ -72,16 +71,18 @@ public class AliasModel extends AbstractTableModel
 
     public AliasList getAliasList(String name)
     {
-		if( mAliasListMap.containsKey( name ) )
+        if(name != null && mAliasListMap.containsKey(name))
         {
             return mAliasListMap.get(name);
         }
 
         AliasList aliasList = new AliasList(name);
 
+        if(name != null)
+        {
             for(Alias alias : mAliases)
             {
-			if( alias.getList().equalsIgnoreCase( name ) )
+                if(alias.hasList() && alias.getList().equalsIgnoreCase(name))
                 {
                     aliasList.addAlias(alias);
                 }
@@ -91,6 +92,7 @@ public class AliasModel extends AbstractTableModel
 
             //Register the new alias list to receive updates from this model
             addListener(aliasList);
+        }
 
         return aliasList;
     }
@@ -213,6 +215,7 @@ public class AliasModel extends AbstractTableModel
 
     /**
      * Renames any broadcast channels that have the previous name.
+     *
      * @param previousName to rename
      * @param newName to assign to the broadcast channel
      */

src/alias/AliasNameEditor.java

@@ -40,10 +40,11 @@ public class AliasNameEditor extends Editor<Alias>
 {
     private static final long serialVersionUID = 1L;
 
-    private static ComboBoxModel<String> EMPTY_MODEL = new DefaultComboBoxModel<>();
+    private static ComboBoxModel<String> EMPTY_LIST_MODEL = new DefaultComboBoxModel<>();
+    private static ComboBoxModel<String> EMPTY_GROUP_MODEL = new DefaultComboBoxModel<>();
 
-    private JComboBox<String> mListCombo = new JComboBox<>(EMPTY_MODEL);
+    private JComboBox<String> mListCombo = new JComboBox<>(EMPTY_LIST_MODEL);
-    private JComboBox<String> mGroupCombo = new JComboBox<>(EMPTY_MODEL);
+    private JComboBox<String> mGroupCombo = new JComboBox<>(EMPTY_GROUP_MODEL);
     private JComboBox<Icon> mIconCombo;
     private JTextField mName;
     private JButton mButtonColor;
@@ -110,7 +111,7 @@ public class AliasNameEditor extends Editor<Alias>
 
                     if(groups.isEmpty())
                     {
-                        mGroupCombo.setModel(EMPTY_MODEL);
+                        mGroupCombo.setModel(EMPTY_GROUP_MODEL);
                     }
                     else
                     {
@@ -238,7 +239,7 @@ public class AliasNameEditor extends Editor<Alias>
 
             if(listNames.isEmpty())
             {
-                mListCombo.setModel(EMPTY_MODEL);
+                mListCombo.setModel(EMPTY_LIST_MODEL);
             }
             else
             {
@@ -253,7 +254,7 @@ public class AliasNameEditor extends Editor<Alias>
 
             if(groupNames.isEmpty())
             {
-                mGroupCombo.setModel(EMPTY_MODEL);
+                mGroupCombo.setModel(EMPTY_GROUP_MODEL);
             }
             else
             {
@@ -285,8 +286,8 @@ public class AliasNameEditor extends Editor<Alias>
         }
         else
         {
-            mListCombo.setModel(EMPTY_MODEL);
+            mListCombo.setModel(EMPTY_LIST_MODEL);
-            mGroupCombo.setModel(EMPTY_MODEL);
+            mGroupCombo.setModel(EMPTY_GROUP_MODEL);
             mName.setText(null);
 
             mButtonColor.setBackground(getBackground());

src/alias/id/WildcardID.java

@@ -18,6 +18,8 @@
  ******************************************************************************/
 package alias.id;
 
+import org.apache.commons.lang3.Validate;
+
 import java.util.regex.Pattern;
 
 public class WildcardID implements Comparable<WildcardID>
@@ -45,7 +47,7 @@ public class WildcardID implements Comparable<WildcardID>
      */
     public WildcardID(String value)
     {
-        assert(value != null && value.contains(WILDCARD) && value.length() < 10);
+        Validate.isTrue(value != null && value.contains(WILDCARD) && value.length() < 10);
 
         mValue = value;
 

src/audio/broadcast/icecast/IcecastHTTPAudioBroadcaster.java

@@ -156,6 +156,8 @@ public class IcecastHTTPAudioBroadcaster extends IcecastAudioBroadcaster
 
                         disconnect();
                     }
+
+                    mConnecting.set(false);
                 }
             };
 
@@ -176,8 +178,6 @@ public class IcecastHTTPAudioBroadcaster extends IcecastAudioBroadcaster
         {
             mStreamingSession.closeNow();
         }
-
-        mConnecting.set(false);
     }
 
     /**
@@ -256,6 +256,7 @@ public class IcecastHTTPAudioBroadcaster extends IcecastAudioBroadcaster
             mSocketConnector = null;
 
             mConnecting.set(false);
+
             super.sessionClosed(session);
         }
 

src/audio/broadcast/icecast/IcecastTCPAudioBroadcaster.java

@@ -147,6 +147,8 @@ public class IcecastTCPAudioBroadcaster extends IcecastAudioBroadcaster
 
                         disconnect();
                     }
+
+                    mConnecting.set(false);
                 }
             };
 
@@ -293,8 +295,6 @@ public class IcecastTCPAudioBroadcaster extends IcecastAudioBroadcaster
                 setBroadcastState(BroadcastState.ERROR);
                 disconnect();
             }
-
-            mConnecting.set(false);
         }
 
         @Override

src/audio/broadcast/shoutcast/v1/ShoutcastV1AudioBroadcaster.java

@@ -168,6 +168,8 @@ public class ShoutcastV1AudioBroadcaster extends AudioBroadcaster
 
                         disconnect();
                     }
+
+                    mConnecting.set(false);
                 }
             };
 

src/audio/broadcast/shoutcast/v2/ShoutcastV2AudioBroadcaster.java

@@ -204,6 +204,8 @@ public class ShoutcastV2AudioBroadcaster extends AudioBroadcaster implements IBr
 
                         disconnect();
                     }
+
+                    mConnecting.set(false);
                 }
             };
 

src/audio/broadcast/shoutcast/v2/ShoutcastV2Configuration.java

@@ -21,6 +21,7 @@ package audio.broadcast.shoutcast.v2;
 import audio.broadcast.BroadcastConfiguration;
 import audio.broadcast.BroadcastFormat;
 import audio.broadcast.BroadcastServerType;
+import org.apache.commons.lang3.Validate;
 
 import javax.xml.bind.annotation.XmlAttribute;
 
@@ -90,7 +91,7 @@ public class ShoutcastV2Configuration extends BroadcastConfiguration
      */
     public void setStreamID(int streamID)
     {
-        assert(1 <= streamID && streamID <= Integer.MAX_VALUE);
+        Validate.isTrue(1 <= streamID && streamID <= Integer.MAX_VALUE);
         mStreamID = streamID;
     }
 

src/audio/broadcast/shoutcast/v2/ultravox/NegotiateMaxPayloadSize.java

@@ -18,6 +18,8 @@
  ******************************************************************************/
 package audio.broadcast.shoutcast.v2.ultravox;
 
+import org.apache.commons.lang3.Validate;
+
 public class NegotiateMaxPayloadSize extends UltravoxMessage
 {
     /**
@@ -47,8 +49,8 @@ public class NegotiateMaxPayloadSize extends UltravoxMessage
      */
     public void setMaximumPayloadSize(int desiredMaximum, int minimum)
     {
-        assert(desiredMaximum <= 16377);
+        Validate.isTrue(desiredMaximum <= 16377);
-        assert(minimum <= 16377);
+        Validate.isTrue(minimum <= 16377);
 
         StringBuilder sb = new StringBuilder();
         sb.append(desiredMaximum).append(":").append(minimum);

src/audio/broadcast/shoutcast/v2/ultravox/UltravoxMessage.java

@@ -19,6 +19,7 @@
 package audio.broadcast.shoutcast.v2.ultravox;
 
 import bits.BinaryMessage;
+import org.apache.commons.lang3.Validate;
 
 import java.util.Arrays;
 
@@ -154,7 +155,7 @@ public abstract class UltravoxMessage
      */
     public void setSendQueuePriority(int priority)
     {
-        assert(0 <= priority && priority <= 7);
+        Validate.isTrue(0 <= priority && priority <= 7);
 
         mMessage.setInt(priority, SEND_QUEUE_PRIORITY);
     }

src/audio/broadcast/shoutcast/v2/ultravox/UltravoxMetadata.java

@@ -65,7 +65,7 @@ public enum UltravoxMetadata
     {
         StringBuilder sb = new StringBuilder();
         sb.append("<").append(getXMLTag()).append(">");
-        sb.append(URLEncoder.encode(value, "UTF-8"));
+        sb.append(new String(value.getBytes(), "UTF-8"));
         sb.append("</").append(getXMLTag()).append(">");
 
         return sb.toString();

src/bits/BinaryMessage.java

@@ -22,6 +22,7 @@ import java.util.BitSet;
 import java.util.logging.LogManager;
 
 import edac.CRC;
+import org.apache.commons.lang3.Validate;
 
 public class BinaryMessage extends BitSet
 {
@@ -456,7 +457,7 @@ public class BinaryMessage extends BitSet
      */
     public byte getByte(int index)
     {
-        assert((index + 7) <= size());
+        Validate.isTrue((index + 7) <= size());
 
         int value = 0;
 
@@ -481,7 +482,7 @@ public class BinaryMessage extends BitSet
      */
     public void setByte(int index, byte value)
     {
-        assert((index + 8) <= size());
+        Validate.isTrue((index + 8) <= size());
 
         int mask = 0x80;
 

src/bits/MultiSyncPatternMatcher.java

@@ -17,6 +17,8 @@
  ******************************************************************************/
 package bits;
 
+import org.apache.commons.lang3.Validate;
+
 import java.util.ArrayList;
 import java.util.List;
 
@@ -39,7 +41,7 @@ public class MultiSyncPatternMatcher
 	
 	public MultiSyncPatternMatcher( int syncSize )
 	{
-		assert( syncSize < 64 );
+		Validate.isTrue(syncSize < 64);
 		
 		//Setup a bit mask of all ones the length of the sync pattern
 		mMask = (long)( ( Math.pow( 2, syncSize ) ) - 1 );

src/channel/metadata/ChannelMetadataPanel.java

@@ -26,6 +26,7 @@ import controller.channel.ChannelUtils;
 import icon.IconManager;
 import module.ProcessingChain;
 import net.miginfocom.swing.MigLayout;
+import org.apache.commons.lang3.Validate;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import properties.SystemProperties;
@@ -140,7 +141,7 @@ public class ChannelMetadataPanel extends JPanel implements ListSelectionListene
 
         public AliasedValueCellRenderer(Attribute attribute)
         {
-            assert(attribute != null);
+            Validate.isTrue(attribute != null);
             mAttribute = attribute;
             setHorizontalAlignment(JLabel.CENTER);
         }

src/controller/channel/NameConfigurationEditor.java

@@ -17,34 +17,29 @@
  ******************************************************************************/
 package controller.channel;
 
+import alias.AliasModel;
 import gui.editor.Editor;
+import net.miginfocom.swing.MigLayout;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
+import javax.swing.*;
+import javax.swing.event.DocumentEvent;
+import javax.swing.event.DocumentListener;
 import java.awt.event.ActionEvent;
 import java.awt.event.ActionListener;
 import java.util.Collections;
 import java.util.List;
 
-import javax.swing.ComboBoxModel;
-import javax.swing.DefaultComboBoxModel;
-import javax.swing.JComboBox;
-import javax.swing.JLabel;
-import javax.swing.JTextField;
-import javax.swing.event.DocumentEvent;
-import javax.swing.event.DocumentListener;
-
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-import net.miginfocom.swing.MigLayout;
-import alias.AliasModel;
-
 public class NameConfigurationEditor extends Editor<Channel> implements DocumentListener
 {
     private static final long serialVersionUID = 1L;
 
     private final static Logger mLog = LoggerFactory.getLogger(NameConfigurationEditor.class);
 
-	private static ComboBoxModel<String> EMPTY_MODEL = new DefaultComboBoxModel<>();
+    private static ComboBoxModel<String> EMPTY_SYSTEM_MODEL = new DefaultComboBoxModel<>();
+    private static ComboBoxModel<String> EMPTY_SITE_MODEL = new DefaultComboBoxModel<>();
+    private static ComboBoxModel<String> EMPTY_ALIAS_LIST_MODEL = new DefaultComboBoxModel<>();
 
     private AliasModel mAliasModel;
     private ChannelModel mChannelModel;
@@ -73,7 +68,7 @@ public class NameConfigurationEditor extends Editor<Channel> implements Document
         add(new JLabel("Name:"));
         add(mChannelName);
 
-		mSystemNameCombo = new JComboBox<>( EMPTY_MODEL );
+        mSystemNameCombo = new JComboBox<>(EMPTY_SYSTEM_MODEL);
         mSystemNameCombo.setEnabled(false);
         mSystemNameCombo.setEditable(true);
         mSystemNameCombo.addActionListener(new ActionListener()
@@ -96,12 +91,13 @@ public class NameConfigurationEditor extends Editor<Channel> implements Document
 
                     if(sites.isEmpty())
                     {
-						mSiteNameCombo.setModel( EMPTY_MODEL );
+                        mSiteNameCombo.setModel(EMPTY_SITE_MODEL);
                     }
                     else
                     {
                         mSiteNameCombo.setModel(new DefaultComboBoxModel<String>(
-								sites.toArray( new String[ sites.size() ] ) ) );;
+                            sites.toArray(new String[sites.size()])));
+                        ;
                     }
 
                     mSiteNameCombo.setSelectedItem(getItem().getSite());
@@ -114,7 +110,7 @@ public class NameConfigurationEditor extends Editor<Channel> implements Document
         add(new JLabel("System:"));
         add(mSystemNameCombo);
 
-		mAliasListCombo = new JComboBox<String>();
+        mAliasListCombo = new JComboBox<String>(EMPTY_ALIAS_LIST_MODEL);
         mAliasListCombo.setEnabled(false);
         mAliasListCombo.setEditable(true);
         mAliasListCombo.addActionListener(new ActionListener()
@@ -129,7 +125,7 @@ public class NameConfigurationEditor extends Editor<Channel> implements Document
         add(new JLabel("Alias List:"));
         add(mAliasListCombo);
 
-		mSiteNameCombo = new JComboBox<>( EMPTY_MODEL );
+        mSiteNameCombo = new JComboBox<>(EMPTY_SITE_MODEL);
         mSiteNameCombo.setEnabled(false);
         mSiteNameCombo.setEditable(true);
         mSiteNameCombo.addActionListener(new ActionListener()
@@ -203,12 +199,13 @@ public class NameConfigurationEditor extends Editor<Channel> implements Document
 
             if(systems.isEmpty())
             {
-				mSystemNameCombo.setModel( EMPTY_MODEL );
+                mSystemNameCombo.setModel(EMPTY_SYSTEM_MODEL);
             }
             else
             {
                 mSystemNameCombo.setModel(new DefaultComboBoxModel<String>(
-						systems.toArray( new String[ systems.size() ] ) ) );;
+                    systems.toArray(new String[systems.size()])));
+                ;
             }
 
             mSystemNameCombo.setSelectedItem(channel.getSystem());
@@ -217,12 +214,13 @@ public class NameConfigurationEditor extends Editor<Channel> implements Document
 
             if(sites.isEmpty())
             {
-				mSiteNameCombo.setModel( EMPTY_MODEL );
+                mSiteNameCombo.setModel(EMPTY_SITE_MODEL);
             }
             else
             {
                 mSiteNameCombo.setModel(new DefaultComboBoxModel<String>(
-						sites.toArray( new String[ sites.size() ] ) ) );;
+                    sites.toArray(new String[sites.size()])));
+                ;
             }
 
             if(channel.getSite() != null)

src/dsp/filter/FloatFIRFilter.java

@@ -19,6 +19,7 @@ package dsp.filter;
 
 import java.util.ArrayList;
 
+import org.apache.commons.lang3.Validate;
 import sample.real.RealSampleListener;
 
 public class FloatFIRFilter implements RealSampleListener
@@ -139,7 +140,7 @@ public class FloatFIRFilter implements RealSampleListener
 	private void generateIndexMap( int size )
 	{
 		//Ensure we have an odd size
-		assert( size % 2 == 1 );
+		Validate.isTrue(size % 2 == 1);
 		
 		mIndexMap = new int[ size ][ size ];
 		

src/dsp/filter/FloatHalfBandFilter.java

@@ -19,6 +19,7 @@ package dsp.filter;
 
 import java.util.ArrayList;
 
+import org.apache.commons.lang3.Validate;
 import sample.real.RealSampleListener;
 
 public class FloatHalfBandFilter implements RealSampleListener
@@ -149,7 +150,7 @@ public class FloatHalfBandFilter implements RealSampleListener
 	private void generateIndexMap( int size )
 	{
 		//Ensure we have an odd size
-		assert( size % 2 == 1 );
+		Validate.isTrue(size % 2 == 1);
 
 		int mapWidth = ( ( size + 1 ) / 2 ) + 1;
 		

src/dsp/filter/FloatHalfBandNoDecimateFilter.java

@@ -19,6 +19,7 @@ package dsp.filter;
 
 import java.util.ArrayList;
 
+import org.apache.commons.lang3.Validate;
 import sample.real.RealSampleListener;
 
 public class FloatHalfBandNoDecimateFilter implements RealSampleListener
@@ -139,7 +140,7 @@ public class FloatHalfBandNoDecimateFilter implements RealSampleListener
 	private void generateIndexMap( int size )
 	{
 		//Ensure we have an odd size
-		assert( size % 2 == 1 );
+		Validate.isTrue(size % 2 == 1);
 
 		int mapWidth = ( ( size + 1 ) / 2 ) + 1;
 		

src/dsp/filter/cic/ComplexPrimeCICDecimate.java

@@ -20,6 +20,7 @@ package dsp.filter.cic;
 import java.util.ArrayList;
 import java.util.List;
 
+import org.apache.commons.lang3.Validate;
 import sample.Listener;
 import sample.complex.ComplexBuffer;
 import sample.complex.ComplexSampleListener;
@@ -67,7 +68,7 @@ public class ComplexPrimeCICDecimate implements Listener<ComplexBuffer>
 	public ComplexPrimeCICDecimate( int decimation, int order, 
 			int passFrequency, int attenuation, WindowType windowType )
 	{
-		assert( decimation <= 700 );
+		Validate.isTrue(decimation <= 700);
 		
 
 		List<Integer> stageSizes = getPrimeFactors( decimation );

src/dsp/filter/cic/RealPrimeCICDecimate.java

@@ -20,6 +20,7 @@ package dsp.filter.cic;
 import java.util.ArrayList;
 import java.util.List;
 
+import org.apache.commons.lang3.Validate;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -81,7 +82,7 @@ public class RealPrimeCICDecimate
 	public RealPrimeCICDecimate( int decimation, int order, int passFrequency, 
 			int attenuation, WindowType windowType, int outputBufferSize )
 	{
-		assert( decimation <= 700 );
+		Validate.isTrue(decimation <= 700);
 
 		mOutputBufferSize = outputBufferSize;
 

src/dsp/filter/halfband/real/HalfBandFilter.java

@@ -17,6 +17,8 @@
  ******************************************************************************/
 package dsp.filter.halfband.real;
 
+import org.apache.commons.lang3.Validate;
+
 public class HalfBandFilter
 {
 	private float[] mBuffer;
@@ -122,7 +124,7 @@ public class HalfBandFilter
 	private void generateIndexMap( int size )
 	{
 		//Ensure we have an odd size
-		assert( size % 2 == 1 );
+		Validate.isTrue(size % 2 == 1);
 
 		int mapWidth = ( ( size + 1 ) / 2 ) + 1;
 		

src/dsp/filter/interpolator/RealInterpolator.java

@@ -1,5 +1,6 @@
 package dsp.filter.interpolator;
 
+import org.apache.commons.lang3.Validate;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -31,7 +32,7 @@ public class RealInterpolator extends Interpolator
 	public float filter( float[] samples, int offset, float mu )
 	{
 		/* Ensure we have enough samples in the array */
-		assert( samples.length >= offset + 7 );
+		Validate.isTrue(samples.length >= offset + 7);
 
 		/* Identify the filter bank that corresponds to mu */
 		int index = (int)( NSTEPS * mu );

src/dsp/filter/polyphase/PolyphaseFIRInterpolatingFilter.java

@@ -18,6 +18,7 @@
  ******************************************************************************/
 package dsp.filter.polyphase;
 
+import org.apache.commons.lang3.Validate;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -53,7 +54,7 @@ public class PolyphaseFIRInterpolatingFilter
 	public PolyphaseFIRInterpolatingFilter( double[] coefficients, int interpolation )
 	{
 		/* Ensure coefficients are an integral multiple of the interpolation factor */
-		assert( coefficients.length % interpolation == 0 );
+		Validate.isTrue(coefficients.length % interpolation == 0);
 		
 		mTaps = coefficients;
 

src/dsp/gain/DirectGainControl.java

@@ -17,6 +17,7 @@
  ******************************************************************************/
 package dsp.gain;
 
+import org.apache.commons.lang3.Validate;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -49,7 +50,7 @@ public class DirectGainControl implements GainController, RealSampleListener
 	 */
 	public DirectGainControl( float gain, float minimum, float maximum, float increment )
 	{
-		assert( minimum > 0 );
+		Validate.isTrue(minimum > 0);
 
 		mDefaultGain = gain;
 		mGain = gain;

src/record/wave/MonoWaveReader.java

@@ -18,6 +18,7 @@
  ******************************************************************************/
 package record.wave;
 
+import org.apache.commons.lang3.Validate;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import sample.ConversionUtils;
@@ -58,7 +59,7 @@ public class MonoWaveReader implements AutoCloseable
      */
 	public MonoWaveReader(Path path, boolean realTime) throws IOException
 	{
-		assert( path != null );
+        Validate.isTrue(path != null);
 		mPath = path;
         mRealTime = realTime;
 

src/record/wave/WaveWriter.java

@@ -17,6 +17,8 @@
  ******************************************************************************/
 package record.wave;
 
+import org.apache.commons.lang3.Validate;
+
 import java.io.IOException;
 import java.nio.ByteBuffer;
 import java.nio.channels.FileChannel;
@@ -59,8 +61,8 @@ public class WaveWriter implements AutoCloseable
 	public WaveWriter( AudioFormat format, Path file, long maxSize ) 
 			throws IOException
 	{
-		assert( format != null );
+		Validate.isTrue(format != null);
-		assert( file != null );
+		Validate.isTrue( file != null );
 		
 		mAudioFormat = format;
 		mFile = file;

src/sample/adapter/ChannelShortAdapter.java

@@ -20,6 +20,7 @@ package sample.adapter;
 import java.nio.ByteBuffer;
 import java.nio.ByteOrder;
 
+import org.apache.commons.lang3.Validate;
 import source.mixer.MixerChannel;
 
 /**
@@ -34,7 +35,7 @@ public class ChannelShortAdapter implements ISampleAdapter
 	public ChannelShortAdapter( MixerChannel channel )
 	{
 		/* Only use with LEFT/RIGHT channels */
-		assert( channel != MixerChannel.MONO );
+		Validate.isTrue(channel != MixerChannel.MONO);
 		
 		mMixerChannel = channel;
 	}

src/sample/complex/ComplexToComplexBufferAssembler.java

@@ -17,6 +17,7 @@
  ******************************************************************************/
 package sample.complex;
 
+import org.apache.commons.lang3.Validate;
 import sample.Listener;
 
 /**
@@ -32,7 +33,7 @@ public class ComplexToComplexBufferAssembler implements ComplexSampleListener
 	
 	public ComplexToComplexBufferAssembler( int bufferSize )
 	{
-		assert( bufferSize % 2 == 0 );
+		Validate.isTrue(bufferSize % 2 == 0);
 		
 		mBufferSize = bufferSize;
 		mBuffer = new float[ mBufferSize ];

src/source/tuner/fcd/proplusV2/FCD2TunerController.java

@@ -113,7 +113,16 @@ public class FCD2TunerController extends FCDTunerController
             FCD2TunerConfiguration fcd2 = (FCD2TunerConfiguration)config;
 
             setFrequencyCorrection(fcd2.getFrequencyCorrection());
-            setFrequency(fcd2.getFrequency());
+
+            long frequency = MINIMUM_TUNABLE_FREQUENCY;
+
+            if(fcd2.getFrequency() >= MINIMUM_TUNABLE_FREQUENCY &&
+                fcd2.getFrequency() <= MAXIMUM_TUNABLE_FREQUENCY)
+            {
+                frequency = fcd2.getFrequency();
+            }
+
+            setFrequency(frequency);
             setLNAGain(fcd2.getGainLNA());
             setMixerGain(fcd2.getGainMixer());
 

src/spectrum/OverlayPanel.java

@@ -1,6 +1,6 @@
 /*******************************************************************************
- *     SDR Trunk 
+ * sdrtrunk
- *     Copyright (C) 2014,2015 Dennis Sheirer
+ * Copyright (C) 2014-2017 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
@@ -14,31 +14,17 @@
  *
  * 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 spectrum;
 
-import java.awt.BasicStroke;
+import controller.channel.Channel;
-import java.awt.Color;
+import controller.channel.Channel.ChannelType;
-import java.awt.Font;
+import controller.channel.ChannelEvent;
-import java.awt.FontMetrics;
+import controller.channel.ChannelEventListener;
-import java.awt.Graphics;
+import controller.channel.ChannelModel;
-import java.awt.Graphics2D;
-import java.awt.Point;
-import java.awt.RenderingHints;
-import java.awt.Stroke;
-import java.awt.event.ComponentEvent;
-import java.awt.event.ComponentListener;
-import java.awt.geom.Line2D;
-import java.awt.geom.Rectangle2D;
-import java.text.DecimalFormat;
-import java.util.ArrayList;
-import java.util.concurrent.CopyOnWriteArrayList;
-
-import javax.swing.JPanel;
-
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
-
 import settings.ColorSetting;
 import settings.ColorSetting.ColorSettingName;
 import settings.Setting;
@@ -47,34 +33,34 @@ import settings.SettingsManager;
 import source.tuner.TunerChannel;
 import source.tuner.frequency.FrequencyChangeEvent;
 import source.tuner.frequency.IFrequencyChangeProcessor;
-import controller.channel.Channel;
-import controller.channel.Channel.ChannelType;
-import controller.channel.ChannelEvent;
-import controller.channel.ChannelEventListener;
-import controller.channel.ChannelModel;
 
-public class OverlayPanel extends JPanel 
+import javax.swing.*;
-						   implements ChannelEventListener,
+import java.awt.*;
-						   			  IFrequencyChangeProcessor,
+import java.awt.event.ComponentEvent;
+import java.awt.event.ComponentListener;
+import java.awt.geom.Line2D;
+import java.awt.geom.Rectangle2D;
+import java.text.DecimalFormat;
+import java.util.ArrayList;
+import java.util.concurrent.CopyOnWriteArrayList;
+
+public class OverlayPanel extends JPanel implements ChannelEventListener, IFrequencyChangeProcessor,
         SettingChangeListener
 {
     private static final long serialVersionUID = 1L;
 
-	private final static Logger mLog = 
+    private final static Logger mLog = LoggerFactory.getLogger(OverlayPanel.class);
-						LoggerFactory.getLogger( OverlayPanel.class );
 
-	private final static RenderingHints RENDERING_HINTS = 
+    private final static RenderingHints RENDERING_HINTS = new RenderingHints(RenderingHints.KEY_ANTIALIASING,
-    		new RenderingHints( RenderingHints.KEY_ANTIALIASING, 
         RenderingHints.VALUE_ANTIALIAS_ON);
 
     static
     {
-		RENDERING_HINTS.put( RenderingHints.KEY_RENDERING, 
+        RENDERING_HINTS.put(RenderingHints.KEY_RENDERING, RenderingHints.VALUE_RENDER_QUALITY);
-							 RenderingHints.VALUE_RENDER_QUALITY );
     }
 
-	private final static BasicStroke DASHED_STROKE = new BasicStroke(0.8f, 
+    private final static BasicStroke DASHED_STROKE = new BasicStroke(0.8f, BasicStroke.CAP_BUTT,
-		BasicStroke.CAP_BUTT, BasicStroke.JOIN_MITER, 5.0f, new float[] {2.0f, 4.0f}, 0.0f);	
+        BasicStroke.JOIN_MITER, 5.0f, new float[]{2.0f, 4.0f}, 0.0f);
 
     private static DecimalFormat CURSOR_FORMAT = new DecimalFormat("000.00000");
     private long mFrequency = 0;
@@ -107,13 +93,13 @@ public class OverlayPanel extends JPanel
 
     private SettingsManager mSettingsManager;
     private ChannelModel mChannelModel;
+
     /**
      * Translucent overlay panel for displaying channel configurations,
      * processing channels, selected channels, frequency labels and lines, and
      * a cursor with a frequency readout.
      */
-	public OverlayPanel( SettingsManager settingsManager, 
+    public OverlayPanel(SettingsManager settingsManager, ChannelModel channelModel)
-						 ChannelModel channelModel )
     {
         mSettingsManager = settingsManager;
 
@@ -222,18 +208,15 @@ public class OverlayPanel extends JPanel
     {
         mColorChannelConfig = getColor(ColorSettingName.CHANNEL_CONFIG);
 
-		mColorChannelConfigProcessing = 
+        mColorChannelConfigProcessing = getColor(ColorSettingName.CHANNEL_CONFIG_PROCESSING);
-				getColor( ColorSettingName.CHANNEL_CONFIG_PROCESSING ); 
 
-		mColorChannelConfigSelected = 
+        mColorChannelConfigSelected = getColor(ColorSettingName.CHANNEL_CONFIG_SELECTED);
-				getColor( ColorSettingName.CHANNEL_CONFIG_SELECTED );
 
         mColorSpectrumCursor = getColor(ColorSettingName.SPECTRUM_CURSOR);
 
         mColorSpectrumLine = getColor(ColorSettingName.SPECTRUM_LINE);
 
-		mColorSpectrumBackground = 
+        mColorSpectrumBackground = getColor(ColorSettingName.SPECTRUM_BACKGROUND);
-				getColor( ColorSettingName.SPECTRUM_BACKGROUND );
     }
 
     /**
@@ -310,21 +293,23 @@ public class OverlayPanel extends JPanel
     {
         if(mCursorVisible)
         {
-    		drawFrequencyLine( graphics, 
+            drawFrequencyLine(graphics, mCursorLocation.x, mColorSpectrumCursor);
-    						   mCursorLocation.x, 
-    						   mColorSpectrumCursor );
 
-    		String frequency = CURSOR_FORMAT.format( 
+            String frequency = CURSOR_FORMAT.format(getFrequencyFromAxis(mCursorLocation.getX()) / 1E6D);
-				getFrequencyFromAxis( mCursorLocation.getX() ) / 1E6D );
 
-    		graphics.drawString( frequency , 
+            FontMetrics fontMetrics = graphics.getFontMetrics(this.getFont());
-    							 mCursorLocation.x + 5, 
+
-    							 mCursorLocation.y );
+            Rectangle2D rect = fontMetrics.getStringBounds(frequency, graphics);
+
+            if(mCursorLocation.y > rect.getHeight())
+            {
+                graphics.drawString(frequency, mCursorLocation.x + 5, mCursorLocation.y);
+            }
 
             if(mZoom != 0)
             {
-        		graphics.drawString( "Zoom: " + (int)Math.pow( 2.0, mZoom ) + "x", 
+                graphics.drawString("Zoom: " + (int)Math.pow(2.0, mZoom) + "x", mCursorLocation.x + 17,
-    				mCursorLocation.x + 17, mCursorLocation.y + 11 ); 
+                    mCursorLocation.y + 11);
             }
         }
     }
@@ -336,8 +321,6 @@ public class OverlayPanel extends JPanel
     {
         Stroke currentStroke = graphics.getStroke();
 
-//    	graphics.setStroke( DASHED_STROKE );
-
         long minFrequency = getMinDisplayFrequency();
         long maxFrequency = getMaxDisplayFrequency();
 
@@ -372,8 +355,6 @@ public class OverlayPanel extends JPanel
 
             frequency += minor;
         }
-    	
-//    	graphics.setStroke( currentStroke );
     }
 
     /**
@@ -415,8 +396,7 @@ public class OverlayPanel extends JPanel
     {
         graphics.setColor(color);
 
-    	graphics.draw( new Line2D.Double( xaxis, 0.0d, 
+        graphics.draw(new Line2D.Double(xaxis, 0.0d, xaxis, getSize().getHeight() - mSpectrumInset));
-					 xaxis, getSize().getHeight() - mSpectrumInset ) );
     }
 
     /**
@@ -428,8 +408,7 @@ public class OverlayPanel extends JPanel
 
         graphics.setColor(Color.LIGHT_GRAY);
 
-    	graphics.draw( new Line2D.Double( xaxis, height * 0.65d, 
+        graphics.draw(new Line2D.Double(xaxis, height * 0.65d, xaxis, height - 1.0d));
-				 xaxis, height - 1.0d ) );
     }
 
     /**
@@ -443,12 +422,10 @@ public class OverlayPanel extends JPanel
         graphics.setColor(Color.YELLOW);
 
         //Vertical frequency error line
-    	graphics.draw( new Line2D.Double( errorAxis, lineHeight, 
+        graphics.draw(new Line2D.Double(errorAxis, lineHeight, errorAxis, height - 1.0d));
-				 errorAxis, height - 1.0d ) );
 
         //Horizontal line connecting frequency and error lines
-    	graphics.draw( new Line2D.Double( frequencyAxis, lineHeight, 
+        graphics.draw(new Line2D.Double(frequencyAxis, lineHeight, errorAxis, lineHeight));
-    									  errorAxis, lineHeight ) );
     }
 
     /**
@@ -484,8 +461,7 @@ public class OverlayPanel extends JPanel
 
         double offset = xAxis / width;
 
-    	long frequency = getMinDisplayFrequency() + 
+        long frequency = getMinDisplayFrequency() + Math.round((double)getDisplayBandwidth() * offset);
-    			Math.round( (double)getDisplayBandwidth() * offset ); 
 
         if(frequency > (getMaxFrequency()))
         {
@@ -498,9 +474,7 @@ public class OverlayPanel extends JPanel
     /**
      * Draws a frequency label at the x-axis position, at the bottom of the panel
      */
-    private void drawFrequencyLabel( Graphics2D graphics, 
+    private void drawFrequencyLabel(Graphics2D graphics, double xaxis, long frequency)
-    								 double xaxis,
-    								 long frequency )
     {
         String label = mLabelSizeMonitor.format(frequency);
 
@@ -510,8 +484,7 @@ public class OverlayPanel extends JPanel
 
         float xOffset = (float)rect.getWidth() / 2;
 
-    	graphics.drawString( label, (float)( xaxis - xOffset ), 
+        graphics.drawString(label, (float)(xaxis - xOffset), (float)(getSize().getHeight() - 2.0f));
-			(float)( getSize().getHeight() - 2.0f ) );
     }
 
 
@@ -523,8 +496,7 @@ public class OverlayPanel extends JPanel
         for(Channel channel : mVisibleChannels)
         {
             if(mChannelDisplay == ChannelDisplay.ALL ||
-    			( mChannelDisplay == ChannelDisplay.ENABLED && 
+                (mChannelDisplay == ChannelDisplay.ENABLED && channel.getEnabled()))
-    			  channel.getEnabled() ) )
             {
                 //Choose the correct background color to use
                 if(channel.isSelected())
@@ -546,12 +518,10 @@ public class OverlayPanel extends JPanel
                 {
                     double xAxis = getAxisFromFrequency(tunerChannel.getFrequency());
 
-                	double width = (double)( tunerChannel.getBandwidth() ) / 
+                    double width = (double)(tunerChannel.getBandwidth()) / (double)getDisplayBandwidth() * getSize().getWidth();
-                        (double)getDisplayBandwidth() * getSize().getWidth(); 
 
                     Rectangle2D.Double box =
-                        new Rectangle2D.Double( xAxis - ( width / 2.0d ),
+                        new Rectangle2D.Double(xAxis - (width / 2.0d), 0.0d, width, getSize().getHeight() - mSpectrumInset);
-                    		0.0d, width, getSize().getHeight() - mSpectrumInset );
 
                     //Fill the box with the correct color
                     graphics.fill(box);
@@ -567,30 +537,15 @@ public class OverlayPanel extends JPanel
                     //Draw the system label and adjust the y-axis position
                     String system = channel.hasSystem() ? channel.getSystem() : " ";
 
-                    yAxis += drawLabel( graphics, 
+                    yAxis += drawLabel(graphics, system, this.getFont(), xAxis, yAxis, width);
-                    				   	system,
-                    				   	this.getFont(),
-                    				   	xAxis,
-                    				   	yAxis,
-                    				   	width );
 
                     //Draw the site label and adjust the y-axis position
                     String site = channel.hasSite() ? channel.getSite() : " ";
 
-                    yAxis += drawLabel( graphics, 
+                    yAxis += drawLabel(graphics, site, this.getFont(), xAxis, yAxis, width);
-                    					site,
-                    					this.getFont(),
-                    					xAxis,
-                    					yAxis,
-                    					width );
 
                     //Draw the channel label and adjust the y-axis position
-                    yAxis += drawLabel( graphics, 
+                    yAxis += drawLabel(graphics, channel.getName(), this.getFont(), xAxis, yAxis, width);
-                    					channel.getName(),
-                    					this.getFont(),
-                    					xAxis,
-                    					yAxis,
-                    					width );
 
                     //Draw the decoder label
                     drawLabel(graphics, channel.getDecodeConfiguration().getDecoderType().getShortDisplayString(),
@@ -623,8 +578,7 @@ public class OverlayPanel extends JPanel
      *
      * @return height of the drawn label
      */
-    private double drawLabel( Graphics2D graphics, String text, Font font, 
+    private double drawLabel(Graphics2D graphics, String text, Font font, double x, double baseY, double maxWidth)
-    						 double x, double baseY, double maxWidth )
     {
         FontMetrics fontMetrics = graphics.getFontMetrics(font);
 
@@ -639,15 +593,11 @@ public class OverlayPanel extends JPanel
          */
         if(offset > (maxWidth / 2.0d))
         {
-        	label.setRect( x - ( maxWidth / 2.0d ), 		
+            label.setRect(x - (maxWidth / 2.0d), y - label.getHeight(), maxWidth, label.getHeight());
-        				   y - label.getHeight(), 
-		   				   maxWidth, 
-		   				   label.getHeight() );
 
             graphics.setClip(label);
 
-            graphics.drawString( text, 
+            graphics.drawString(text, (float)(x - (maxWidth / 2.0d)), (float)y);
-            		(float)( x - ( maxWidth / 2.0d ) ), (float)y );
 
             graphics.setClip(null);
         }
@@ -683,9 +633,7 @@ public class OverlayPanel extends JPanel
          * Reset the visible channels list
          */
         mVisibleChannels.clear();
-		mVisibleChannels.addAll( 
+        mVisibleChannels.addAll(mChannelModel.getChannelsInFrequencyRange(getMinFrequency(), getMaxFrequency()));
-				mChannelModel.getChannelsInFrequencyRange( getMinFrequency(), 
-						getMaxFrequency() ) );
     }
 
     /**
@@ -701,8 +649,7 @@ public class OverlayPanel extends JPanel
         {
             case NOTIFICATION_ADD:
             case NOTIFICATION_PROCESSING_START:
-				if( !mVisibleChannels.contains( channel ) &&
+                if(!mVisibleChannels.contains(channel) && channel.isWithin(getMinFrequency(), getMaxFrequency()))
-					channel.isWithin( getMinFrequency(), getMaxFrequency() ) )
                 {
                     mVisibleChannels.add(channel);
                 }
@@ -717,14 +664,12 @@ public class OverlayPanel extends JPanel
                 }
                 break;
             case NOTIFICATION_CONFIGURATION_CHANGE:
-				if( mVisibleChannels.contains( channel ) && 
+                if(mVisibleChannels.contains(channel) && !channel.isWithin(getMinFrequency(), getMaxFrequency()))
-					!channel.isWithin( getMinFrequency(), getMaxFrequency() ) )
                 {
                     mVisibleChannels.remove(channel);
                 }
 
-				if( !mVisibleChannels.contains( channel ) &&
+                if(!mVisibleChannels.contains(channel) && channel.isWithin(getMinFrequency(), getMaxFrequency()))
-					channel.isWithin( getMinFrequency(), getMaxFrequency() ) )
                 {
                     mVisibleChannels.add(channel);
                 }
@@ -796,9 +741,7 @@ public class OverlayPanel extends JPanel
         {
             TunerChannel channel = config.getTunerChannel();
 
-			if( channel != null &&
+            if(channel != null && channel.getMinFrequency() <= frequency && channel.getMaxFrequency() >= frequency)
-				channel.getMinFrequency() <= frequency &&
-				channel.getMaxFrequency() >= frequency )
             {
                 configs.add(config);
             }
@@ -808,7 +751,8 @@ public class OverlayPanel extends JPanel
     }
 
     @Override
-    public void settingDeleted( Setting setting ) { /* not implemented */ }
+    public void settingDeleted(Setting setting)
+    { /* not implemented */ }
 
     /**
      * Calculates correct spacing and format for frequency labels and major/minor
@@ -858,9 +802,7 @@ public class OverlayPanel extends JPanel
 
                 int maxLabelWidth = fontMetrics.stringWidth(format(getMaxDisplayFrequency()));
 
-		        double maxLabels = ( (double)OverlayPanel.this.getWidth() * 
+                double maxLabels = ((double)OverlayPanel.this.getWidth() * LABEL_FILL_THRESHOLD) / (double)maxLabelWidth;
-		        		LABEL_FILL_THRESHOLD ) / 
-		        		(double)maxLabelWidth;
 
                 //Calculate the next smallest base 10 value for the major increment
                 int power = (int)Math.log10((double)getDisplayBandwidth() / maxLabels);
@@ -874,9 +816,7 @@ public class OverlayPanel extends JPanel
 
                 int labelIncrement = start;
 
-		        while( ( (double)getDisplayBandwidth() / 
+                while(((double)getDisplayBandwidth() / (double)labelIncrement) < maxLabels && labelIncrement >= minimum)
-		        		 (double)labelIncrement ) < maxLabels && 
-		        		 labelIncrement >= minimum )
                 {
                     labelIncrement /= 2;
                     precision++;
@@ -930,9 +870,17 @@ public class OverlayPanel extends JPanel
             update();
         }
 
-		public void componentHidden( ComponentEvent arg0 ) {}
+        public void componentHidden(ComponentEvent arg0)
-        public void componentMoved( ComponentEvent arg0 ) {}
+        {
-        public void componentShown( ComponentEvent arg0 ) {}
+        }
+
+        public void componentMoved(ComponentEvent arg0)
+        {
+        }
+
+        public void componentShown(ComponentEvent arg0)
+        {
+        }
 
     }
 

src/spectrum/SpectrumPanel.java

@@ -30,6 +30,7 @@ import java.util.Arrays;
 
 import javax.swing.JPanel;
 
+import org.apache.commons.lang3.Validate;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -276,7 +277,7 @@ public class SpectrumPanel extends JPanel implements DFTResultsListener, Setting
      */
     public void setZoom( int zoom )
     {
-    	assert( 0 <= zoom && zoom <= 5 );
+    	Validate.isTrue( 0 <= zoom && zoom <= 5 );
     	
     	mZoom = zoom;
     }
@@ -299,7 +300,7 @@ public class SpectrumPanel extends JPanel implements DFTResultsListener, Setting
 	 */
 	public void setSampleSize( double sampleSize )
 	{
-		assert( 2.0 <= sampleSize && sampleSize <= 32.0 );
+		Validate.isTrue(2.0 <= sampleSize && sampleSize <= 32.0);
 
 		mDBScale = (float)( 20.0 * Math.log10( Math.pow( 2.0, sampleSize - 1 ) ) );
 	}

src/util/XTEA.java

@@ -18,6 +18,8 @@
  ******************************************************************************/
 package util;
 
+import org.apache.commons.lang3.Validate;
+
 import java.util.Arrays;
 
 public class XTEA
@@ -58,7 +60,7 @@ public class XTEA
      */
     public void setKey(byte[] key)
     {
-        assert(key.length == 16);
+        Validate.isTrue(key.length == 16);
 
         int keyInts[] = new int[8];
         
@@ -94,7 +96,7 @@ public class XTEA
      */
     public byte[] encrypt(byte[] plainText)
     {
-        assert(plainText.length == 8);
+        Validate.isTrue(plainText.length == 8);
 
         //Convert the 8 bytes of plaintext to 2 integers
         int result0 = (plainText[3] << 0) & MASK0 | (plainText[2] << 8) & MASK1 |