From 7f1e7d9cd26148f4172a908524662dda83d2c46b Mon Sep 17 00:00:00 2001 From: Denny Sheirer Date: Tue, 17 Nov 2026 03:56:36 -0500 Subject: [PATCH] #2q683 Now playing channel adds new Alias List column (#2684) Co-authored-by: denny --- .../channel/metadata/ChannelMetadata.java | 24 +++++++++++++++++++ .../metadata/ChannelMetadataField.java | 1 + .../gui/nowplaying/ChannelMetadataView.java | 8 +++++-- 3 files changed, 31 insertions(+), 2 deletions(-) diff --git a/src/main/java/io/github/dsheirer/channel/metadata/ChannelMetadata.java b/src/main/java/io/github/dsheirer/channel/metadata/ChannelMetadata.java index dcb1e503..dc1bdd2f 100644 --- a/src/main/java/io/github/dsheirer/channel/metadata/ChannelMetadata.java +++ b/src/main/java/io/github/dsheirer/channel/metadata/ChannelMetadata.java @@ -49,6 +49,7 @@ public class ChannelMetadata implements Listener, { private final static Logger mLog = LoggerFactory.getLogger(ChannelMetadata.class); + private AliasListConfigurationIdentifier mAliasListConfigurationIdentifier; private SystemConfigurationIdentifier mSystemConfigurationIdentifier; private SiteConfigurationIdentifier mSiteConfigurationIdentifier; private ChannelNameConfigurationIdentifier mChannelNameConfigurationIdentifier; @@ -128,6 +129,19 @@ public class ChannelMetadata implements Listener, return this; } + /** + * Alias list configuration identifier + */ + public AliasListConfigurationIdentifier getAliasListConfigurationIdentifier() + { + return mAliasListConfigurationIdentifier; + } + + public boolean hasAliasListConfigurationIdentifier() + { + return mAliasListConfigurationIdentifier != null; + } + /** * System configuration identifier */ @@ -323,6 +337,15 @@ public class ChannelMetadata implements Listener, switch(identifier.getForm()) { case ALIAS_LIST: + if(identifier instanceof AliasListConfigurationIdentifier && (update.isAdd() || update.isSilentAdd())) + { + mAliasListConfigurationIdentifier = (AliasListConfigurationIdentifier)identifier; + } + else + { + mAliasListConfigurationIdentifier = null; + } + if(update.isAdd()) { mAliasList = mAliasModel.getAliasList((AliasListConfigurationIdentifier)identifier); @@ -339,6 +362,7 @@ public class ChannelMetadata implements Listener, } } } + broadcastUpdate(ChannelMetadataField.CONFIGURATION_ALIAS_LIST); break; case CHANNEL: if(identifier instanceof ChannelNameConfigurationIdentifier && (update.isAdd() || update.isSilentAdd())) diff --git a/src/main/java/io/github/dsheirer/channel/metadata/ChannelMetadataField.java b/src/main/java/io/github/dsheirer/channel/metadata/ChannelMetadataField.java index c68e800f..dc4b2869 100644 --- a/src/main/java/io/github/dsheirer/channel/metadata/ChannelMetadataField.java +++ b/src/main/java/io/github/dsheirer/channel/metadata/ChannelMetadataField.java @@ -22,6 +22,7 @@ package io.github.dsheirer.channel.metadata; public enum ChannelMetadataField { + CONFIGURATION_ALIAS_LIST, CONFIGURATION_CHANNEL, CONFIGURATION_FREQUENCY, CONFIGURATION_SITE, diff --git a/src/main/java/io/github/dsheirer/gui/nowplaying/ChannelMetadataView.java b/src/main/java/io/github/dsheirer/gui/nowplaying/ChannelMetadataView.java index 0a0d0a51..4e2fd0d0 100644 --- a/src/main/java/io/github/dsheirer/gui/nowplaying/ChannelMetadataView.java +++ b/src/main/java/io/github/dsheirer/gui/nowplaying/ChannelMetadataView.java @@ -375,14 +375,18 @@ public class ChannelMetadataView extends VBox implements ChannelMetadataModel.Li columns.add(NowPlayingCells.column("channel.name", "Channel Name", null, Pos.CENTER, row -> toText(row.getChannelMetadata().getChannelNameConfigurationIdentifier()), Row::revisionProperty)); + //Alias list from the channel configuration + columns.add(NowPlayingCells.column("alias.list", "Alias List", null, Pos.CENTER, + row -> toText(row.getChannelMetadata().getAliasListConfigurationIdentifier()), Row::revisionProperty)); + //The channel rows are in channel start order, the same as the Swing version of the table for(TableColumn column: columns) { column.setSortable(false); } - //Column numbers in the Swing version of the table, for its stored column widths. Talker, Tuner, System and Site are new - //columns. + //Column numbers in the Swing version of the table, for its stored column widths. Talker, Tuner, System, Site and Alias + //List are new columns. String[] swingColumns = {"status", "decoder", "from", "from.alias", "to", "to.alias", "channel", "frequency", "channel.name"};