diff --git a/src/decode/ltrnet/LTRNetActivitySummary.java b/src/decode/ltrnet/LTRNetActivitySummary.java index 97966a77..8f1991c6 100644 --- a/src/decode/ltrnet/LTRNetActivitySummary.java +++ b/src/decode/ltrnet/LTRNetActivitySummary.java @@ -71,7 +71,7 @@ public class LTRNetActivitySummary implements ActivitySummaryProvider { case CA_STRT: case CA_ENDD: - String talkgroup = ltr.getTalkgroupID( false ); + String talkgroup = ltr.getTalkgroupID(); if( mTalkgroupsFirstHeard.contains( talkgroup ) ) { @@ -298,7 +298,7 @@ public class LTRNetActivitySummary implements ActivitySummaryProvider String tgid = it.next(); sb.append( " " ); - sb.append( formatTalkgroup( tgid ) ); + sb.append( tgid ); sb.append( " " ); Alias alias = mAliasList.getTalkgroupAlias( tgid ); @@ -401,24 +401,4 @@ public class LTRNetActivitySummary implements ActivitySummaryProvider return sb.toString(); } - - public static String formatTalkgroup( String talkgroup ) - { - StringBuilder sb = new StringBuilder(); - - if( talkgroup.length() == 6 ) - { - sb.append( talkgroup.substring( 0, 1 ) ); - sb.append( "-" ); - sb.append( talkgroup.substring( 1, 3 ) ); - sb.append( "-" ); - sb.append( talkgroup.substring( 3, 6 ) ); - - return sb.toString(); - } - else - { - return talkgroup; - } - } } diff --git a/src/decode/ltrnet/LTRNetOSWMessage.java b/src/decode/ltrnet/LTRNetOSWMessage.java index 76bb899d..20a88d3d 100644 --- a/src/decode/ltrnet/LTRNetOSWMessage.java +++ b/src/decode/ltrnet/LTRNetOSWMessage.java @@ -241,28 +241,13 @@ public class LTRNetOSWMessage extends LTRNetMessage } public String getTalkgroupID() - { - return getTalkgroupID( true ); - } - - public String getTalkgroupID( boolean format ) { StringBuilder sb = new StringBuilder(); sb.append( getArea() ); - - if( format ) - { - sb.append( "-" ); - } - + sb.append( "-" ); sb.append( format( getHomeRepeater(), 2 ) ); - - if( format ) - { - sb.append( "-" ); - } - + sb.append( "-" ); sb.append( format( getGroup(), 3 ) ); return sb.toString();