From ca2b12b8685c731eae2ff76c029c30b2354b5f1f Mon Sep 17 00:00:00 2001
From: denny <dennissheirer2002@yahoo.com>
Date: Sat, 20 Feb 2016 17:56:28 -0500
Subject: [PATCH] Merges master 88d3088

---
 src/module/decode/p25/P25_C4FMDecoder.java | 1 -
 src/module/decode/state/ChannelList.java   | 7 +++----
 2 files changed, 3 insertions(+), 5 deletions(-)

diff --git a/src/module/decode/p25/P25_C4FMDecoder.java b/src/module/decode/p25/P25_C4FMDecoder.java
index 09d6e45d..c9f8ba7f 100644
--- a/src/module/decode/p25/P25_C4FMDecoder.java
+++ b/src/module/decode/p25/P25_C4FMDecoder.java
@@ -77,7 +77,6 @@ public class P25_C4FMDecoder extends P25Decoder
 		/* Filter demodulated sample buffers */
 		float[] filter = FilterFactory.getLowPass( 48000, 2500, 4000, 80, WindowType.HANNING, true );
 
-//		mLog.debug( "Demod Filter tap count:" + filter.length + " coefficients:" + Arrays.toString( filter ) );
 		mC4FMPreFilter = new RealFIRFilter_RB_RB( filter, 1.0f );
 
 		/* Shape gain and frequency offsets to optimize sample stream */
diff --git a/src/module/decode/state/ChannelList.java b/src/module/decode/state/ChannelList.java
index 16fe4e4e..fc333914 100644
--- a/src/module/decode/state/ChannelList.java
+++ b/src/module/decode/state/ChannelList.java
@@ -19,17 +19,15 @@ package module.decode.state;
 
 import java.awt.Color;
 import java.awt.Component;
-import java.awt.Point;
 import java.awt.event.MouseEvent;
 import java.awt.event.MouseListener;
-import java.util.HashMap;
 import java.util.Map;
+import java.util.concurrent.ConcurrentHashMap;
 
 import javax.swing.JMenu;
 import javax.swing.JPanel;
 import javax.swing.JPopupMenu;
 import javax.swing.JSeparator;
-import javax.swing.SwingUtilities;
 
 import net.miginfocom.swing.MigLayout;
 
@@ -57,7 +55,8 @@ public class ChannelList extends JPanel implements ChannelEventListener
 
 	private final static Logger mLog = LoggerFactory.getLogger( ChannelList.class );
 
-    private Map<Channel,ChannelPanel> mDisplayedPanels = new HashMap<Channel,ChannelPanel>();
+    private Map<Channel,ChannelPanel> mDisplayedPanels = 
+    		new ConcurrentHashMap<Channel,ChannelPanel>();
 
     private ChannelModel mChannelModel;
     private ChannelProcessingManager mChannelProcessingManager;