Resolves #620. Separates radio identifiers from talkgroups for APCO-25. Updates alias editor with two new options for radio id and radio id range. (#627)

2026-11-12 16:47:31 -05:00 · 2019-12-22 07:30:48 -05:00
parent 83e518d503
commit c658582157
208 changed files with 4490 additions and 3218 deletions
--- a/src/main/java/io/github/dsheirer/alias/AliasFactory.java
+++ b/src/main/java/io/github/dsheirer/alias/AliasFactory.java
@@ -1,21 +1,23 @@
 /*
- * ******************************************************************************
- * sdrtrunk
- * Copyright (C) 2014-2018 Dennis Sheirer
 *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
+ *  * ******************************************************************************
+ *  * Copyright (C) 2014-2019 Dennis Sheirer
+ *  *
+ *  * This program is free software: you can redistribute it and/or modify
+ *  * it under the terms of the GNU General Public License as published by
+ *  * the Free Software Foundation, either version 3 of the License, or
+ *  * (at your option) any later version.
+ *  *
+ *  * This program is distributed in the hope that it will be useful,
+ *  * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  * GNU General Public License for more details.
+ *  *
+ *  * You should have received a copy of the GNU General Public License
+ *  * along with this program.  If not, see <http://www.gnu.org/licenses/>
+ *  * *****************************************************************************
 *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
 *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>
- * *****************************************************************************
 */
 package io.github.dsheirer.alias;

@@ -37,30 +39,34 @@ import io.github.dsheirer.alias.id.legacy.fleetsync.FleetsyncID;
 import io.github.dsheirer.alias.id.legacy.fleetsync.FleetsyncIDEditor;
 import io.github.dsheirer.alias.id.legacy.mdc.MDC1200ID;
 import io.github.dsheirer.alias.id.legacy.mdc.MDC1200IDEditor;
+import io.github.dsheirer.alias.id.legacy.mobileID.MINEditor;
+import io.github.dsheirer.alias.id.legacy.mobileID.Min;
 import io.github.dsheirer.alias.id.legacy.mpt1327.MPT1327ID;
 import io.github.dsheirer.alias.id.legacy.mpt1327.MPT1327IDEditor;
 import io.github.dsheirer.alias.id.legacy.nonrecordable.NonRecordable;
 import io.github.dsheirer.alias.id.legacy.nonrecordable.NonRecordableEditor;
-import io.github.dsheirer.alias.id.legacy.talkgroup.LegacyTalkgroupID;
-import io.github.dsheirer.alias.id.legacy.talkgroup.LegacyTalkgroupIDEditor;
-import io.github.dsheirer.alias.id.lojack.LoJackFunctionAndID;
-import io.github.dsheirer.alias.id.lojack.LoJackIDEditor;
-import io.github.dsheirer.alias.id.legacy.mobileID.MINEditor;
-import io.github.dsheirer.alias.id.legacy.mobileID.Min;
-import io.github.dsheirer.alias.id.priority.Priority;
-import io.github.dsheirer.alias.id.priority.PriorityEditor;
-import io.github.dsheirer.alias.id.record.Record;
-import io.github.dsheirer.alias.id.record.RecordEditor;
 import io.github.dsheirer.alias.id.legacy.siteID.SiteID;
 import io.github.dsheirer.alias.id.legacy.siteID.SiteIDEditor;
+import io.github.dsheirer.alias.id.legacy.talkgroup.LegacyTalkgroupID;
+import io.github.dsheirer.alias.id.legacy.talkgroup.LegacyTalkgroupIDEditor;
+import io.github.dsheirer.alias.id.legacy.uniqueID.UniqueID;
+import io.github.dsheirer.alias.id.legacy.uniqueID.UniqueIDEditor;
+import io.github.dsheirer.alias.id.lojack.LoJackFunctionAndID;
+import io.github.dsheirer.alias.id.lojack.LoJackIDEditor;
+import io.github.dsheirer.alias.id.priority.Priority;
+import io.github.dsheirer.alias.id.priority.PriorityEditor;
+import io.github.dsheirer.alias.id.radio.Radio;
+import io.github.dsheirer.alias.id.radio.RadioEditor;
+import io.github.dsheirer.alias.id.radio.RadioRange;
+import io.github.dsheirer.alias.id.radio.RadioRangeEditor;
+import io.github.dsheirer.alias.id.record.Record;
+import io.github.dsheirer.alias.id.record.RecordEditor;
 import io.github.dsheirer.alias.id.status.StatusID;
 import io.github.dsheirer.alias.id.status.StatusIDEditor;
 import io.github.dsheirer.alias.id.talkgroup.Talkgroup;
 import io.github.dsheirer.alias.id.talkgroup.TalkgroupEditor;
 import io.github.dsheirer.alias.id.talkgroup.TalkgroupRange;
 import io.github.dsheirer.alias.id.talkgroup.TalkgroupRangeEditor;
-import io.github.dsheirer.alias.id.legacy.uniqueID.UniqueID;
-import io.github.dsheirer.alias.id.legacy.uniqueID.UniqueIDEditor;
 import io.github.dsheirer.audio.broadcast.BroadcastModel;
 import io.github.dsheirer.gui.editor.Editor;
 import io.github.dsheirer.gui.editor.EmptyEditor;
@@ -102,6 +108,15 @@ public class AliasFactory
                Priority copyPriority = new Priority();
                copyPriority.setPriority(originalPriority.getPriority());
                return copyPriority;
+            case RADIO_ID:
+                Radio originalRadio = (Radio)id;
+                Radio copyRadio = new Radio(originalRadio.getProtocol(), originalRadio.getValue());
+                return copyRadio;
+            case RADIO_ID_RANGE:
+                RadioRange originalRadioRange = (RadioRange)id;
+                RadioRange copyRadioRange = new RadioRange(originalRadioRange.getProtocol(), originalRadioRange.getMinRadio(),
+                    originalRadioRange.getMaxRadio());
+                return copyRadioRange;
            case RECORD:
                return new Record();
            case SITE:
@@ -213,6 +228,10 @@ public class AliasFactory
                    return new MINEditor(aliasID);
                case PRIORITY:
                    return new PriorityEditor(aliasID);
+                case RADIO_ID:
+                    return new RadioEditor(aliasID);
+                case RADIO_ID_RANGE:
+                    return new RadioRangeEditor(aliasID);
                case RECORD:
                    return new RecordEditor(aliasID);
                case SITE:
@@ -286,6 +305,10 @@ public class AliasFactory
                return new NonRecordable();
            case PRIORITY:
                return new Priority();
+            case RADIO_ID:
+                return new Radio();
+            case RADIO_ID_RANGE:
+                return new RadioRange();
            case RECORD:
                return new Record();
            case TALKGROUP:
