diff --git a/src/main/java/io/github/dsheirer/gui/playlist/alias/identifier/RadioIdRangeEditor.java b/src/main/java/io/github/dsheirer/gui/playlist/alias/identifier/RadioIdRangeEditor.java index c8acf611..17c3388d 100644 --- a/src/main/java/io/github/dsheirer/gui/playlist/alias/identifier/RadioIdRangeEditor.java +++ b/src/main/java/io/github/dsheirer/gui/playlist/alias/identifier/RadioIdRangeEditor.java @@ -292,10 +292,10 @@ public class RadioIdRangeEditor extends IdentifierEditor new IntegerFormatter(0,0xFFFFFF), "Format: 0 - 16777215")); details.add(new RadioIdDetail(Protocol.APCO25, IntegerFormat.HEXADECIMAL, new HexFormatter(0,0xFFFFFF), new HexFormatter(0,0xFFFFFF), "Format: 0 - FFFFFF")); - details.add(new RadioIdDetail(Protocol.NXDN, IntegerFormat.DECIMAL, new IntegerFormatter(0,0xFFFF), - new IntegerFormatter(0,0xFFFF),"Format: 1 - 65,535")); - details.add(new RadioIdDetail(Protocol.NXDN, IntegerFormat.HEXADECIMAL, new HexFormatter(0,0xFFFF), - new HexFormatter(0,0xFFFF),"Format: 1 - FFFF")); + details.add(new RadioIdDetail(Protocol.NXDN, IntegerFormat.DECIMAL, new IntegerFormatter(1,0xFFFF), + new IntegerFormatter(1,0xFFFF),"Format: 1 - 65,535")); + details.add(new RadioIdDetail(Protocol.NXDN, IntegerFormat.HEXADECIMAL, new HexFormatter(1,0xFFFF), + new HexFormatter(1,0xFFFF),"Format: 1 - FFFF")); details.add(new RadioIdDetail(Protocol.PASSPORT, IntegerFormat.DECIMAL, new IntegerFormatter(0,0x7FFFFF), new IntegerFormatter(0,0x7FFFFF), "Format: 0 - 8388607")); details.add(new RadioIdDetail(Protocol.PASSPORT, IntegerFormat.HEXADECIMAL, new HexFormatter(0,0x7FFFFF), diff --git a/src/main/java/io/github/dsheirer/gui/playlist/alias/identifier/TalkgroupRangeEditor.java b/src/main/java/io/github/dsheirer/gui/playlist/alias/identifier/TalkgroupRangeEditor.java index 91323004..9e6e4ec1 100644 --- a/src/main/java/io/github/dsheirer/gui/playlist/alias/identifier/TalkgroupRangeEditor.java +++ b/src/main/java/io/github/dsheirer/gui/playlist/alias/identifier/TalkgroupRangeEditor.java @@ -220,7 +220,7 @@ public class TalkgroupRangeEditor extends IdentifierEditor if(mMaxTalkgroupField == null) { mMaxTalkgroupField = new TextField(); - mMaxTalkgroupField.setTextFormatter(mMinIntegerTextFormatter); + mMaxTalkgroupField.setTextFormatter(mMaxIntegerTextFormatter); } return mMaxTalkgroupField; @@ -301,7 +301,7 @@ public class TalkgroupRangeEditor extends IdentifierEditor details.add(new TalkgroupDetail(Protocol.DMR, IntegerFormat.DECIMAL, new IntegerFormatter(1,16777215), new IntegerFormatter(1,16777215), "Format: 1 - 16777215")); details.add(new TalkgroupDetail(Protocol.DMR, IntegerFormat.HEXADECIMAL, new HexFormatter(1,0XFFFFFF), - new HexFormatter(1, 0xFFFFFF), "Format: 0 - FFFFFF")); + new HexFormatter(1, 0xFFFFFF), "Format: 1 - FFFFFF")); details.add(new TalkgroupDetail(Protocol.FLEETSYNC, IntegerFormat.FORMATTED, new PrefixIdentFormatter(0,0xFFFFF), new PrefixIdentFormatter(0,0xFFFFF), "Format: PPP-IIII = Prefix (0-127), Ident (0-8191)")); @@ -318,10 +318,10 @@ public class TalkgroupRangeEditor extends IdentifierEditor new IntegerFormatter(0,65535), "Format 0 - 65535")); details.add(new TalkgroupDetail(Protocol.NBFM, IntegerFormat.HEXADECIMAL, new HexFormatter(0,65535), new HexFormatter(0,65535), "Format 0 - FFFF")); - details.add(new TalkgroupDetail(Protocol.NXDN, IntegerFormat.DECIMAL, new IntegerFormatter(1,0xFFFF), - new IntegerFormatter(1,0xFFFF),"Format: 1 - 65,535")); - details.add(new TalkgroupDetail(Protocol.NXDN, IntegerFormat.HEXADECIMAL, new HexFormatter(1,0xFFFF), - new HexFormatter(1,0xFFFF),"Format: 1 - FFFF")); + details.add(new TalkgroupDetail(Protocol.NXDN, IntegerFormat.DECIMAL, new IntegerFormatter(0,0xFFFF), + new IntegerFormatter(0,0xFFFF),"Format: 0 - 65,535")); + details.add(new TalkgroupDetail(Protocol.NXDN, IntegerFormat.HEXADECIMAL, new HexFormatter(0,0xFFFF), + new HexFormatter(0,0xFFFF),"Format: 0 - FFFF")); details.add(new TalkgroupDetail(Protocol.PASSPORT, IntegerFormat.DECIMAL, new IntegerFormatter(0,0xFFFF), new IntegerFormatter(0,0xFFFF), "Format: 0 - 65535")); details.add(new TalkgroupDetail(Protocol.PASSPORT, IntegerFormat.HEXADECIMAL, new HexFormatter(0,0xFFFF), diff --git a/src/main/java/io/github/dsheirer/module/decode/nxdn/identifier/NXDNTalkgroupIdentifier.java b/src/main/java/io/github/dsheirer/module/decode/nxdn/identifier/NXDNTalkgroupIdentifier.java index 7465e282..be711905 100644 --- a/src/main/java/io/github/dsheirer/module/decode/nxdn/identifier/NXDNTalkgroupIdentifier.java +++ b/src/main/java/io/github/dsheirer/module/decode/nxdn/identifier/NXDNTalkgroupIdentifier.java @@ -91,7 +91,6 @@ public class NXDNTalkgroupIdentifier extends TalkgroupIdentifier return getValue() & 0x7FF; } - @Override public String toString() { @@ -100,13 +99,7 @@ public class NXDNTalkgroupIdentifier extends TalkgroupIdentifier return REPEATER_FORMAT.format(getTypeDHomeRepeater()) + "-" + TALKGROUP_FORMAT.format(getTypeDTalkgroup()); } - return switch(getValue()) - { - case 0x0 -> "0x0000 NULL GROUP"; - case 0xFFF0 -> "0xFFF0 RESERVED GROUP"; - case 0xFFFF -> "0xFFFF ALL GROUPS"; - default -> super.toString(); - }; + return super.toString(); } /**