From 853748edd8be6ad333d69996164c734f8225461d Mon Sep 17 00:00:00 2001
From: denny <dennissheirer2002@yahoo.com>
Date: Fri, 11 Sep 2015 15:37:39 -0400
Subject: [PATCH] Resolved issue with icons displaying in call event panel

---
 src/controller/ControllerPanel.java           |  4 +-
 .../event/CallEventAliasCellRenderer.java     |  8 ++++
 src/module/decode/event/CallEventPanel.java   | 47 +++++++++----------
 3 files changed, 34 insertions(+), 25 deletions(-)

diff --git a/src/controller/ControllerPanel.java b/src/controller/ControllerPanel.java
index f7dd9f19..d5eb8de3 100644
--- a/src/controller/ControllerPanel.java
+++ b/src/controller/ControllerPanel.java
@@ -48,7 +48,7 @@ public class ControllerPanel extends JPanel
 
     private ChannelList mChannelStateList;
 
-    private CallEventPanel mCallEventPanel = new CallEventPanel();
+    private CallEventPanel mCallEventPanel;
     
     private MessageActivityPanel mMessageActivityPanel = 
     		new MessageActivityPanel();
@@ -67,6 +67,8 @@ public class ControllerPanel extends JPanel
 	public ControllerPanel( ResourceManager resourceManager )
 	{
 	    mResourceManager = resourceManager;
+	    
+	    mCallEventPanel = new CallEventPanel( resourceManager.getSettingsManager() );	    
 		init();
 	}
 	
diff --git a/src/module/decode/event/CallEventAliasCellRenderer.java b/src/module/decode/event/CallEventAliasCellRenderer.java
index 6ef081ee..50840a55 100644
--- a/src/module/decode/event/CallEventAliasCellRenderer.java
+++ b/src/module/decode/event/CallEventAliasCellRenderer.java
@@ -20,6 +20,9 @@ package module.decode.event;
 import javax.swing.ImageIcon;
 import javax.swing.table.DefaultTableCellRenderer;
 
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
 import settings.SettingsManager;
 import alias.Alias;
 
@@ -30,6 +33,11 @@ import alias.Alias;
  */
 public class CallEventAliasCellRenderer extends DefaultTableCellRenderer
 {
+	private static final long serialVersionUID = 1L;
+
+	private final static Logger mLog = LoggerFactory
+			.getLogger( CallEventAliasCellRenderer.class );
+
 	private SettingsManager mSettingsManager;
 	
 	public CallEventAliasCellRenderer( SettingsManager settingsManager )
diff --git a/src/module/decode/event/CallEventPanel.java b/src/module/decode/event/CallEventPanel.java
index 962a090e..810231ae 100644
--- a/src/module/decode/event/CallEventPanel.java
+++ b/src/module/decode/event/CallEventPanel.java
@@ -22,6 +22,7 @@ import javax.swing.JScrollPane;
 import javax.swing.JTable;
 
 import net.miginfocom.swing.MigLayout;
+import settings.SettingsManager;
 import controller.channel.Channel;
 import controller.channel.ChannelEvent;
 import controller.channel.ChannelEvent.Event;
@@ -33,36 +34,28 @@ public class CallEventPanel extends JPanel implements ChannelEventListener
 
     private JScrollPane mEmptyScroller;
     private Channel mDisplayedChannel;
+    private CallEventAliasCellRenderer mRenderer;
 
-	public CallEventPanel()
+	public CallEventPanel( SettingsManager settingsManager )
 	{
     	setLayout( new MigLayout("insets 0 0 0 0 ", "[grow,fill]", "[grow,fill]") );
 
     	JTable table = new JTable( new CallEventModel() );
     	table.setAutoCreateRowSorter( true );
     	table.setAutoResizeMode( JTable.AUTO_RESIZE_LAST_COLUMN );
-    	mEmptyScroller = new JScrollPane( table );
     	
-    	add( mEmptyScroller );
+    	mRenderer = new CallEventAliasCellRenderer( settingsManager );
+		
+		table.getColumnModel().getColumn( CallEventModel.FROM_ALIAS )
+				.setCellRenderer( mRenderer );
+
+		table.getColumnModel().getColumn( CallEventModel.TO_ALIAS )
+				.setCellRenderer( mRenderer );
+
+    	mEmptyScroller = new JScrollPane( table );
+
+		add( mEmptyScroller );
 	}
-//	if( mCallEventTable == null )
-//	{
-//		mCallEventTable = new JTable( mCallEventModel );
-//		mCallEventTable.setAutoCreateRowSorter( true );
-//		mCallEventTable.setAutoResizeMode( JTable.AUTO_RESIZE_LAST_COLUMN );
-//
-//		CallEventAliasCellRenderer renderer = 
-//				new CallEventAliasCellRenderer( mProcessingChain
-//						.getResourceManager().getSettingsManager() );
-//		
-//		mCallEventTable.getColumnModel().getColumn( 3 )
-//						.setCellRenderer( renderer );
-//
-//		mCallEventTable.getColumnModel().getColumn( 5 )
-//						.setCellRenderer( renderer );
-//	}
-//	
-//	return mCallEventTable;
 
 	@Override
     public void channelChanged( ChannelEvent event )
@@ -76,10 +69,16 @@ public class CallEventPanel extends JPanel implements ChannelEventListener
 			{
 				removeAll();
 				
-				JScrollPane scroller = new JScrollPane( new JTable(
-						event.getChannel().getCallEventModel() ) );
+				JTable table = new JTable(
+						event.getChannel().getCallEventModel() );
+				
+				table.getColumnModel().getColumn( CallEventModel.FROM_ALIAS )
+				.setCellRenderer( mRenderer );
 
-				add( scroller );
+				table.getColumnModel().getColumn( CallEventModel.TO_ALIAS )
+				.setCellRenderer( mRenderer );
+				
+				add( new JScrollPane( table ) );
 				
 				mDisplayedChannel = event.getChannel();