--- a/src/main/java/io/github/dsheirer/alias/AliasList.java
+++ b/src/main/java/io/github/dsheirer/alias/AliasList.java
@@ -1,21 +1,23 @@
 /*
- * ******************************************************************************
- * sdrtrunk
- * Copyright (C) 2014-2019 Dennis Sheirer
 *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
+ *  * ******************************************************************************
+ *  * Copyright (C) 2014-2019 Dennis Sheirer
+ *  *
+ *  * This program is free software: you can redistribute it and/or modify
+ *  * it under the terms of the GNU General Public License as published by
+ *  * the Free Software Foundation, either version 3 of the License, or
+ *  * (at your option) any later version.
+ *  *
+ *  * This program is distributed in the hope that it will be useful,
+ *  * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  * GNU General Public License for more details.
+ *  *
+ *  * You should have received a copy of the GNU General Public License
+ *  * along with this program.  If not, see <http://www.gnu.org/licenses/>
+ *  * *****************************************************************************
 *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
 *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>
- * *****************************************************************************
 */
 package io.github.dsheirer.alias;

@@ -24,6 +26,8 @@ import io.github.dsheirer.alias.id.AliasID;
 import io.github.dsheirer.alias.id.broadcast.BroadcastChannel;
 import io.github.dsheirer.alias.id.esn.Esn;
 import io.github.dsheirer.alias.id.priority.Priority;
+import io.github.dsheirer.alias.id.radio.Radio;
+import io.github.dsheirer.alias.id.radio.RadioRange;
 import io.github.dsheirer.alias.id.status.StatusID;
 import io.github.dsheirer.alias.id.talkgroup.Talkgroup;
 import io.github.dsheirer.alias.id.talkgroup.TalkgroupRange;
@@ -32,6 +36,7 @@ import io.github.dsheirer.identifier.IdentifierCollection;
 import io.github.dsheirer.identifier.esn.ESNIdentifier;
 import io.github.dsheirer.identifier.patch.PatchGroup;
 import io.github.dsheirer.identifier.patch.PatchGroupIdentifier;
+import io.github.dsheirer.identifier.radio.RadioIdentifier;
 import io.github.dsheirer.identifier.status.UnitStatusIdentifier;
 import io.github.dsheirer.identifier.status.UserStatusIdentifier;
 import io.github.dsheirer.identifier.talkgroup.TalkgroupIdentifier;
@@ -48,10 +53,15 @@ import java.util.List;
 import java.util.Map;
 import java.util.TreeMap;

+/**
+ * List of aliases that share the same alias list name and provides convenient methods for looking up alias
+ * objects that match an identifier.
+ */
 public class AliasList implements Listener<AliasEvent>
 {
    private final static Logger mLog = LoggerFactory.getLogger(AliasList.class);
    private Map<Protocol,TalkgroupAliasList> mTalkgroupProtocolMap = new HashMap<>();
+    private Map<Protocol,RadioAliasList> mRadioProtocolMap = new HashMap<>();
    private Map<String,Alias> mESNMap = new HashMap<>();
    private Map<Integer,Alias> mStatusMap = new HashMap<>();
    private boolean mHasAliasActions = false;
@@ -124,6 +134,32 @@ public class AliasList implements Listener<AliasEvent>

                        talkgroupRangeAliasList.add(talkgroupRange, alias);
                        break;
+                    case RADIO_ID:
+                        Radio radio = (Radio)id;
+
+                        RadioAliasList radioAliasList = mRadioProtocolMap.get(radio.getProtocol());
+
+                        if(radioAliasList == null)
+                        {
+                            radioAliasList = new RadioAliasList();
+                            mRadioProtocolMap.put(radio.getProtocol(), radioAliasList);
+                        }
+
+                        radioAliasList.add(radio, alias);
+                        break;
+                    case RADIO_ID_RANGE:
+                        RadioRange radioRange = (RadioRange)id;
+
+                        RadioAliasList radioRangeAliasList = mRadioProtocolMap.get(radioRange.getProtocol());
+
+                        if(radioRangeAliasList == null)
+                        {
+                            radioRangeAliasList = new RadioAliasList();
+                            mRadioProtocolMap.put(radioRange.getProtocol(), radioRangeAliasList);
+                        }
+
+                        radioRangeAliasList.add(radioRange, alias);
+                        break;
                    case ESN:
                        String esn = ((Esn) id).getEsn();

@@ -253,14 +289,7 @@ public class AliasList implements Listener<AliasEvent>

                    if(talkgroupAliasList != null)
                    {
-                        Alias alias = talkgroupAliasList.getAlias(talkgroup);
-
-                        if(alias != null)
-                        {
-                            List<Alias> aliases = new ArrayList<>();
-                            aliases.add(alias);
-                            return aliases;
-                        }
+                        return toList(talkgroupAliasList.getAlias(talkgroup));
                    }
                    break;
                case PATCH_GROUP:
@@ -293,53 +322,52 @@ public class AliasList implements Listener<AliasEvent>
                        return aliases;
                    }
                    break;
+                case RADIO:
+                    RadioIdentifier radio = (RadioIdentifier)identifier;
+
+                    RadioAliasList radioAliasList = mRadioProtocolMap.get(identifier.getProtocol());
+
+                    if(radioAliasList != null)
+                    {
+                        return toList(radioAliasList.getAlias(radio));
+                    }
+                    break;
                case ESN:
                    if(identifier instanceof ESNIdentifier)
                    {
-                        Alias alias = getESNAlias(((ESNIdentifier)identifier).getValue());
-
-                        if(alias != null)
-                        {
-                            List<Alias> aliases = new ArrayList<>();
-                            aliases.add(alias);
-                            return aliases;
-                        }
+                        return toList(getESNAlias(((ESNIdentifier)identifier).getValue()));
                    }
                    break;
                case UNIT_STATUS:
                    if(identifier instanceof UnitStatusIdentifier)
                    {
                        int status = ((UnitStatusIdentifier)identifier).getValue();
-
-                        Alias alias = mStatusMap.get(status);
-
-                        if(alias != null)
-                        {
-                            List<Alias> aliases = new ArrayList<>();
-                            aliases.add(alias);
-                            return aliases;
-                        }
+                        return toList(mStatusMap.get(status));
                    }
                    break;
                case USER_STATUS:
                    if(identifier instanceof UserStatusIdentifier)
                    {
                        int status = ((UserStatusIdentifier)identifier).getValue();
-
-                        Alias alias = mStatusMap.get(status);
-
-                        if(alias != null)
-                        {
-                            List<Alias> aliases = new ArrayList<>();
-                            aliases.add(alias);
-                            return aliases;
-                        }
+                        return toList(mStatusMap.get(status));
                    }
                    break;
            }
        }

