#2002 P25 fully qualified identifiers now formatted correctly in now …

…playing window. (#2003) Co-authored-by: Dennis Sheirer <[email protected]>
DSheirer · Oct 5, 2024 · c97e355 · c97e355
1 parent 3c8cd03
commit c97e355
Showing 1 changed file with 8 additions and 8 deletions.
diff --git a/...ain/java/io/github/dsheirer/preference/identifier/talkgroup/APCO25TalkgroupFormatter.java b/...ain/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)
                     {