Compare commits

...

1 Commits

Author SHA1 Message Date
Wahaj18
08753eedcd Show the identifier of auto-added talker alias radios (#2743)
Radio and P25FullyQualifiedRadio didn't set the value property when built
with the value constructor, which is how TalkerAliasAutoAdder creates the
radio ID for a new alias. The Identifier column in the alias view by
identifier type binds to that property, so it stayed blank until the alias
was edited or the playlist was reloaded through the setters.

Fixes #2730
2026-11-21 07:08:46 -05:00
3 changed files with 5 additions and 0 deletions

View File

@@ -48,6 +48,7 @@ public class P25FullyQualifiedRadio extends Radio
super(Protocol.APCO25, id); super(Protocol.APCO25, id);
mWacn = wacn; mWacn = wacn;
mSystem = system; mSystem = system;
updateValueProperty();
} }
@Override @Override

View File

@@ -45,6 +45,7 @@ public class Radio extends AliasID implements Comparable<Radio>
{ {
mProtocol = protocol; mProtocol = protocol;
mValue = value; mValue = value;
updateValueProperty();
} }
@Override @Override

View File

@@ -82,6 +82,7 @@ public class TalkerAliasAutoAdderTest
assertEquals(TalkerAliasAutoAdder.ALIAS_GROUP, alias.getGroup()); assertEquals(TalkerAliasAutoAdder.ALIAS_GROUP, alias.getGroup());
assertTrue(alias.getAliasIdentifiers().get(0) instanceof Radio radio && radio.getValue() == 1234 && assertTrue(alias.getAliasIdentifiers().get(0) instanceof Radio radio && radio.getValue() == 1234 &&
radio.getProtocol() == Protocol.APCO25); radio.getProtocol() == Protocol.APCO25);
assertEquals("Radio ID:1234 Protocol:APCO-25", alias.getAliasIdentifiers().get(0).valueProperty().get());
decode(RADIO, "ENGINE 12"); decode(RADIO, "ENGINE 12");
assertEquals(1, aliases().size(), "no duplicate alias"); assertEquals(1, aliases().size(), "no duplicate alias");
@@ -252,6 +253,8 @@ public class TalkerAliasAutoAdderTest
decode(roaming, "ROAMER"); decode(roaming, "ROAMER");
Alias alias = alias(roaming); Alias alias = alias(roaming);
assertTrue(alias.getAliasIdentifiers().get(0) instanceof P25FullyQualifiedRadio); assertTrue(alias.getAliasIdentifiers().get(0) instanceof P25FullyQualifiedRadio);
assertEquals("Fully Qualified Radio ID:781824.291.777 Protocol:APCO-25",
alias.getAliasIdentifiers().get(0).valueProperty().get());
assertNull(alias(RADIO), "local radio with the same value isn't aliased"); assertNull(alias(RADIO), "local radio with the same value isn't aliased");
} }