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,195 +30,192 @@ 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
  */
 public class AliasModel extends AbstractTableModel
 {
-	private static final long serialVersionUID = 1L;
+    private static final long serialVersionUID = 1L;
 
-	public static final int COLUMN_LIST = 0;
+    public static final int COLUMN_LIST = 0;
-	public static final int COLUMN_GROUP = 1;
+    public static final int COLUMN_GROUP = 1;
-	public static final int COLUMN_NAME = 2;
+    public static final int COLUMN_NAME = 2;
-	public static final int COLUMN_ICON = 3;
+    public static final int COLUMN_ICON = 3;
-	public static final int COLUMN_COLOR = 4;
+    public static final int COLUMN_COLOR = 4;
 
-	private List<Alias> mAliases = new CopyOnWriteArrayList<>();
+    private List<Alias> mAliases = new CopyOnWriteArrayList<>();
-	private Broadcaster<AliasEvent> mAliasEventBroadcaster = new Broadcaster<>();
+    private Broadcaster<AliasEvent> mAliasEventBroadcaster = new Broadcaster<>();
-	private Map<String,AliasList> mAliasListMap = new HashMap<>();
+    private Map<String,AliasList> mAliasListMap = new HashMap<>();
 
-	public AliasModel()
+    public AliasModel()
-	{
+    {
-	}
+    }
 
-	/**
+    /**
-	 * Unmodifiable list of all aliases currently in the model
+     * Unmodifiable list of all aliases currently in the model
-	 */
+     */
-	public List<Alias> getAliases()
+    public List<Alias> getAliases()
-	{
+    {
-		return Collections.unmodifiableList( mAliases );
+        return Collections.unmodifiableList(mAliases);
-	}
+    }
 
-	public Alias getAliasAtIndex( int row )
+    public Alias getAliasAtIndex(int row)
-	{
+    {
-		if( mAliases.size() >= row )
+        if(mAliases.size() >= row)
-		{
+        {
-			return mAliases.get( row );
+            return mAliases.get(row);
-		}
+        }
 
-		return null;
+        return null;
-	}
+    }
 
-	public AliasList getAliasList( String name )
+    public AliasList getAliasList(String name)
-	{
+    {
-		if( mAliasListMap.containsKey( name ) )
+        if(name != null && mAliasListMap.containsKey(name))
-		{
+        {
-			return mAliasListMap.get( name );
+            return mAliasListMap.get(name);
-		}
+        }
 
-		AliasList aliasList = new AliasList( name );
+        AliasList aliasList = new AliasList(name);
 
-		for( Alias alias: mAliases )
+        if(name != null)
-		{
+        {
-			if( alias.getList().equalsIgnoreCase( name ) )
+            for(Alias alias : mAliases)
-			{
+            {
-				aliasList.addAlias( alias );
+                if(alias.hasList() && alias.getList().equalsIgnoreCase(name))
-			}
+                {
-		}
+                    aliasList.addAlias(alias);
+                }
+            }
 
-		mAliasListMap.put( name, aliasList );
+            mAliasListMap.put(name, aliasList);
 
-		//Register the new alias list to receive updates from this model
+            //Register the new alias list to receive updates from this model
-		addListener( aliasList );
+            addListener(aliasList);
+        }
 
-		return aliasList;
+        return aliasList;
-	}
+    }
 
-	/**
+    /**
-	 * Returns a list of unique alias list names from across the alias set
+     * Returns a list of unique alias list names from across the alias set
-	 */
+     */
-	public List<String> getListNames()
+    public List<String> getListNames()
-	{
+    {
-		List<String> listNames = new ArrayList<>();
+        List<String> listNames = new ArrayList<>();
 
-		for( Alias alias: mAliases )
+        for(Alias alias : mAliases)
-		{
+        {
-			if( alias.hasList() && !listNames.contains( alias.getList() ) )
+            if(alias.hasList() && !listNames.contains(alias.getList()))
-			{
+            {
-				listNames.add( alias.getList() );
+                listNames.add(alias.getList());
-			}
+            }
-		}
+        }
 
-		Collections.sort( listNames );
+        Collections.sort(listNames);
 
-		return listNames;
+        return listNames;
-	}
+    }
 
-	/**
+    /**
-	 * Returns a list of alias group names for all aliases
+     * Returns a list of alias group names for all aliases
-	 */
+     */
-	public List<String> getGroupNames()
+    public List<String> getGroupNames()
-	{
+    {
-		List<String> groupNames = new ArrayList<>();
+        List<String> groupNames = new ArrayList<>();
 
-		for( Alias alias: mAliases )
+        for(Alias alias : mAliases)
-		{
+        {
-			if( alias.hasGroup() &&	!groupNames.contains( alias.getGroup() ) )
+            if(alias.hasGroup() && !groupNames.contains(alias.getGroup()))
-			{
+            {
-				groupNames.add( alias.getGroup() );
+                groupNames.add(alias.getGroup());
-			}
+            }
-		}
+        }
 
-		Collections.sort( groupNames );
+        Collections.sort(groupNames);
 
-		return groupNames;
+        return groupNames;
-	}
+    }
 
-	/**
+    /**
-	 * Returns a list of alias group names for all aliases that have a matching
+     * Returns a list of alias group names for all aliases that have a matching
-	 * list name value
+     * list name value
-	 */
+     */
-	public List<String> getGroupNames( String listName )
+    public List<String> getGroupNames(String listName)
-	{
+    {
-		List<String> groupNames = new ArrayList<>();
+        List<String> groupNames = new ArrayList<>();
 
-		if( listName != null )
+        if(listName != null)
-		{
+        {
-			for( Alias alias: mAliases )
+            for(Alias alias : mAliases)
-			{
+            {
-				if( alias.hasList() && 
+                if(alias.hasList() &&
-					alias.hasGroup() &&
+                    alias.hasGroup() &&
-					listName.equals( alias.getList() ) &&
+                    listName.equals(alias.getList()) &&
-					!groupNames.contains( alias.getGroup() ) )
+                    !groupNames.contains(alias.getGroup()))
-				{
+                {
-					groupNames.add( alias.getGroup() );
+                    groupNames.add(alias.getGroup());
-				}
+                }
-			}
+            }
-		}
+        }
 
-		Collections.sort( groupNames );
+        Collections.sort(groupNames);
 
-		return groupNames;
+        return groupNames;
-	}
+    }
 
-	/**
+    /**
-	 * Bulk loading of aliases
+     * Bulk loading of aliases
-	 */
+     */
-	public void addAliases( List<Alias> aliases )
+    public void addAliases(List<Alias> aliases)
-	{
+    {
-		for( Alias alias: aliases )
+        for(Alias alias : aliases)
-		{
+        {
-			addAlias( alias );
+            addAlias(alias);
-		}
+        }
-	}
+    }
 
-	/**
+    /**
-	 * Adds the alias to the model
+     * Adds the alias to the model
-	 */
+     */
-	public int addAlias( Alias alias )
+    public int addAlias(Alias alias)
-	{
+    {
-		if( alias != null )
+        if(alias != null)
-		{
+        {
-			mAliases.add( alias );
+            mAliases.add(alias);
 
-			int index = mAliases.size() - 1;
+            int index = mAliases.size() - 1;
 
-			fireTableRowsInserted( index, index );
+            fireTableRowsInserted(index, index);
 
-			broadcast( new AliasEvent( alias, Event.ADD ) );
+            broadcast(new AliasEvent(alias, Event.ADD));
 
-			return index;
+            return index;
-		}
+        }
 
-		return -1;
+        return -1;
-	}
+    }
 
-	/**
+    /**
-	 * Removes the channel from the model and broadcasts a channel remove event
+     * Removes the channel from the model and broadcasts a channel remove event
-	 */
+     */
-	public void removeAlias( Alias alias )
+    public void removeAlias(Alias alias)
-	{
+    {
-		if( alias != null )
+        if(alias != null)
-		{
+        {
-			int index = mAliases.indexOf( alias );
+            int index = mAliases.indexOf(alias);
 
-			mAliases.remove( alias );
+            mAliases.remove(alias);
 
-			fireTableRowsDeleted( index, index );
+            fireTableRowsDeleted(index, index);
 
-			broadcast( new AliasEvent( alias, Event.DELETE ) );
+            broadcast(new AliasEvent(alias, Event.DELETE));
-		}
+        }
-	}
+    }
 
     /**
      * Renames any broadcast channels that have the previous name.
+     *
      * @param previousName to rename
      * @param newName to assign to the broadcast channel
      */
@@ -223,11 +226,11 @@ public class AliasModel extends AbstractTableModel
             return;
         }
 
