#90 [WIP] Adds support for attribute monitors to all of the decoder states. Updates color scheme in 'Now Playing' view for channel states. Wires selection listener for selected channel metadata to the Events and Messages views. Finalizes format for horizontal audio panels, font and coloration.

This commit is contained in:
Denny
2017-01-20 21:12:57 -05:00
parent ce47d2545d
commit 2d9c3c0aa4
25 changed files with 1511 additions and 1816 deletions

View File

@@ -25,6 +25,7 @@ import icon.IconManager;
import net.miginfocom.swing.MigLayout; import net.miginfocom.swing.MigLayout;
import org.slf4j.Logger; import org.slf4j.Logger;
import org.slf4j.LoggerFactory; import org.slf4j.LoggerFactory;
import properties.SystemProperties;
import sample.Listener; import sample.Listener;
import settings.ColorSetting; import settings.ColorSetting;
import settings.ColorSetting.ColorSettingName; import settings.ColorSetting.ColorSettingName;
@@ -41,23 +42,27 @@ public class AudioChannelPanel extends JPanel
private static final long serialVersionUID = 1L; private static final long serialVersionUID = 1L;
private static final Logger mLog = LoggerFactory.getLogger(AudioChannelPanel.class); private static final Logger mLog = LoggerFactory.getLogger(AudioChannelPanel.class);
public static final String PROPERTY_PREFIX = "audio.channel.panel.color.";
public static final String PROPERTY_COLOR_BACKGROUND = PROPERTY_PREFIX + "background";
public static final String PROPERTY_COLOR_LABEL = PROPERTY_PREFIX + "label";
public static final String PROPERTY_COLOR_MUTED = PROPERTY_PREFIX + "muted";
public static final String PROPERTY_COLOR_VALUE = PROPERTY_PREFIX + "value";
private Font mFont = new Font(Font.MONOSPACED, Font.PLAIN, 16); private Font mFont = new Font(Font.MONOSPACED, Font.PLAIN, 16);
private Color mBackgroundColor;
private Color mLabelColor; private Color mLabelColor;
private Color mDetailsColor; private Color mMutedColor;
private Color mValueColor;
private IconManager mIconManager; private IconManager mIconManager;
private SettingsManager mSettingsManager; private SettingsManager mSettingsManager;
private AudioOutput mAudioOutput; private AudioOutput mAudioOutput;
private JLabel mMutedLabel = new JLabel("M");
private JLabel mChannelName = new JLabel(" "); private JLabel mChannelName = new JLabel(" ");
private JLabel mToLabel = new JLabel("TO:");
private JLabel mTo = new JLabel("-----");
private JLabel mToAlias = new JLabel(" "); private JLabel mToAlias = new JLabel(" ");
private JLabel mTo = new JLabel("-----");
private JLabel mMutedLabel = new JLabel("MUTED");
private JLabel mFromLabel = new JLabel("FROM:");
private JLabel mFrom = new JLabel("-----");
private JLabel mFromAlias = new JLabel(" ");
private boolean mConfigured = false; private boolean mConfigured = false;
@@ -75,67 +80,36 @@ public class AudioChannelPanel extends JPanel
mAudioOutput.setMetadataListener(new AudioMetadataProcessor()); mAudioOutput.setMetadataListener(new AudioMetadataProcessor());
} }
mLabelColor = mSettingsManager.getColorSetting( mBackgroundColor = SystemProperties.getInstance().get(PROPERTY_COLOR_BACKGROUND, Color.BLACK);
ColorSettingName.CHANNEL_STATE_LABEL_DECODER).getColor(); mLabelColor = SystemProperties.getInstance().get(PROPERTY_COLOR_LABEL, Color.LIGHT_GRAY);
mDetailsColor = mSettingsManager.getColorSetting( mMutedColor = SystemProperties.getInstance().get(PROPERTY_COLOR_MUTED, Color.RED);
ColorSettingName.CHANNEL_STATE_LABEL_DETAILS).getColor(); mValueColor = SystemProperties.getInstance().get(PROPERTY_COLOR_VALUE, Color.GREEN);
init(); init();
} }
private void init() private void init()
{ {
setLayout(new MigLayout("align center center, insets 0 0 0 0", setLayout(new MigLayout("align center center, insets 0 0 0 0", "[][][align right]0[grow,fill]", ""));
"[][][right][grow,fill][grow,fill][right][grow,fill][grow,fill]", "")); setBackground(mBackgroundColor);
setBackground(Color.BLACK);
mMutedLabel.setFont(mFont); mMutedLabel.setFont(mFont);
mMutedLabel.setForeground(Color.RED); mMutedLabel.setForeground(mMutedColor);
mMutedLabel.setVisible(false); mMutedLabel.setVisible(false);
add(mMutedLabel); add(mMutedLabel);
mChannelName = new JLabel(mAudioOutput != null ? mAudioOutput.getChannelName() : " "); mChannelName = new JLabel(mAudioOutput != null ? mAudioOutput.getChannelName() : " ");
mChannelName.setFont(mFont); mChannelName.setFont(mFont);
mChannelName.setForeground(mDetailsColor); mChannelName.setForeground(mLabelColor);
add(mChannelName); add(mChannelName);
mToLabel.setFont(mFont);
if(mAudioOutput != null)
{
mToLabel.setForeground(mLabelColor);
}
else
{
mToLabel.setForeground(getBackground());
}
add(mToLabel);
mTo.setFont(mFont);
mTo.setForeground(mLabelColor);
add(mTo);
mToAlias.setFont(mFont); mToAlias.setFont(mFont);
mToAlias.setForeground(mLabelColor); mToAlias.setForeground(mValueColor);
add(mToAlias); add(mToAlias);
mFromLabel.setFont(mFont); mTo.setFont(mFont);
if(mAudioOutput != null) mTo.setForeground(mValueColor);
{ add(mTo);
mFromLabel.setForeground(mLabelColor);
}
else
{
mFromLabel.setForeground(getBackground());
}
add(mFromLabel);
mFrom.setFont(mFont);
mFrom.setForeground(mLabelColor);
add(mFrom);
mFromAlias.setFont(mFont);
mFromAlias.setForeground(mLabelColor);
add(mFromAlias);
} }
@Override @Override
@@ -175,7 +149,6 @@ public class AudioChannelPanel extends JPanel
*/ */
private void resetLabels() private void resetLabels()
{ {
updateLabel(mFrom, null, mFromAlias, null);
updateLabel(mTo, null, mToAlias, null); updateLabel(mTo, null, mToAlias, null);
mConfigured = false; mConfigured = false;
@@ -190,14 +163,15 @@ public class AudioChannelPanel extends JPanel
{ {
if(value != null) if(value != null)
{ {
valueLabel.setText(value);
if(alias != null) if(alias != null)
{ {
aliasLabel.setIcon(mIconManager.getIcon(alias.getIconName(), 16)); valueLabel.setText(alias.getName());
aliasLabel.setIcon(mIconManager.getIcon(alias.getIconName(), 18));
} }
else else
{ {
valueLabel.setText(value);
aliasLabel.setIcon(null); aliasLabel.setIcon(null);
} }
} }
@@ -224,9 +198,6 @@ public class AudioChannelPanel extends JPanel
@Override @Override
public void run() public void run()
{ {
updateLabel(mFrom, metadata.getPrimaryAddressFrom().getIdentifier(),
mFromAlias, metadata.getPrimaryAddressFrom().getAlias());
updateLabel(mTo, metadata.getPrimaryAddressTo().getIdentifier(), updateLabel(mTo, metadata.getPrimaryAddressTo().getIdentifier(),
mToAlias, metadata.getPrimaryAddressTo().getAlias()); mToAlias, metadata.getPrimaryAddressTo().getAlias());
@@ -249,14 +220,6 @@ public class AudioChannelPanel extends JPanel
switch(colorSetting.getColorSettingName()) switch(colorSetting.getColorSettingName())
{ {
case CHANNEL_STATE_LABEL_DECODER: case CHANNEL_STATE_LABEL_DECODER:
if(mFrom != null)
{
mFrom.setForeground(mLabelColor);
}
if(mFromAlias != null)
{
mFromAlias.setForeground(mLabelColor);
}
if(mTo != null) if(mTo != null)
{ {
mTo.setForeground(mLabelColor); mTo.setForeground(mLabelColor);
@@ -266,16 +229,6 @@ public class AudioChannelPanel extends JPanel
mToAlias.setForeground(mLabelColor); mToAlias.setForeground(mLabelColor);
} }
break; break;
case CHANNEL_STATE_LABEL_DETAILS:
if(mFromLabel != null)
{
mFromLabel.setForeground(mDetailsColor);
}
if(mToLabel != null)
{
mToLabel.setForeground(mDetailsColor);
}
break;
default: default:
break; break;
} }

View File

@@ -33,7 +33,8 @@ public class AudioChannelsPanel extends JPanel
public AudioChannelsPanel(IconManager iconManager, SettingsManager settingsManager, IAudioController controller) public AudioChannelsPanel(IconManager iconManager, SettingsManager settingsManager, IAudioController controller)
{ {
setLayout(new MigLayout("insets 0 0 0 0", "[][grow,fill][][grow,fill]", "[grow,fill]")); // setLayout(new MigLayout("insets 0 0 0 0", "[][grow,fill][][grow,fill]", "[grow,fill]"));
setLayout(new MigLayout("insets 0 0 0 0", "[][sg,grow,fill][][sg,grow,fill]", "[grow,fill]"));
setBackground(Color.BLACK); setBackground(Color.BLACK);

View File

@@ -258,10 +258,17 @@ public abstract class AudioBroadcaster implements Listener<AudioRecording>
{ {
//Remove all pending audio recordings //Remove all pending audio recordings
while(!mAudioRecordingQueue.isEmpty()) while(!mAudioRecordingQueue.isEmpty())
{
try
{ {
AudioRecording recording = mAudioRecordingQueue.get(0); AudioRecording recording = mAudioRecordingQueue.get(0);
recording.removePendingReplay(); recording.removePendingReplay();
} }
catch(Exception e)
{
//Ignore
}
}
} }
} }
} }

View File

@@ -0,0 +1,99 @@
/*******************************************************************************
* sdrtrunk
* 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
* the Free Software Foundation, either version 3 of the License, or
* (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* 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 channel.metadata;
import alias.Alias;
import alias.AliasList;
import alias.id.AliasIDType;
import sample.Listener;
import static alias.id.AliasIDType.*;
public class AliasedIntegerAttributeMonitor extends AttributeMonitor<Integer>
{
private static final AliasIDType[] VALID_ID_TYPES = {STATUS, LTR_NET_UID};
private AliasList mAliasList;
private AliasIDType mAliasIDType;
/**
* Provides monitoring of a String attribute's values with occurrence heuristics enabled and alias lookup with each
* change in the attribute's value.
*
* @param attribute to monitor
* @param listener to receive change requests
* @param aliasList to lookup alias from
* @param aliasIDType to determine correct alias lookup method in alias list
*/
public AliasedIntegerAttributeMonitor(Attribute attribute, Listener<AttributeChangeRequest> listener, AliasList aliasList,
AliasIDType aliasIDType)
{
super(attribute, listener);
if(!isValidIDType(aliasIDType))
{
throw new IllegalArgumentException("Alias ID Type [" + aliasIDType.name() + "] is not supported");
}
mAliasList = aliasList;
mAliasIDType = aliasIDType;
}
/**
* Indicates if the alias ID type is a supported/valid type for this monitor.
*/
public static boolean isValidIDType(AliasIDType type)
{
for(AliasIDType validType: VALID_ID_TYPES)
{
if(type == validType)
{
return true;
}
}
return false;
}
/**
* Lookup of the alias that corresponds to the value's alias ID type
*/
@Override
protected Alias getAlias()
{
Alias alias = null;
if(mAliasList != null)
{
if(hasValue())
{
switch(mAliasIDType)
{
case STATUS:
alias = mAliasList.getStatus(getValue());
break;
case LTR_NET_UID:
alias = mAliasList.getUniqueID(getValue());
break;
}
}
}
return alias;
}
}

View File

@@ -51,13 +51,15 @@ public class AttributeMonitor<T>
* different from the current value, has a higher occurrence count than the current value. If heuristics are * different from the current value, has a higher occurrence count than the current value. If heuristics are
* disabled, then a change is emitted at each change in the value. * disabled, then a change is emitted at each change in the value.
* @param t * @param t
*
* @return true if the value was changed after processing
*/ */
public void process(T t) public boolean process(T t)
{
if(t != null && !mIllegalValues.contains(t))
{ {
boolean changed = false; boolean changed = false;
if(t != null && !mIllegalValues.contains(t))
{
if(mHeuristicsEnabled) if(mHeuristicsEnabled)
{ {
if(mOccurrenceCounts.containsKey(t)) if(mOccurrenceCounts.containsKey(t))
@@ -103,6 +105,8 @@ public class AttributeMonitor<T>
mListener.receive(new AttributeChangeRequest(mAttribute, getValue(), getAlias())); mListener.receive(new AttributeChangeRequest(mAttribute, getValue(), getAlias()));
} }
} }
return changed;
} }
/** /**

View File

@@ -18,11 +18,13 @@
******************************************************************************/ ******************************************************************************/
package channel.metadata; package channel.metadata;
import channel.state.State;
import controller.channel.Channel; import controller.channel.Channel;
import sample.Listener; import sample.Listener;
import javax.swing.table.AbstractTableModel; import javax.swing.table.AbstractTableModel;
import java.awt.*; import java.awt.*;
import java.text.DecimalFormat;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.HashMap; import java.util.HashMap;
import java.util.List; import java.util.List;
@@ -30,22 +32,28 @@ import java.util.Map;
public class ChannelMetadataModel extends AbstractTableModel implements Listener<MutableMetadataChangeEvent> public class ChannelMetadataModel extends AbstractTableModel implements Listener<MutableMetadataChangeEvent>
{ {
public static final int COLUMN_STATE = 0; private final DecimalFormat FREQUENCY_FORMATTER = new DecimalFormat( "#.0000" );
public static final int COLUMN_FREQUENCY = 1;
public static final int COLUMN_PRIMARY = 2;
public static final int COLUMN_SECONDARY = 3;
public static final int COLUMN_MESSAGE = 4;
public static final int COLUMN_NETWORK = 5;
public static final int COLUMN_CONFIGURATION = 6;
private static final String[] COLUMNS = public static final int COLUMN_STATE = 0;
{"State", "Frequency", "Primary", "Secondary", "Message", "Network", "Configuration"}; public static final int COLUMN_DECODER = 1;
public static final int COLUMN_CHANNEL = 2;
public static final int COLUMN_FREQUENCY = 3;
public static final int COLUMN_PRIMARY_FROM = 4;
public static final int COLUMN_PRIMARY_TO = 5;
public static final int COLUMN_SECONDARY_FROM = 6;
public static final int COLUMN_SECONDARY_TO = 7;
public static final int COLUMN_CONFIGURATION_NAME = 8;
public static final int COLUMN_MESSAGE = 9;
private static final String[] COLUMNS = {"State", "Decoder", "Channel", "Frequency", "Primary From", "Primary To",
"Secondary From", "Secondary To", "Channel Name", "Message"};
private List<MutableMetadata> mChannelMetadata = new ArrayList(); private List<MutableMetadata> mChannelMetadata = new ArrayList();
private Map<MutableMetadata,Channel> mMetadataChannelMap = new HashMap(); private Map<MutableMetadata,Channel> mMetadataChannelMap = new HashMap();
public void add(MutableMetadata metadata, Channel channel) public void add(MutableMetadata metadata, Channel channel)
{ {
//Execute on the swing thread to avoid threading issues
EventQueue.invokeLater(new Runnable() EventQueue.invokeLater(new Runnable()
{ {
@Override @Override
@@ -65,6 +73,7 @@ public class ChannelMetadataModel extends AbstractTableModel implements Listener
public void remove(MutableMetadata metadata) public void remove(MutableMetadata metadata)
{ {
//Execute on the swing thread to avoid threading issues
EventQueue.invokeLater(new Runnable() EventQueue.invokeLater(new Runnable()
{ {
@Override @Override
@@ -82,6 +91,27 @@ public class ChannelMetadataModel extends AbstractTableModel implements Listener
}); });
} }
/**
* Get the channel metadata at the specified model row index
*/
public Metadata getMetadata(int row)
{
if(row < mChannelMetadata.size())
{
return mChannelMetadata.get(row);
}
return null;
}
/**
* Returns the channel that matches the metadata or null
*/
public Channel getChannelFromMetadata(Metadata metadata)
{
return mMetadataChannelMap.get(metadata);
}
@Override @Override
public int getRowCount() public int getRowCount()
{ {
@@ -103,7 +133,27 @@ public class ChannelMetadataModel extends AbstractTableModel implements Listener
@Override @Override
public Class<?> getColumnClass(int columnIndex) public Class<?> getColumnClass(int columnIndex)
{ {
switch(columnIndex)
{
case COLUMN_STATE:
return State.class;
case COLUMN_DECODER:
case COLUMN_CHANNEL:
case COLUMN_FREQUENCY:
case COLUMN_MESSAGE:
case COLUMN_CONFIGURATION_NAME:
return String.class;
case COLUMN_PRIMARY_TO:
case COLUMN_PRIMARY_FROM:
case COLUMN_SECONDARY_TO:
case COLUMN_SECONDARY_FROM:
return MutableMetadata.class; return MutableMetadata.class;
default:
return String.class;
}
} }
@Override @Override
@@ -111,7 +161,57 @@ public class ChannelMetadataModel extends AbstractTableModel implements Listener
{ {
if(rowIndex <= mChannelMetadata.size()) if(rowIndex <= mChannelMetadata.size())
{ {
return mChannelMetadata.get(rowIndex); Metadata metadata = mChannelMetadata.get(rowIndex);
switch(columnIndex)
{
case COLUMN_STATE:
return metadata.getState();
case COLUMN_DECODER:
if(metadata.hasPrimaryDecoderType())
{
return metadata.getPrimaryDecoderType().getShortDisplayString();
}
return null;
case COLUMN_CHANNEL:
return metadata.getChannelFrequencyLabel();
case COLUMN_FREQUENCY:
if(metadata.hasChannelFrequency())
{
return FREQUENCY_FORMATTER.format((double)metadata.getChannelFrequency() / 1E6d);
}
return null;
case COLUMN_MESSAGE:
if(metadata.hasMessageType() | metadata.hasMessage())
{
StringBuilder sb = new StringBuilder();
if(metadata.hasMessageType())
{
sb.append(metadata.getMessageType()).append(" ");
}
if(metadata.hasMessage())
{
sb.append(metadata.getMessage());
}
return sb.toString();
}
return null;
case COLUMN_CONFIGURATION_NAME:
return metadata.getChannelConfigurationLabel1();
case COLUMN_PRIMARY_TO:
case COLUMN_PRIMARY_FROM:
case COLUMN_SECONDARY_TO:
case COLUMN_SECONDARY_FROM:
return metadata;
default:
return String.class;
}
} }
return null; return null;
@@ -120,6 +220,7 @@ public class ChannelMetadataModel extends AbstractTableModel implements Listener
@Override @Override
public void receive(MutableMetadataChangeEvent mutableMetadataChangeEvent) public void receive(MutableMetadataChangeEvent mutableMetadataChangeEvent)
{ {
//Execute on the swing thread to avoid threading issues
EventQueue.invokeLater(new Runnable() EventQueue.invokeLater(new Runnable()
{ {
@Override @Override
@@ -132,13 +233,16 @@ public class ChannelMetadataModel extends AbstractTableModel implements Listener
switch(mutableMetadataChangeEvent.getAttribute()) switch(mutableMetadataChangeEvent.getAttribute())
{ {
case CHANNEL_CONFIGURATION_LABEL_1: case CHANNEL_CONFIGURATION_LABEL_1:
break;
case CHANNEL_CONFIGURATION_LABEL_2: case CHANNEL_CONFIGURATION_LABEL_2:
fireTableCellUpdated(rowIndex, COLUMN_CONFIGURATION); fireTableCellUpdated(rowIndex, COLUMN_CONFIGURATION_NAME);
break; break;
case CHANNEL_FREQUENCY: case CHANNEL_FREQUENCY:
case CHANNEL_FREQUENCY_LABEL:
fireTableCellUpdated(rowIndex, COLUMN_FREQUENCY); fireTableCellUpdated(rowIndex, COLUMN_FREQUENCY);
break; break;
case CHANNEL_FREQUENCY_LABEL:
fireTableCellUpdated(rowIndex, COLUMN_CHANNEL);
break;
case CHANNEL_STATE: case CHANNEL_STATE:
fireTableCellUpdated(rowIndex, COLUMN_STATE); fireTableCellUpdated(rowIndex, COLUMN_STATE);
break; break;
@@ -146,17 +250,20 @@ public class ChannelMetadataModel extends AbstractTableModel implements Listener
case MESSAGE_TYPE: case MESSAGE_TYPE:
fireTableCellUpdated(rowIndex, COLUMN_MESSAGE); fireTableCellUpdated(rowIndex, COLUMN_MESSAGE);
break; break;
case NETWORK_ID_1:
case NETWORK_ID_2:
fireTableCellUpdated(rowIndex, COLUMN_NETWORK);
break;
case PRIMARY_ADDRESS_FROM: case PRIMARY_ADDRESS_FROM:
fireTableCellUpdated(rowIndex, COLUMN_PRIMARY_FROM);
break;
case PRIMARY_ADDRESS_TO: case PRIMARY_ADDRESS_TO:
fireTableCellUpdated(rowIndex, COLUMN_PRIMARY); fireTableCellUpdated(rowIndex, COLUMN_PRIMARY_TO);
break;
case PRIMARY_DECODER_TYPE:
fireTableCellUpdated(rowIndex, COLUMN_DECODER);
break; break;
case SECONDARY_ADDRESS_FROM: case SECONDARY_ADDRESS_FROM:
fireTableCellUpdated(rowIndex, COLUMN_SECONDARY_FROM);
break;
case SECONDARY_ADDRESS_TO: case SECONDARY_ADDRESS_TO:
fireTableCellUpdated(rowIndex, COLUMN_SECONDARY); fireTableCellUpdated(rowIndex, COLUMN_SECONDARY_TO);
break; break;
} }
} }

View File

@@ -19,26 +19,39 @@
package channel.metadata; package channel.metadata;
import alias.Alias; import alias.Alias;
import channel.state.State;
import com.sun.xml.internal.ws.api.streaming.XMLStreamReaderFactory;
import controller.channel.Channel;
import controller.channel.ChannelProcessingManager;
import icon.IconManager; import icon.IconManager;
import icon.IconTableModel; import module.ProcessingChain;
import net.miginfocom.swing.MigLayout; import net.miginfocom.swing.MigLayout;
import properties.SystemProperties;
import sample.Broadcaster;
import sample.Listener;
import javax.swing.*; import javax.swing.*;
import javax.swing.event.ListSelectionEvent;
import javax.swing.event.ListSelectionListener; import javax.swing.event.ListSelectionListener;
import javax.swing.table.TableCellRenderer; import javax.swing.table.DefaultTableCellRenderer;
import java.awt.*; import java.awt.*;
import java.text.DecimalFormat;
public class ChannelMetadataPanel extends JPanel public class ChannelMetadataPanel extends JPanel implements ListSelectionListener
{ {
private ChannelMetadataModel mChannelMetadataModel; private static final String PROPERTY_PREFIX_BACKGROUND = "channel.metadata.panel.state.color.";
private static final String PROPERTY_PREFIX_FOREGROUND = "channel.metadata.panel.text.color.";
private ChannelProcessingManager mChannelProcessingManager;
private IconManager mIconManager; private IconManager mIconManager;
private JTable mTable; private JTable mTable;
private Broadcaster<ProcessingChain> mSelectedProcessingChainBroadcaster = new Broadcaster<>();
public ChannelMetadataPanel(ChannelMetadataModel channelMetadataModel, IconManager iconManager) /**
* Table view for currently decoding channel metadata
*/
public ChannelMetadataPanel(ChannelProcessingManager channelProcessingManager, IconManager iconManager)
{ {
mChannelMetadataModel = channelMetadataModel;
mIconManager = iconManager; mIconManager = iconManager;
mChannelProcessingManager = channelProcessingManager;
init(); init();
} }
@@ -50,199 +63,165 @@ public class ChannelMetadataPanel extends JPanel
{ {
setLayout( new MigLayout( "insets 0 0 0 0", "[grow,fill]", "[grow,fill]") ); setLayout( new MigLayout( "insets 0 0 0 0", "[grow,fill]", "[grow,fill]") );
mTable = new JTable(mChannelMetadataModel); mTable = new JTable(mChannelProcessingManager.getChannelMetadataModel());
mTable.setRowHeight(35);
mTable.getColumnModel().getColumn(ChannelMetadataModel.COLUMN_STATE).setCellRenderer(new StateCellRenderer()); DefaultTableCellRenderer renderer = (DefaultTableCellRenderer)mTable.getDefaultRenderer(String.class);
renderer.setHorizontalAlignment(SwingConstants.CENTER);
mTable.getColumnModel().getColumn(ChannelMetadataModel.COLUMN_FREQUENCY) mTable.getSelectionModel().addListSelectionListener(this);
.setCellRenderer(new FrequencyCellRenderer());
mTable.getColumnModel().getColumn(ChannelMetadataModel.COLUMN_PRIMARY) mTable.getColumnModel().getColumn(ChannelMetadataModel.COLUMN_STATE)
.setCellRenderer(new AliasedValueCellRenderer(Attribute.PRIMARY_ADDRESS_TO, Attribute.PRIMARY_ADDRESS_FROM)); .setCellRenderer(new ColoredStateCellRenderer());
mTable.getColumnModel().getColumn(ChannelMetadataModel.COLUMN_PRIMARY_TO)
mTable.getColumnModel().getColumn(ChannelMetadataModel.COLUMN_SECONDARY) .setCellRenderer(new AliasedValueCellRenderer(Attribute.PRIMARY_ADDRESS_TO));
.setCellRenderer(new AliasedValueCellRenderer(Attribute.SECONDARY_ADDRESS_TO, Attribute.SECONDARY_ADDRESS_FROM)); mTable.getColumnModel().getColumn(ChannelMetadataModel.COLUMN_PRIMARY_FROM)
.setCellRenderer(new AliasedValueCellRenderer(Attribute.PRIMARY_ADDRESS_FROM));
mTable.getColumnModel().getColumn(ChannelMetadataModel.COLUMN_MESSAGE) mTable.getColumnModel().getColumn(ChannelMetadataModel.COLUMN_SECONDARY_TO)
.setCellRenderer(new AliasedValueCellRenderer(Attribute.MESSAGE, Attribute.MESSAGE_TYPE)); .setCellRenderer(new AliasedValueCellRenderer(Attribute.SECONDARY_ADDRESS_TO));
mTable.getColumnModel().getColumn(ChannelMetadataModel.COLUMN_SECONDARY_FROM)
mTable.getColumnModel().getColumn(ChannelMetadataModel.COLUMN_NETWORK) .setCellRenderer(new AliasedValueCellRenderer(Attribute.SECONDARY_ADDRESS_FROM));
.setCellRenderer(new AliasedValueCellRenderer(Attribute.NETWORK_ID_1, Attribute.NETWORK_ID_2));
mTable.getColumnModel().getColumn(ChannelMetadataModel.COLUMN_CONFIGURATION)
.setCellRenderer(new AliasedValueCellRenderer(Attribute.CHANNEL_CONFIGURATION_LABEL_1,
Attribute.CHANNEL_CONFIGURATION_LABEL_2));
JScrollPane scrollPane = new JScrollPane(mTable, JScrollPane.VERTICAL_SCROLLBAR_ALWAYS, JScrollPane scrollPane = new JScrollPane(mTable, JScrollPane.VERTICAL_SCROLLBAR_ALWAYS,
JScrollPane.HORIZONTAL_SCROLLBAR_AS_NEEDED); JScrollPane.HORIZONTAL_SCROLLBAR_AS_NEEDED);
add(scrollPane); add(scrollPane);
// new TableColumnWidthMonitor(mTable, PROPERTY_PREFIX, new int[] {15,15,15,15,25,25,25,25,15,40});
}
@Override
public void valueChanged(ListSelectionEvent e)
{
if(!mTable.getSelectionModel().getValueIsAdjusting())
{
ProcessingChain processingChain = null;
int selectedViewRow = mTable.getSelectedRow();
if(selectedViewRow >= 0)
{
int selectedModelRow = mTable.convertRowIndexToModel(selectedViewRow);
Metadata selectedMetadata = mChannelProcessingManager.getChannelMetadataModel()
.getMetadata(selectedModelRow);
if(selectedMetadata != null)
{
Channel selectedChannel = mChannelProcessingManager.getChannelMetadataModel()
.getChannelFromMetadata(selectedMetadata);
processingChain = mChannelProcessingManager.getProcessingChain(selectedChannel);
}
}
mSelectedProcessingChainBroadcaster.broadcast(processingChain);
}
} }
/** /**
* Adds a selection listener to the contained metadata JTable * Adds the listener to receive the processing chain associated with the metadata selected in the
* metadata table.
*/ */
public void addListSelectionListener(ListSelectionListener listener) public void addProcessingChainSelectionListener(Listener<ProcessingChain> listener)
{ {
mTable.getSelectionModel().addListSelectionListener(listener); mSelectedProcessingChainBroadcaster.addListener(listener);
} }
/** public class AliasedValueCellRenderer extends DefaultTableCellRenderer
* Removes the selection listener from the contained metadata JTable
*/
public void removeListSelectionListener(ListSelectionListener listener)
{ {
mTable.getSelectionModel().removeListSelectionListener(listener); private Attribute mAttribute;
}
public class AliasedValueCellRenderer extends JPanel implements TableCellRenderer public AliasedValueCellRenderer(Attribute attribute)
{ {
private JLabel mLabel1; assert(attribute != null);
private JLabel mAlias1; mAttribute = attribute;
private JLabel mLabel2; setHorizontalAlignment(JLabel.CENTER);
private JLabel mAlias2;
private Attribute mAttribute1;
private Attribute mAttribute2;
public AliasedValueCellRenderer(Attribute attribute1, Attribute attribute2)
{
mAttribute1 = attribute1;
mAttribute2 = attribute2;
setLayout( new MigLayout( "insets 0 0 0 0", "[12][grow,fill]", "[grow,fill]0[grow,fill]") );
mAlias1 = new JLabel();
add(mAlias1);
mLabel1 = new JLabel("---");
mLabel1.setFont(mTable.getFont());
add(mLabel1,"wrap");
mAlias2 = new JLabel();
add(mAlias2);
mLabel2 = new JLabel("---");
mLabel2.setFont(mTable.getFont());
add(mLabel2,"wrap");
} }
@Override @Override
public Component getTableCellRendererComponent(JTable table, Object value, boolean isSelected, boolean hasFocus, public Component getTableCellRendererComponent(JTable table, Object value, boolean isSelected, boolean hasFocus,
int row, int column) int row, int column)
{ {
MutableMetadata metadata = (MutableMetadata)value; JLabel label = (JLabel)super.getTableCellRendererComponent(table, value, isSelected, hasFocus, row, column);
if(mAttribute1 != null) Metadata metadata = (Metadata)value;
{ String value1 = metadata.getValue(mAttribute);
String value1 = metadata.getValue(mAttribute1); Alias alias = metadata.getAlias(mAttribute);
mLabel1.setText(value1);
Alias alias1 = metadata.getAlias(mAttribute1); label.setText(alias != null ? alias.getName() : value1);
label.setIcon(alias != null ? mIconManager.getIcon(alias.getIconName(), IconManager.DEFAULT_ICON_SIZE) : null);
label.setForeground(alias != null ? alias.getDisplayColor() : table.getForeground());
if(alias1 != null) return label;
{
mAlias1.setIcon(mIconManager.getIcon(alias1.getIconName(), IconManager.DEFAULT_ICON_SIZE));
mLabel1.setForeground(alias1.getDisplayColor());
}
else
{
mAlias1.setIcon(null);
mLabel1.setForeground(mTable.getForeground());
} }
} }
if(mAttribute2 != null) public class ColoredStateCellRenderer extends DefaultTableCellRenderer
{ {
String value2 = metadata.getValue(mAttribute2); public ColoredStateCellRenderer()
mLabel2.setText(value2);
Alias alias2 = metadata.getAlias(mAttribute2);
if(alias2 != null)
{ {
mAlias2.setIcon(mIconManager.getIcon(alias2.getIconName(), IconManager.DEFAULT_ICON_SIZE)); setHorizontalAlignment(SwingConstants.CENTER);
mLabel2.setForeground(alias2.getDisplayColor());
}
else
{
mAlias2.setIcon(null);
mLabel2.setForeground(mTable.getForeground());
}
}
setBackground(isSelected ? table.getSelectionBackground() : table.getBackground());
return this;
}
}
public class FrequencyCellRenderer extends JPanel implements TableCellRenderer
{
private final DecimalFormat FREQUENCY_FORMATTER = new DecimalFormat( "#.000000" );
private JLabel mLabel1;
private JLabel mLabel2;
public FrequencyCellRenderer()
{
setLayout( new MigLayout( "insets 0 0 0 0", "[grow,fill,align center]", "[grow,fill]0[grow,fill]") );
mLabel1 = new JLabel();
mLabel1.setFont(mTable.getFont());
add(mLabel1,"wrap");
mLabel2 = new JLabel();
mLabel2.setFont(mTable.getFont());
add(mLabel2);
} }
@Override @Override
public Component getTableCellRendererComponent(JTable table, Object value, boolean isSelected, boolean hasFocus, public Component getTableCellRendererComponent(JTable table, Object value, boolean isSelected, boolean hasFocus,
int row, int column) int row, int column)
{ {
MutableMetadata metadata = (MutableMetadata)value; JLabel label = (JLabel)super.getTableCellRendererComponent(table, value, isSelected, hasFocus, row, column);
if(metadata.hasChannelFrequency()) Color background = table.getBackground();
Color foreground = table.getForeground();
if(value instanceof State)
{ {
mLabel1.setText(FREQUENCY_FORMATTER.format((double)metadata.getChannelFrequency() / 1E6d)); State state = (State)value;
label.setText(state.getDisplayValue());
switch(state)
{
case CALL:
background = SystemProperties.getInstance().get(PROPERTY_PREFIX_BACKGROUND + "call", Color.BLUE);
foreground = SystemProperties.getInstance().get(PROPERTY_PREFIX_FOREGROUND + "call", Color.YELLOW);
break;
case CONTROL:
background = SystemProperties.getInstance().get(PROPERTY_PREFIX_BACKGROUND + "control", Color.ORANGE);
foreground = SystemProperties.getInstance().get(PROPERTY_PREFIX_FOREGROUND + "control", Color.BLUE);
break;
case DATA:
background = SystemProperties.getInstance().get(PROPERTY_PREFIX_BACKGROUND + "data", Color.GREEN);
foreground = SystemProperties.getInstance().get(PROPERTY_PREFIX_FOREGROUND + "data", Color.BLUE);
break;
case ENCRYPTED:
background = SystemProperties.getInstance().get(PROPERTY_PREFIX_BACKGROUND + "encrypted", Color.MAGENTA);
foreground = SystemProperties.getInstance().get(PROPERTY_PREFIX_FOREGROUND + "encrypted", Color.WHITE);
break;
case FADE:
background = SystemProperties.getInstance().get(PROPERTY_PREFIX_BACKGROUND + "fade", Color.LIGHT_GRAY.BLUE);
foreground = SystemProperties.getInstance().get(PROPERTY_PREFIX_FOREGROUND + "fade", Color.YELLOW);
break;
case IDLE:
background = SystemProperties.getInstance().get(PROPERTY_PREFIX_BACKGROUND + "idle", Color.WHITE);
foreground = SystemProperties.getInstance().get(PROPERTY_PREFIX_FOREGROUND + "idle", Color.BLUE);
break;
case RESET:
background = SystemProperties.getInstance().get(PROPERTY_PREFIX_BACKGROUND + "reset", Color.PINK);
foreground = SystemProperties.getInstance().get(PROPERTY_PREFIX_FOREGROUND + "reset", Color.YELLOW);
break;
case TEARDOWN:
background = SystemProperties.getInstance().get(PROPERTY_PREFIX_BACKGROUND + "teardown", Color.DARK_GRAY);
foreground = SystemProperties.getInstance().get(PROPERTY_PREFIX_FOREGROUND + "teardown", Color.WHITE);
break;
}
} }
else else
{ {
mLabel1.setText(null); setText("");
} }
mLabel2.setText(metadata.getChannelFrequencyLabel()); setBackground(background);
setForeground(foreground);
setBackground(isSelected ? table.getSelectionBackground() : table.getBackground()); return label;
return this;
} }
} }
public class StateCellRenderer extends JPanel implements TableCellRenderer
{
private JLabel mLabel1;
public StateCellRenderer()
{
setLayout( new MigLayout( "insets 0 0 0 0", "[grow,fill,align center]", "[grow,fill,align center]") );
mLabel1 = new JLabel();
mLabel1.setFont(mTable.getFont());
add(mLabel1);
}
@Override
public Component getTableCellRendererComponent(JTable table, Object value, boolean isSelected, boolean hasFocus,
int row, int column)
{
MutableMetadata metadata = (MutableMetadata)value;
mLabel1.setText(metadata.getState().getDisplayValue());
setBackground(isSelected ? table.getSelectionBackground() : table.getBackground());
return this;
}
}
} }

View File

@@ -22,7 +22,6 @@ import com.jidesoft.swing.JideSplitPane;
import com.jidesoft.swing.JideTabbedPane; import com.jidesoft.swing.JideTabbedPane;
import controller.channel.ChannelProcessingManager; import controller.channel.ChannelProcessingManager;
import icon.IconManager; import icon.IconManager;
import icon.IconTableModel;
import module.decode.event.CallEventPanel; import module.decode.event.CallEventPanel;
import module.decode.event.MessageActivityPanel; import module.decode.event.MessageActivityPanel;
import net.miginfocom.swing.MigLayout; import net.miginfocom.swing.MigLayout;
@@ -30,6 +29,7 @@ import settings.SettingsManager;
import spectrum.ChannelSpectrumPanel; import spectrum.ChannelSpectrumPanel;
import javax.swing.*; import javax.swing.*;
import java.awt.*;
public class ChannelMetadataViewer extends JPanel public class ChannelMetadataViewer extends JPanel
{ {
@@ -45,11 +45,10 @@ public class ChannelMetadataViewer extends JPanel
public ChannelMetadataViewer(ChannelProcessingManager channelProcessingManager, IconManager iconManager, public ChannelMetadataViewer(ChannelProcessingManager channelProcessingManager, IconManager iconManager,
SettingsManager settingsManager) SettingsManager settingsManager)
{ {
mCallEventPanel = new CallEventPanel(iconManager, channelProcessingManager); mCallEventPanel = new CallEventPanel(iconManager);
mMessageActivityPanel = new MessageActivityPanel(channelProcessingManager); mMessageActivityPanel = new MessageActivityPanel(channelProcessingManager);
mChannelSpectrumPanel = new ChannelSpectrumPanel(settingsManager, channelProcessingManager); mChannelSpectrumPanel = new ChannelSpectrumPanel(settingsManager, channelProcessingManager);
mChannelMetadataPanel = new ChannelMetadataPanel(channelProcessingManager.getChannelMetadataModel(), mChannelMetadataPanel = new ChannelMetadataPanel(channelProcessingManager, iconManager);
iconManager);
init(); init();
} }
@@ -59,49 +58,20 @@ public class ChannelMetadataViewer extends JPanel
setLayout( new MigLayout( "insets 0 0 0 0", "[grow,fill]", "[grow,fill]") ); setLayout( new MigLayout( "insets 0 0 0 0", "[grow,fill]", "[grow,fill]") );
JideTabbedPane tabbedPane = new JideTabbedPane(); JideTabbedPane tabbedPane = new JideTabbedPane();
tabbedPane.addTab("Details", new JPanel()); // tabbedPane.addTab("Details", new JPanel());
tabbedPane.addTab("Events", mCallEventPanel); tabbedPane.addTab("Events", mCallEventPanel);
tabbedPane.addTab("Messages", mMessageActivityPanel); tabbedPane.addTab("Messages", mMessageActivityPanel);
tabbedPane.addTab("Spectrum", mChannelSpectrumPanel); // tabbedPane.addTab("Spectrum", mChannelSpectrumPanel);
tabbedPane.setFont(this.getFont());
tabbedPane.setForeground(Color.BLACK);
JideSplitPane splitPane = new JideSplitPane(JideSplitPane.VERTICAL_SPLIT); JideSplitPane splitPane = new JideSplitPane(JideSplitPane.VERTICAL_SPLIT);
splitPane.setShowGripper(true);
splitPane.add(mChannelMetadataPanel); splitPane.add(mChannelMetadataPanel);
splitPane.add(tabbedPane); splitPane.add(tabbedPane);
add(splitPane); add(splitPane);
//TODO: move this change listener to the metadata table view mChannelMetadataPanel.addProcessingChainSelectionListener(mCallEventPanel);
// /** mChannelMetadataPanel.addProcessingChainSelectionListener(mMessageActivityPanel);
// * Change listener to enable/disable the channel spectrum display
// * only when the tab is visible, and a channel has been selected
// */
// mTabbedPane.addChangeListener(new ChangeListener()
// {
// @Override
// public void stateChanged(ChangeEvent event)
// {
// int index = mTabbedPane.getSelectedIndex();
//
// Component component = mTabbedPane.getComponentAt(index);
//
// if(component instanceof ChannelSpectrumPanel)
// {
// mChannelSpectrumPanel.setEnabled(true);
// }
// else
// {
// mChannelSpectrumPanel.setEnabled(false);
// }
// }
// });
//TODO: call, message and spectrum should listen to the metadata table now
//
//
// /* Register each of the components to receive channel events when the
// * channels are selected or change */
// mChannelModel.addListener(mCallEventPanel);
// mChannelModel.addListener(mChannelSpectrumPanel);
// mChannelModel.addListener(mMessageActivityPanel);
} }
} }

View File

@@ -18,30 +18,10 @@
******************************************************************************/ ******************************************************************************/
package channel.traffic; package channel.traffic;
import java.util.ArrayList;
import java.util.List;
import java.util.Map;
import java.util.concurrent.ConcurrentHashMap;
import java.util.concurrent.ScheduledExecutorService;
import channel.state.DecoderStateEvent;
import channel.state.IDecoderStateEventListener;
import module.Module;
import module.decode.config.DecodeConfiguration;
import module.decode.event.CallEvent;
import module.decode.event.CallEvent.CallEventType;
import module.decode.event.ICallEventProvider;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import record.config.RecordConfiguration;
import sample.Listener;
import source.config.SourceConfigTuner;
import source.tuner.TunerChannel;
import source.tuner.TunerChannel.Type;
import alias.Alias; import alias.Alias;
import alias.id.priority.Priority; import alias.id.priority.Priority;
import channel.state.DecoderStateEvent;
import channel.state.IDecoderStateEventListener;
import controller.channel.Channel; import controller.channel.Channel;
import controller.channel.Channel.ChannelType; import controller.channel.Channel.ChannelType;
import controller.channel.ChannelEvent; import controller.channel.ChannelEvent;
@@ -49,17 +29,33 @@ import controller.channel.ChannelEvent.Event;
import controller.channel.ChannelModel; import controller.channel.ChannelModel;
import controller.channel.ChannelProcessingManager; import controller.channel.ChannelProcessingManager;
import controller.channel.TrafficChannelEvent; import controller.channel.TrafficChannelEvent;
import module.Module;
import module.decode.config.DecodeConfiguration;
import module.decode.event.CallEvent;
import module.decode.event.CallEvent.CallEventType;
import module.decode.event.ICallEventProvider;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import record.config.RecordConfiguration;
import sample.Listener;
import source.config.SourceConfigTuner;
import source.tuner.TunerChannel;
import source.tuner.TunerChannel.Type;
public class TrafficChannelManager extends Module import java.util.ArrayList;
implements ICallEventProvider, IDecoderStateEventListener import java.util.List;
import java.util.Map;
import java.util.concurrent.ConcurrentHashMap;
import java.util.concurrent.ScheduledExecutorService;
public class TrafficChannelManager extends Module implements ICallEventProvider, IDecoderStateEventListener
{ {
private final static Logger mLog = LoggerFactory.getLogger(TrafficChannelManager.class); private final static Logger mLog = LoggerFactory.getLogger(TrafficChannelManager.class);
public static final String CHANNEL_START_REJECTED = "CHANNEL START REJECTED"; public static final String CHANNEL_START_REJECTED = "CHANNEL START REJECTED";
public static final String NO_TUNER_AVAILABLE = "NO TUNER AVAILABLE"; public static final String NO_TUNER_AVAILABLE = "NO TUNER AVAILABLE";
public static final String UNKNOWN_FREQUENCY = "UNKNOWN FREQUENCY"; public static final String UNKNOWN_FREQUENCY = "UNKNOWN FREQUENCY";
private int mTrafficChannelPoolMaximumSize = private int mTrafficChannelPoolMaximumSize = DecodeConfiguration.TRAFFIC_CHANNEL_LIMIT_DEFAULT;
DecodeConfiguration.TRAFFIC_CHANNEL_LIMIT_DEFAULT;
private List<Channel> mTrafficChannelPool = new ArrayList<Channel>(); private List<Channel> mTrafficChannelPool = new ArrayList<Channel>();
private Map<String,Channel> mTrafficChannelsInUse = new ConcurrentHashMap<String,Channel>(); private Map<String,Channel> mTrafficChannelsInUse = new ConcurrentHashMap<String,Channel>();
@@ -81,23 +77,15 @@ public class TrafficChannelManager extends Module
* traffic channel allocations. * traffic channel allocations.
* *
* @param channelModel containing channels currently in use * @param channelModel containing channels currently in use
*
* @param channelProcessingManager * @param channelProcessingManager
*
* @param decodeConfiguration - decoder configuration to use for each * @param decodeConfiguration - decoder configuration to use for each
* traffic channel allocation. * traffic channel allocation.
*
* @param recordConfiguration - recording options for each traffic channel * @param recordConfiguration - recording options for each traffic channel
*
* @param system label to use to describe the system * @param system label to use to describe the system
*
* @param site label to use to describe the site * @param site label to use to describe the site
*
* @param aliasListName designated for the channel * @param aliasListName designated for the channel
*
* @param trafficChannelTimeout - millisecond call timer limit used when an * @param trafficChannelTimeout - millisecond call timer limit used when an
* end of call signalling event is not decoded. * end of call signalling event is not decoded.
*
* @param trafficChannelPoolSize - maximum number of allocated traffic channels * @param trafficChannelPoolSize - maximum number of allocated traffic channels
* in the pool * in the pool
*/ */
@@ -255,8 +243,7 @@ public class TrafficChannelManager extends Module
} }
else if(!details.contains(CHANNEL_START_REJECTED)) else if(!details.contains(CHANNEL_START_REJECTED))
{ {
callEvent.setDetails(new StringBuilder(CHANNEL_START_REJECTED) callEvent.setDetails(new StringBuilder(CHANNEL_START_REJECTED).append(" : ")
.append(" : ")
.append(callEvent.getDetails()).toString()); .append(callEvent.getDetails()).toString());
} }
} }
@@ -273,8 +260,7 @@ public class TrafficChannelManager extends Module
} }
else if(!details.contains(NO_TUNER_AVAILABLE)) else if(!details.contains(NO_TUNER_AVAILABLE))
{ {
callEvent.setDetails(new StringBuilder(NO_TUNER_AVAILABLE) callEvent.setDetails(new StringBuilder(NO_TUNER_AVAILABLE).append(" : ")
.append(" : ")
.append(callEvent.getDetails()).toString()); .append(callEvent.getDetails()).toString());
} }
} }
@@ -291,8 +277,7 @@ public class TrafficChannelManager extends Module
} }
else if(!details.contains(UNKNOWN_FREQUENCY)) else if(!details.contains(UNKNOWN_FREQUENCY))
{ {
callEvent.setDetails(new StringBuilder(UNKNOWN_FREQUENCY) callEvent.setDetails(new StringBuilder(UNKNOWN_FREQUENCY).append(" : ")
.append(" : ")
.append(callEvent.getDetails()).toString()); .append(callEvent.getDetails()).toString());
} }
} }
@@ -326,30 +311,19 @@ public class TrafficChannelManager extends Module
return false; return false;
} }
if( e1.getChannel() == null || if(e1.getChannel() == null || e2.getChannel() == null || !e1.getChannel().contentEquals(e2.getChannel()))
e2.getChannel() == null ||
!e1.getChannel().contentEquals( e2.getChannel() ) )
{ {
return false; return false;
} }
if( e1.getToID() == null || if(e1.getToID() == null || e2.getToID() == null || !e1.getToID().contentEquals(e2.getToID()))
e2.getToID() == null ||
!e1.getToID().contentEquals( e2.getToID() ) )
{ {
return false; return false;
} }
if(e1.getFromID() == null || e2.getFromID() == null) if(e1.getFromID() == null || e2.getFromID() == null)
{ {
if( e1.getFromID() == null && e2.getFromID() == null ) return (e1.getFromID() == null && e2.getFromID() == null);
{
return true;
}
else
{
return false;
}
} }
else if(e1.getFromID().contentEquals(e2.getFromID())) else if(e1.getFromID().contentEquals(e2.getFromID()))
{ {
@@ -369,18 +343,14 @@ public class TrafficChannelManager extends Module
{ {
Alias to = event.getToIDAlias(); Alias to = event.getToIDAlias();
if( to != null && if(to != null && to.hasCallPriority() && to.getCallPriority() == Priority.DO_NOT_MONITOR)
to.hasCallPriority() &&
to.getCallPriority() == Priority.DO_NOT_MONITOR )
{ {
return true; return true;
} }
Alias from = event.getFromIDAlias(); Alias from = event.getFromIDAlias();
if( from != null && if(from != null && from.hasCallPriority() && from.getCallPriority() == Priority.DO_NOT_MONITOR)
from.hasCallPriority() &&
from.getCallPriority() == Priority.DO_NOT_MONITOR )
{ {
return true; return true;
} }

View File

@@ -31,6 +31,7 @@ import message.Message;
import module.Module; import module.Module;
import module.ProcessingChain; import module.ProcessingChain;
import module.decode.DecoderFactory; import module.decode.DecoderFactory;
import module.decode.DecoderType;
import module.decode.event.MessageActivityModel; import module.decode.event.MessageActivityModel;
import module.log.EventLogManager; import module.log.EventLogManager;
import org.slf4j.Logger; import org.slf4j.Logger;
@@ -41,6 +42,8 @@ import sample.Listener;
import source.Source; import source.Source;
import source.SourceException; import source.SourceException;
import source.SourceManager; import source.SourceManager;
import source.SourceType;
import source.config.SourceConfigTuner;
import java.util.HashMap; import java.util.HashMap;
import java.util.List; import java.util.List;
@@ -184,8 +187,7 @@ public class ChannelProcessingManager implements ChannelEventListener
{ {
channel.setEnabled(false); channel.setEnabled(false);
mChannelModel.broadcast( mChannelModel.broadcast(new ChannelEvent(channel, Event.NOTIFICATION_ENABLE_REJECTED));
new ChannelEvent(channel, Event.NOTIFICATION_ENABLE_REJECTED));
return; return;
} }
@@ -224,31 +226,20 @@ public class ChannelProcessingManager implements ChannelEventListener
} }
//Inject channel metadata that will be inserted into audio packets for recorder manager and streaming //Inject channel metadata that will be inserted into audio packets for recorder manager and streaming
StringBuilder sb = new StringBuilder(); processingChain.getChannelState().getMutableMetadata().receive(
new AttributeChangeRequest<String>(Attribute.CHANNEL_CONFIGURATION_LABEL_1, channel.getName()));
if(channel.getSystem() != null) if(channel.getSourceConfiguration().getSourceType() == SourceType.TUNER)
{ {
sb.append(channel.getSystem()); long frequency = ((SourceConfigTuner)channel.getSourceConfiguration()).getFrequency();
processingChain.getChannelState().getMutableMetadata().receive(
new AttributeChangeRequest<Long>(Attribute.CHANNEL_FREQUENCY, frequency));
} }
if(channel.getSite() != null) processingChain.getChannelState().getMutableMetadata().receive(
{ new AttributeChangeRequest<DecoderType>(Attribute.PRIMARY_DECODER_TYPE,
if(sb.length() > 0) channel.getDecodeConfiguration().getDecoderType()));
{
sb.append(" - ");
}
sb.append(channel.getSite());
}
if(sb.length() > 0)
{
processingChain.getChannelState().getMutableMetadata()
.receive(new AttributeChangeRequest<String>(Attribute.CHANNEL_CONFIGURATION_LABEL_1, sb.toString()));
}
processingChain.getChannelState().getMutableMetadata()
.receive(new AttributeChangeRequest<String>(Attribute.CHANNEL_CONFIGURATION_LABEL_2, channel.getName()));
} }
/* Setup event logging */ /* Setup event logging */

View File

@@ -19,10 +19,14 @@
package module.decode.event; package module.decode.event;
import alias.Alias; import alias.Alias;
import gui.SDRTrunk;
import icon.IconManager; import icon.IconManager;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import javax.swing.*; import javax.swing.*;
import javax.swing.table.DefaultTableCellRenderer; import javax.swing.table.DefaultTableCellRenderer;
import java.awt.*;
/** /**
* Custom renderer for JTable cells that contain Alias objects. Renders the * Custom renderer for JTable cells that contain Alias objects. Renders the
@@ -32,6 +36,7 @@ import javax.swing.table.DefaultTableCellRenderer;
public class CallEventAliasCellRenderer extends DefaultTableCellRenderer public class CallEventAliasCellRenderer extends DefaultTableCellRenderer
{ {
private static final long serialVersionUID = 1L; private static final long serialVersionUID = 1L;
private final static Logger mLog = LoggerFactory.getLogger(CallEventAliasCellRenderer.class);
private IconManager mIconManager; private IconManager mIconManager;
@@ -41,35 +46,26 @@ public class CallEventAliasCellRenderer extends DefaultTableCellRenderer
mIconManager = iconManager; mIconManager = iconManager;
} }
public void setValue(Object obj) @Override
public Component getTableCellRendererComponent(JTable table, Object value, boolean isSelected, boolean hasFocus, int row, int column)
{ {
if(obj != null && obj instanceof Alias) JLabel label = (JLabel)super.getTableCellRendererComponent(table, value, isSelected, hasFocus, row, column);
if(value instanceof Alias)
{ {
Alias alias = (Alias) obj; Alias alias = (Alias)value;
setText(alias.getName()); label.setText(alias.getName());
label.setForeground(alias.getDisplayColor());
ImageIcon icon = getIcon(alias, IconManager.DEFAULT_ICON_SIZE); label.setIcon(mIconManager.getIcon(alias.getIconName(), IconManager.DEFAULT_ICON_SIZE));
if(icon != null)
{
setIcon(icon);
}
} }
else else
{ {
setText(" "); label.setText("");
setIcon(null); label.setForeground(table.getForeground());
} label.setIcon(null);
} }
private ImageIcon getIcon(Alias alias, int height) return label;
{
if(mIconManager != null && alias != null)
{
return mIconManager.getIcon(alias.getIconName(), height);
}
return null;
} }
} }

View File

@@ -17,16 +17,16 @@
******************************************************************************/ ******************************************************************************/
package module.decode.event; package module.decode.event;
import alias.Alias;
import module.decode.event.CallEvent.CallEventType;
import sample.Listener;
import javax.swing.table.AbstractTableModel;
import java.text.DecimalFormat; import java.text.DecimalFormat;
import java.text.SimpleDateFormat; import java.text.SimpleDateFormat;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.List; import java.util.List;
import javax.swing.table.AbstractTableModel;
import module.decode.event.CallEvent.CallEventType;
import sample.Listener;
public class CallEventModel extends AbstractTableModel implements Listener<CallEvent> public class CallEventModel extends AbstractTableModel implements Listener<CallEvent>
{ {
private static final long serialVersionUID = 1L; private static final long serialVersionUID = 1L;
@@ -207,4 +207,15 @@ public class CallEventModel extends AbstractTableModel implements Listener<CallE
return null; return null;
} }
@Override
public Class<?> getColumnClass(int columnIndex)
{
if(columnIndex == FROM_ALIAS || columnIndex == TO_ALIAS)
{
return Alias.class;
}
return super.getColumnClass(columnIndex);
}
} }

View File

@@ -18,112 +18,58 @@
******************************************************************************/ ******************************************************************************/
package module.decode.event; package module.decode.event;
import controller.channel.Channel;
import controller.channel.ChannelEvent;
import controller.channel.ChannelEvent.Event;
import controller.channel.ChannelEventListener;
import controller.channel.ChannelProcessingManager;
import icon.IconManager; import icon.IconManager;
import module.ProcessingChain; import module.ProcessingChain;
import net.miginfocom.swing.MigLayout; import net.miginfocom.swing.MigLayout;
import sample.Listener;
import javax.swing.*; import javax.swing.*;
import java.awt.*; import java.awt.*;
public class CallEventPanel extends JPanel implements ChannelEventListener public class CallEventPanel extends JPanel implements Listener<ProcessingChain>
{ {
private static final long serialVersionUID = 1L; private static final long serialVersionUID = 1L;
private JTable mTable;
private CallEventModel mEmptyCallEventModel = new CallEventModel();
private JScrollPane mEmptyScroller; private JScrollPane mEmptyScroller;
private Channel mDisplayedChannel;
private CallEventAliasCellRenderer mRenderer; private CallEventAliasCellRenderer mRenderer;
private ChannelProcessingManager mChannelProcessingManager;
public CallEventPanel(IconManager iconManager, ChannelProcessingManager channelProcessingManager) /**
* View for call event table
* @param iconManager to display alias icons in table rows
*/
public CallEventPanel(IconManager iconManager)
{ {
mChannelProcessingManager = channelProcessingManager;
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()); mTable = new JTable(mEmptyCallEventModel);
table.setAutoCreateRowSorter(true); mTable.setAutoCreateRowSorter(true);
table.setAutoResizeMode(JTable.AUTO_RESIZE_LAST_COLUMN); mTable.setAutoResizeMode(JTable.AUTO_RESIZE_LAST_COLUMN);
mRenderer = new CallEventAliasCellRenderer(iconManager); mRenderer = new CallEventAliasCellRenderer(iconManager);
table.getColumnModel().getColumn(CallEventModel.FROM_ALIAS).setCellRenderer(mRenderer);
table.getColumnModel().getColumn(CallEventModel.TO_ALIAS).setCellRenderer(mRenderer); mEmptyScroller = new JScrollPane(mTable);
mEmptyScroller = new JScrollPane(table);
add(mEmptyScroller); add(mEmptyScroller);
} }
@Override @Override
public void channelChanged(final ChannelEvent event) public void receive(ProcessingChain processingChain)
{
if(event.getEvent() == Event.NOTIFICATION_SELECTION_CHANGE && event.getChannel().isSelected())
{
if(mDisplayedChannel == null || (mDisplayedChannel != null && mDisplayedChannel != event.getChannel()))
{
ProcessingChain chain = mChannelProcessingManager.getProcessingChain(event.getChannel());
if(chain != null)
{
final CallEventModel model = chain.getCallEventModel();
if(model != null)
{ {
EventQueue.invokeLater(new Runnable() EventQueue.invokeLater(new Runnable()
{ {
@Override @Override
public void run() public void run()
{ {
removeAll(); mTable.setModel(processingChain != null ? processingChain.getCallEventModel() : mEmptyCallEventModel);
JTable table = new JTable(model); if(processingChain != null)
{
table.setAutoCreateRowSorter(true); mTable.getColumnModel().getColumn(CallEventModel.FROM_ALIAS).setCellRenderer(mRenderer);
table.setAutoResizeMode(JTable.AUTO_RESIZE_LAST_COLUMN); mTable.getColumnModel().getColumn(CallEventModel.TO_ALIAS).setCellRenderer(mRenderer);
}
table.getColumnModel().getColumn(CallEventModel.FROM_ALIAS)
.setCellRenderer(mRenderer);
table.getColumnModel().getColumn(CallEventModel.TO_ALIAS)
.setCellRenderer(mRenderer);
add(new JScrollPane(table));
mDisplayedChannel = event.getChannel();
revalidate();
repaint();
} }
}); });
} }
} }
}
}
else if(event.getEvent() == Event.NOTIFICATION_PROCESSING_STOP || event.getEvent() == Event.REQUEST_DISABLE)
{
if(mDisplayedChannel != null && mDisplayedChannel == event.getChannel())
{
mDisplayedChannel = null;
EventQueue.invokeLater(new Runnable()
{
@Override
public void run()
{
removeAll();
add(mEmptyScroller);
revalidate();
repaint();
}
});
}
}
}
}

View File

@@ -32,6 +32,7 @@ import module.ProcessingChain;
import net.miginfocom.swing.MigLayout; import net.miginfocom.swing.MigLayout;
import org.slf4j.Logger; import org.slf4j.Logger;
import org.slf4j.LoggerFactory; import org.slf4j.LoggerFactory;
import sample.Listener;
import javax.swing.*; import javax.swing.*;
import javax.swing.event.ChangeEvent; import javax.swing.event.ChangeEvent;
@@ -42,7 +43,7 @@ import java.awt.event.ActionListener;
import java.awt.event.MouseEvent; import java.awt.event.MouseEvent;
import java.awt.event.MouseListener; import java.awt.event.MouseListener;
public class MessageActivityPanel extends JPanel implements ChannelEventListener public class MessageActivityPanel extends JPanel implements Listener<ProcessingChain>
{ {
private static final long serialVersionUID = 1L; private static final long serialVersionUID = 1L;
@@ -50,10 +51,7 @@ public class MessageActivityPanel extends JPanel implements ChannelEventListener
private static MessageActivityModel EMPTY_MODEL = new MessageActivityModel(); private static MessageActivityModel EMPTY_MODEL = new MessageActivityModel();
private JTable mMessageTable; private JTable mTable = new JTable(EMPTY_MODEL);
private Channel mDisplayedChannel;
private MessageActivityModel mDisplayedModel = EMPTY_MODEL;
private MessageManagementPanel mManagementPanel = new MessageManagementPanel(); private MessageManagementPanel mManagementPanel = new MessageManagementPanel();
@@ -67,37 +65,20 @@ public class MessageActivityPanel extends JPanel implements ChannelEventListener
add(mManagementPanel, "span,growx"); add(mManagementPanel, "span,growx");
mMessageTable = new JTable(mDisplayedModel); add(new JScrollPane(mTable), "span,grow");
add(new JScrollPane(mMessageTable), "span,grow");
} }
@Override @Override
public void channelChanged(ChannelEvent event) public void receive(ProcessingChain processingChain)
{ {
boolean changed = false; EventQueue.invokeLater(new Runnable()
if(event.getEvent() == Event.NOTIFICATION_SELECTION_CHANGE &&
event.getChannel().isSelected())
{ {
if(mDisplayedChannel == null || (mDisplayedChannel != null && mDisplayedChannel != event.getChannel())) @Override
public void run()
{ {
mDisplayedChannel = event.getChannel(); mTable.setModel(processingChain != null ? processingChain.getMessageActivityModel() : EMPTY_MODEL);
ProcessingChain chain = mChannelProcessingManager.getProcessingChain(mDisplayedChannel); if(processingChain != null)
if(chain != null)
{
mDisplayedModel = chain.getMessageActivityModel();
}
else
{
mDisplayedModel = EMPTY_MODEL;
}
mMessageTable.setModel(mDisplayedModel);
if(mDisplayedChannel != null)
{ {
mManagementPanel.enableButtons(); mManagementPanel.enableButtons();
} }
@@ -105,30 +86,67 @@ public class MessageActivityPanel extends JPanel implements ChannelEventListener
{ {
mManagementPanel.disableButtons(); mManagementPanel.disableButtons();
} }
changed = true;
}
}
else if(event.getEvent() == Event.NOTIFICATION_PROCESSING_STOP || event.getEvent() == Event.REQUEST_DISABLE)
{
if(mDisplayedChannel != null && mDisplayedChannel == event.getChannel())
{
mDisplayedChannel = null;
mMessageTable.setModel(EMPTY_MODEL);
mManagementPanel.disableButtons();
changed = true;
} }
});
} }
if(changed) // @Override
{ // public void channelChanged(ChannelEvent event)
revalidate(); // {
repaint(); // boolean changed = false;
} //
} // if(event.getEvent() == Event.NOTIFICATION_SELECTION_CHANGE &&
// event.getChannel().isSelected())
// {
// if(mDisplayedChannel == null || (mDisplayedChannel != null && mDisplayedChannel != event.getChannel()))
// {
// mDisplayedChannel = event.getChannel();
//
// ProcessingChain chain = mChannelProcessingManager.getProcessingChain(mDisplayedChannel);
//
// if(chain != null)
// {
// mDisplayedModel = chain.getMessageActivityModel();
// }
// else
// {
// mDisplayedModel = EMPTY_MODEL;
// }
//
// mMessageTable.setModel(mDisplayedModel);
//
// if(mDisplayedChannel != null)
// {
// mManagementPanel.enableButtons();
// }
// else
// {
// mManagementPanel.disableButtons();
// }
//
// changed = true;
// }
// }
// else if(event.getEvent() == Event.NOTIFICATION_PROCESSING_STOP || event.getEvent() == Event.REQUEST_DISABLE)
// {
// if(mDisplayedChannel != null && mDisplayedChannel == event.getChannel())
// {
// mDisplayedChannel = null;
//
// mMessageTable.setModel(EMPTY_MODEL);
//
// mManagementPanel.disableButtons();
//
// changed = true;
// }
// }
//
// if(changed)
// {
// revalidate();
// repaint();
// }
// }
public class MessageManagementPanel extends JPanel public class MessageManagementPanel extends JPanel
{ {
@@ -184,8 +202,7 @@ public class MessageActivityPanel extends JPanel implements ChannelEventListener
@Override @Override
public void mouseClicked(MouseEvent arg0) public void mouseClicked(MouseEvent arg0)
{ {
if(SwingUtilities.isLeftMouseButton(arg0) && if(SwingUtilities.isLeftMouseButton(arg0) && arg0.getClickCount() == 2)
arg0.getClickCount() == 2)
{ {
slider.setValue(500); //default slider.setValue(500); //default
} }
@@ -208,24 +225,13 @@ public class MessageActivityPanel extends JPanel implements ChannelEventListener
} }
}); });
if(mDisplayedModel != null) slider.setValue(((MessageActivityModel)mTable.getModel()).getMaxMessageCount());
{
slider.setValue(mDisplayedModel.getMaxMessageCount());
}
else
{
slider.setValue(500);
}
slider.addChangeListener(new ChangeListener() slider.addChangeListener(new ChangeListener()
{ {
@Override @Override
public void stateChanged(ChangeEvent arg0) public void stateChanged(ChangeEvent arg0)
{ {
if(mDisplayedModel != null) ((MessageActivityModel)mTable.getModel()).setMaxMessageCount(slider.getValue());
{
mDisplayedModel.setMaxMessageCount(slider.getValue());
}
} }
}); });
@@ -239,10 +245,7 @@ public class MessageActivityPanel extends JPanel implements ChannelEventListener
@Override @Override
public void actionPerformed(ActionEvent e) public void actionPerformed(ActionEvent e)
{ {
if(mDisplayedModel != null) ((MessageActivityModel)mTable.getModel()).clear();
{
mDisplayedModel.clear();
}
} }
}); });
} }
@@ -260,16 +263,6 @@ public class MessageActivityPanel extends JPanel implements ChannelEventListener
{ {
@Override @Override
public void actionPerformed(ActionEvent arg0) public void actionPerformed(ActionEvent arg0)
{
if(mDisplayedChannel == null)
{
JOptionPane.showMessageDialog(MessageFilterButton.this,
"Please enable and select a decoding channel to "
+ "adjust the channel's message display filter");
}
else
{
if(mDisplayedModel != null)
{ {
final JFrame editor = new JFrame(); final JFrame editor = new JFrame();
@@ -281,19 +274,16 @@ public class MessageActivityPanel extends JPanel implements ChannelEventListener
"[grow,fill][][]")); "[grow,fill][][]"));
@SuppressWarnings("unchecked") @SuppressWarnings("unchecked")
FilterSet<Message> filter = (FilterSet<Message>) FilterSet<Message> filter = (FilterSet<Message>) ((MessageActivityModel)mTable.getModel()).getMessageFilter();
mDisplayedModel.getMessageFilter();
FilterEditorPanel<Message> panel = FilterEditorPanel<Message> panel = new FilterEditorPanel<Message>(filter);
new FilterEditorPanel<Message>(filter);
JScrollPane scroller = new JScrollPane(panel); JScrollPane scroller = new JScrollPane(panel);
scroller.setViewportView(panel); scroller.setViewportView(panel);
editor.add(scroller, "wrap"); editor.add(scroller, "wrap");
editor.add(new JLabel("Right-click to select/deselect " editor.add(new JLabel("Right-click to select/deselect all nodes"), "wrap");
+ "all nodes"), "wrap");
JButton close = new JButton("Close"); JButton close = new JButton("Close");
close.addActionListener(new ActionListener() close.addActionListener(new ActionListener()
@@ -315,8 +305,6 @@ public class MessageActivityPanel extends JPanel implements ChannelEventListener
} }
}); });
} }
}
}
}); });
} }
} }

