From c97e355349eb0f2d58b211c48eea13f680cd8161 Mon Sep 17 00:00:00 2001 From: Denny Sheirer Date: Sat, 5 Oct 2024 05:06:51 -0400 Subject: [PATCH] #2002 P25 fully qualified identifiers now formatted correctly in now playing window. (#2003) Co-authored-by: Dennis Sheirer --- .../talkgroup/APCO25TalkgroupFormatter.java | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/src/main/java/io/github/dsheirer/preference/identifier/talkgroup/APCO25TalkgroupFormatter.java b/src/main/java/io/github/dsheirer/preference/identifier/talkgroup/APCO25TalkgroupFormatter.java index 155057af5..4b7390cc5 100644 --- a/src/main/java/io/github/dsheirer/preference/identifier/talkgroup/APCO25TalkgroupFormatter.java +++ b/src/main/java/io/github/dsheirer/preference/identifier/talkgroup/APCO25TalkgroupFormatter.java @@ -115,14 +115,14 @@ public static String format(FullyQualifiedTalkgroupIdentifier identifier, Intege case DECIMAL: case FORMATTED: sb.append(id); - sb.append("(").append(toHex(wacn, WACN_HEXADECIMAL_WIDTH)); - sb.append(".").append(toHex(system, SYSTEM_HEXADECIMAL_WIDTH)); + sb.append("(").append(toHex(wacn)); + sb.append(".").append(toHex(system)); sb.append(".").append(talkgroup).append(")"); return sb.toString(); case HEXADECIMAL: sb.append(toHex(id)); - sb.append("(").append(toHex(wacn, WACN_HEXADECIMAL_WIDTH)); - sb.append(".").append(toHex(system, SYSTEM_HEXADECIMAL_WIDTH)); + sb.append("(").append(toHex(wacn)); + sb.append(".").append(toHex(system)); sb.append(".").append(toHex(talkgroup)).append(")"); return sb.toString(); default: @@ -266,8 +266,8 @@ public static String format(FullyQualifiedRadioIdentifier identifier, IntegerFor { sb.append(id).append(" ("); } - sb.append("(").append(toHex(wacn, WACN_HEXADECIMAL_WIDTH)); - sb.append(".").append(toHex(system, SYSTEM_HEXADECIMAL_WIDTH)); + sb.append(toHex(wacn)); + sb.append(".").append(toHex(system)); sb.append(".").append(radio); if(id > 0) { @@ -279,8 +279,8 @@ public static String format(FullyQualifiedRadioIdentifier identifier, IntegerFor { sb.append(toHex(id)).append(" ("); } - sb.append(toHex(wacn, WACN_HEXADECIMAL_WIDTH)); - sb.append(".").append(toHex(system, SYSTEM_HEXADECIMAL_WIDTH)); + sb.append(toHex(wacn)); + sb.append(".").append(toHex(system)); sb.append(".").append(toHex(radio)); if(id > 0) {