-        for(Alias alias: mAliases)
+        for(Alias alias : mAliases)
         {
             if(alias.hasBroadcastChannel(previousName))
             {
-                for(BroadcastChannel broadcastChannel: alias.getBroadcastChannels())
+                for(BroadcastChannel broadcastChannel : alias.getBroadcastChannels())
                 {
                     if(broadcastChannel.getChannelName().contentEquals(previousName))
                     {
@@ -238,85 +241,85 @@ public class AliasModel extends AbstractTableModel
         }
     }
 
-	@Override
+    @Override
-	public int getRowCount()
+    public int getRowCount()
-	{
+    {
-		return mAliases.size();
+        return mAliases.size();
-	}
+    }
 
-	@Override
+    @Override
-	public int getColumnCount()
+    public int getColumnCount()
-	{
+    {
-		return 5;
+        return 5;
-	}
+    }
 
-	@Override
+    @Override
-	public String getColumnName( int columnIndex )
+    public String getColumnName(int columnIndex)
-	{
+    {
-		switch( columnIndex )
+        switch(columnIndex)
-		{
+        {
-			case COLUMN_LIST:
+            case COLUMN_LIST:
-				return "List";
+                return "List";
-			case COLUMN_GROUP:
+            case COLUMN_GROUP:
-				return "Group";
+                return "Group";
-			case COLUMN_NAME:
+            case COLUMN_NAME:
-				return "Name";
+                return "Name";
-			case COLUMN_ICON:
+            case COLUMN_ICON:
-				return "Icon";
+                return "Icon";
-			case COLUMN_COLOR:
+            case COLUMN_COLOR:
-				return "Color";
+                return "Color";
-		}
+        }
 
-		return null;
+        return null;
-	}
+    }
 
-	@Override
+    @Override
-	public Class<?> getColumnClass( int columnIndex )
+    public Class<?> getColumnClass(int columnIndex)
-	{
+    {
-		if( columnIndex == COLUMN_COLOR )
+        if(columnIndex == COLUMN_COLOR)
-		{
+        {
-			return Integer.class;
+            return Integer.class;
-		}
+        }
 
-		return String.class;
+        return String.class;
-	}
+    }
 
-	@Override
+    @Override
-	public boolean isCellEditable( int rowIndex, int columnIndex )
+    public boolean isCellEditable(int rowIndex, int columnIndex)
-	{
+    {
-		return false;
+        return false;
-	}
+    }
 
-	@Override
+    @Override
-	public Object getValueAt( int rowIndex, int columnIndex )
+    public Object getValueAt(int rowIndex, int columnIndex)
-	{
+    {
-		Alias alias = mAliases.get( rowIndex );
+        Alias alias = mAliases.get(rowIndex);
 
-		switch( columnIndex )
+        switch(columnIndex)
-		{
+        {
-			case COLUMN_LIST:
+            case COLUMN_LIST:
-				return alias.getList();
+                return alias.getList();
-			case COLUMN_GROUP:
+            case COLUMN_GROUP:
-				return alias.getGroup();
+                return alias.getGroup();
-			case COLUMN_NAME:
+            case COLUMN_NAME:
-				return alias.getName();
+                return alias.getName();
-			case COLUMN_ICON:
+            case COLUMN_ICON:
-				return alias.getIconName();
+                return alias.getIconName();
-			case COLUMN_COLOR:
+            case COLUMN_COLOR:
-				return alias.getColor();
+                return alias.getColor();
-		}
+        }
 
-		return null;
+        return null;
-	}
+    }
 
-	@Override
+    @Override
-	public void setValueAt( Object aValue, int rowIndex, int columnIndex )
+    public void setValueAt(Object aValue, int rowIndex, int columnIndex)
-	{
+    {
-		throw new IllegalArgumentException( "Not yet implemented" );
+        throw new IllegalArgumentException("Not yet implemented");
-	}
+    }
 
-	public void broadcast( AliasEvent event )
+    public void broadcast(AliasEvent event)
-	{
+    {
         Alias alias = event.getAlias();
 
         //Validate the alias following a user action that changed the alias or any alias IDs
@@ -325,23 +328,23 @@ public class AliasModel extends AbstractTableModel
             alias.validate();
         }
 
-		if( event.getEvent() == Event.CHANGE )
+        if(event.getEvent() == Event.CHANGE)
-		{
+        {
-			int index = mAliases.indexOf( event.getAlias() );
+            int index = mAliases.indexOf(event.getAlias());
 
-			fireTableRowsUpdated( index, index );
+            fireTableRowsUpdated(index, index);
-		}
+        }
 
-		mAliasEventBroadcaster.broadcast( event );
+        mAliasEventBroadcaster.broadcast(event);
-	}
+    }
 
-	public void addListener( Listener<AliasEvent> listener )
+    public void addListener(Listener<AliasEvent> listener)
-	{
+    {
-		mAliasEventBroadcaster.addListener( listener );
+        mAliasEventBroadcaster.addListener(listener);
-	}
+    }
 
-	public void removeListener( Listener<AliasEvent> listener )
+    public void removeListener(Listener<AliasEvent> listener)
-	{
+    {
-		mAliasEventBroadcaster.removeListener( listener );
+        mAliasEventBroadcaster.removeListener(listener);
-	}
+    }
 }

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,253 +17,251 @@
  ******************************************************************************/
 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 static final long serialVersionUID = 1L;
 