View File

@@ -20,6 +20,8 @@ package module.decode.fleetsync2;
import alias.Alias; import alias.Alias;
import alias.AliasList; import alias.AliasList;
import alias.id.AliasIDType;
import channel.metadata.AliasedStringAttributeMonitor;
import channel.metadata.Attribute; import channel.metadata.Attribute;
import channel.metadata.AttributeChangeRequest; import channel.metadata.AttributeChangeRequest;
import channel.state.DecoderState; import channel.state.DecoderState;
@@ -39,20 +41,20 @@ public class Fleetsync2DecoderState extends DecoderState
private TreeSet<String> mIdents = new TreeSet<String>(); private TreeSet<String> mIdents = new TreeSet<String>();
private TreeSet<String> mEmergencyIdents = new TreeSet<String>(); private TreeSet<String> mEmergencyIdents = new TreeSet<String>();
private String mFrom; private AliasedStringAttributeMonitor mFromAttribute;
private Alias mFromAlias; private AliasedStringAttributeMonitor mToAttribute;
private String mTo;
private Alias mToAlias;
private String mMessage; private String mMessage;
private String mMessageType; private String mMessageType;
private long mFrequency; private long mFrequency;
public Fleetsync2DecoderState(AliasList aliasList) public Fleetsync2DecoderState(AliasList aliasList)
{ {
super(aliasList); super(aliasList);
mFromAttribute = new AliasedStringAttributeMonitor(Attribute.SECONDARY_ADDRESS_FROM,
getAttributeChangeRequestListener(), getAliasList(), AliasIDType.FLEETSYNC);
mToAttribute = new AliasedStringAttributeMonitor(Attribute.SECONDARY_ADDRESS_TO,
getAttributeChangeRequestListener(), getAliasList(), AliasIDType.FLEETSYNC);
} }
@Override @Override
@@ -99,10 +101,8 @@ public class Fleetsync2DecoderState extends DecoderState
*/ */
public void resetState() public void resetState()
{ {
mFrom = null; mFromAttribute.reset();
mFromAlias = null; mToAttribute.reset();
mTo = null;
mToAlias = null;
mMessage = null; mMessage = null;
mMessageType = null; mMessageType = null;
} }
@@ -118,14 +118,14 @@ public class Fleetsync2DecoderState extends DecoderState
{ {
State state = State.CALL; State state = State.CALL;
setFromID(fleetsync.getFromID()); mFromAttribute.process(fleetsync.getFromID());
mIdents.add(fleetsync.getFromID()); mIdents.add(fleetsync.getFromID());
FleetsyncMessageType type = fleetsync.getMessageType(); FleetsyncMessageType type = fleetsync.getMessageType();
if(type != FleetsyncMessageType.ANI) if(type != FleetsyncMessageType.ANI)
{ {
setToID(fleetsync.getToID()); mToAttribute.process(fleetsync.getToID());
mIdents.add(fleetsync.getToID()); mIdents.add(fleetsync.getToID());
} }
@@ -175,46 +175,6 @@ public class Fleetsync2DecoderState extends DecoderState
} }
} }
public String getFromID()
{
return mFrom;
}
public Alias getFromIDAlias()
{
return mFromAlias;
}
public void setFromID(String from)
{
if(!StringUtils.isEqual(mFrom, from))
{
mFrom = from;
mFromAlias = hasAliasList() ? getAliasList().getFleetsyncAlias(mFrom) : null;
broadcast(new AttributeChangeRequest<String>(Attribute.SECONDARY_ADDRESS_FROM, mFrom, mFromAlias));
}
}
public String getToID()
{
return mTo;
}
public Alias getToIDAlias()
{
return mToAlias;
}
public void setToID(String to)
{
if(!StringUtils.isEqual(mTo, to))
{
mTo = to;
mToAlias = hasAliasList() ? getAliasList().getFleetsyncAlias(mTo) : null;
broadcast(new AttributeChangeRequest<String>(Attribute.SECONDARY_ADDRESS_TO, mTo, mToAlias));
}
}
public String getMessage() public String getMessage()
{ {
return mMessage; return mMessage;

View File

@@ -20,6 +20,8 @@ package module.decode.lj1200;
import alias.Alias; import alias.Alias;
import alias.AliasList; import alias.AliasList;
import alias.id.AliasIDType;
import channel.metadata.AliasedStringAttributeMonitor;
import channel.metadata.Attribute; import channel.metadata.Attribute;
import channel.metadata.AttributeChangeRequest; import channel.metadata.AttributeChangeRequest;
import channel.state.DecoderState; import channel.state.DecoderState;
@@ -45,12 +47,14 @@ public class LJ1200DecoderState extends DecoderState
private Set<String> mAddresses = new TreeSet<String>(); private Set<String> mAddresses = new TreeSet<String>();
private String mAddress; private AliasedStringAttributeMonitor mAddressAttribute;
private Alias mAddressAlias;
public LJ1200DecoderState(AliasList aliasList) public LJ1200DecoderState(AliasList aliasList)
{ {
super(aliasList); super(aliasList);
mAddressAttribute = new AliasedStringAttributeMonitor(Attribute.SECONDARY_ADDRESS_TO,
getAttributeChangeRequestListener(), getAliasList(), AliasIDType.LOJACK);
} }
@Override @Override
@@ -69,16 +73,6 @@ public class LJ1200DecoderState extends DecoderState
{ {
} }
public String getAddress()
{
return mAddress;
}
public Alias getAddressAlias()
{
return mAddressAlias;
}
@Override @Override
public void receive(Message message) public void receive(Message message)
{ {
@@ -88,10 +82,10 @@ public class LJ1200DecoderState extends DecoderState
if(lj.isValid()) if(lj.isValid())
{ {
setAddress(lj.getAddress()); String address = lj.getAddress();
setAddressAlias(lj.getTransponderAlias());
mAddresses.add(mAddress); mAddressAttribute.process(address);
mAddresses.add(address);
broadcast(LJ1200CallEvent.getLJ1200Event(lj)); broadcast(LJ1200CallEvent.getLJ1200Event(lj));
@@ -104,21 +98,6 @@ public class LJ1200DecoderState extends DecoderState
} }
} }
private void setAddress(String address)
{
if(!StringUtils.isEqual(mAddress, address))
{
mAddress = address;
broadcast(new AttributeChangeRequest<String>(Attribute.SECONDARY_ADDRESS_TO, mAddress, mAddressAlias));
}
}
private void setAddressAlias(Alias alias)
{
mAddressAlias = alias;
broadcast(new AttributeChangeRequest<String>(Attribute.SECONDARY_ADDRESS_TO, mAddress, mAddressAlias));
}
@Override @Override
public String getActivitySummary() public String getActivitySummary()
{ {
@@ -163,8 +142,7 @@ public class LJ1200DecoderState extends DecoderState
private void resetState() private void resetState()
{ {
mAddress = null; mAddressAttribute.reset();
mAddressAlias = null;
} }
@Override @Override

View File

@@ -19,6 +19,9 @@ package module.decode.ltrnet;
import alias.Alias; import alias.Alias;
import alias.AliasList; import alias.AliasList;
import alias.id.AliasIDType;
import channel.metadata.AliasedIntegerAttributeMonitor;
import channel.metadata.AliasedStringAttributeMonitor;
import channel.metadata.Attribute; import channel.metadata.Attribute;
import channel.metadata.AttributeChangeRequest; import channel.metadata.AttributeChangeRequest;
import channel.state.DecoderState; import channel.state.DecoderState;
@@ -57,10 +60,9 @@ public class LTRNetDecoderState extends DecoderState
new HashMap<Integer,Long>(); new HashMap<Integer,Long>();
private HashMap<Integer,String> mActiveCalls = new HashMap<Integer,String>(); private HashMap<Integer,String> mActiveCalls = new HashMap<Integer,String>();
private String mToTalkgroup; private AliasedStringAttributeMonitor mToAttribute;
private Alias mToTalkgroupAlias; private AliasedIntegerAttributeMonitor mFromUIDAttribute;
private String mFromTalkgroup; private AliasedStringAttributeMonitor mESNAttribute;
private Alias mFromTalkgroupAlias;
private String mMessage; private String mMessage;
private String mMessageType; private String mMessageType;
private int mChannelNumber; private int mChannelNumber;
@@ -69,6 +71,16 @@ public class LTRNetDecoderState extends DecoderState
public LTRNetDecoderState(AliasList aliasList) public LTRNetDecoderState(AliasList aliasList)
{ {
super(aliasList); super(aliasList);
mToAttribute = new AliasedStringAttributeMonitor(Attribute.PRIMARY_ADDRESS_TO,
getAttributeChangeRequestListener(), getAliasList(), AliasIDType.TALKGROUP);
mToAttribute.addIllegalValue("0-00-000");
mFromUIDAttribute = new AliasedIntegerAttributeMonitor(Attribute.PRIMARY_ADDRESS_TO,
getAttributeChangeRequestListener(), getAliasList(), AliasIDType.LTR_NET_UID);
mESNAttribute = new AliasedStringAttributeMonitor(Attribute.SECONDARY_ADDRESS_FROM,
getAttributeChangeRequestListener(), getAliasList(), AliasIDType.ESN);
} }
@Override @Override
@@ -204,8 +216,7 @@ public class LTRNetDecoderState extends DecoderState
broadcast(mCurrentCallEvent); broadcast(mCurrentCallEvent);
} }
setFromTalkgroup(String.valueOf(uniqueID)); mFromUIDAttribute.process(uniqueID);
setFromTalkgroupAlias(ltr.getRadioUniqueIDAlias());
break; break;
case ID_SITE: case ID_SITE:
String siteID = ltr.getSiteID(); String siteID = ltr.getSiteID();
@@ -243,8 +254,7 @@ public class LTRNetDecoderState extends DecoderState
} }
setMessageType("ESN"); setMessageType("ESN");
setFromTalkgroup(ltr.getESN()); mESNAttribute.process(ltr.getESN());
setFromTalkgroupAlias(ltr.getESNAlias());
broadcast(new DecoderStateEvent(this, Event.DECODE, State.DATA)); broadcast(new DecoderStateEvent(this, Event.DECODE, State.DATA));
@@ -272,8 +282,7 @@ public class LTRNetDecoderState extends DecoderState
mUniqueIDs.add(uniqueid); mUniqueIDs.add(uniqueid);
setMessageType("REGISTER UID"); setMessageType("REGISTER UID");
setToTalkgroup(String.valueOf(uniqueid)); mFromUIDAttribute.process(uniqueid);
setToTalkgroupAlias(ltr.getRadioUniqueIDAlias());
if(getCurrentLTRCallEvent() == null) if(getCurrentLTRCallEvent() == null)
{ {
@@ -609,10 +618,11 @@ public class LTRNetDecoderState extends DecoderState
if(isValidTalkgroup(talkgroup)) if(isValidTalkgroup(talkgroup))
{ {
mToAttribute.process(talkgroup);
final LTRCallEvent current = getCurrentLTRCallEvent(); final LTRCallEvent current = getCurrentLTRCallEvent();
/* If this is a new call or the talkgroup is different from the current //If this is a new call or the talkgroup is different from the current call, create a new call event
* call, create a new call event */
if(current == null || isDifferentTalkgroup(talkgroup)) if(current == null || isDifferentTalkgroup(talkgroup))
{ {
/* Invalidate the current call */ /* Invalidate the current call */
@@ -622,22 +632,18 @@ public class LTRNetDecoderState extends DecoderState
broadcast(current); broadcast(current);
} }
setToTalkgroup(message.getTalkgroupID());
/* A talkgroup must be seen at least once before it will be added /* A talkgroup must be seen at least once before it will be added
* to the mTalkgroups list that is used in the activity summary, * to the mTalkgroups list that is used in the activity summary,
* so that we don't pollute the summary with one-off error talkgroups */ * so that we don't pollute the summary with one-off error talkgroups */
if(mTalkgroupsFirstHeard.contains(mToTalkgroup)) if(mTalkgroupsFirstHeard.contains(talkgroup))
{ {
mTalkgroups.add(mToTalkgroup); mTalkgroups.add(talkgroup);
} }
else else
{ {
mTalkgroupsFirstHeard.add(mToTalkgroup); mTalkgroupsFirstHeard.add(talkgroup);
} }
setToTalkgroupAlias(message.getTalkgroupIDAlias());
CallEvent callEvent = new LTRCallEvent.Builder(DecoderType.LTR_NET, CallEventType.CALL) CallEvent callEvent = new LTRCallEvent.Builder(DecoderType.LTR_NET, CallEventType.CALL)
.aliasList(getAliasList()) .aliasList(getAliasList())
.channel(String.valueOf(message.getChannel())) .channel(String.valueOf(message.getChannel()))
@@ -704,71 +710,13 @@ public class LTRNetDecoderState extends DecoderState
mCurrentCallEvent = null; mCurrentCallEvent = null;
mToTalkgroup = null; mToAttribute.reset();
mESNAttribute.reset();
mToTalkgroupAlias = null; mFromUIDAttribute.reset();
mMessage = null;
mMessageType = null; mMessageType = null;
} }
public String getToTalkgroup()
{
return mToTalkgroup;
}
public void setToTalkgroup(String toTalkgroup)
{
if(!StringUtils.isEqual(mToTalkgroup, toTalkgroup))
{
mToTalkgroup = toTalkgroup;
broadcast(new AttributeChangeRequest<String>(Attribute.PRIMARY_ADDRESS_TO, mToTalkgroup, mToTalkgroupAlias));
}
}
public Alias getToTalkgroupAlias()
{
return mToTalkgroupAlias;
}
public void setToTalkgroupAlias(Alias alias)
{
if(mToTalkgroupAlias == null || (alias != null && mToTalkgroupAlias != alias))
{
mToTalkgroupAlias = alias;
broadcast(new AttributeChangeRequest<String>(Attribute.PRIMARY_ADDRESS_TO, mToTalkgroup, mToTalkgroupAlias));
}
}
public String getFromTalkgroup()
{
return mFromTalkgroup;
}
public void setFromTalkgroup(String fromTalkgroup)
{
if(!StringUtils.isEqual(mFromTalkgroup, fromTalkgroup))
{
mFromTalkgroup = fromTalkgroup;
broadcast(new AttributeChangeRequest<String>(Attribute.PRIMARY_ADDRESS_FROM, mFromTalkgroup,
mFromTalkgroupAlias));
}
}
public Alias getFromTalkgroupAlias()
{
return mFromTalkgroupAlias;
}
public void setFromTalkgroupAlias(Alias alias)
{
if(mFromTalkgroupAlias == null || (alias != null && alias != mFromTalkgroupAlias))
{
mFromTalkgroupAlias = alias;
broadcast(new AttributeChangeRequest<String>(Attribute.PRIMARY_ADDRESS_FROM, mFromTalkgroup,
mFromTalkgroupAlias));
}
}
public String getMessage() public String getMessage()
{ {
return mMessage; return mMessage;

View File

@@ -20,6 +20,8 @@ package module.decode.ltrstandard;
import alias.Alias; import alias.Alias;
import alias.AliasList; import alias.AliasList;
import alias.id.AliasIDType;
import channel.metadata.AliasedStringAttributeMonitor;
import channel.metadata.Attribute; import channel.metadata.Attribute;
import channel.metadata.AttributeChangeRequest; import channel.metadata.AttributeChangeRequest;
import channel.state.DecoderState; import channel.state.DecoderState;
@@ -56,14 +58,16 @@ public class LTRStandardDecoderState extends DecoderState
private Set<String> mTalkgroupsFirstHeard = new HashSet<>(); private Set<String> mTalkgroupsFirstHeard = new HashSet<>();
private Set<String> mTalkgroups = new TreeSet<>(); private Set<String> mTalkgroups = new TreeSet<>();
private String mTalkgroup; private AliasedStringAttributeMonitor mTalkgroupAttribute;
private Alias mTalkgroupAlias;
private long mFrequency; private long mFrequency;
private LCNTracker mLCNTracker = new LCNTracker(); private LCNTracker mLCNTracker = new LCNTracker();
public LTRStandardDecoderState(AliasList aliasList) public LTRStandardDecoderState(AliasList aliasList)
{ {
super(aliasList); super(aliasList);
mTalkgroupAttribute = new AliasedStringAttributeMonitor(Attribute.PRIMARY_ADDRESS_TO,
getAttributeChangeRequestListener(), getAliasList(), AliasIDType.TALKGROUP);
} }
@Override @Override
@@ -134,11 +138,9 @@ public class LTRStandardDecoderState extends DecoderState
if(mLCNTracker.isCurrentChannel(channel)) if(mLCNTracker.isCurrentChannel(channel))
{ {
setTalkgroup(start.getToID()); String talkgroup = start.getToID();
mTalkgroupAttribute.process(talkgroup);
processTalkgroup(mTalkgroup); processTalkgroup(talkgroup);
setTalkgroupAlias(start.getToIDAlias());
} }
} }
@@ -156,11 +158,9 @@ public class LTRStandardDecoderState extends DecoderState
if(mLCNTracker.isCurrentChannel(repeater)) if(mLCNTracker.isCurrentChannel(repeater))
{ {
setTalkgroup(end.getToID()); String talkgroup = end.getToID();
mTalkgroupAttribute.process(talkgroup);
processTalkgroup(mTalkgroup); processTalkgroup(talkgroup);
setTalkgroupAlias(end.getToIDAlias());
LTRCallEvent event = mActiveCalls.remove(repeater); LTRCallEvent event = mActiveCalls.remove(repeater);
@@ -231,36 +231,7 @@ public class LTRStandardDecoderState extends DecoderState
mActiveCalls.clear(); mActiveCalls.clear();
mTalkgroup = null; mTalkgroupAttribute.reset();
mTalkgroupAlias = null;
}
public String getTalkgroup()
{
return mTalkgroup;
}
private void setTalkgroup(String talkgroup)
{
if(!StringUtils.isEqual(mTalkgroup, talkgroup))
{
mTalkgroup = talkgroup;
broadcast(new AttributeChangeRequest<String>(Attribute.PRIMARY_ADDRESS_TO, mTalkgroup, mTalkgroupAlias));
}
}
public Alias getTalkgroupAlias()
{
return mTalkgroupAlias;
}
private void setTalkgroupAlias(Alias alias)
{
if(mTalkgroupAlias == null || (alias != null && mTalkgroupAlias != alias))
{
mTalkgroupAlias = alias;
broadcast(new AttributeChangeRequest<String>(Attribute.PRIMARY_ADDRESS_TO, mTalkgroup, mTalkgroupAlias));
}
} }
public boolean hasChannelNumber() public boolean hasChannelNumber()

View File

@@ -20,6 +20,8 @@ package module.decode.mdc1200;
import alias.Alias; import alias.Alias;
import alias.AliasList; import alias.AliasList;
import alias.id.AliasIDType;
import channel.metadata.AliasedStringAttributeMonitor;
import channel.metadata.Attribute; import channel.metadata.Attribute;
import channel.metadata.AttributeChangeRequest; import channel.metadata.AttributeChangeRequest;
import channel.state.DecoderState; import channel.state.DecoderState;
@@ -39,16 +41,16 @@ public class MDCDecoderState extends DecoderState
private TreeSet<String> mIdents = new TreeSet<String>(); private TreeSet<String> mIdents = new TreeSet<String>();
private TreeSet<String> mEmergencyIdents = new TreeSet<String>(); private TreeSet<String> mEmergencyIdents = new TreeSet<String>();
private String mFrom; private AliasedStringAttributeMonitor mFromAttribute;
private Alias mFromAlias;
private String mTo;
private Alias mToAlias;
private String mMessage; private String mMessage;
private String mMessageType; private String mMessageType;
public MDCDecoderState(AliasList aliasList) public MDCDecoderState(AliasList aliasList)
{ {
super(aliasList); super(aliasList);
mFromAttribute = new AliasedStringAttributeMonitor(Attribute.SECONDARY_ADDRESS_FROM,
getAttributeChangeRequestListener(), getAliasList(), AliasIDType.MDC1200);
} }
@Override @Override
@@ -78,10 +80,7 @@ public class MDCDecoderState extends DecoderState
private void resetState() private void resetState()
{ {
mFrom = null; mFromAttribute.reset();
mFromAlias = null;
mTo = null;
mToAlias = null;
mMessage = null; mMessage = null;
mMessageType = null; mMessageType = null;
} }
@@ -100,8 +99,7 @@ public class MDCDecoderState extends DecoderState
mEmergencyIdents.add(mdc.getUnitID()); mEmergencyIdents.add(mdc.getUnitID());
} }
setFrom(mdc.getFromID()); mFromAttribute.process(mdc.getFromID());
setFromAlias(mdc.getFromIDAlias());
MDCMessageType type = mdc.getMessageType(); MDCMessageType type = mdc.getMessageType();
@@ -145,62 +143,6 @@ public class MDCDecoderState extends DecoderState
} }
} }
public String getFrom()
{
return mFrom;
}
public void setFrom(String from)
{
if(!StringUtils.isEqual(mFrom, from))
{
mFrom = from;
broadcast(new AttributeChangeRequest<String>(Attribute.SECONDARY_ADDRESS_FROM, mFrom, mFromAlias));
}
}
public Alias getFromAlias()
{
return mFromAlias;
}
public void setFromAlias(Alias alias)
{
if(mFromAlias == null || (alias != null && mFromAlias != alias))
{
mFromAlias = alias;
broadcast(new AttributeChangeRequest<String>(Attribute.SECONDARY_ADDRESS_FROM, mFrom, mFromAlias));
}
}
public String getTo()
{
return mTo;
}
public void setTo(String to)
{
if(!StringUtils.isEqual(mTo, to))
{
mTo = to;
broadcast(new AttributeChangeRequest<String>(Attribute.SECONDARY_ADDRESS_TO, mTo, mToAlias));
}
}
public Alias getToAlias()
{
return mToAlias;
}
public void setToAlias(Alias alias)
{
if(mToAlias == null || (alias != null && mToAlias != alias))
{
mToAlias = alias;
broadcast(new AttributeChangeRequest<String>(Attribute.SECONDARY_ADDRESS_TO, mTo, mToAlias));
}
}
public String getMessage() public String getMessage()
{ {
return mMessage; return mMessage;

View File

@@ -20,6 +20,8 @@ package module.decode.mpt1327;
import alias.Alias; import alias.Alias;
import alias.AliasList; import alias.AliasList;
import alias.id.AliasIDType;
import channel.metadata.AliasedStringAttributeMonitor;
import channel.metadata.Attribute; import channel.metadata.Attribute;
import channel.metadata.AttributeChangeRequest; import channel.metadata.AttributeChangeRequest;
import channel.state.ChangeChannelTimeoutEvent; import channel.state.ChangeChannelTimeoutEvent;
@@ -56,8 +58,8 @@ public class MPT1327DecoderState extends DecoderState
private HashMap<String,ArrayList<String>> mGroups = new HashMap<String,ArrayList<String>>(); private HashMap<String,ArrayList<String>> mGroups = new HashMap<String,ArrayList<String>>();
private String mSite; private String mSite;
private String mFromTalkgroup; private AliasedStringAttributeMonitor mFromAttribute;
private String mToTalkgroup; private AliasedStringAttributeMonitor mToAttribute;
private int mChannelNumber; private int mChannelNumber;
private ChannelType mChannelType; private ChannelType mChannelType;
@@ -73,6 +75,10 @@ public class MPT1327DecoderState extends DecoderState
mChannelMap = channelMap; mChannelMap = channelMap;
mChannelType = channelType; mChannelType = channelType;
mCallTimeout = callTimeout; mCallTimeout = callTimeout;
mFromAttribute = new AliasedStringAttributeMonitor(Attribute.PRIMARY_ADDRESS_FROM,
getAttributeChangeRequestListener(), getAliasList(), AliasIDType.MPT1327);
mToAttribute = new AliasedStringAttributeMonitor(Attribute.PRIMARY_ADDRESS_TO,
getAttributeChangeRequestListener(), getAliasList(), AliasIDType.MPT1327);
} }
@Override @Override
@@ -277,7 +283,7 @@ public class MPT1327DecoderState extends DecoderState
broadcast(mCurrentCallEvent); broadcast(mCurrentCallEvent);
} }
setToTalkgroup(mpt.getToID()); mToAttribute.process(mpt.getToID());
broadcast(new DecoderStateEvent(this, Event.START, State.CALL)); broadcast(new DecoderStateEvent(this, Event.START, State.CALL));
} }
@@ -298,8 +304,8 @@ public class MPT1327DecoderState extends DecoderState
private void resetState() private void resetState()
{ {
mFromTalkgroup = null; mFromAttribute.reset();
mToTalkgroup = null; mToAttribute.reset();
/** /**
* If this is a standard channel, reset the fade timeout to the default * If this is a standard channel, reset the fade timeout to the default
@@ -359,67 +365,6 @@ public class MPT1327DecoderState extends DecoderState
mChannelMap = channelMap; mChannelMap = channelMap;
} }
public String getFromTalkgroup()
{
return mFromTalkgroup;
}
/**
* Set the talkgroup. This is used primarily for traffic channels since
* the talkgroup will already have been identified prior to the traffic
* channel being created.
*/
public void setFromTalkgroup(String fromTalkgroup)
{
if(!StringUtils.isEqual(mFromTalkgroup, fromTalkgroup))
{
mFromTalkgroup = fromTalkgroup;
broadcast(new AttributeChangeRequest<String>(Attribute.PRIMARY_ADDRESS_FROM, mFromTalkgroup,
getFromTalkgroupAlias()));
}
}
public Alias getFromTalkgroupAlias()
{
if(hasAliasList())
{
return getAliasList().getMPT1327Alias(mFromTalkgroup);
}
return null;
}
public String getToTalkgroup()
{
return mToTalkgroup;
}
/**
* Set the talkgroup. This is used primarily for traffic channels since
* the talkgroup will already have been identified prior to the traffic
* channel being created.
*/
public void setToTalkgroup(String toTalkgroup)
{
if(!StringUtils.isEqual(mToTalkgroup, toTalkgroup))
{
mToTalkgroup = toTalkgroup;
broadcast(new AttributeChangeRequest<String>(Attribute.PRIMARY_ADDRESS_TO, mToTalkgroup,
getToTalkgroupAlias()));
}
}
public Alias getToTalkgroupAlias()
{
if(hasAliasList())
{
return getAliasList().getMPT1327Alias(mToTalkgroup);
}
return null;
}
public int getChannelNumber() public int getChannelNumber()
{ {
return mChannelNumber; return mChannelNumber;
@@ -588,6 +533,8 @@ public class MPT1327DecoderState extends DecoderState
TrafficChannelAllocationEvent allocationEvent = TrafficChannelAllocationEvent allocationEvent =
(TrafficChannelAllocationEvent) event; (TrafficChannelAllocationEvent) event;
broadcast(new AttributeChangeRequest<String>(Attribute.CHANNEL_CONFIGURATION_LABEL_1, "TRAFFIC"));
String channel = allocationEvent.getCallEvent().getChannel(); String channel = allocationEvent.getCallEvent().getChannel();
if(channel != null) if(channel != null)
@@ -606,8 +553,8 @@ public class MPT1327DecoderState extends DecoderState
broadcast(new AttributeChangeRequest<Long>(Attribute.CHANNEL_FREQUENCY, broadcast(new AttributeChangeRequest<Long>(Attribute.CHANNEL_FREQUENCY,
allocationEvent.getCallEvent().getFrequency())); allocationEvent.getCallEvent().getFrequency()));
setFromTalkgroup(allocationEvent.getCallEvent().getFromID()); mFromAttribute.process(allocationEvent.getCallEvent().getFromID());
setToTalkgroup(allocationEvent.getCallEvent().getToID()); mToAttribute.process(allocationEvent.getCallEvent().getToID());
} }
} }
break; break;

