mirror of
https://github.com/DSheirer/sdrtrunk.git
synced 2026-11-19 20:17:25 -05:00
Resolved issue with icons displaying in call event panel
This commit is contained in:
@@ -48,7 +48,7 @@ public class ControllerPanel extends JPanel
|
|||||||
|
|
||||||
private ChannelList mChannelStateList;
|
private ChannelList mChannelStateList;
|
||||||
|
|
||||||
private CallEventPanel mCallEventPanel = new CallEventPanel();
|
private CallEventPanel mCallEventPanel;
|
||||||
|
|
||||||
private MessageActivityPanel mMessageActivityPanel =
|
private MessageActivityPanel mMessageActivityPanel =
|
||||||
new MessageActivityPanel();
|
new MessageActivityPanel();
|
||||||
@@ -67,6 +67,8 @@ public class ControllerPanel extends JPanel
|
|||||||
public ControllerPanel( ResourceManager resourceManager )
|
public ControllerPanel( ResourceManager resourceManager )
|
||||||
{
|
{
|
||||||
mResourceManager = resourceManager;
|
mResourceManager = resourceManager;
|
||||||
|
|
||||||
|
mCallEventPanel = new CallEventPanel( resourceManager.getSettingsManager() );
|
||||||
init();
|
init();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -20,6 +20,9 @@ package module.decode.event;
|
|||||||
import javax.swing.ImageIcon;
|
import javax.swing.ImageIcon;
|
||||||
import javax.swing.table.DefaultTableCellRenderer;
|
import javax.swing.table.DefaultTableCellRenderer;
|
||||||
|
|
||||||
|
import org.slf4j.Logger;
|
||||||
|
import org.slf4j.LoggerFactory;
|
||||||
|
|
||||||
import settings.SettingsManager;
|
import settings.SettingsManager;
|
||||||
import alias.Alias;
|
import alias.Alias;
|
||||||
|
|
||||||
@@ -30,6 +33,11 @@ import alias.Alias;
|
|||||||
*/
|
*/
|
||||||
public class CallEventAliasCellRenderer extends DefaultTableCellRenderer
|
public class CallEventAliasCellRenderer extends DefaultTableCellRenderer
|
||||||
{
|
{
|
||||||
|
private static final long serialVersionUID = 1L;
|
||||||
|
|
||||||
|
private final static Logger mLog = LoggerFactory
|
||||||
|
.getLogger( CallEventAliasCellRenderer.class );
|
||||||
|
|
||||||
private SettingsManager mSettingsManager;
|
private SettingsManager mSettingsManager;
|
||||||
|
|
||||||
public CallEventAliasCellRenderer( SettingsManager settingsManager )
|
public CallEventAliasCellRenderer( SettingsManager settingsManager )
|
||||||
|
|||||||
@@ -22,6 +22,7 @@ import javax.swing.JScrollPane;
|
|||||||
import javax.swing.JTable;
|
import javax.swing.JTable;
|
||||||
|
|
||||||
import net.miginfocom.swing.MigLayout;
|
import net.miginfocom.swing.MigLayout;
|
||||||
|
import settings.SettingsManager;
|
||||||
import controller.channel.Channel;
|
import controller.channel.Channel;
|
||||||
import controller.channel.ChannelEvent;
|
import controller.channel.ChannelEvent;
|
||||||
import controller.channel.ChannelEvent.Event;
|
import controller.channel.ChannelEvent.Event;
|
||||||
@@ -33,36 +34,28 @@ public class CallEventPanel extends JPanel implements ChannelEventListener
|
|||||||
|
|
||||||
private JScrollPane mEmptyScroller;
|
private JScrollPane mEmptyScroller;
|
||||||
private Channel mDisplayedChannel;
|
private Channel mDisplayedChannel;
|
||||||
|
private CallEventAliasCellRenderer mRenderer;
|
||||||
|
|
||||||
public CallEventPanel()
|
public CallEventPanel( SettingsManager settingsManager )
|
||||||
{
|
{
|
||||||
setLayout( new MigLayout("insets 0 0 0 0 ", "[grow,fill]", "[grow,fill]") );
|
setLayout( new MigLayout("insets 0 0 0 0 ", "[grow,fill]", "[grow,fill]") );
|
||||||
|
|
||||||
JTable table = new JTable( new CallEventModel() );
|
JTable table = new JTable( new CallEventModel() );
|
||||||
table.setAutoCreateRowSorter( true );
|
table.setAutoCreateRowSorter( true );
|
||||||
table.setAutoResizeMode( JTable.AUTO_RESIZE_LAST_COLUMN );
|
table.setAutoResizeMode( JTable.AUTO_RESIZE_LAST_COLUMN );
|
||||||
|
|
||||||
|
mRenderer = new CallEventAliasCellRenderer( settingsManager );
|
||||||
|
|
||||||
|
table.getColumnModel().getColumn( CallEventModel.FROM_ALIAS )
|
||||||
|
.setCellRenderer( mRenderer );
|
||||||
|
|
||||||
|
table.getColumnModel().getColumn( CallEventModel.TO_ALIAS )
|
||||||
|
.setCellRenderer( mRenderer );
|
||||||
|
|
||||||
mEmptyScroller = new JScrollPane( table );
|
mEmptyScroller = new JScrollPane( table );
|
||||||
|
|
||||||
add( mEmptyScroller );
|
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
|
@Override
|
||||||
public void channelChanged( ChannelEvent event )
|
public void channelChanged( ChannelEvent event )
|
||||||
@@ -76,10 +69,16 @@ public class CallEventPanel extends JPanel implements ChannelEventListener
|
|||||||
{
|
{
|
||||||
removeAll();
|
removeAll();
|
||||||
|
|
||||||
JScrollPane scroller = new JScrollPane( new JTable(
|
JTable table = new JTable(
|
||||||
event.getChannel().getCallEventModel() ) );
|
event.getChannel().getCallEventModel() );
|
||||||
|
|
||||||
add( scroller );
|
table.getColumnModel().getColumn( CallEventModel.FROM_ALIAS )
|
||||||
|
.setCellRenderer( mRenderer );
|
||||||
|
|
||||||
|
table.getColumnModel().getColumn( CallEventModel.TO_ALIAS )
|
||||||
|
.setCellRenderer( mRenderer );
|
||||||
|
|
||||||
|
add( new JScrollPane( table ) );
|
||||||
|
|
||||||
mDisplayedChannel = event.getChannel();
|
mDisplayedChannel = event.getChannel();
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user