-	private final static Logger mLog = LoggerFactory.getLogger( NameConfigurationEditor.class );
+    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 AliasModel mAliasModel;
-	private ChannelModel mChannelModel;
+    private ChannelModel mChannelModel;
 
-	private JTextField mChannelName;
+    private JTextField mChannelName;
-	private JComboBox<String> mSystemNameCombo;
+    private JComboBox<String> mSystemNameCombo;
-	private JComboBox<String> mSiteNameCombo;
+    private JComboBox<String> mSiteNameCombo;
-	private JComboBox<String> mAliasListCombo;
+    private JComboBox<String> mAliasListCombo;
 
-	public NameConfigurationEditor( AliasModel aliasModel, ChannelModel model )
+    public NameConfigurationEditor(AliasModel aliasModel, ChannelModel model)
-	{
+    {
-		mAliasModel = aliasModel;
+        mAliasModel = aliasModel;
-		mChannelModel = model;
+        mChannelModel = model;
 
-		init();
+        init();
-	}
+    }
 
-	private void init()
+    private void init()
-	{
+    {
-		setLayout( new MigLayout( "fill,wrap 4", "[right][grow,fill][right][grow,fill]", "[][][grow]" ) );
+        setLayout(new MigLayout("fill,wrap 4", "[right][grow,fill][right][grow,fill]", "[][][grow]"));
 
-		mChannelName = new JTextField( "" );
+        mChannelName = new JTextField("");
-		mChannelName.getDocument().addDocumentListener( this );
+        mChannelName.getDocument().addDocumentListener(this);
-		mChannelName.setEnabled( false );
+        mChannelName.setEnabled(false);
 
-		add( new JLabel( "Name:" ) );
+        add(new JLabel("Name:"));
-		add( mChannelName );
+        add(mChannelName);
 
-		mSystemNameCombo = new JComboBox<>( EMPTY_MODEL );
+        mSystemNameCombo = new JComboBox<>(EMPTY_SYSTEM_MODEL);
-		mSystemNameCombo.setEnabled( false );
+        mSystemNameCombo.setEnabled(false);
-		mSystemNameCombo.setEditable( true );
+        mSystemNameCombo.setEditable(true);
-		mSystemNameCombo.addActionListener( new ActionListener()
+        mSystemNameCombo.addActionListener(new ActionListener()
-		{
+        {
-			@Override
+            @Override
-			public void actionPerformed( ActionEvent e )
+            public void actionPerformed(ActionEvent e)
-			{
+            {
-				Object selected = mSystemNameCombo.getSelectedItem();
+                Object selected = mSystemNameCombo.getSelectedItem();
 
-				if( selected != null )
+                if(selected != null)
-				{
+                {
-					String system = (String)selected;
+                    String system = (String)selected;
 
-					List<String> sites = mChannelModel.getSites( system );
+                    List<String> sites = mChannelModel.getSites(system);
 
-					if( !sites.contains( getItem().getSite() ) )
+                    if(!sites.contains(getItem().getSite()))
-					{
+                    {
-						sites.add( getItem().getSite() );
+                        sites.add(getItem().getSite());
-					}
+                    }
 
-					if( sites.isEmpty() )
+                    if(sites.isEmpty())
-					{
+                    {
-						mSiteNameCombo.setModel( EMPTY_MODEL );
+                        mSiteNameCombo.setModel(EMPTY_SITE_MODEL);
-					}
+                    }
-					else
+                    else
-					{
+                    {
-						mSiteNameCombo.setModel( new DefaultComboBoxModel<String>( 
+                        mSiteNameCombo.setModel(new DefaultComboBoxModel<String>(
-								sites.toArray( new String[ sites.size() ] ) ) );;
+                            sites.toArray(new String[sites.size()])));
-					}
+                        ;
+                    }
 
-					mSiteNameCombo.setSelectedItem( getItem().getSite() );
+                    mSiteNameCombo.setSelectedItem(getItem().getSite());
-				}
+                }
 
-				setModified( true );
+                setModified(true);
-			}
+            }
-		} );
+        });
 
-		add( new JLabel( "System:" ) );
+        add(new JLabel("System:"));
-		add( mSystemNameCombo );
+        add(mSystemNameCombo);
 
-		mAliasListCombo = new JComboBox<String>();
+        mAliasListCombo = new JComboBox<String>(EMPTY_ALIAS_LIST_MODEL);
-		mAliasListCombo.setEnabled( false );
+        mAliasListCombo.setEnabled(false);
-		mAliasListCombo.setEditable( true );
+        mAliasListCombo.setEditable(true);
-		mAliasListCombo.addActionListener( new ActionListener()
+        mAliasListCombo.addActionListener(new ActionListener()
-		{
+        {
-			@Override
+            @Override
-			public void actionPerformed( ActionEvent e )
+            public void actionPerformed(ActionEvent e)
-			{
+            {
-				setModified( true );
+                setModified(true);
-			}
+            }
-		} );
+        });
 
-		add( new JLabel( "Alias List:" ) );
+        add(new JLabel("Alias List:"));
-		add( mAliasListCombo );
+        add(mAliasListCombo);
 
-		mSiteNameCombo = new JComboBox<>( EMPTY_MODEL );
+        mSiteNameCombo = new JComboBox<>(EMPTY_SITE_MODEL);
-		mSiteNameCombo.setEnabled( false );
+        mSiteNameCombo.setEnabled(false);
-		mSiteNameCombo.setEditable( true );
+        mSiteNameCombo.setEditable(true);
-		mSiteNameCombo.addActionListener( new ActionListener()
+        mSiteNameCombo.addActionListener(new ActionListener()
-		{
+        {
-			@Override
+            @Override
-			public void actionPerformed( ActionEvent e )
+            public void actionPerformed(ActionEvent e)
-			{
+            {
-				setModified( true );
+                setModified(true);
-			}
+            }
-		} );
+        });
 
-		add( new JLabel( "Site:" ) );
+        add(new JLabel("Site:"));
-		add( mSiteNameCombo );
+        add(mSiteNameCombo);
-	}
+    }
 