View File

@@ -3669,8 +3669,9 @@ public class P25DecoderState extends DecoderState
{ {
if(event instanceof TrafficChannelAllocationEvent) if(event instanceof TrafficChannelAllocationEvent)
{ {
TrafficChannelAllocationEvent allocationEvent = TrafficChannelAllocationEvent allocationEvent = (TrafficChannelAllocationEvent) event;
(TrafficChannelAllocationEvent) event;
broadcast(new AttributeChangeRequest<String>(Attribute.CHANNEL_CONFIGURATION_LABEL_1, "TRAFFIC"));
mCurrentCallEvent = (P25CallEvent) allocationEvent.getCallEvent(); mCurrentCallEvent = (P25CallEvent) allocationEvent.getCallEvent();

View File

@@ -20,6 +20,8 @@ package module.decode.passport;
import alias.Alias; import alias.Alias;
import alias.AliasList; import alias.AliasList;
import alias.id.AliasIDType;
import channel.metadata.AliasedStringAttributeMonitor;
import channel.metadata.Attribute; import channel.metadata.Attribute;
import channel.metadata.AttributeChangeRequest; import channel.metadata.AttributeChangeRequest;
import channel.state.DecoderState; import channel.state.DecoderState;
@@ -32,7 +34,6 @@ import module.decode.event.CallEvent;
import module.decode.event.CallEvent.CallEventType; import module.decode.event.CallEvent.CallEventType;
import org.slf4j.Logger; import org.slf4j.Logger;
import org.slf4j.LoggerFactory; import org.slf4j.LoggerFactory;
import util.StringUtils;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.Collections; import java.util.Collections;
@@ -53,10 +54,8 @@ public class PassportDecoderState extends DecoderState
private HashMap<Integer,String> mSiteLCNs = new HashMap<Integer,String>(); private HashMap<Integer,String> mSiteLCNs = new HashMap<Integer,String>();
private HashMap<Integer,String> mNeighborLCNs = new HashMap<Integer,String>(); private HashMap<Integer,String> mNeighborLCNs = new HashMap<Integer,String>();
private String mTalkgroup; private AliasedStringAttributeMonitor mFromMobileIDAttribute;
private Alias mTalkgroupAlias; private AliasedStringAttributeMonitor mToTalkgroupAttribute;
private String mMobileID;
private Alias mMobileIDAlias;
private int mChannelNumber; private int mChannelNumber;
private int mSiteNumber; private int mSiteNumber;
private PassportBand mSiteBand; private PassportBand mSiteBand;
@@ -66,6 +65,11 @@ public class PassportDecoderState extends DecoderState
public PassportDecoderState(AliasList aliasList) public PassportDecoderState(AliasList aliasList)
{ {
super(aliasList); super(aliasList);
mFromMobileIDAttribute = new AliasedStringAttributeMonitor(Attribute.PRIMARY_ADDRESS_FROM,
getAttributeChangeRequestListener(), getAliasList(), AliasIDType.MIN);
mToTalkgroupAttribute = new AliasedStringAttributeMonitor(Attribute.PRIMARY_ADDRESS_TO,
getAttributeChangeRequestListener(), getAliasList(), AliasIDType.TALKGROUP);
} }
@Override @Override
@@ -146,7 +150,7 @@ public class PassportDecoderState extends DecoderState
/* Call on this channel */ /* Call on this channel */
if(passport.getLCN() == mChannelNumber) if(passport.getLCN() == mChannelNumber)
{ {
setTalkgroup(talkgroup); mToTalkgroupAttribute.process(talkgroup);
PassportCallEvent current = getCurrentCallEvent(); PassportCallEvent current = getCurrentCallEvent();
@@ -207,7 +211,7 @@ public class PassportDecoderState extends DecoderState
String.valueOf(passport.getTalkgroupID()); String.valueOf(passport.getTalkgroupID());
logTalkgroup(endTalkgroup); logTalkgroup(endTalkgroup);
setTalkgroup(endTalkgroup); mToTalkgroupAttribute.process(endTalkgroup);
broadcast(new DecoderStateEvent(this, broadcast(new DecoderStateEvent(this,
Event.END, State.CALL)); Event.END, State.CALL));
@@ -238,7 +242,7 @@ public class PassportDecoderState extends DecoderState
/* Data call on this channel */ /* Data call on this channel */
if(passport.getLCN() == mChannelNumber) if(passport.getLCN() == mChannelNumber)
{ {
setTalkgroup(dataTalkgroup); mToTalkgroupAttribute.process(dataTalkgroup);
PassportCallEvent current = getCurrentCallEvent(); PassportCallEvent current = getCurrentCallEvent();
@@ -299,7 +303,7 @@ public class PassportDecoderState extends DecoderState
String.valueOf(passport.getTalkgroupID()); String.valueOf(passport.getTalkgroupID());
logTalkgroup(dataEndTalkgroup); logTalkgroup(dataEndTalkgroup);
setTalkgroup(dataEndTalkgroup); mToTalkgroupAttribute.process(dataEndTalkgroup);
broadcast(new DecoderStateEvent(this, broadcast(new DecoderStateEvent(this,
Event.END, State.DATA)); Event.END, State.DATA));
@@ -321,7 +325,7 @@ public class PassportDecoderState extends DecoderState
mMobileIDs.add(min); mMobileIDs.add(min);
} }
setMobileID(min); mFromMobileIDAttribute.process(min);
final CallEvent current = getCurrentCallEvent(); final CallEvent current = getCurrentCallEvent();
@@ -519,10 +523,8 @@ public class PassportDecoderState extends DecoderState
private void resetState() private void resetState()
{ {
mTalkgroup = null; mToTalkgroupAttribute.reset();
mTalkgroupAlias = null; mFromMobileIDAttribute.reset();
mMobileID = null;
mMobileIDAlias = null;
} }
public int getChannelNumber() public int getChannelNumber()
@@ -568,48 +570,6 @@ public class PassportDecoderState extends DecoderState
} }
} }
public String getTalkgroup()
{
return mTalkgroup;
}
public void setTalkgroup(String talkgroup)
{
if(!StringUtils.isEqual(mTalkgroup, talkgroup))
{
mTalkgroup = talkgroup;
mTalkgroupAlias = hasAliasList() ? getAliasList().getTalkgroupAlias(getTalkgroup()) : null;
broadcast(new AttributeChangeRequest<String>(Attribute.PRIMARY_ADDRESS_TO, getTalkgroup(),
getTalkgroupAlias()));
}
}
public Alias getTalkgroupAlias()
{
return mTalkgroupAlias;
}
public String getMobileID()
{
return mMobileID;
}
public void setMobileID(String id)
{
if(!StringUtils.isEqual(mMobileID, id))
{
mMobileID = id;
mMobileIDAlias = hasAliasList() ? getAliasList().getMobileIDNumberAlias(getMobileID()) : null;
broadcast(new AttributeChangeRequest<String>(Attribute.PRIMARY_ADDRESS_FROM, getMobileID(),
getMobileIDAlias()));
}
}
public Alias getMobileIDAlias()
{
return mMobileIDAlias;
}
@Override @Override
public void receiveDecoderStateEvent(DecoderStateEvent event) public void receiveDecoderStateEvent(DecoderStateEvent event)
{ {

View File

@@ -20,6 +20,8 @@ package module.decode.tait;
import alias.Alias; import alias.Alias;
import alias.AliasList; import alias.AliasList;
import alias.id.AliasIDType;
import channel.metadata.AliasedStringAttributeMonitor;
import channel.metadata.Attribute; import channel.metadata.Attribute;
import channel.metadata.AttributeChangeRequest; import channel.metadata.AttributeChangeRequest;
import channel.state.DecoderState; import channel.state.DecoderState;
@@ -42,18 +44,19 @@ public class Tait1200DecoderState extends DecoderState
{ {
private TreeSet<String> mIdents = new TreeSet<String>(); private TreeSet<String> mIdents = new TreeSet<String>();
private String mFrom; private AliasedStringAttributeMonitor mFromAttribute;
private Alias mFromAlias; private AliasedStringAttributeMonitor mToAttribute;
private String mTo;
private Alias mToAlias;
private String mMessage; private String mMessage;
private String mMessageType; private String mMessageType;
public Tait1200DecoderState(AliasList aliasList) public Tait1200DecoderState(AliasList aliasList)
{ {
super(aliasList); super(aliasList);
mFromAttribute = new AliasedStringAttributeMonitor(Attribute.SECONDARY_ADDRESS_FROM,
getAttributeChangeRequestListener(), getAliasList(), AliasIDType.TALKGROUP);
mToAttribute = new AliasedStringAttributeMonitor(Attribute.SECONDARY_ADDRESS_TO,
getAttributeChangeRequestListener(), getAliasList(), AliasIDType.TALKGROUP);
} }
@Override @Override
@@ -82,10 +85,8 @@ public class Tait1200DecoderState extends DecoderState
private void resetState() private void resetState()
{ {
mFrom = null; mFromAttribute.reset();
mFromAlias = null; mToAttribute.reset();
mTo = null;
mToAlias = null;
mMessage = null; mMessage = null;
mMessageType = null; mMessageType = null;
} }
@@ -97,12 +98,10 @@ public class Tait1200DecoderState extends DecoderState
{ {
Tait1200GPSMessage gps = (Tait1200GPSMessage) message; Tait1200GPSMessage gps = (Tait1200GPSMessage) message;
setFromID(gps.getFromID()); mFromAttribute.process(gps.getFromID());
setFromIDAlias(gps.getFromIDAlias());
mIdents.add(gps.getFromID()); mIdents.add(gps.getFromID());
setToID(gps.getToID()); mToAttribute.process(gps.getToID());
setToIDAlias(gps.getToIDAlias());
mIdents.add(gps.getToID()); mIdents.add(gps.getToID());
GeoPosition position = gps.getGPSLocation(); GeoPosition position = gps.getGPSLocation();
@@ -123,13 +122,10 @@ public class Tait1200DecoderState extends DecoderState
else if(message instanceof Tait1200ANIMessage) else if(message instanceof Tait1200ANIMessage)
{ {
Tait1200ANIMessage ani = (Tait1200ANIMessage) message; Tait1200ANIMessage ani = (Tait1200ANIMessage) message;
mFromAttribute.process(ani.getFromID());
setFromID(ani.getFromID());
setFromIDAlias(ani.getFromIDAlias());
mIdents.add(ani.getFromID()); mIdents.add(ani.getFromID());
setToID(ani.getToID()); mToAttribute.process(ani.getToID());
setToIDAlias(ani.getToIDAlias());
mIdents.add(ani.getToID()); mIdents.add(ani.getToID());
setMessage(null); setMessage(null);
@@ -202,62 +198,6 @@ public class Tait1200DecoderState extends DecoderState
} }
} }
public String getFromID()
{
return mFrom;
}
public void setFromID(String from)
{
if(!StringUtils.isEqual(mFrom, from))
{
mFrom = from;
broadcast(new AttributeChangeRequest<String>(Attribute.SECONDARY_ADDRESS_FROM, getFromID(), getFromIDAlias()));
}
}
public Alias getFromIDAlias()
{
return mFromAlias;
}
public void setFromIDAlias(Alias alias)
{
if(mFromAlias == null || (alias != null && mFromAlias != alias))
{
mFromAlias = alias;
broadcast(new AttributeChangeRequest<String>(Attribute.SECONDARY_ADDRESS_FROM, getFromID(), getFromIDAlias()));
}
}
public String getToID()
{
return mTo;
}
public void setToID(String to)
{
if(!StringUtils.isEqual(mTo, to))
{
mTo = to;
broadcast(new AttributeChangeRequest<String>(Attribute.SECONDARY_ADDRESS_TO, getToID(), getToIDAlias()));
}
}
public Alias getToIDAlias()
{
return mToAlias;
}
public void setToIDAlias(Alias alias)
{
if(mToAlias == null || (alias != null && mToAlias != alias))
{
mToAlias = alias;
broadcast(new AttributeChangeRequest<String>(Attribute.SECONDARY_ADDRESS_TO, getToID(), getToIDAlias()));
}
}
public String getMessage() public String getMessage()
{ {
return mMessage; return mMessage;

View File

@@ -17,6 +17,10 @@
******************************************************************************/ ******************************************************************************/
package properties; package properties;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import java.awt.*;
import java.io.BufferedReader; import java.io.BufferedReader;
import java.io.FileInputStream; import java.io.FileInputStream;
import java.io.FileNotFoundException; import java.io.FileNotFoundException;
@@ -30,9 +34,6 @@ import java.nio.file.Path;
import java.nio.file.Paths; import java.nio.file.Paths;
import java.util.Properties; import java.util.Properties;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
/** /**
* SystemProperties - provides an isolated instance of properties for the * SystemProperties - provides an isolated instance of properties for the
* application * application
@@ -58,6 +59,7 @@ public class SystemProperties
/** /**
* Returns a SINGLETON instance of the application properties set * Returns a SINGLETON instance of the application properties set
*
* @return * @return
*/ */
public static SystemProperties getInstance() public static SystemProperties getInstance()
@@ -167,6 +169,7 @@ public class SystemProperties
/** /**
* Loads the properties file into this properties set * Loads the properties file into this properties set
*
* @param file * @param file
*/ */
public void load(Path propertiesPath) public void load(Path propertiesPath)
@@ -336,5 +339,27 @@ public class SystemProperties
save(); save();
} }
/**
* Gets the named color property, storing the default value in properties file if it doesn't exist.
*
* @param key identifying the color property
* @param defaultColor to use for creating the property if it doesn't exist
* @return named color
*/
public Color get(String key, Color defaultColor)
{
return new Color(get(key, defaultColor.getRGB()), true);
}
/**
* Creates a new color instance with the RGB values from color argument and translucency (alpha) argument
* @param color containing RGB values
* @param alpha desired translucency/alpha value
* @return new color with adjusted alpha value
*/
public static Color getTranslucent(Color color, int alpha)
{
return new Color(color.getRed(), color.getGreen(), color.getBlue(), alpha);
}
} }

View File

@@ -135,6 +135,7 @@ public class SettingsManager implements Listener<TunerConfigurationEvent>
return setting; return setting;
} }
/** /**
* Fetches the current setting and applies the parameter(s) to it. Creates * Fetches the current setting and applies the parameter(s) to it. Creates
* the setting if it does not exist * the setting if it does not exist