-        return Collections.EMPTY_LIST;
+        return Collections.emptyList();
+    }
+
+    private static List<Alias> toList(Alias alias)
+    {
+        if(alias != null)
+        {
+            List<Alias> aliases = new ArrayList<>();
+            aliases.add(alias);
+            return aliases;
+        }
+
+        return Collections.emptyList();
    }

    /**
@@ -553,4 +581,87 @@ public class AliasList implements Listener<AliasEvent>
            AliasList.remove(alias, mTalkgroupRangeAliasMap);
        }
    }
+
+    /**
+     * Listing of radio IDs and ranges for a specific protocol
+     */
+    public class RadioAliasList
+    {
+        private Map<Integer,Alias> mRadioAliasMap = new TreeMap<>();
+        private Map<RadioRange, Alias> mRadioRangeAliasMap = new HashMap<>();
+
+        public RadioAliasList()
+        {
+        }
+
+        public Alias getAlias(RadioIdentifier identifier)
+        {
+            int value = identifier.getValue();
+
+            if(mRadioAliasMap.containsKey(value))
+            {
+                return mRadioAliasMap.get(value);
+            }
+
+            for(RadioRange radioRange: mRadioRangeAliasMap.keySet())
+            {
+                if(radioRange.contains(value))
+                {
+                    return mRadioRangeAliasMap.get(radioRange);
+                }
+            }
+
+            return null;
+        }
+
+        public void add(Radio radio, Alias alias)
+        {
+            //Detect collisions
+            if(mRadioAliasMap.containsKey(radio.getValue()))
+            {
+                Alias existing = mRadioAliasMap.get(radio.getValue());
+
+                mLog.warn("Alias [" + alias.getName() + "] radio ID [" + radio.getValue() +
+                    "] has the same value as alias [" + existing.getName() +
+                    "] - alias [" + alias.getName() + "] will be used for alias list [" + getName() + "]");
+            }
+
+            mRadioAliasMap.put(radio.getValue(), alias);
+        }
+
+        public void add(RadioRange radioRange, Alias alias)
+        {
+            //Log warning if the new range overlaps with any existing ranges
+            for(Map.Entry<RadioRange,Alias> entry: mRadioRangeAliasMap.entrySet())
+            {
+                if(radioRange.overlaps(entry.getKey()))
+                {
+                    mLog.warn("Alias [" + alias.getName() + "] with radio ID range [" + radioRange.toString() +
+                        "] overlaps with alias [" + entry.getValue().getName() +
+                        "] with range [" + entry.getKey().toString() + "] for alias list [" + getName() + "]");
+                }
+            }
+
+            mRadioRangeAliasMap.put(radioRange, alias);
+        }
+
+        public void remove(Radio radio)
+        {
+            mRadioAliasMap.remove(radio.getValue());
+        }
+
+        public void remove(RadioRange radioRange)
+        {
+            mRadioRangeAliasMap.remove(radioRange);
+        }
+
+        /**
+         * Removes the alias from all internal maps
+         */
+        public void remove(Alias alias)
+        {
+            AliasList.remove(alias, mRadioAliasMap);
+            AliasList.remove(alias, mRadioRangeAliasMap);
+        }
+    }
 }
--- a/src/main/java/io/github/dsheirer/alias/id/AliasID.java
+++ b/src/main/java/io/github/dsheirer/alias/id/AliasID.java
@@ -1,20 +1,24 @@
-/*******************************************************************************
- *     SDR Trunk 
- *     Copyright (C) 2014-2016 Dennis Sheirer
+/*
 *
- *     This program is free software: you can redistribute it and/or modify
- *     it under the terms of the GNU General Public License as published by
- *     the Free Software Foundation, either version 3 of the License, or
- *     (at your option) any later version.
+ *  * ******************************************************************************
+ *  * Copyright (C) 2014-2019 Dennis Sheirer
+ *  *
+ *  * This program is free software: you can redistribute it and/or modify
+ *  * it under the terms of the GNU General Public License as published by
+ *  * the Free Software Foundation, either version 3 of the License, or
+ *  * (at your option) any later version.
+ *  *
+ *  * This program is distributed in the hope that it will be useful,
+ *  * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  * GNU General Public License for more details.
+ *  *
+ *  * You should have received a copy of the GNU General Public License
+ *  * along with this program.  If not, see <http://www.gnu.org/licenses/>
+ *  * *****************************************************************************
 *
- *     This program is distributed in the hope that it will be useful,
- *     but WITHOUT ANY WARRANTY; without even the implied warranty of
- *     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *     GNU General Public License for more details.
 *
- *     You should have received a copy of the GNU General Public License
- *     along with this program.  If not, see <http://www.gnu.org/licenses/>
- ******************************************************************************/
+ */
 package io.github.dsheirer.alias.id;

 import com.fasterxml.jackson.annotation.JsonIgnore;
@@ -25,18 +29,20 @@ import io.github.dsheirer.alias.id.broadcast.BroadcastChannel;
 import io.github.dsheirer.alias.id.esn.Esn;
 import io.github.dsheirer.alias.id.legacy.fleetsync.FleetsyncID;
 import io.github.dsheirer.alias.id.legacy.mdc.MDC1200ID;
+import io.github.dsheirer.alias.id.legacy.mobileID.Min;
 import io.github.dsheirer.alias.id.legacy.mpt1327.MPT1327ID;
 import io.github.dsheirer.alias.id.legacy.nonrecordable.NonRecordable;
-import io.github.dsheirer.alias.id.legacy.talkgroup.LegacyTalkgroupID;
-import io.github.dsheirer.alias.id.lojack.LoJackFunctionAndID;
-import io.github.dsheirer.alias.id.legacy.mobileID.Min;
-import io.github.dsheirer.alias.id.priority.Priority;
-import io.github.dsheirer.alias.id.record.Record;
 import io.github.dsheirer.alias.id.legacy.siteID.SiteID;
+import io.github.dsheirer.alias.id.legacy.talkgroup.LegacyTalkgroupID;
+import io.github.dsheirer.alias.id.legacy.uniqueID.UniqueID;
+import io.github.dsheirer.alias.id.lojack.LoJackFunctionAndID;
+import io.github.dsheirer.alias.id.priority.Priority;
+import io.github.dsheirer.alias.id.radio.Radio;
+import io.github.dsheirer.alias.id.radio.RadioRange;
+import io.github.dsheirer.alias.id.record.Record;
 import io.github.dsheirer.alias.id.status.StatusID;
 import io.github.dsheirer.alias.id.talkgroup.Talkgroup;
 import io.github.dsheirer.alias.id.talkgroup.TalkgroupRange;
-import io.github.dsheirer.alias.id.legacy.uniqueID.UniqueID;