-	@Override
+    @Override
-	public void save()
+    public void save()
-	{
+    {
-		if( hasItem() && isModified() )
+        if(hasItem() && isModified())
-		{
+        {
-			getItem().setName( mChannelName.getText() );
+            getItem().setName(mChannelName.getText());
 
-			Object system = mSystemNameCombo.getSelectedItem();
+            Object system = mSystemNameCombo.getSelectedItem();
-			getItem().setSystem( ( system == null ? null : (String)system ) );
+            getItem().setSystem((system == null ? null : (String)system));
 
-			Object site = mSiteNameCombo.getSelectedItem();
+            Object site = mSiteNameCombo.getSelectedItem();
-			getItem().setSite( ( site == null ? null : (String)site ) );
+            getItem().setSite((site == null ? null : (String)site));
 
-			Object aliasList = mAliasListCombo.getSelectedItem();
+            Object aliasList = mAliasListCombo.getSelectedItem();
-			getItem().setAliasListName( aliasList == null ? null : (String)aliasList );
+            getItem().setAliasListName(aliasList == null ? null : (String)aliasList);
-		}
+        }
 
-		setModified( false );
+        setModified(false);
-	}
+    }
 
-	private void setControlsEnabled( boolean enabled )
+    private void setControlsEnabled(boolean enabled)
-	{
+    {
-		if( mChannelName.isEnabled() != enabled )
+        if(mChannelName.isEnabled() != enabled)
-		{
+        {
-			mChannelName.setEnabled( enabled );
+            mChannelName.setEnabled(enabled);
-		}
+        }
 
-		if( mAliasListCombo.isEnabled() != enabled )
+        if(mAliasListCombo.isEnabled() != enabled)
-		{
+        {
-			mAliasListCombo.setEnabled( enabled );
+            mAliasListCombo.setEnabled(enabled);
-		}
+        }
 
-		if( mSystemNameCombo.isEnabled() != enabled )
+        if(mSystemNameCombo.isEnabled() != enabled)
-		{
+        {
-			mSystemNameCombo.setEnabled( enabled );
+            mSystemNameCombo.setEnabled(enabled);
-		}
+        }
 
-		if( mSiteNameCombo.isEnabled() != enabled )
+        if(mSiteNameCombo.isEnabled() != enabled)
-		{
+        {
-			mSiteNameCombo.setEnabled( enabled );
+            mSiteNameCombo.setEnabled(enabled);
-		}
+        }
-	}
+    }
 
-	@Override
+    @Override
-	public void setItem( Channel channel )
+    public void setItem(Channel channel)
-	{
+    {
-		super.setItem( channel );
+        super.setItem(channel);
 
-		if( hasItem() )
+        if(hasItem())
-		{
+        {
-			setControlsEnabled( true );
+            setControlsEnabled(true);
 
-			mChannelName.setText( channel.getName() );
+            mChannelName.setText(channel.getName());
 
-			List<String> systems = mChannelModel.getSystems();
+            List<String> systems = mChannelModel.getSystems();
 
-			if( systems.isEmpty() )
+            if(systems.isEmpty())
-			{
+            {
-				mSystemNameCombo.setModel( EMPTY_MODEL );
+                mSystemNameCombo.setModel(EMPTY_SYSTEM_MODEL);
-			}
+            }
-			else
+            else
-			{
+            {
-				mSystemNameCombo.setModel( new DefaultComboBoxModel<String>( 
+                mSystemNameCombo.setModel(new DefaultComboBoxModel<String>(
-						systems.toArray( new String[ systems.size() ] ) ) );;
+                    systems.toArray(new String[systems.size()])));
-			}
+                ;
+            }
 
-			mSystemNameCombo.setSelectedItem( channel.getSystem() );
+            mSystemNameCombo.setSelectedItem(channel.getSystem());
 
-			List<String> sites = mChannelModel.getSites( channel.getSystem() );
+            List<String> sites = mChannelModel.getSites(channel.getSystem());
 
-			if( sites.isEmpty() )
+            if(sites.isEmpty())
-			{
+            {
-				mSiteNameCombo.setModel( EMPTY_MODEL );
+                mSiteNameCombo.setModel(EMPTY_SITE_MODEL);
-			}
+            }
-			else
+            else
-			{
+            {
-				mSiteNameCombo.setModel( new DefaultComboBoxModel<String>( 
+                mSiteNameCombo.setModel(new DefaultComboBoxModel<String>(
-						sites.toArray( new String[ sites.size() ] ) ) );;
+                    sites.toArray(new String[sites.size()])));
-			}
+                ;
+            }
 
-			if( channel.getSite() != null )
+            if(channel.getSite() != null)
-			{
+            {
-				mSiteNameCombo.setSelectedItem( channel.getSite() );
+                mSiteNameCombo.setSelectedItem(channel.getSite());
-			}
+            }
 
-			List<String> lists = mAliasModel.getListNames();
+            List<String> lists = mAliasModel.getListNames();
-			Collections.sort( lists );
+            Collections.sort(lists);
-			mAliasListCombo.setModel( new DefaultComboBoxModel<String>( 
+            mAliasListCombo.setModel(new DefaultComboBoxModel<String>(
-					lists.toArray( new String[ lists.size() ] ) ) );
+                lists.toArray(new String[lists.size()])));
 
-			if( channel.getAliasListName() != null )
+            if(channel.getAliasListName() != null)
-			{
+            {
-		   		mAliasListCombo.setSelectedItem( channel.getAliasListName() );
+                mAliasListCombo.setSelectedItem(channel.getAliasListName());
-			}
+            }
-		}
+        }
-		else
+        else
-		{
+        {
-			setControlsEnabled( false );
+            setControlsEnabled(false);
-			mChannelName.setText( null );
+            mChannelName.setText(null);
-		}
+        }
 
-		setModified( false );
+        setModified(false);
-	}
+    }
 
-	@Override
+    @Override
-	public void insertUpdate( DocumentEvent e )
+    public void insertUpdate(DocumentEvent e)
-	{
+    {
-		setModified( true );
+        setModified(true);
-	}
+    }
 
-	@Override
+    @Override
-	public void changedUpdate( DocumentEvent e )
+    public void changedUpdate(DocumentEvent e)
-	{
+    {
-		setModified( true );
+        setModified(true);
-	}
+    }
 
-	@Override
+    @Override
-	public void removeUpdate( DocumentEvent e ) 
+    public void removeUpdate(DocumentEvent e)
-	{
+    {
-		setModified( true );
+        setModified(true);
-	}
+    }
 }

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/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 |