@JsonTypeInfo(use = JsonTypeInfo.Id.NAME, include = JsonTypeInfo.As.PROPERTY, property = "type")
@JsonSubTypes({
@@ -48,6 +54,8 @@ import io.github.dsheirer.alias.id.legacy.uniqueID.UniqueID;
    @JsonSubTypes.Type(value = Min.class, name = "min"),
    @JsonSubTypes.Type(value = MPT1327ID.class, name = "mpt1327ID"),
    @JsonSubTypes.Type(value = NonRecordable.class, name = "nonRecordable"),
+    @JsonSubTypes.Type(value = Radio.class, name = "radio"),
+    @JsonSubTypes.Type(value = RadioRange.class, name = "radioRange"),
    @JsonSubTypes.Type(value = Talkgroup.class, name = "talkgroup"),
    @JsonSubTypes.Type(value = TalkgroupRange.class, name = "talkgroupRange"),
    @JsonSubTypes.Type(value = Priority.class, name = "priority"),
--- a/src/main/java/io/github/dsheirer/alias/id/AliasIDType.java
+++ b/src/main/java/io/github/dsheirer/alias/id/AliasIDType.java
@@ -1,21 +1,23 @@
 /*
- * ******************************************************************************
- * sdrtrunk
- * Copyright (C) 2014-2018 Dennis Sheirer
 *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
+ *  * ******************************************************************************
+ *  * Copyright (C) 2014-2019 Dennis Sheirer
+ *  *
+ *  * This program is free software: you can redistribute it and/or modify
+ *  * it under the terms of the GNU General Public License as published by
+ *  * the Free Software Foundation, either version 3 of the License, or
+ *  * (at your option) any later version.
+ *  *
+ *  * This program is distributed in the hope that it will be useful,
+ *  * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  * GNU General Public License for more details.
+ *  *
+ *  * You should have received a copy of the GNU General Public License
+ *  * along with this program.  If not, see <http://www.gnu.org/licenses/>
+ *  * *****************************************************************************
 *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
 *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>
- * *****************************************************************************
 */
 package io.github.dsheirer.alias.id;

@@ -28,6 +30,8 @@ public enum AliasIDType
    LTR_NET_UID("LTR-Net UID"),
    MIN("Passport MIN"),
    PRIORITY("Audio Priority"),
+    RADIO_ID("Radio ID"),
+    RADIO_ID_RANGE("Radio ID Range"),
    RECORD("Record"),
    SITE("Site"),
    STATUS("Status"),
--- a/src/main/java/io/github/dsheirer/alias/id/AliasIdentifierEditor.java
+++ b/src/main/java/io/github/dsheirer/alias/id/AliasIdentifierEditor.java
@@ -1,21 +1,23 @@
 /*
- * ******************************************************************************
- * sdrtrunk
- * Copyright (C) 2014-2018 Dennis Sheirer
 *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
+ *  * ******************************************************************************
+ *  * Copyright (C) 2014-2019 Dennis Sheirer
+ *  *
+ *  * This program is free software: you can redistribute it and/or modify
+ *  * it under the terms of the GNU General Public License as published by
+ *  * the Free Software Foundation, either version 3 of the License, or
+ *  * (at your option) any later version.
+ *  *
+ *  * This program is distributed in the hope that it will be useful,
+ *  * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  * GNU General Public License for more details.
+ *  *
+ *  * You should have received a copy of the GNU General Public License
+ *  * along with this program.  If not, see <http://www.gnu.org/licenses/>
+ *  * *****************************************************************************
 *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
 *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>
- * *****************************************************************************
 */
 package io.github.dsheirer.alias.id;

@@ -124,6 +126,8 @@ public class AliasIdentifierEditor extends Editor<Alias>

                menu.add(new AddAliasIdentifierItem(AliasIDType.TALKGROUP));
                menu.add(new AddAliasIdentifierItem(AliasIDType.TALKGROUP_RANGE));
+                menu.add(new AddAliasIdentifierItem(AliasIDType.RADIO_ID));
+                menu.add(new AddAliasIdentifierItem(AliasIDType.RADIO_ID_RANGE));
                menu.add(new AddAliasIdentifierItem(AliasIDType.ESN));
 //                menu.add(new AddAliasIdentifierItem(AliasIDType.LOJACK));
                menu.add(new AddAliasIdentifierItem(AliasIDType.STATUS));
--- a/src/main/java/io/github/dsheirer/alias/id/radio/Radio.java
+++ b/src/main/java/io/github/dsheirer/alias/id/radio/Radio.java
@@ -0,0 +1,118 @@
+/*
+ *
+ *  * ******************************************************************************
+ *  * Copyright (C) 2014-2019 Dennis Sheirer
+ *  *
+ *  * This program is free software: you can redistribute it and/or modify
+ *  * it under the terms of the GNU General Public License as published by
+ *  * the Free Software Foundation, either version 3 of the License, or
+ *  * (at your option) any later version.
+ *  *
+ *  * This program is distributed in the hope that it will be useful,
+ *  * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  * GNU General Public License for more details.
+ *  *
+ *  * You should have received a copy of the GNU General Public License
+ *  * along with this program.  If not, see <http://www.gnu.org/licenses/>
+ *  * *****************************************************************************
+ *
+ *
+ */
+package io.github.dsheirer.alias.id.radio;
+
+
+import com.fasterxml.jackson.dataformat.xml.annotation.JacksonXmlProperty;
+import io.github.dsheirer.alias.id.AliasID;
+import io.github.dsheirer.alias.id.AliasIDType;
+import io.github.dsheirer.alias.id.talkgroup.TalkgroupFormat;
+import io.github.dsheirer.alias.id.talkgroup.TalkgroupFormatter;
+import io.github.dsheirer.protocol.Protocol;
+
+/**
+ * Integer radio identifier with protocol.
+ */
+public class Radio extends AliasID
+{
+    private Protocol mProtocol = Protocol.UNKNOWN;
+    private int mValue;
+
+    public Radio()
+    {
+        //No arg JAXB constructor
+    }
+
+    public Radio(Protocol protocol, int value)
+    {
+        mProtocol = protocol;
+        mValue = value;
+    }
+
+    @JacksonXmlProperty(isAttribute = true, localName = "value")
+    public int getValue()
+    {
+        return mValue;
+    }
+
+    public void setValue(int value)
+    {
+        mValue = value;
+    }
+
+    @JacksonXmlProperty(isAttribute = true, localName = "protocol")
+    public Protocol getProtocol()
+    {
+        return mProtocol;
+    }
+
+    public void setProtocol(Protocol protocol)
+    {
+        mProtocol = protocol;
+    }
+
+    @Override
+    public boolean isValid()
+    {
+        if(mProtocol == null || mProtocol == Protocol.UNKNOWN)
+        {
+            return false;
+        }
+
+        TalkgroupFormat talkgroupFormat = TalkgroupFormat.get(mProtocol);
+        return talkgroupFormat.getMinimumValidValue() <= mValue && mValue <= talkgroupFormat.getMaximumValidValue();
+    }
+
+    public String toString()
+    {
+        StringBuilder sb = new StringBuilder();
+
+        sb.append("Radio ID:").append(TalkgroupFormatter.format(mProtocol, mValue));
+        sb.append(" Protocol:").append((mProtocol));
+
+        if(!isValid())
+        {
+            sb.append(" **NOT VALID**");
+        }
+
+        return sb.toString();
+    }
+
+    @Override
+    public boolean matches(AliasID id)
+    {
+        if(id instanceof Radio)
+        {
+            Radio tgid = (Radio)id;
+            return (getProtocol() == tgid.getProtocol()) && (getValue() == tgid.getValue());
+        }
+
+        return false;
+    }
+
+    @JacksonXmlProperty(isAttribute = true, localName = "type", namespace = "http://www.w3.org/2001/XMLSchema-instance")
+    @Override
+    public AliasIDType getType()
+    {
+        return AliasIDType.RADIO_ID;
+    }
+}
--- a/src/main/java/io/github/dsheirer/alias/id/radio/RadioEditor.java
+++ b/src/main/java/io/github/dsheirer/alias/id/radio/RadioEditor.java
@@ -0,0 +1,235 @@
+/*
+ *
+ *  * ******************************************************************************
+ *  * Copyright (C) 2014-2019 Dennis Sheirer
+ *  *
+ *  * This program is free software: you can redistribute it and/or modify
+ *  * it under the terms of the GNU General Public License as published by
+ *  * the Free Software Foundation, either version 3 of the License, or
+ *  * (at your option) any later version.
+ *  *
+ *  * This program is distributed in the hope that it will be useful,
+ *  * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  * GNU General Public License for more details.
+ *  *
+ *  * You should have received a copy of the GNU General Public License
+ *  * along with this program.  If not, see <http://www.gnu.org/licenses/>
+ *  * *****************************************************************************
+ *
+ *
+ */
+package io.github.dsheirer.alias.id.radio;
+
+import io.github.dsheirer.alias.id.AliasID;
+import io.github.dsheirer.gui.editor.DocumentListenerEditor;
+import io.github.dsheirer.protocol.Protocol;
+import net.miginfocom.swing.MigLayout;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import javax.swing.DefaultComboBoxModel;
+import javax.swing.JComboBox;
+import javax.swing.JFormattedTextField;
+import javax.swing.JLabel;
+import javax.swing.JOptionPane;
+import javax.swing.text.MaskFormatter;
+import java.awt.Color;
+import java.awt.Cursor;
+import java.awt.event.ActionEvent;
+import java.awt.event.ActionListener;
+import java.awt.event.MouseAdapter;
+import java.awt.event.MouseEvent;
+import java.text.ParseException;
+
+public class RadioEditor extends DocumentListenerEditor<AliasID>
+{
+    private final static Logger mLog = LoggerFactory.getLogger(RadioEditor.class);
+    private static final long serialVersionUID = 1L;
+
+    private static final String VALID_CHARACTERS_FOR_ASTERISK_MASKS = "0123456789 ";
+    private MaskFormatter mMaskFormatter = new MaskFormatter();
+    private JComboBox<Protocol> mComboProtocol;
+    private JFormattedTextField mRadioIdField;
+
+
+    public RadioEditor(AliasID aliasID)
+    {
+        initGUI();
+        setItem(aliasID);
+    }
+
+    private void initGUI()
+    {
+        setLayout(new MigLayout("fill,wrap 2", "[right][left]", "[][]"));
+
+        add(new JLabel("Protocol:"));
+
+        mComboProtocol = new JComboBox<>();
+
+        DefaultComboBoxModel<Protocol> model = new DefaultComboBoxModel<>();
+
+        for(Protocol protocol : Protocol.RADIO_ID_PROTOCOLS)
+        {
+            model.addElement(protocol);
+        }
+
+        mComboProtocol.setModel(model);
+        mComboProtocol.addActionListener(new ActionListener()
+        {
+            @Override
+            public void actionPerformed(ActionEvent e)
+            {
+                Protocol protocol = (Protocol)mComboProtocol.getSelectedItem();
+                updateEditor(protocol);
+                setModified(true);
+            }
+        });
+
+        add(mComboProtocol);
+
+        add(new JLabel("Value:"));
+
+        mRadioIdField = new JFormattedTextField(mMaskFormatter);
+        mRadioIdField.getDocument().addDocumentListener(this);
+        add(mRadioIdField, "growx,push");
+
+        JLabel help = new JLabel("Help ...");
+        help.setForeground(Color.BLUE.brighter());
+        help.setCursor(new Cursor(Cursor.HAND_CURSOR));
+        help.addMouseListener(new MouseAdapter()
+        {
+            @Override
+            public void mouseClicked(MouseEvent e)
+            {
+                RadioFormat radioFormat = RadioFormat.get(getCurrentProtocol());
+                JOptionPane.showMessageDialog(RadioEditor.this,
+                    radioFormat.getValidRangeHelpText(), "Help", JOptionPane.INFORMATION_MESSAGE);
+            }
+        });
+        add(help, "align left");
+    }
+
+    private void updateEditor(Protocol protocol)
+    {
+        RadioFormat mask = RadioFormat.get(protocol);
+        int currentValue = 0;
+        Radio radio = getRadio();
+
+        if(radio != null)
+        {
+            currentValue = radio.getValue();
+        }
+
+        try
+        {
+            mRadioIdField.setValue(null);
+            mRadioIdField.setToolTipText(mask.getValidRangeHelpText());
+            mMaskFormatter.setMask(mask.getMask());
+            if(mask.getMask().contains("*"))
+            {
+                mMaskFormatter.setValidCharacters(VALID_CHARACTERS_FOR_ASTERISK_MASKS);
+            }
+            mRadioIdField.setValue(RadioFormatter.format(protocol, currentValue));
+        }
+        catch(ParseException pe)
+        {
+            mLog.error("Error applying talkgroup editor mask to mask formatter [" + mask.getMask() + "]");
+        }
+    }
+
+    private Protocol getCurrentProtocol()
+    {
+        return mComboProtocol.getItemAt(mComboProtocol.getSelectedIndex());
+    }
+
+    /**
+     * Current talkgroup alias id
+     */
+    public Radio getRadio()
+    {
+        if(getItem() instanceof Radio)
+        {
+            return (Radio)getItem();
+        }
+
+        return null;
+    }
+
+    @Override
+    public void setItem(AliasID aliasID)
+    {
+        super.setItem(aliasID);
+
+        Radio radio = getRadio();
+
+        if(radio != null)
+        {
+            Protocol currentProtocol = getCurrentProtocol();
+            if(currentProtocol == radio.getProtocol())
+            {
+                updateEditor(radio.getProtocol());
+            }
+            mComboProtocol.getModel().setSelectedItem(radio.getProtocol());
+
+            String formatted = RadioFormatter.format(radio.getProtocol(), radio.getValue());
+            mRadioIdField.setValue(formatted);
+        }
+        else
+        {
+            mComboProtocol.getModel().setSelectedItem(Protocol.UNKNOWN);
+            mRadioIdField.setValue(RadioFormatter.format(getCurrentProtocol(), 0));
+        }
+
+        setModified(false);
+
+        repaint();
+    }
+
+    @Override
+    public void save()
+    {
+        Radio radio = getRadio();
+
+        if(radio != null)
+        {
+            Protocol protocol = mComboProtocol.getItemAt(mComboProtocol.getSelectedIndex());
+
+            if(protocol == null)
+            {
+                protocol = Protocol.UNKNOWN;
+            }
+
+            int value = -1;
+
+            try
+            {
+                value = RadioFormatter.parse(protocol, mRadioIdField.getText());
+            }
+            catch(ParseException pe)
+            {
+                //ignore ... value is still -1 and outside valid value range
+            }
+
+            RadioFormat mask = RadioFormat.get(protocol);
+
+            //Check for valid value within range ... notify user but allow value to persist
+            if(value < mask.getMinimumValidValue() || value > mask.getMaximumValidValue())
+            {
+                String message = "Invalid value [" + mRadioIdField.getText() + "].  " + protocol.name() +
+                    " valid range is [" + mask.getValidRangeDescription() + "]";
+
+                JOptionPane.showMessageDialog(RadioEditor.this, message, "Invalid Radio ID Value",
+                    JOptionPane.ERROR_MESSAGE);
+            }
+            else
+            {
+                radio.setValue(value);
+            }
+
+            radio.setProtocol(protocol);
+        }
+
+        setModified(false);
+    }
+}
--- a/src/main/java/io/github/dsheirer/alias/id/radio/RadioFormat.java
+++ b/src/main/java/io/github/dsheirer/alias/id/radio/RadioFormat.java
@@ -0,0 +1,117 @@
+/*
+ *
+ *  * ******************************************************************************
+ *  * Copyright (C) 2014-2019 Dennis Sheirer
+ *  *
+ *  * This program is free software: you can redistribute it and/or modify
+ *  * it under the terms of the GNU General Public License as published by
+ *  * the Free Software Foundation, either version 3 of the License, or
+ *  * (at your option) any later version.
+ *  *
+ *  * This program is distributed in the hope that it will be useful,
+ *  * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  * GNU General Public License for more details.
+ *  *
+ *  * You should have received a copy of the GNU General Public License
+ *  * along with this program.  If not, see <http://www.gnu.org/licenses/>
+ *  * *****************************************************************************
+ *
+ *
+ */
+
+package io.github.dsheirer.alias.id.radio;
+
+import io.github.dsheirer.protocol.Protocol;
+
+/**
+ * Radio ID protocol identifier entry masks and min/max valid ranges and valid range descriptions
+ *
+ * Note: the getMask() value is intended for use with a MaskFormatter attached to a JFormattedTextField.  The
+ * protocol masks that have a dash (-) use the # (any digit) character and the protocol masks that do not have
+ * a formatting dash use an asterisk (*).  Within the editor(s) that use this enumeration, the editor must use
+ * a setValidCharacters() on the mask formatter whenever it detects the mask containing one or more asterisks.
+ */
+public enum RadioFormat
+{
+    APCO25("********", 1, 0xFFFFFF, "1 to 16,777,215",
+        "<html>APCO25 valid range is 1 to 16,777,215"),
+    UNKNOWN("********", 1, 0xFFFFFF, "1 to 16,777,215",
+        "Unknown protocol valid value range is 1-16,777,215");
+
+    private String mMask;
+    private int mMinimumValue;
+    private int mMaximumValue;
+    private String mValidRangeDescription;
+    private String mValidRangeHelpText;
+
+    RadioFormat(String mask, int minimumValue, int maximumValue, String validRangeDescription, String validRangeHelpText)
+    {
+        mMask = mask;
+        mMinimumValue = minimumValue;
+        mMaximumValue = maximumValue;
+        mValidRangeDescription = validRangeDescription;
+        mValidRangeHelpText = validRangeHelpText;
+    }
+
+    public String getMask()
+    {
+        return mMask;
+    }
+
+    /**
+     * Minimum valid value for the protocol
+     */
+    public int getMinimumValidValue()
+    {
+        return mMinimumValue;
+    }
+
+    /**
+     * Maximum valid value for the protocol
+     */
+    public int getMaximumValidValue()
+    {
+        return mMaximumValue;
+    }
+
+    /**
+     * Indicates if the value is valid for the protocol
+     */
+    public boolean isValid(int value)
+    {
+        return getMinimumValidValue() <= value && value <= getMaximumValidValue();
+    }
+
+    /**
+     * Short description of the valid value range
+     */
+    public String getValidRangeDescription()
+    {
+        return mValidRangeDescription;
+    }
+
+    /**
+     * Help text for valid value ranges
+     */
+    public String getValidRangeHelpText()
+    {
+        return mValidRangeHelpText;
+    }
+
+    public static RadioFormat get(Protocol protocol)
+    {
+        if(protocol == null)
+        {
+            return UNKNOWN;
+        }
+
+        switch(protocol)
+        {
+            case APCO25:
+                return APCO25;
+            default:
+                return UNKNOWN;
+        }
+    }
+}
--- a/src/main/java/io/github/dsheirer/alias/id/radio/RadioFormatter.java
+++ b/src/main/java/io/github/dsheirer/alias/id/radio/RadioFormatter.java
@@ -0,0 +1,82 @@
+/*
+ *
+ *  * ******************************************************************************
+ *  * Copyright (C) 2014-2019 Dennis Sheirer
+ *  *
+ *  * This program is free software: you can redistribute it and/or modify
+ *  * it under the terms of the GNU General Public License as published by
+ *  * the Free Software Foundation, either version 3 of the License, or
+ *  * (at your option) any later version.
+ *  *
+ *  * This program is distributed in the hope that it will be useful,
+ *  * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  * GNU General Public License for more details.
+ *  *
+ *  * You should have received a copy of the GNU General Public License
+ *  * along with this program.  If not, see <http://www.gnu.org/licenses/>
+ *  * *****************************************************************************
+ *
+ *
+ */
+
+package io.github.dsheirer.alias.id.radio;
+
+import io.github.dsheirer.preference.identifier.talkgroup.APCO25TalkgroupFormatter;
+import io.github.dsheirer.preference.identifier.talkgroup.IntegerFormatter;
+import io.github.dsheirer.protocol.Protocol;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import java.text.ParseException;
+import java.util.HashMap;
+import java.util.Map;
+
+/**
+ * Protocol-specific formatting of radio id values and parsing of formatted radio id values.
+ */
+public class RadioFormatter
+{
+    private final static Logger mLog = LoggerFactory.getLogger(RadioFormatter.class);
+    private static Map<Protocol,IntegerFormatter> mFormatterMap = new HashMap<>();
+
+    static
+    {
+        mFormatterMap.put(Protocol.APCO25, new APCO25TalkgroupFormatter());
+        mFormatterMap.put(Protocol.UNKNOWN, new IntegerFormatter());
+    }
+
+    public RadioFormatter()
+    {
+    }
+
+    /**
+     * Parses the formatted value into an integer using a protocol specific formatter
+     */
+    public static int parse(Protocol protocol, String value) throws ParseException
+    {
+        IntegerFormatter formatter = mFormatterMap.get(protocol);
+
+        if(formatter == null)
+        {
+            formatter = mFormatterMap.get(Protocol.UNKNOWN);
+        }
+
+        return formatter.parse(value);
+    }
+
+    /**
+     * Formats the integer value using a protocol-specific formatter
+     */
+    public static String format(Protocol protocol, int value)
+    {
+        IntegerFormatter formatter = mFormatterMap.get(protocol);
+
+        if(formatter == null)
+        {
+            formatter = mFormatterMap.get(Protocol.UNKNOWN);
+        }
+
+        return formatter.format(value);
+    }
+}
--- a/src/main/java/io/github/dsheirer/alias/id/radio/RadioRange.java
+++ b/src/main/java/io/github/dsheirer/alias/id/radio/RadioRange.java
@@ -0,0 +1,166 @@
+/*
+ *
+ *  * ******************************************************************************
+ *  * Copyright (C) 2014-2019 Dennis Sheirer
+ *  *
+ *  * This program is free software: you can redistribute it and/or modify
+ *  * it under the terms of the GNU General Public License as published by
+ *  * the Free Software Foundation, either version 3 of the License, or
+ *  * (at your option) any later version.
+ *  *
+ *  * This program is distributed in the hope that it will be useful,
+ *  * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  * GNU General Public License for more details.
+ *  *
+ *  * You should have received a copy of the GNU General Public License
+ *  * along with this program.  If not, see <http://www.gnu.org/licenses/>
+ *  * *****************************************************************************
+ *
+ *
+ */
+package io.github.dsheirer.alias.id.radio;
+
+
+import com.fasterxml.jackson.dataformat.xml.annotation.JacksonXmlProperty;
+import io.github.dsheirer.alias.id.AliasID;
+import io.github.dsheirer.alias.id.AliasIDType;
+import io.github.dsheirer.protocol.Protocol;
+
+/**
+ * Integer radio identifier range of values with protocol.
+ */
+public class RadioRange extends AliasID
+{
+    private Protocol mProtocol = Protocol.UNKNOWN;
+    private int mMinRadio;
+    private int mMaxRadio;
+
+    public RadioRange()
+    {
+        //No arg JAXB constructor
+    }
+
+    /**
+     * Creates a radio range of from - to radio values (inclusive) for the specified protocol
+     * @param protocol for the radio range
+     * @param minRadio starting or minimum radio value
+     * @param maxRadio ending or maximum radio value
+     */
+    public RadioRange(Protocol protocol, int minRadio, int maxRadio)
+    {
+        mProtocol = protocol;
+        mMinRadio = minRadio;
+        mMaxRadio = maxRadio;
+    }
+
+    @JacksonXmlProperty(isAttribute = true, localName = "min")
+    public int getMinRadio()
+    {
+        return mMinRadio;
+    }
+
+    public void setMinRadio(int minRadio)
+    {
+        mMinRadio = minRadio;
+    }
+
+    @JacksonXmlProperty(isAttribute = true, localName = "max")
+    public int getMaxRadio()
+    {
+        return mMaxRadio;
+    }
+
+    public void setMaxRadio(int maxRadio)
+    {
+        mMaxRadio = maxRadio;
+    }
+
+    @JacksonXmlProperty(isAttribute = true, localName = "protocol")
+    public Protocol getProtocol()
+    {
+        return mProtocol;
+    }
+
+    public void setProtocol(Protocol protocol)
+    {
+        mProtocol = protocol;
+    }
+
+    @Override
+    public boolean isValid()
+    {
+        if(mProtocol == null || mProtocol == Protocol.UNKNOWN)
+        {
+            return false;
+        }
+
+        RadioFormat radioFormat = RadioFormat.get(mProtocol);
+        return radioFormat.getMinimumValidValue() <= mMinRadio &&
+               mMinRadio <= radioFormat.getMaximumValidValue() &&
+               radioFormat.getMinimumValidValue() <= mMaxRadio &&
+               mMaxRadio <= radioFormat.getMaximumValidValue();
+    }
+
+    public String toString()
+    {
+        StringBuilder sb = new StringBuilder();
+
+        sb.append("Radio ID Range:").append(RadioFormatter.format(mProtocol, mMinRadio));
+        sb.append(" to ").append(RadioFormatter.format(mProtocol, mMaxRadio));
+        sb.append(" Protocol:").append(mProtocol != null ? mProtocol : "unspecified");
+
+        if(!isValid())
+        {
+            sb.append(" **NOT VALID**");
+        }
+
+        return sb.toString();
+    }
+
+    @Override
+    public boolean matches(AliasID id)
+    {
+        if(id instanceof RadioRange)
+        {
+            RadioRange tgid = (RadioRange)id;
+            return (getProtocol() == tgid.getProtocol()) &&
+                (getMinRadio() == tgid.getMinRadio()) &&
+                (getMaxRadio() == tgid.getMaxRadio());
+        }
+
+        return false;
+    }
+
+    /**
+     * Indicates if this radio range contains/includes the value
+     * @param radioValue
+     * @return
+     */
+    public boolean contains(int radioValue)
+    {
+        return getMinRadio() <= radioValue && radioValue <= getMaxRadio();
+    }
+
+    /**
+     * Indicates if this talkgroup range overlaps the talkgroup range argument.
+     * @param radioRange to check for overlap
+     * @return true if the ranges overlap
+     */
+    public boolean overlaps(RadioRange radioRange)
+    {
+        return contains(radioRange.getMinRadio()) ||
+               contains(radioRange.getMaxRadio()) ||
+               (getMinRadio() < radioRange.getMinRadio() &&
+                   radioRange.getMaxRadio() < getMaxRadio()) ||
+               (radioRange.getMinRadio() < getMinRadio() &&
+                   getMaxRadio() < radioRange.getMaxRadio());
+    }
+
+    @JacksonXmlProperty(isAttribute = true, localName = "type", namespace = "http://www.w3.org/2001/XMLSchema-instance")
+    @Override
+    public AliasIDType getType()
+    {
+        return AliasIDType.RADIO_ID_RANGE;
+    }
+}
--- a/src/main/java/io/github/dsheirer/alias/id/radio/RadioRangeEditor.java
+++ b/src/main/java/io/github/dsheirer/alias/id/radio/RadioRangeEditor.java
@@ -0,0 +1,273 @@
+/*
+ *
+ *  * ******************************************************************************
+ *  * Copyright (C) 2014-2019 Dennis Sheirer
+ *  *
+ *  * This program is free software: you can redistribute it and/or modify
+ *  * it under the terms of the GNU General Public License as published by
+ *  * the Free Software Foundation, either version 3 of the License, or
+ *  * (at your option) any later version.
+ *  *
+ *  * This program is distributed in the hope that it will be useful,
+ *  * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  * GNU General Public License for more details.
+ *  *
+ *  * You should have received a copy of the GNU General Public License
+ *  * along with this program.  If not, see <http://www.gnu.org/licenses/>
+ *  * *****************************************************************************
+ *
+ *
+ */
+package io.github.dsheirer.alias.id.radio;
+
+import io.github.dsheirer.alias.id.AliasID;
+import io.github.dsheirer.gui.editor.DocumentListenerEditor;
+import io.github.dsheirer.protocol.Protocol;
+import net.miginfocom.swing.MigLayout;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import javax.swing.DefaultComboBoxModel;
+import javax.swing.JComboBox;
+import javax.swing.JFormattedTextField;
+import javax.swing.JLabel;
+import javax.swing.JOptionPane;
+import javax.swing.text.MaskFormatter;
+import java.awt.Color;
+import java.awt.Cursor;
+import java.awt.event.ActionEvent;
+import java.awt.event.ActionListener;
+import java.awt.event.MouseAdapter;
+import java.awt.event.MouseEvent;
+import java.text.ParseException;
+
+public class RadioRangeEditor extends DocumentListenerEditor<AliasID>
+{
+    private final static Logger mLog = LoggerFactory.getLogger(RadioRangeEditor.class);
+    private static final long serialVersionUID = 1L;
+
+    private static final String VALID_CHARACTERS_FOR_ASTERISK_MASKS = "0123456789 ";
+    private MaskFormatter mMaskFormatter = new MaskFormatter();
+    private JComboBox<Protocol> mComboProtocol;
+    private JFormattedTextField mMinRadioField;
+    private JFormattedTextField mMaxRadioField;
+
+    public RadioRangeEditor(AliasID aliasID)
+    {
+        initGUI();
+
+        setItem(aliasID);
+    }
+
+    private void initGUI()
+    {
+        setLayout(new MigLayout("fill,wrap 2", "[right][left]", "[][]"));
+
+        add(new JLabel("Protocol:"));
+
+        mComboProtocol = new JComboBox<Protocol>();
+
+        DefaultComboBoxModel<Protocol> model = new DefaultComboBoxModel<>();
+
+        for(Protocol protocol : Protocol.RADIO_ID_PROTOCOLS)
+        {
+            model.addElement(protocol);
+        }
+
+        mComboProtocol.setModel(model);
+        mComboProtocol.addActionListener(new ActionListener()
+        {
+            @Override
+            public void actionPerformed(ActionEvent e)
+            {
+                Protocol protocol = (Protocol)mComboProtocol.getSelectedItem();
+                updateEditor(protocol);
+                setModified(true);
+            }
+        });
+
+        add(mComboProtocol);
+
+        add(new JLabel("Min:"));
+
+        mMinRadioField = new JFormattedTextField(mMaskFormatter);
+        mMinRadioField.getDocument().addDocumentListener(this);
+        add(mMinRadioField, "growx,push");
+
+        add(new JLabel("Max:"));
+
+        mMaxRadioField = new JFormattedTextField(mMaskFormatter);
+        mMaxRadioField.getDocument().addDocumentListener(this);
+        add(mMaxRadioField, "growx,push");
+
+        JLabel help = new JLabel("Help ...");
+        help.setForeground(Color.BLUE.brighter());
+        help.setCursor(new Cursor(Cursor.HAND_CURSOR));
+        help.addMouseListener(new MouseAdapter()
+        {
+            @Override
+            public void mouseClicked(MouseEvent e)
+            {
+                RadioFormat radioFormat = RadioFormat.get(getCurrentProtocol());
+                JOptionPane.showMessageDialog(RadioRangeEditor.this,
+                    radioFormat.getValidRangeHelpText(), "Help", JOptionPane.INFORMATION_MESSAGE);
+            }
+        });
+        add(help, "align left");
+    }
+
+    private void updateEditor(Protocol protocol)
+    {
+        RadioFormat mask = RadioFormat.get(protocol);
+        int currentMinValue = 0;
+        int currentMaxValue = 0;
+        RadioRange radioRange = getRadioRange();
+
+        if(radioRange != null)
+        {
+            currentMinValue = radioRange.getMinRadio();
+            currentMaxValue = radioRange.getMaxRadio();
+        }
+
+        try
+        {
+            mMinRadioField.setValue(null);
+            mMaxRadioField.setValue(null);
+
+            mMinRadioField.setToolTipText(mask.getValidRangeHelpText());
+            mMaxRadioField.setToolTipText(mask.getValidRangeHelpText());
+            mMaskFormatter.setMask(mask.getMask());
+            if(mask.getMask().contains("*"))
+            {
+                mMaskFormatter.setValidCharacters(VALID_CHARACTERS_FOR_ASTERISK_MASKS);
+            }
+
+            mMinRadioField.setValue(RadioFormatter.format(protocol, currentMinValue));
+            mMaxRadioField.setValue(RadioFormatter.format(protocol, currentMaxValue));
+        }
+        catch(ParseException pe)
+        {
+            mLog.error("Error applying radio editor mask to mask formatter [" + mask.getMask() + "]");
+        }
+    }
+
+    private Protocol getCurrentProtocol()
+    {
+        return mComboProtocol.getItemAt(mComboProtocol.getSelectedIndex());
+    }
+
+
+
+    public RadioRange getRadioRange()
+    {
+        if(getItem() instanceof RadioRange)
+        {
+            return (RadioRange)getItem();
+        }
+
+        return null;
+    }
+
+    @Override
+    public void setItem(AliasID aliasID)
+    {
+        super.setItem(aliasID);
+
+        RadioRange radioRange = getRadioRange();
+
+        updateEditor(radioRange.getProtocol());
+
+        if(radioRange != null)
+        {
+            mComboProtocol.getModel().setSelectedItem(radioRange.getProtocol());
+            String minFormatted = RadioFormatter.format(radioRange.getProtocol(), radioRange.getMinRadio());
+            mMinRadioField.setValue(minFormatted);
+            String maxFormatted = RadioFormatter.format(radioRange.getProtocol(), radioRange.getMaxRadio());
+            mMaxRadioField.setValue(maxFormatted);
+        }
+        else
+        {
+            mComboProtocol.getModel().setSelectedItem(Protocol.UNKNOWN);
+            mMinRadioField.setValue(RadioFormatter.format(getCurrentProtocol(), 0));
+            mMaxRadioField.setValue(RadioFormatter.format(getCurrentProtocol(), 0));
+        }
+
+        setModified(false);
+
+        repaint();
+    }
+
+    @Override
+    public void save()
+    {
+        RadioRange radioRange = getRadioRange();
+
+        if(radioRange != null)
+        {
+            Protocol protocol = mComboProtocol.getItemAt(mComboProtocol.getSelectedIndex());
+
+            if(protocol == null)
+            {
+                protocol = Protocol.UNKNOWN;
+            }
+
+            radioRange.setProtocol(protocol);
+
+            int minValue = -1;
+            int maxValue = -1;
+
+            try
+            {
+                minValue = RadioFormatter.parse(protocol, mMinRadioField.getText());
+            }
+            catch(ParseException pe)
+            {
+                //ignore ... value is still -1 and outside valid value range
+            }
+
+            try
+            {
+                maxValue = RadioFormatter.parse(protocol, mMaxRadioField.getText());
+            }
+            catch(ParseException pe)
+            {
+                //ignore ... value is still -1 and outside valid value range
+            }
+
+            RadioFormat mask = RadioFormat.get(protocol);
+
+            //Check for valid value within range ... notify user but allow value to persist
+            if(minValue < mask.getMinimumValidValue() || minValue > mask.getMaximumValidValue())
+            {
+                String message = "Invalid minimum value [" + mMinRadioField.getText() + "].  " + protocol.name() +
+                    " valid range is [" + mask.getValidRangeDescription() + "]";
+
+                JOptionPane.showMessageDialog(RadioRangeEditor.this, message,
+                    "Invalid Radio Value", JOptionPane.ERROR_MESSAGE);
+            }
+            else
+            {
+                radioRange.setMinRadio(minValue);
+            }
+
+            //Check for valid value within range ... notify user but allow value to persist
+            if(maxValue < mask.getMinimumValidValue() || maxValue > mask.getMaximumValidValue())
+            {
+                String message = "Invalid maximum value [" + mMaxRadioField.getText() + "].  " + protocol.name() +
+                    " valid range is [" + mask.getValidRangeDescription() + "]";
+
+                JOptionPane.showMessageDialog(RadioRangeEditor.this, message,
+                    "Invalid Radio Value", JOptionPane.ERROR_MESSAGE);
+            }
+            else
+            {
+                radioRange.setMaxRadio(maxValue);
+            }
+
+            radioRange.setProtocol(protocol);
+        }
+
+        setModified(false);
+    }
+}