Updates build version to 0.4.0 alpha 7

* Resolves issue with non-aliased talkgroup values not displaying in
audio playback (left/right/mono) windows.

* Adds buildSdr build target back into gradle script.

.idea/compiler.xml

@@ -2,8 +2,8 @@
 <project version="4">
   <component name="CompilerConfiguration">
     <bytecodeTargetLevel>
-      <module name="sdr-trunk_main" target="1.8" />
-      <module name="sdr-trunk_test" target="1.8" />
+      <module name="sdr-trunk_main" target="11" />
+      <module name="sdr-trunk_test" target="11" />
     </bytecodeTargetLevel>
   </component>
 </project>

.idea/misc.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
-  <component name="ProjectRootManager" version="2" languageLevel="JDK_1_8" default="false" project-jdk-name="1.8" project-jdk-type="JavaSDK">
+  <component name="ProjectRootManager" version="2" languageLevel="JDK_11" default="false" project-jdk-name="11" project-jdk-type="JavaSDK">
     <output url="file://$PROJECT_DIR$/out" />
   </component>
 </project>

README.md

@@ -21,6 +21,8 @@ All release versions of sdrtrunk are available from the [releases](https://githu
 
 **(final)** These versions have been tested and are the current release version.
 
+**(alpha)** These versions are under development feature previews and likely to contain bugs and unexpected behavior.
+
 **(beta)** These versions are currently being tested for bugs and functionality.
 
 ## Run the application
@@ -58,7 +60,7 @@ Linux
 ```
 Windows
 ```
-gradle.bat clean buildSdr
+gradlew.bat clean buildSdr
 ```
 This would add gradle, download all project dependencies and build JAR
 

build.gradle

@@ -1,3 +1,22 @@
+/*
+ * ******************************************************************************
+ * 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.
+ *
+ * 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/>
+ * *****************************************************************************
+ */
 buildscript {
     repositories {
         jcenter()
@@ -7,22 +26,72 @@ buildscript {
     }
 }
 
-apply plugin: 'java'
-apply plugin: 'idea'
+plugins {
+    id 'application'
+    id 'java'
+    id 'idea'
+    id 'org.openjfx.javafxplugin' version '0.0.6'
+    id 'org.beryx.runtime' version '1.1.1'
+}
 
 repositories {
     jcenter()
     mavenCentral()
 }
 
-version = '0.4.0-alpha.2'
-sourceCompatibility = 1.8
+version = '0.4.0-alpha.7'
+sourceCompatibility = '11'
 
 sourceSets {
     main.java.srcDirs 'src/main'
     test.java.srcDirs 'src/test'
 }
 
+dependencies {
+    testCompile 'junit:junit:4.12'
+    testCompile 'org.assertj:assertj-core:3.8.0'
+    compile fileTree(dir: 'imports', include: '*.jar')
+    compile 'ch.qos.logback:logback-core:1.2.3'
+    compile 'ch.qos.logback:logback-classic:1.2.3'
+    compile 'com.fasterxml.jackson.dataformat:jackson-dataformat-xml:2.9.8'
+    compile 'com.github.jiconfont:jiconfont-font_awesome:4.7.0.1'
+    compile 'com.github.jiconfont:jiconfont-javafx:1.0.0'
+    compile 'com.github.jiconfont:jiconfont-swing:1.0.1'
+    compile 'com.github.wendykierp:JTransforms:3.1'
+    compile 'com.google.guava:guava:27.0.1-jre'
+    compile 'com.jidesoft:jide-oss:3.6.18'
+    compile 'com.miglayout:miglayout-swing:5.2'
+    compile 'javax.usb:usb-api:1.0.2'
+    compile 'net.coderazzi:tablefilter-swing:5.4.0'
+    compile 'org.apache.axis:axis:1.4'
+    compile 'org.apache.axis:axis-jaxrpc:1.4'
+    compile 'org.apache.commons:commons-lang3:3.8.1'
+    compile 'org.apache.commons:commons-io:1.3.2'
+    compile 'org.apache.mina:mina-core:2.0.19'
+    compile 'org.apache.mina:mina-http:2.0.19'
+    compile "org.openjfx:javafx-base:11:win"
+    compile "org.openjfx:javafx-base:11:linux"
+    compile "org.openjfx:javafx-base:11:mac"
+    compile "org.openjfx:javafx-controls:11:win"
+    compile "org.openjfx:javafx-controls:11:linux"
+    compile "org.openjfx:javafx-controls:11:mac"
+    compile "org.openjfx:javafx-graphics:11:win"
+    compile "org.openjfx:javafx-graphics:11:linux"
+    compile "org.openjfx:javafx-graphics:11:mac"
+    compile "org.openjfx:javafx-swing:11:win"
+    compile "org.openjfx:javafx-swing:11:linux"
+    compile "org.openjfx:javafx-swing:11:mac"
+    compile 'org.slf4j:slf4j-api:1.7.25'
+    compile 'org.usb4java:libusb4java:1.3.0'
+    compile 'org.usb4java:usb4java:1.3.0'
+    compile 'org.usb4java:usb4java-javax:1.3.0'
+    compile 'pl.edu.icm:JLargeArrays:1.6'
+}
+
+application {
+    mainClassName = "io.github.dsheirer.gui.SDRTrunk"
+}
+
 idea {
     module {
         downloadJavadoc = true
@@ -30,36 +99,17 @@ idea {
     }
 }
 
-dependencies {
-    testCompile 'junit:junit:4.12'
-    testCompile 'org.assertj:assertj-core:3.8.0'
-    compile fileTree(dir: 'imports', include: '*.jar')
-    compile 'org.apache.commons:commons-lang3:3.7'
-    compile 'org.apache.commons:commons-io:1.3.2'
-    compile 'org.slf4j:slf4j-api:1.7.25'
-    compile 'ch.qos.logback:logback-core:1.2.3'
-    compile 'ch.qos.logback:logback-classic:1.2.3'
-    compile 'com.miglayout:miglayout-swing:5.0'
-
-    compile 'org.usb4java:usb4java-javax:1.2.0'
-    compile 'org.usb4java:usb4java:1.2.0'
-    compile 'org.usb4java:libusb4java:1.2.0'
-    compile 'javax.usb:usb-api:1.0.2'
-    compile 'com.github.wendykierp:JTransforms:3.1'
-    compile 'pl.edu.icm:JLargeArrays:1.6'
-    compile 'net.coderazzi:tablefilter-swing:5.3.1'
-    compile 'com.jidesoft:jide-oss:3.4.3'
-    compile 'org.apache.mina:mina-core:2.0.16'
-    compile 'org.apache.mina:mina-http:2.0.16'
-    compile 'org.apache.axis:axis-jaxrpc:1.4'
-    compile 'org.apache.axis:axis:1.4'
-    compile 'com.fasterxml.jackson.dataformat:jackson-dataformat-xml:2.9.3'
-    compile 'org.kordamp.ikonli:ikonli-javafx:2.1.1'
-    compile 'org.kordamp.ikonli:ikonli-fontawesome-pack:2.1.1'
+javafx {
+    modules = ['javafx.base', 'javafx.controls', 'javafx.graphics', 'javafx.swing']
 }
 
-task wrapper(type: Wrapper) {
-    gradleVersion = '4.3.1'
+runtime {
+    targetPlatform('linux-x64', '/media/denny/WD250GB/java/linux/jdk-11.0.1')
+    targetPlatform('osx-x64', '/media/denny/WD250GB/java/osx/jdk-11.0.1.jdk/Contents/Home')
+    targetPlatform('windows-x64', '/media/denny/WD250GB/java/windows/jdk-11.0.1')
+    options = ['--strip-debug', '--compress', '2', '--no-header-files', '--no-man-pages']
+    modules = ['java.desktop', 'java.naming', 'jdk.unsupported', 'jdk.unsupported.desktop']
+    imageZip = file("$buildDir/image/sdr-trunk-" + version + ".zip")
 }
 
 task buildSdr(type: Jar) {

gradle/wrapper/gradle-wrapper.properties

@@ -1,5 +1,25 @@
-distributionUrl=https\://services.gradle.org/distributions/gradle-4.3.1-bin.zip
+#
+# *******************************************************************************
+# 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.
+#
+# 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/>
+# ******************************************************************************
+#
+
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-zipStorePath=wrapper/dists
+distributionUrl=https\://services.gradle.org/distributions/gradle-5.1.1-bin.zip
 zipStoreBase=GRADLE_USER_HOME
+zipStorePath=wrapper/dists

gradlew

@@ -28,7 +28,7 @@ APP_NAME="Gradle"
 APP_BASE_NAME=`basename "$0"`
 
 # Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
-DEFAULT_JVM_OPTS=""
+DEFAULT_JVM_OPTS='"-Xmx64m"'
 
 # Use the maximum available, or set MAX_FD != -1 to use that value.
 MAX_FD="maximum"

gradlew.bat

@@ -14,7 +14,7 @@ set APP_BASE_NAME=%~n0
 set APP_HOME=%DIRNAME%
 
 @rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
-set DEFAULT_JVM_OPTS=
+set DEFAULT_JVM_OPTS="-Xmx64m"
 
 @rem Find java.exe
 if defined JAVA_HOME goto findJavaFromJavaHome

sdr-trunk.ipr

@@ -1,79 +1,721 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
   <component name="CompilerConfiguration">
-    <option name="DEFAULT_COMPILER" value="Javac"/>
     <resourceExtensions>
-      <entry name=".+\.(properties|xml|html|dtd|tld)"/>
-      <entry name=".+\.(gif|png|jpeg|jpg)"/>
+      <entry name=".+\.(properties|xml|html|dtd|tld)" />
+      <entry name=".+\.(gif|png|jpeg|jpg)" />
     </resourceExtensions>
     <wildcardResourcePatterns>
-      <entry name="!?*.class"/>
-      <entry name="!?*.scala"/>
-      <entry name="!?*.java"/>
-      <entry name="!?*.groovy"/>
+      <entry name="!?*.class" />
+      <entry name="!?*.scala" />
+      <entry name="!?*.java" />
+      <entry name="!?*.groovy" />
     </wildcardResourcePatterns>
-    <annotationProcessing enabled="false" useClasspath="true"/>
-    <bytecodeTargetLevel target="1.8"/>
+    <bytecodeTargetLevel target="1.8">
+      <module name="sdr-trunk_main" target="1.8" />
+      <module name="sdr-trunk_test" target="1.8" />
+    </bytecodeTargetLevel>
   </component>
-  <component name="CopyrightManager" default="">
-    <module2copyright/>
+  <component name="CopyrightManager" default="sdrtrunk">
+    <copyright>
+      <option name="notice" value="sdr-trunk&#10;Copyright (C) 2014-&amp;#36;today.year Dennis Sheirer&#10;&#10;This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public&#10;License as published by  the Free Software Foundation, either version 3 of the License, or  (at your option) any&#10;later version.&#10;&#10;This program is distributed in the hope that it will be useful,  but WITHOUT ANY WARRANTY; without even the implied&#10;warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for more details.&#10;&#10;You should have received a copy of the GNU General Public License  along with this program.&#10;If not, see &lt;http://www.gnu.org/licenses/&gt;&#10;" />
+      <option name="myName" value="sdrtrunk" />
+    </copyright>
+    <LanguageOptions name="JAVA">
+      <option name="fileTypeOverride" value="3" />
+      <option name="separateBefore" value="true" />
+      <option name="separateAfter" value="true" />
+    </LanguageOptions>
   </component>
   <component name="DependencyValidationManager">
-    <option name="SKIP_IMPORT_STATEMENTS" value="false"/>
+    <option name="SKIP_IMPORT_STATEMENTS" value="false" />
+  </component>
+  <component name="GradleSettings">
+    <option name="linkedExternalProjectsSettings">
+      <GradleProjectSettings>
+        <option name="distributionType" value="WRAPPED" />
+        <option name="externalProjectPath" value="$PROJECT_DIR$" />
+        <option name="gradleHome" value="$USER_HOME$/gradle/gradle-2.12" />
+        <option name="modules">
+          <set>
+            <option value="$PROJECT_DIR$" />
+          </set>
+        </option>
+        <option name="useAutoImport" value="true" />
+      </GradleProjectSettings>
+    </option>
   </component>
-  <component name="Encoding" useUTFGuessing="true" native2AsciiForPropertiesFiles="false"/>
   <component name="GradleUISettings">
-    <setting name="root"/>
+    <setting name="root" />
   </component>
   <component name="GradleUISettings2">
-    <setting name="root"/>
+    <setting name="root" />
+  </component>
+  <component name="IdProvider" IDEtalkID="11DA1DB66DD62DDA1ED602B7079FE97C" />
+  <component name="InspectionProjectProfileManager">
+    <profile version="1.0">
+      <option name="myName" value="Project Default" />
+    </profile>
+    <version value="1.0" />
   </component>
-  <component name="IdProvider" IDEtalkID="11DA1DB66DD62DDA1ED602B7079FE97C"/>
   <component name="JavadocGenerationManager">
-    <option name="OUTPUT_DIRECTORY"/>
-    <option name="OPTION_SCOPE" value="protected"/>
-    <option name="OPTION_HIERARCHY" value="true"/>
-    <option name="OPTION_NAVIGATOR" value="true"/>
-    <option name="OPTION_INDEX" value="true"/>
-    <option name="OPTION_SEPARATE_INDEX" value="true"/>
-    <option name="OPTION_DOCUMENT_TAG_USE" value="false"/>
-    <option name="OPTION_DOCUMENT_TAG_AUTHOR" value="false"/>
-    <option name="OPTION_DOCUMENT_TAG_VERSION" value="false"/>
-    <option name="OPTION_DOCUMENT_TAG_DEPRECATED" value="true"/>
-    <option name="OPTION_DEPRECATED_LIST" value="true"/>
-    <option name="OTHER_OPTIONS" value=""/>
-    <option name="HEAP_SIZE"/>
-    <option name="LOCALE"/>
-    <option name="OPEN_IN_BROWSER" value="true"/>
+    <option name="OUTPUT_DIRECTORY" />
+    <option name="OPTION_SCOPE" value="protected" />
+    <option name="OPTION_HIERARCHY" value="true" />
+    <option name="OPTION_NAVIGATOR" value="true" />
+    <option name="OPTION_INDEX" value="true" />
+    <option name="OPTION_SEPARATE_INDEX" value="true" />
+    <option name="OPTION_DOCUMENT_TAG_USE" value="false" />
+    <option name="OPTION_DOCUMENT_TAG_AUTHOR" value="false" />
+    <option name="OPTION_DOCUMENT_TAG_VERSION" value="false" />
+    <option name="OPTION_DOCUMENT_TAG_DEPRECATED" value="true" />
+    <option name="OPTION_DEPRECATED_LIST" value="true" />
+    <option name="OTHER_OPTIONS" value="" />
+    <option name="HEAP_SIZE" />
+    <option name="LOCALE" />
+    <option name="OPEN_IN_BROWSER" value="true" />
+  </component>
+  <component name="Palette2">
+    <group name="Swing">
+      <item class="com.intellij.uiDesigner.HSpacer" tooltip-text="Horizontal Spacer" icon="/com/intellij/uiDesigner/icons/hspacer.png" removable="false" auto-create-binding="false" can-attach-label="false">
+        <default-constraints vsize-policy="1" hsize-policy="6" anchor="0" fill="1" />
+      </item>
+      <item class="com.intellij.uiDesigner.VSpacer" tooltip-text="Vertical Spacer" icon="/com/intellij/uiDesigner/icons/vspacer.png" removable="false" auto-create-binding="false" can-attach-label="false">
+        <default-constraints vsize-policy="6" hsize-policy="1" anchor="0" fill="2" />
+      </item>
+      <item class="javax.swing.JPanel" icon="/com/intellij/uiDesigner/icons/panel.png" removable="false" auto-create-binding="false" can-attach-label="false">
+        <default-constraints vsize-policy="3" hsize-policy="3" anchor="0" fill="3" />
+      </item>
+      <item class="javax.swing.JScrollPane" icon="/com/intellij/uiDesigner/icons/scrollPane.png" removable="false" auto-create-binding="false" can-attach-label="true">
+        <default-constraints vsize-policy="7" hsize-policy="7" anchor="0" fill="3" />
+      </item>
+      <item class="javax.swing.JButton" icon="/com/intellij/uiDesigner/icons/button.png" removable="false" auto-create-binding="true" can-attach-label="false">
+        <default-constraints vsize-policy="0" hsize-policy="3" anchor="0" fill="1" />
+        <initial-values>
+          <property name="text" value="Button" />
+        </initial-values>
+      </item>
+      <item class="javax.swing.JRadioButton" icon="/com/intellij/uiDesigner/icons/radioButton.png" removable="false" auto-create-binding="true" can-attach-label="false">
+        <default-constraints vsize-policy="0" hsize-policy="3" anchor="8" fill="0" />
+        <initial-values>
+          <property name="text" value="RadioButton" />
+        </initial-values>
+      </item>
+      <item class="javax.swing.JCheckBox" icon="/com/intellij/uiDesigner/icons/checkBox.png" removable="false" auto-create-binding="true" can-attach-label="false">
+        <default-constraints vsize-policy="0" hsize-policy="3" anchor="8" fill="0" />
+        <initial-values>
+          <property name="text" value="CheckBox" />
+        </initial-values>
+      </item>
+      <item class="javax.swing.JLabel" icon="/com/intellij/uiDesigner/icons/label.png" removable="false" auto-create-binding="false" can-attach-label="false">
+        <default-constraints vsize-policy="0" hsize-policy="0" anchor="8" fill="0" />
+        <initial-values>
+          <property name="text" value="Label" />
+        </initial-values>
+      </item>
+      <item class="javax.swing.JTextField" icon="/com/intellij/uiDesigner/icons/textField.png" removable="false" auto-create-binding="true" can-attach-label="true">
+        <default-constraints vsize-policy="0" hsize-policy="6" anchor="8" fill="1">
+          <preferred-size width="150" height="-1" />
+        </default-constraints>
+      </item>
+      <item class="javax.swing.JPasswordField" icon="/com/intellij/uiDesigner/icons/passwordField.png" removable="false" auto-create-binding="true" can-attach-label="true">
+        <default-constraints vsize-policy="0" hsize-policy="6" anchor="8" fill="1">
+          <preferred-size width="150" height="-1" />
+        </default-constraints>
+      </item>
+      <item class="javax.swing.JFormattedTextField" icon="/com/intellij/uiDesigner/icons/formattedTextField.png" removable="false" auto-create-binding="true" can-attach-label="true">
+        <default-constraints vsize-policy="0" hsize-policy="6" anchor="8" fill="1">
+          <preferred-size width="150" height="-1" />
+        </default-constraints>
+      </item>
+      <item class="javax.swing.JTextArea" icon="/com/intellij/uiDesigner/icons/textArea.png" removable="false" auto-create-binding="true" can-attach-label="true">
+        <default-constraints vsize-policy="6" hsize-policy="6" anchor="0" fill="3">
+          <preferred-size width="150" height="50" />
+        </default-constraints>
+      </item>
+      <item class="javax.swing.JTextPane" icon="/com/intellij/uiDesigner/icons/textPane.png" removable="false" auto-create-binding="true" can-attach-label="true">
+        <default-constraints vsize-policy="6" hsize-policy="6" anchor="0" fill="3">
+          <preferred-size width="150" height="50" />
+        </default-constraints>
+      </item>
+      <item class="javax.swing.JEditorPane" icon="/com/intellij/uiDesigner/icons/editorPane.png" removable="false" auto-create-binding="true" can-attach-label="true">
+        <default-constraints vsize-policy="6" hsize-policy="6" anchor="0" fill="3">
+          <preferred-size width="150" height="50" />
+        </default-constraints>
+      </item>
+      <item class="javax.swing.JComboBox" icon="/com/intellij/uiDesigner/icons/comboBox.png" removable="false" auto-create-binding="true" can-attach-label="true">
+        <default-constraints vsize-policy="0" hsize-policy="2" anchor="8" fill="1" />
+      </item>
+      <item class="javax.swing.JTable" icon="/com/intellij/uiDesigner/icons/table.png" removable="false" auto-create-binding="true" can-attach-label="false">
+        <default-constraints vsize-policy="6" hsize-policy="6" anchor="0" fill="3">
+          <preferred-size width="150" height="50" />
+        </default-constraints>
+      </item>
+      <item class="javax.swing.JList" icon="/com/intellij/uiDesigner/icons/list.png" removable="false" auto-create-binding="true" can-attach-label="false">
+        <default-constraints vsize-policy="6" hsize-policy="2" anchor="0" fill="3">
+          <preferred-size width="150" height="50" />
+        </default-constraints>
+      </item>
+      <item class="javax.swing.JTree" icon="/com/intellij/uiDesigner/icons/tree.png" removable="false" auto-create-binding="true" can-attach-label="false">
+        <default-constraints vsize-policy="6" hsize-policy="6" anchor="0" fill="3">
+          <preferred-size width="150" height="50" />
+        </default-constraints>
+      </item>
+      <item class="javax.swing.JTabbedPane" icon="/com/intellij/uiDesigner/icons/tabbedPane.png" removable="false" auto-create-binding="true" can-attach-label="false">
+        <default-constraints vsize-policy="3" hsize-policy="3" anchor="0" fill="3">
+          <preferred-size width="200" height="200" />
+        </default-constraints>
+      </item>
+      <item class="javax.swing.JSplitPane" icon="/com/intellij/uiDesigner/icons/splitPane.png" removable="false" auto-create-binding="false" can-attach-label="false">
+        <default-constraints vsize-policy="3" hsize-policy="3" anchor="0" fill="3">
+          <preferred-size width="200" height="200" />
+        </default-constraints>
+      </item>
+      <item class="javax.swing.JSpinner" icon="/com/intellij/uiDesigner/icons/spinner.png" removable="false" auto-create-binding="true" can-attach-label="true">
+        <default-constraints vsize-policy="0" hsize-policy="6" anchor="8" fill="1" />
+      </item>
+      <item class="javax.swing.JSlider" icon="/com/intellij/uiDesigner/icons/slider.png" removable="false" auto-create-binding="true" can-attach-label="false">
+        <default-constraints vsize-policy="0" hsize-policy="6" anchor="8" fill="1" />
+      </item>
+      <item class="javax.swing.JSeparator" icon="/com/intellij/uiDesigner/icons/separator.png" removable="false" auto-create-binding="false" can-attach-label="false">
+        <default-constraints vsize-policy="6" hsize-policy="6" anchor="0" fill="3" />
+      </item>
+      <item class="javax.swing.JProgressBar" icon="/com/intellij/uiDesigner/icons/progressbar.png" removable="false" auto-create-binding="true" can-attach-label="false">
+        <default-constraints vsize-policy="0" hsize-policy="6" anchor="0" fill="1" />
+      </item>
+      <item class="javax.swing.JToolBar" icon="/com/intellij/uiDesigner/icons/toolbar.png" removable="false" auto-create-binding="false" can-attach-label="false">
+        <default-constraints vsize-policy="0" hsize-policy="6" anchor="0" fill="1">
+          <preferred-size width="-1" height="20" />
+        </default-constraints>
+      </item>
+      <item class="javax.swing.JToolBar$Separator" icon="/com/intellij/uiDesigner/icons/toolbarSeparator.png" removable="false" auto-create-binding="false" can-attach-label="false">
+        <default-constraints vsize-policy="0" hsize-policy="0" anchor="0" fill="1" />
+      </item>
+      <item class="javax.swing.JScrollBar" icon="/com/intellij/uiDesigner/icons/scrollbar.png" removable="false" auto-create-binding="true" can-attach-label="false">
+        <default-constraints vsize-policy="6" hsize-policy="0" anchor="0" fill="2" />
+      </item>
+    </group>
+  </component>
+  <component name="ProjectDictionaryState">
+    <dictionary name="Denny">
+      <words>
+        <w>baseband</w>
+        <w>costas</w>
+      </words>
+    </dictionary>
   </component>
   <component name="ProjectModuleManager">
     <modules>
-      <module filepath="$PROJECT_DIR$/sdr-trunk.iml" fileurl="file://$PROJECT_DIR$/sdr-trunk.iml"/>
+      <module fileurl="file://$PROJECT_DIR$/sdr-trunk.iml" filepath="$PROJECT_DIR$/sdr-trunk.iml" />
+      <module fileurl="file://$PROJECT_DIR$/sdr-trunk_main.iml" filepath="$PROJECT_DIR$/sdr-trunk_main.iml" group="sdr-trunk" />
+      <module fileurl="file://$PROJECT_DIR$/sdr-trunk_test.iml" filepath="$PROJECT_DIR$/sdr-trunk_test.iml" group="sdr-trunk" />
     </modules>
   </component>
-  <component name="ProjectRootManager" version="2" languageLevel="JDK_1_8" assert-keyword="true" jdk-15="true" project-jdk-type="JavaSDK" assert-jdk-15="true" project-jdk-name="1.8">
-    <output url="file://$PROJECT_DIR$/out"/>
+  <component name="ProjectRootManager" version="2" languageLevel="JDK_1_8" project-jdk-name="1.8" project-jdk-type="JavaSDK">
+    <output url="file://$PROJECT_DIR$/out" />
   </component>
   <component name="SvnBranchConfigurationManager">
-    <option name="mySupportsUserInfoFilter" value="true"/>
+    <option name="mySupportsUserInfoFilter" value="true" />
   </component>
   <component name="VcsDirectoryMappings">
-    <mapping directory="" vcs=""/>
+    <mapping directory="" vcs="Git" />
+    <mapping directory="$PROJECT_DIR$" vcs="Git" />
+  </component>
+  <component name="libraryTable">
+    <library name="Gradle: ch.qos.logback:logback-classic:1.2.3">
+      <CLASSES>
+        <root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/ch.qos.logback/logback-classic/1.2.3/7c4f3c474fb2c041d8028740440937705ebb473a/logback-classic-1.2.3.jar!/" />
+      </CLASSES>
+      <JAVADOC>
+        <root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/ch.qos.logback/logback-classic/1.2.3/99b0433b7d86044643b7d677f22d2c793d31d416/logback-classic-1.2.3-javadoc.jar!/" />
+      </JAVADOC>
+      <SOURCES>
+        <root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/ch.qos.logback/logback-classic/1.2.3/cfd5385e0c5ed1c8a5dce57d86e79cf357153a64/logback-classic-1.2.3-sources.jar!/" />
+      </SOURCES>
+    </library>
+    <library name="Gradle: ch.qos.logback:logback-core:1.2.3">
+      <CLASSES>
+        <root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/ch.qos.logback/logback-core/1.2.3/864344400c3d4d92dfeb0a305dc87d953677c03c/logback-core-1.2.3.jar!/" />
+      </CLASSES>
+      <JAVADOC>
+        <root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/ch.qos.logback/logback-core/1.2.3/c978d4afd24d32991c8aa31a9c8a1119f19a1cb4/logback-core-1.2.3-javadoc.jar!/" />
+      </JAVADOC>
+      <SOURCES>
+        <root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/ch.qos.logback/logback-core/1.2.3/3ebabe69eba0196af9ad3a814f723fb720b9101e/logback-core-1.2.3-sources.jar!/" />
+      </SOURCES>
+    </library>
+    <library name="Gradle: com.fasterxml.jackson.core:jackson-annotations:2.9.0">
+      <CLASSES>
+        <root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/com.fasterxml.jackson.core/jackson-annotations/2.9.0/7c10d545325e3a6e72e06381afe469fd40eb701/jackson-annotations-2.9.0.jar!/" />
+      </CLASSES>
+      <JAVADOC>
+        <root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/com.fasterxml.jackson.core/jackson-annotations/2.9.0/9978adad2c78154ca4aca7cd2a71941e1278f724/jackson-annotations-2.9.0-javadoc.jar!/" />
+      </JAVADOC>
+      <SOURCES>
+        <root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/com.fasterxml.jackson.core/jackson-annotations/2.9.0/a0ad4e203304ccab7e01266fa814115850edb8a9/jackson-annotations-2.9.0-sources.jar!/" />
+      </SOURCES>
+    </library>
+    <library name="Gradle: com.fasterxml.jackson.core:jackson-core:2.9.3">
+      <CLASSES>
+        <root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/com.fasterxml.jackson.core/jackson-core/2.9.3/ea9b6fc7bc3ccba9777b0827091f9aa1f8580371/jackson-core-2.9.3.jar!/" />
+      </CLASSES>
+      <JAVADOC>
+        <root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/com.fasterxml.jackson.core/jackson-core/2.9.3/a1c84964d4a1ef15eeb91d0c2b62460e7d7c4829/jackson-core-2.9.3-javadoc.jar!/" />
+      </JAVADOC>
+      <SOURCES>
+        <root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/com.fasterxml.jackson.core/jackson-core/2.9.3/99006a307afedb30000fc93b462e98f0d822fa11/jackson-core-2.9.3-sources.jar!/" />
+      </SOURCES>
+    </library>
+    <library name="Gradle: com.fasterxml.jackson.core:jackson-databind:2.9.3">
+      <CLASSES>
+        <root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/com.fasterxml.jackson.core/jackson-databind/2.9.3/193b96ef555b2f2573b576887ba9a93e4bf48e8c/jackson-databind-2.9.3.jar!/" />
+      </CLASSES>
+      <JAVADOC>
+        <root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/com.fasterxml.jackson.core/jackson-databind/2.9.3/486b5cb643a0c98342b6f533d9fc5aa75ab736df/jackson-databind-2.9.3-javadoc.jar!/" />
+      </JAVADOC>
+      <SOURCES>
+        <root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/com.fasterxml.jackson.core/jackson-databind/2.9.3/eab1ff15884e40c0adafe219a98c46513eb1d0e6/jackson-databind-2.9.3-sources.jar!/" />
+      </SOURCES>
+    </library>
+    <library name="Gradle: com.fasterxml.jackson.dataformat:jackson-dataformat-xml:2.9.3">
+      <CLASSES>
+        <root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/com.fasterxml.jackson.dataformat/jackson-dataformat-xml/2.9.3/c7d7d9f5316e0098e4d652f2d013aa9f9d69e3b1/jackson-dataformat-xml-2.9.3.jar!/" />
+      </CLASSES>
+      <JAVADOC>
+        <root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/com.fasterxml.jackson.dataformat/jackson-dataformat-xml/2.9.3/9f09f5e7b1ff00b02953b0dc64e6edcc03d8dbc2/jackson-dataformat-xml-2.9.3-javadoc.jar!/" />
+      </JAVADOC>
+      <SOURCES>
+        <root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/com.fasterxml.jackson.dataformat/jackson-dataformat-xml/2.9.3/585e357aeb2ce0428740e88efd1443889e5834f4/jackson-dataformat-xml-2.9.3-sources.jar!/" />
+      </SOURCES>
+    </library>
+    <library name="Gradle: com.fasterxml.jackson.module:jackson-module-jaxb-annotations:2.9.3">
+      <CLASSES>
+        <root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/com.fasterxml.jackson.module/jackson-module-jaxb-annotations/2.9.3/ffe9afb0a9ee84fc79a9fd451b00643da1fa2466/jackson-module-jaxb-annotations-2.9.3.jar!/" />
+      </CLASSES>
+      <JAVADOC>
+        <root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/com.fasterxml.jackson.module/jackson-module-jaxb-annotations/2.9.3/21ec5b47ad8833bbe1ce1f99192bcb6a4d0d3846/jackson-module-jaxb-annotations-2.9.3-javadoc.jar!/" />
+      </JAVADOC>
+      <SOURCES>
+        <root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/com.fasterxml.jackson.module/jackson-module-jaxb-annotations/2.9.3/660f2e6f5bc3dcd507e21ec656218d92095e4e01/jackson-module-jaxb-annotations-2.9.3-sources.jar!/" />
+      </SOURCES>
+    </library>
+    <library name="Gradle: com.fasterxml.woodstox:woodstox-core:5.0.3">
+      <CLASSES>
+        <root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/com.fasterxml.woodstox/woodstox-core/5.0.3/10aa199207fda142eff01cd61c69244877d71770/woodstox-core-5.0.3.jar!/" />
+      </CLASSES>
+      <JAVADOC>
+        <root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/com.fasterxml.woodstox/woodstox-core/5.0.3/7f5316fa0b4e68daa353bb2df3c546bfd854d54f/woodstox-core-5.0.3-javadoc.jar!/" />
+      </JAVADOC>
+      <SOURCES>
+        <root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/com.fasterxml.woodstox/woodstox-core/5.0.3/f38482e8b060d9e5354c10103f4c4db53c58db7d/woodstox-core-5.0.3-sources.jar!/" />
+      </SOURCES>
+    </library>
+    <library name="Gradle: com.github.wendykierp:JTransforms:3.1">
+      <CLASSES>
+        <root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/com.github.wendykierp/JTransforms/3.1/f1f6d3c9c9bc04f848e38bdb77dea01e8764a01f/JTransforms-3.1.jar!/" />
+      </CLASSES>
+      <JAVADOC>
+        <root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/com.github.wendykierp/JTransforms/3.1/30208ebb430bee1b2e48e28478853bc9628c0e54/JTransforms-3.1-javadoc.jar!/" />
+      </JAVADOC>
+      <SOURCES>
+        <root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/com.github.wendykierp/JTransforms/3.1/fc9cbab6459c03db12a643bc5dc1b1475a3f0b52/JTransforms-3.1-sources.jar!/" />
+      </SOURCES>
+    </library>
+    <library name="Gradle: com.google.code.findbugs:jsr305:3.0.2">
+      <CLASSES>
+        <root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/com.google.code.findbugs/jsr305/3.0.2/25ea2e8b0c338a877313bd4672d3fe056ea78f0d/jsr305-3.0.2.jar!/" />
+      </CLASSES>
+      <JAVADOC>
+        <root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/com.google.code.findbugs/jsr305/3.0.2/7cb5b4e91eb0741882c8fefb2fd0338eff9857c/jsr305-3.0.2-javadoc.jar!/" />
+      </JAVADOC>
+      <SOURCES>
+        <root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/com.google.code.findbugs/jsr305/3.0.2/b19b5927c2c25b6c70f093767041e641ae0b1b35/jsr305-3.0.2-sources.jar!/" />
+      </SOURCES>
+    </library>
+    <library name="Gradle: com.google.errorprone:error_prone_annotations:2.2.0">
+      <CLASSES>
+        <root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/com.google.errorprone/error_prone_annotations/2.2.0/88e3c593e9b3586e1c6177f89267da6fc6986f0c/error_prone_annotations-2.2.0.jar!/" />
+      </CLASSES>
+      <JAVADOC>
+        <root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/com.google.errorprone/error_prone_annotations/2.2.0/959f406f238a0e047ed2a227479ff9db28173be9/error_prone_annotations-2.2.0-javadoc.jar!/" />
+      </JAVADOC>
+      <SOURCES>
+        <root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/com.google.errorprone/error_prone_annotations/2.2.0/a8cd7823aa1dcd2fd6677c0c5988fdde9d1fb0a3/error_prone_annotations-2.2.0-sources.jar!/" />
+      </SOURCES>
+    </library>
+    <library name="Gradle: com.google.guava:failureaccess:1.0">
+      <CLASSES>
+        <root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/com.google.guava/failureaccess/1.0/50bacb0bdbbeeda25142aff57e2214c402e1193c/failureaccess-1.0.jar!/" />
+      </CLASSES>
+      <JAVADOC>
+        <root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/com.google.guava/failureaccess/1.0/d4f5c095ed310f738d56b26bad666f342c1fd73d/failureaccess-1.0-javadoc.jar!/" />
+      </JAVADOC>
+      <SOURCES>
+        <root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/com.google.guava/failureaccess/1.0/1e90402881010c96ea5e4b7e6f56acb283e78db3/failureaccess-1.0-sources.jar!/" />
+      </SOURCES>
+    </library>
+    <library name="Gradle: com.google.guava:guava:27.0-jre">
+      <CLASSES>
+        <root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/com.google.guava/guava/27.0-jre/c6ad87d2575af8ac8ec38e28e75aefa882cc3a1f/guava-27.0-jre.jar!/" />
+      </CLASSES>
+      <JAVADOC>
+        <root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/com.google.guava/guava/27.0-jre/607bfb3210bdc9c60315b033710e35428bc400bb/guava-27.0-jre-javadoc.jar!/" />
+      </JAVADOC>
+      <SOURCES>
+        <root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/com.google.guava/guava/27.0-jre/d6484e2ee11ad928ccf61cf3e4ce9cedc2eead7e/guava-27.0-jre-sources.jar!/" />
+      </SOURCES>
+    </library>
+    <library name="Gradle: com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava">
+      <CLASSES>
+        <root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/com.google.guava/listenablefuture/9999.0-empty-to-avoid-conflict-with-guava/b421526c5f297295adef1c886e5246c39d4ac629/listenablefuture-9999.0-empty-to-avoid-conflict-with-guava.jar!/" />
+      </CLASSES>
+      <JAVADOC />
+      <SOURCES />
+    </library>
+    <library name="Gradle: com.google.j2objc:j2objc-annotations:1.1">
+      <CLASSES>
+        <root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/com.google.j2objc/j2objc-annotations/1.1/976d8d30bebc251db406f2bdb3eb01962b5685b3/j2objc-annotations-1.1.jar!/" />
+      </CLASSES>
+      <JAVADOC>
+        <root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/com.google.j2objc/j2objc-annotations/1.1/2e1e0c8db5be95ec85d19d456186f8989ea263fa/j2objc-annotations-1.1-javadoc.jar!/" />
+      </JAVADOC>
+      <SOURCES>
+        <root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/com.google.j2objc/j2objc-annotations/1.1/dcd31de68a90e41e336f6b7afce0d39285c433d7/j2objc-annotations-1.1-sources.jar!/" />
+      </SOURCES>
+    </library>
+    <library name="Gradle: com.jidesoft:jide-oss:3.6.18">
+      <CLASSES>
+        <root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/com.jidesoft/jide-oss/3.6.18/2a0b8ef9ed1f18607b70f1e627d862fb8e595373/jide-oss-3.6.18.jar!/" />
+      </CLASSES>
+      <JAVADOC>
+        <root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/com.jidesoft/jide-oss/3.6.18/814e47763c22729f665a4232da421824831ea734/jide-oss-3.6.18-javadoc.jar!/" />
+      </JAVADOC>
+      <SOURCES>
+        <root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/com.jidesoft/jide-oss/3.6.18/b9cadcf869c0bdd032756228315252516856ad56/jide-oss-3.6.18-sources.jar!/" />
+      </SOURCES>
+    </library>
+    <library name="Gradle: com.miglayout:miglayout-core:5.0">
+      <CLASSES>
+        <root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/com.miglayout/miglayout-core/5.0/956daa1576bccb24e727ab75540b078171c7c432/miglayout-core-5.0.jar!/" />
+      </CLASSES>
+      <JAVADOC>
+        <root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/com.miglayout/miglayout-core/5.0/c346dd69f6de7ae6ab2e93d42fa5def41c99aa1c/miglayout-core-5.0-javadoc.jar!/" />
+      </JAVADOC>
+      <SOURCES>
+        <root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/com.miglayout/miglayout-core/5.0/c457b92ed51255fdb5dfab4e89c7aec06674cd7c/miglayout-core-5.0-sources.jar!/" />
+      </SOURCES>
+    </library>
+    <library name="Gradle: com.miglayout:miglayout-swing:5.0">
+      <CLASSES>
+        <root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/com.miglayout/miglayout-swing/5.0/7b4c4d92002459e68e8f115b9ae8a774b2660490/miglayout-swing-5.0.jar!/" />
+      </CLASSES>
+      <JAVADOC>
+        <root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/com.miglayout/miglayout-swing/5.0/7f87b7818189138a1e9691b861d06f20f121820d/miglayout-swing-5.0-javadoc.jar!/" />
+      </JAVADOC>
+      <SOURCES>
+        <root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/com.miglayout/miglayout-swing/5.0/d3e06bcc8aabd8cdd1f40989e12ced6413fae68c/miglayout-swing-5.0-sources.jar!/" />
+      </SOURCES>
+    </library>
+    <library name="Gradle: commons-io:commons-io:1.3.2">
+      <CLASSES>
+        <root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/commons-io/commons-io/1.3.2/b6dde38349ba9bb5e6ea6320531eae969985dae5/commons-io-1.3.2.jar!/" />
+      </CLASSES>
+      <JAVADOC>
+        <root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/commons-io/commons-io/1.3.2/6927a72f39651d8d57070a35c3ba669c2314a47c/commons-io-1.3.2-javadoc.jar!/" />
+      </JAVADOC>
+      <SOURCES>
+        <root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/commons-io/commons-io/1.3.2/b41a5f39fa90007a6c247175933555ba5f166d70/commons-io-1.3.2-sources.jar!/" />
+      </SOURCES>
+    </library>
+    <library name="Gradle: javax.usb:usb-api:1.0.2">
+      <CLASSES>
+        <root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/javax.usb/usb-api/1.0.2/f0ae0d322a99811cf79d508d37f3dc2d82753070/usb-api-1.0.2.jar!/" />
+      </CLASSES>
+      <JAVADOC>
+        <root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/javax.usb/usb-api/1.0.2/c0bc03446978d12d8b5b3e8a136a181936f61015/usb-api-1.0.2-javadoc.jar!/" />
+      </JAVADOC>
+      <SOURCES>
+        <root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/javax.usb/usb-api/1.0.2/4b6337e574535ac803bbc05f3f22808d8bdba0d0/usb-api-1.0.2-sources.jar!/" />
+      </SOURCES>
+    </library>
+    <library name="Gradle: junit:junit:4.12">
+      <CLASSES>
+        <root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/junit/junit/4.12/2973d150c0dc1fefe998f834810d68f278ea58ec/junit-4.12.jar!/" />
+      </CLASSES>
+      <JAVADOC>
+        <root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/junit/junit/4.12/941a8be4506c65f0a9001c08812fb7da1e505e21/junit-4.12-javadoc.jar!/" />
+      </JAVADOC>
+      <SOURCES>
+        <root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/junit/junit/4.12/a6c32b40bf3d76eca54e3c601e5d1470c86fcdfa/junit-4.12-sources.jar!/" />
+      </SOURCES>
+    </library>
+    <library name="Gradle: net.coderazzi:tablefilter-swing:5.3.1">
+      <CLASSES>
+        <root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/net.coderazzi/tablefilter-swing/5.3.1/998bed231fba3ca6ab2f182aa576e5cb1df3339c/tablefilter-swing-5.3.1.jar!/" />
+      </CLASSES>
+      <JAVADOC>
+        <root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/net.coderazzi/tablefilter-swing/5.3.1/90c361ce16cd898f1629906fa1df6d74a678704c/tablefilter-swing-5.3.1-javadoc.jar!/" />
+      </JAVADOC>
+      <SOURCES>
+        <root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/net.coderazzi/tablefilter-swing/5.3.1/9e46adc554cfdf19029afa46ee81044ea5602b44/tablefilter-swing-5.3.1-sources.jar!/" />
+      </SOURCES>
+    </library>
+    <library name="Gradle: org.apache.axis:axis-jaxrpc:1.4">
+      <CLASSES>
+        <root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/org.apache.axis/axis-jaxrpc/1.4/b393f1f0c0d95b68c86d0b1ab2e687bb71f3c075/axis-jaxrpc-1.4.jar!/" />
+      </CLASSES>
+      <JAVADOC />
+      <SOURCES />
+    </library>
+    <library name="Gradle: org.apache.axis:axis:1.4">
+      <CLASSES>
+        <root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/org.apache.axis/axis/1.4/94a9ce681a42d0352b3ad22659f67835e560d107/axis-1.4.jar!/" />
+      </CLASSES>
+      <JAVADOC />
+      <SOURCES>
+        <root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/org.apache.axis/axis/1.4/442ab1fe3e66b6d5c916ae3f203fbfa618515f1c/axis-1.4-sources.jar!/" />
+      </SOURCES>
+    </library>
+    <library name="Gradle: org.apache.commons:commons-lang3:3.8.1">
+      <CLASSES>
+        <root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/org.apache.commons/commons-lang3/3.8.1/6505a72a097d9270f7a9e7bf42c4238283247755/commons-lang3-3.8.1.jar!/" />
+      </CLASSES>
+      <JAVADOC>
+        <root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/org.apache.commons/commons-lang3/3.8.1/e7e19f37a0e712862967e39558b888fb59ee5b6a/commons-lang3-3.8.1-javadoc.jar!/" />
+      </JAVADOC>
+      <SOURCES>
+        <root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/org.apache.commons/commons-lang3/3.8.1/e9748d7783594da3735ad9724390a10e7cebc01d/commons-lang3-3.8.1-sources.jar!/" />
+      </SOURCES>
+    </library>
+    <library name="Gradle: org.apache.commons:commons-math3:3.5">
+      <CLASSES>
+        <root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/org.apache.commons/commons-math3/3.5/13af68e9a11576953f5c4b09436f8207be9d3a27/commons-math3-3.5.jar!/" />
+      </CLASSES>
+      <JAVADOC>
+        <root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/org.apache.commons/commons-math3/3.5/e6106a9927c5ee66d0e647ad116af26c9b6b5f06/commons-math3-3.5-javadoc.jar!/" />
+      </JAVADOC>
+      <SOURCES>
+        <root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/org.apache.commons/commons-math3/3.5/1d3f412d28c8bff0e8f048240b08bcd21cfa432e/commons-math3-3.5-sources.jar!/" />
+      </SOURCES>
+    </library>
+    <library name="Gradle: org.apache.mina:mina-core:2.0.16">
+      <CLASSES>
+        <root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/org.apache.mina/mina-core/2.0.16/f720f17643eaa7b0fec07c1d7f6272972c02bba4/mina-core-2.0.16.jar!/" />
+      </CLASSES>
+      <JAVADOC>
+        <root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/org.apache.mina/mina-core/2.0.16/9b8b385cba38847719659ce6fde466828c4ab623/mina-core-2.0.16-javadoc.jar!/" />
+      </JAVADOC>
+      <SOURCES>
+        <root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/org.apache.mina/mina-core/2.0.16/660fb813ca1c8d8a936f894324091400a5ac128a/mina-core-2.0.16-sources.jar!/" />
+      </SOURCES>
+    </library>
+    <library name="Gradle: org.apache.mina:mina-http:2.0.16">
+      <CLASSES>
+        <root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/org.apache.mina/mina-http/2.0.16/b2081b5255a3998a044c34b12797b915e1640122/mina-http-2.0.16.jar!/" />
+      </CLASSES>
+      <JAVADOC>
+        <root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/org.apache.mina/mina-http/2.0.16/38119b808477795cc161a2aaf3e5bb16920a9aae/mina-http-2.0.16-javadoc.jar!/" />
+      </JAVADOC>
+      <SOURCES>
+        <root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/org.apache.mina/mina-http/2.0.16/fadd15439d830c99ccd6e020a2e125f0a4224059/mina-http-2.0.16-sources.jar!/" />
+      </SOURCES>
+    </library>
+    <library name="Gradle: org.assertj:assertj-core:3.8.0">
+      <CLASSES>
+        <root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/org.assertj/assertj-core/3.8.0/b209d90ff2e279bee3e02547ee7b11349c52d0e3/assertj-core-3.8.0.jar!/" />
+      </CLASSES>
+      <JAVADOC>
+        <root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/org.assertj/assertj-core/3.8.0/a2958ce39a3fd0ccdb52502e3a839edec50b6a98/assertj-core-3.8.0-javadoc.jar!/" />
+      </JAVADOC>
+      <SOURCES>
+        <root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/org.assertj/assertj-core/3.8.0/85dab3e124fb391b10196df9bfdb43640deabb09/assertj-core-3.8.0-sources.jar!/" />
+      </SOURCES>
+    </library>
+    <library name="Gradle: org.checkerframework:checker-qual:2.5.2">
+      <CLASSES>
+        <root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/org.checkerframework/checker-qual/2.5.2/cea74543d5904a30861a61b4643a5f2bb372efc4/checker-qual-2.5.2.jar!/" />
+      </CLASSES>
+      <JAVADOC>
+        <root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/org.checkerframework/checker-qual/2.5.2/bfab5d13a888ce75ba0104fdb310808e445ff67d/checker-qual-2.5.2-javadoc.jar!/" />
+      </JAVADOC>
+      <SOURCES>
+        <root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/org.checkerframework/checker-qual/2.5.2/ebb8ebccd42218434674f3e1d9022c13df1c19f8/checker-qual-2.5.2-sources.jar!/" />
+      </SOURCES>
+    </library>
+    <library name="Gradle: org.codehaus.mojo:animal-sniffer-annotations:1.17">
+      <CLASSES>
+        <root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/org.codehaus.mojo/animal-sniffer-annotations/1.17/f97ce6decaea32b36101e37979f8b647f00681fb/animal-sniffer-annotations-1.17.jar!/" />
+      </CLASSES>
+      <JAVADOC>
+        <root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/org.codehaus.mojo/animal-sniffer-annotations/1.17/c67d33bf1588c89f633cf6b5a629d0e1dc1b02c4/animal-sniffer-annotations-1.17-javadoc.jar!/" />
+      </JAVADOC>
+      <SOURCES>
+        <root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/org.codehaus.mojo/animal-sniffer-annotations/1.17/8fb5b5ad9c9723951b9fccaba5bb657fa6064868/animal-sniffer-annotations-1.17-sources.jar!/" />
+      </SOURCES>
+    </library>
+    <library name="Gradle: org.codehaus.woodstox:stax2-api:3.1.4">
+      <CLASSES>
+        <root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/org.codehaus.woodstox/stax2-api/3.1.4/ac19014b1e6a7c08aad07fe114af792676b685b7/stax2-api-3.1.4.jar!/" />
+      </CLASSES>
+      <JAVADOC>
+        <root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/org.codehaus.woodstox/stax2-api/3.1.4/819aa74f907d379c6afc2e0376808ca9feadcbb1/stax2-api-3.1.4-javadoc.jar!/" />
+      </JAVADOC>
+      <SOURCES>
+        <root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/org.codehaus.woodstox/stax2-api/3.1.4/b40604d61c01cc081a4a7bdfc562aa9847ee8857/stax2-api-3.1.4-sources.jar!/" />
+      </SOURCES>
+    </library>
+    <library name="Gradle: org.hamcrest:hamcrest-core:1.3">
+      <CLASSES>
+        <root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/org.hamcrest/hamcrest-core/1.3/42a25dc3219429f0e5d060061f71acb49bf010a0/hamcrest-core-1.3.jar!/" />
+      </CLASSES>
+      <JAVADOC>
+        <root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/org.hamcrest/hamcrest-core/1.3/ad09811315f1d4f5756986575b0ea16b99cd686f/hamcrest-core-1.3-javadoc.jar!/" />
+      </JAVADOC>
+      <SOURCES>
+        <root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/org.hamcrest/hamcrest-core/1.3/1dc37250fbc78e23a65a67fbbaf71d2e9cbc3c0b/hamcrest-core-1.3-sources.jar!/" />
+      </SOURCES>
+    </library>
+    <library name="Gradle: org.kordamp.ikonli:ikonli-core:2.1.1">
+      <CLASSES>
+        <root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/org.kordamp.ikonli/ikonli-core/2.1.1/99b0142ea24785d14d51e329dd8050a9a55b8904/ikonli-core-2.1.1.jar!/" />
+      </CLASSES>
+      <JAVADOC>
+        <root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/org.kordamp.ikonli/ikonli-core/2.1.1/2931b2864da41ce42f1a5973b4239d25e02d0f37/ikonli-core-2.1.1-javadoc.jar!/" />
+      </JAVADOC>
+      <SOURCES>
+        <root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/org.kordamp.ikonli/ikonli-core/2.1.1/ce342290407ae3c6ce7b1249978c9ddf45b92974/ikonli-core-2.1.1-sources.jar!/" />
+      </SOURCES>
+    </library>
+    <library name="Gradle: org.kordamp.ikonli:ikonli-fontawesome-pack:2.1.1">
+      <CLASSES>
+        <root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/org.kordamp.ikonli/ikonli-fontawesome-pack/2.1.1/5c48f3fbb11a21b6fe460650569085aa0b7e4ae1/ikonli-fontawesome-pack-2.1.1.jar!/" />
+      </CLASSES>
+      <JAVADOC>
+        <root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/org.kordamp.ikonli/ikonli-fontawesome-pack/2.1.1/e8c0c8694953bdbcca312b8cc0e6dbc5c2e7ec8b/ikonli-fontawesome-pack-2.1.1-javadoc.jar!/" />
+      </JAVADOC>
+      <SOURCES>
+        <root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/org.kordamp.ikonli/ikonli-fontawesome-pack/2.1.1/19de8abf192dcc83c0d0b7b507fa1fc72ce6bbb2/ikonli-fontawesome-pack-2.1.1-sources.jar!/" />
+      </SOURCES>
+    </library>
+    <library name="Gradle: org.kordamp.ikonli:ikonli-javafx:2.1.1">
+      <CLASSES>
+        <root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/org.kordamp.ikonli/ikonli-javafx/2.1.1/bf3e8f21146016f3fcee9ab48ab2228b7db4bc49/ikonli-javafx-2.1.1.jar!/" />
+      </CLASSES>
+      <JAVADOC>
+        <root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/org.kordamp.ikonli/ikonli-javafx/2.1.1/7c45822547d7a8a53d80ebb8e4a5602db10f9e45/ikonli-javafx-2.1.1-javadoc.jar!/" />
+      </JAVADOC>
+      <SOURCES>
+        <root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/org.kordamp.ikonli/ikonli-javafx/2.1.1/a9c7c4aaad34e274df03701b84e064d9169ddd1d/ikonli-javafx-2.1.1-sources.jar!/" />
+      </SOURCES>
+    </library>
+    <library name="Gradle: org.slf4j:slf4j-api:1.7.25">
+      <CLASSES>
+        <root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/org.slf4j/slf4j-api/1.7.25/da76ca59f6a57ee3102f8f9bd9cee742973efa8a/slf4j-api-1.7.25.jar!/" />
+      </CLASSES>
+      <JAVADOC>
+        <root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/org.slf4j/slf4j-api/1.7.25/f003e89ddebdbaca5cf3fc7cc0c67c88c2ca1a3c/slf4j-api-1.7.25-javadoc.jar!/" />
+      </JAVADOC>
+      <SOURCES>
+        <root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/org.slf4j/slf4j-api/1.7.25/962153db4a9ea71b79d047dfd1b2a0d80d8f4739/slf4j-api-1.7.25-sources.jar!/" />
+      </SOURCES>
+    </library>
+    <library name="Gradle: org.usb4java:libusb4java:darwin-x86-64:1.3.0">
+      <CLASSES>
+        <root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/org.usb4java/libusb4java/1.3.0/1fdaa8ec7cfad158be58fbc8e2867d05f2b5fe63/libusb4java-1.3.0-darwin-x86-64.jar!/" />
+      </CLASSES>
+      <JAVADOC />
+      <SOURCES />
+    </library>
+    <library name="Gradle: org.usb4java:libusb4java:linux-aarch64:1.3.0">
+      <CLASSES>
+        <root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/org.usb4java/libusb4java/1.3.0/bb5924dfb86c27ca5d91ccc975c11da2caa3c82d/libusb4java-1.3.0-linux-aarch64.jar!/" />
+      </CLASSES>
+      <JAVADOC />
+      <SOURCES />
+    </library>
+    <library name="Gradle: org.usb4java:libusb4java:linux-arm:1.3.0">
+      <CLASSES>
+        <root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/org.usb4java/libusb4java/1.3.0/504de50cc979b1f19b76ba1154d298632ff1be4e/libusb4java-1.3.0-linux-arm.jar!/" />
+      </CLASSES>
+      <JAVADOC />
+      <SOURCES />
+    </library>
+    <library name="Gradle: org.usb4java:libusb4java:linux-x86-64:1.3.0">
+      <CLASSES>
+        <root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/org.usb4java/libusb4java/1.3.0/9514c818fc97f831277873f082dcefd5394045e4/libusb4java-1.3.0-linux-x86-64.jar!/" />
+      </CLASSES>
+      <JAVADOC />
+      <SOURCES />
+    </library>
+    <library name="Gradle: org.usb4java:libusb4java:linux-x86:1.3.0">
+      <CLASSES>
+        <root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/org.usb4java/libusb4java/1.3.0/7abf7240bcd7c26cb1ea5265eec5e6d703b71b4e/libusb4java-1.3.0-linux-x86.jar!/" />
+      </CLASSES>
+      <JAVADOC />
+      <SOURCES />
+    </library>
+    <library name="Gradle: org.usb4java:libusb4java:win32-x86-64:1.3.0">
+      <CLASSES>
+        <root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/org.usb4java/libusb4java/1.3.0/8cd521a203404d65f4bc59c2a8a38eb4dcd302da/libusb4java-1.3.0-win32-x86-64.jar!/" />
+      </CLASSES>
+      <JAVADOC />
+      <SOURCES />
+    </library>
+    <library name="Gradle: org.usb4java:libusb4java:win32-x86:1.3.0">
+      <CLASSES>
+        <root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/org.usb4java/libusb4java/1.3.0/9cb97c4b8317d8dae0401f80438fde5bfd910b2c/libusb4java-1.3.0-win32-x86.jar!/" />
+      </CLASSES>
+      <JAVADOC />
+      <SOURCES />
+    </library>
+    <library name="Gradle: org.usb4java:usb4java-javax:1.3.0">
+      <CLASSES>
+        <root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/org.usb4java/usb4java-javax/1.3.0/b68f4617513a61e889fbf81926daba9c9accc96d/usb4java-javax-1.3.0.jar!/" />
+      </CLASSES>
+      <JAVADOC>
+        <root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/org.usb4java/usb4java-javax/1.3.0/76268e0268e00cace559a5d3284b065d64044a76/usb4java-javax-1.3.0-javadoc.jar!/" />
+      </JAVADOC>
+      <SOURCES>
+        <root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/org.usb4java/usb4java-javax/1.3.0/684ff71e8ca72e5536116390909dd37fcb590690/usb4java-javax-1.3.0-sources.jar!/" />
+      </SOURCES>
+    </library>
+    <library name="Gradle: org.usb4java:usb4java:1.3.0">
+      <CLASSES>
+        <root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/org.usb4java/usb4java/1.3.0/2d5487fdf303642d480b199a9da0c5a0d2bb0e82/usb4java-1.3.0.jar!/" />
+      </CLASSES>
+      <JAVADOC>
+        <root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/org.usb4java/usb4java/1.3.0/e688082c68718dfbd6f566beb2eebf31cc225036/usb4java-1.3.0-javadoc.jar!/" />
+      </JAVADOC>
+      <SOURCES>
+        <root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/org.usb4java/usb4java/1.3.0/e6f73cf21dbbc0ecf85417f311e13d8eb278d14a/usb4java-1.3.0-sources.jar!/" />
+      </SOURCES>
+    </library>
+    <library name="Gradle: pl.edu.icm:JLargeArrays:1.6">
+      <CLASSES>
+        <root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/pl.edu.icm/JLargeArrays/1.6/be888269f87ebf21f49d979925a07551f6e795ff/JLargeArrays-1.6.jar!/" />
+      </CLASSES>
+      <JAVADOC>
+        <root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/pl.edu.icm/JLargeArrays/1.6/80bc6536d3d1183ed46bf8a3fccfe8da9a65d34e/JLargeArrays-1.6-javadoc.jar!/" />
+      </JAVADOC>
+      <SOURCES>
+        <root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/pl.edu.icm/JLargeArrays/1.6/20a1c4e9de9d8d4943ecdf723bed6a7f843ac20e/JLargeArrays-1.6-sources.jar!/" />
+      </SOURCES>
+    </library>
   </component>
   <component name="masterDetails">
     <states>
       <state key="ArtifactsStructureConfigurable.UI">
         <UIState>
           <splitter-proportions>
-            <SplitterProportionsDataImpl/>
+            <SplitterProportionsDataImpl />
           </splitter-proportions>
-          <settings/>
+          <settings />
         </UIState>
       </state>
       <state key="Copyright.UI">
         <UIState>
           <splitter-proportions>
-            <SplitterProportionsDataImpl/>
+            <SplitterProportionsDataImpl />
           </splitter-proportions>
         </UIState>
       </state>
@@ -83,7 +725,7 @@
             <SplitterProportionsDataImpl>
               <option name="proportions">
                 <list>
-                  <option value="0.2"/>
+                  <option value="0.2" />
                 </list>
               </option>
             </SplitterProportionsDataImpl>
@@ -94,11 +736,11 @@
       <state key="ScopeChooserConfigurable.UI">
         <UIState>
           <splitter-proportions>
-            <SplitterProportionsDataImpl/>
+            <SplitterProportionsDataImpl />
           </splitter-proportions>
-          <settings/>
+          <settings />
         </UIState>
       </state>
     </states>
   </component>
-</project>
+</project>

sdrtrunk.iml

@@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<module type="JAVA_MODULE" version="4">
-  <component name="NewModuleRootManager" inherit-compiler-output="true">
-    <exclude-output />
-    <content url="file://$MODULE_DIR$">
-      <sourceFolder url="file://$MODULE_DIR$/src" isTestSource="false" />
-      <sourceFolder url="file://$MODULE_DIR$/images" type="java-resource" />
-      <sourceFolder url="file://$MODULE_DIR$/config" type="java-resource" />
-    </content>
-    <orderEntry type="inheritedJdk" />
-    <orderEntry type="sourceFolder" forTests="false" />
-    <orderEntry type="library" name="imports" level="project" />
-  </component>
-</module>

src/main/java/io/github/dsheirer/alias/Alias.java

@@ -1,20 +1,22 @@
-/*******************************************************************************
- *     SDR Trunk 
- *     Copyright (C) 2014-2016 Dennis Sheirer
+/*
+ * ******************************************************************************
+ * 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.
+ * 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.
+ * 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/>
- ******************************************************************************/
+ * 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;
 
 import com.fasterxml.jackson.annotation.JsonIgnore;
@@ -24,10 +26,10 @@ import io.github.dsheirer.alias.action.AliasAction;
 import io.github.dsheirer.alias.id.AliasID;
 import io.github.dsheirer.alias.id.AliasIDType;
 import io.github.dsheirer.alias.id.broadcast.BroadcastChannel;
-import io.github.dsheirer.alias.id.nonrecordable.NonRecordable;
 import io.github.dsheirer.alias.id.priority.Priority;
+import io.github.dsheirer.alias.id.record.Record;
 
-import java.awt.*;
+import java.awt.Color;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Set;
@@ -187,7 +189,7 @@ public class Alias
      * Returns the priority level of this alias, if defined, or the default priority
      */
     @JsonIgnore
-    public int getCallPriority()
+    public int getPlaybackPriority()
     {
         for(AliasID id : mAliasIDs)
         {
@@ -245,27 +247,39 @@ public class Alias
     {
         for(AliasID id : getId())
         {
-            if(id.getType() == AliasIDType.NON_RECORDABLE)
+            if(id.getType() == AliasIDType.RECORD)
             {
-                return false;
+                return true;
             }
         }
 
-        return true;
+        return false;
     }
 
     /**
-     * Sets or removes the non-recordable alias ID for this alias.
+     * Sets or removes the record alias ID for this alias.
      */
     public void setRecordable(boolean recordable)
     {
         if(recordable)
+        {
+            for(AliasID id : getId())
+            {
+                if(id.getType() == AliasIDType.RECORD)
+                {
+                    return;
+                }
+            }
+
+            addAliasID(new Record());
+        }
+        else
         {
             AliasID toRemove = null;
 
             for(AliasID id : getId())
             {
-                if(id.getType() == AliasIDType.NON_RECORDABLE)
+                if(id.getType() == AliasIDType.RECORD)
                 {
                     toRemove = id;
                     break;
@@ -277,18 +291,6 @@ public class Alias
                 removeAliasID(toRemove);
             }
         }
-        else
-        {
-            for(AliasID id : getId())
-            {
-                if(id.getType() == AliasIDType.NON_RECORDABLE)
-                {
-                    return;
-                }
-            }
-
-            addAliasID(new NonRecordable());
-        }
     }
 
     /**

src/main/java/io/github/dsheirer/alias/AliasEditor.java

@@ -31,8 +31,7 @@ import java.awt.*;
 import java.awt.event.ActionEvent;
 import java.awt.event.ActionListener;
 
-public class AliasEditor extends Editor<Alias> 
-			implements ActionListener, Listener<AliasEvent>
+public class AliasEditor extends Editor<Alias> implements ActionListener, Listener<AliasEvent>
 {
     private static final long serialVersionUID = 1L;
 

src/main/java/io/github/dsheirer/alias/AliasFactory.java

@@ -1,20 +1,22 @@
-/*******************************************************************************
- *     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.
- * 
- *     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/>
- ******************************************************************************/
+/*
+ * ******************************************************************************
+ * 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.
+ *
+ * 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;
 
 import io.github.dsheirer.alias.action.AliasAction;
@@ -31,274 +33,289 @@ import io.github.dsheirer.alias.id.broadcast.BroadcastChannel;
 import io.github.dsheirer.alias.id.broadcast.BroadcastChannelEditor;
 import io.github.dsheirer.alias.id.esn.ESNEditor;
 import io.github.dsheirer.alias.id.esn.Esn;
-import io.github.dsheirer.alias.id.fleetsync.FleetsyncID;
-import io.github.dsheirer.alias.id.fleetsync.FleetsyncIDEditor;
+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.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.mdc.MDC1200ID;
-import io.github.dsheirer.alias.id.mdc.MDC1200IDEditor;
-import io.github.dsheirer.alias.id.mobileID.MINEditor;
-import io.github.dsheirer.alias.id.mobileID.Min;
-import io.github.dsheirer.alias.id.mpt1327.MPT1327ID;
-import io.github.dsheirer.alias.id.mpt1327.MPT1327IDEditor;
-import io.github.dsheirer.alias.id.nonrecordable.NonRecordable;
-import io.github.dsheirer.alias.id.nonrecordable.NonRecordableEditor;
+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.siteID.SiteID;
-import io.github.dsheirer.alias.id.siteID.SiteIDEditor;
+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.status.StatusID;
 import io.github.dsheirer.alias.id.status.StatusIDEditor;
-import io.github.dsheirer.alias.id.talkgroup.TalkgroupID;
-import io.github.dsheirer.alias.id.talkgroup.TalkgroupIDEditor;
-import io.github.dsheirer.alias.id.uniqueID.UniqueID;
-import io.github.dsheirer.alias.id.uniqueID.UniqueIDEditor;
+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;
 
 public class AliasFactory
 {
-	public static AliasID copyOf( AliasID id )
-	{
-		switch( id.getType() )
-		{
-			case BROADCAST_CHANNEL:
-				BroadcastChannel originalBroadcast = (BroadcastChannel)id;
-				BroadcastChannel copyBroadcast = new BroadcastChannel();
-				copyBroadcast.setChannelName(originalBroadcast.getChannelName());
-				return copyBroadcast;
-			case ESN:
-				Esn originalESN = (Esn)id;
-				Esn copyESN = new Esn();
-				copyESN.setEsn( originalESN.getEsn() );
-				return copyESN;
-			case FLEETSYNC:
-				FleetsyncID originalFleetsyncID = (FleetsyncID)id;
-				FleetsyncID copyFleetsyncID = new FleetsyncID();
-				copyFleetsyncID.setIdent( originalFleetsyncID.getIdent() );
-				return copyFleetsyncID;
-			case LTR_NET_UID:
-				UniqueID originalUniqueID = (UniqueID)id;
-				UniqueID copyUniqueID = new UniqueID();
-				copyUniqueID.setUid( originalUniqueID.getUid() );
-				return copyUniqueID;
-			case LOJACK:
-				LoJackFunctionAndID originalLoJackFunctionAndID = (LoJackFunctionAndID)id;
-				LoJackFunctionAndID copyLoJackFunctionAndID = new LoJackFunctionAndID();
-				copyLoJackFunctionAndID.setFunction( originalLoJackFunctionAndID.getFunction() );
-				copyLoJackFunctionAndID.setID( originalLoJackFunctionAndID.getID() );
-				return copyLoJackFunctionAndID;
-			case MDC1200:
-				MDC1200ID originalMDC1200ID = (MDC1200ID)id;
-				MDC1200ID copyMDC1200ID = new MDC1200ID();
-				copyMDC1200ID.setIdent( originalMDC1200ID.getIdent() );
-				return copyMDC1200ID;
-			case MIN:
-				Min originalMin = (Min)id;
-				Min copyMin = new Min();
-				copyMin.setMin( originalMin.getMin() );
-				return copyMin;
-			case MPT1327:
-				MPT1327ID originalMPT1327ID = (MPT1327ID)id;
-				MPT1327ID copyMPT1327ID = new MPT1327ID();
-				copyMPT1327ID.setIdent( originalMPT1327ID.getIdent() );
-				return copyMPT1327ID;
-			case NON_RECORDABLE:
-				return new NonRecordable();
-			case PRIORITY:
-				Priority originalPriority = (Priority)id;
-				Priority copyPriority = new Priority();
-				copyPriority.setPriority( originalPriority.getPriority() );
-				return copyPriority;
-			case SITE:
-				SiteID originalSiteID = (SiteID)id;
-				SiteID copySiteID = new SiteID();
-				copySiteID.setSite( originalSiteID.getSite() );
-				return copySiteID;
-			case TALKGROUP:
-				TalkgroupID originalTalkgroupID = (TalkgroupID)id;
-				TalkgroupID copyTalkgroupID = new TalkgroupID();
-				copyTalkgroupID.setTalkgroup( originalTalkgroupID.getTalkgroup() );
-				return copyTalkgroupID;
-			case STATUS:
-				StatusID originalStatusID = (StatusID)id;
-				StatusID copyStatusID = new StatusID();
-				copyStatusID.setStatus( originalStatusID.getStatus() );
-				return copyStatusID;
-			default:
-		}
+    public static AliasID copyOf(AliasID id)
+    {
+        switch(id.getType())
+        {
+            case BROADCAST_CHANNEL:
+                BroadcastChannel originalBroadcast = (BroadcastChannel)id;
+                BroadcastChannel copyBroadcast = new BroadcastChannel();
+                copyBroadcast.setChannelName(originalBroadcast.getChannelName());
+                return copyBroadcast;
+            case ESN:
+                Esn originalESN = (Esn)id;
+                Esn copyESN = new Esn();
+                copyESN.setEsn(originalESN.getEsn());
+                return copyESN;
+            case LTR_NET_UID:
+                UniqueID originalUniqueID = (UniqueID)id;
+                UniqueID copyUniqueID = new UniqueID();
+                copyUniqueID.setUid(originalUniqueID.getUid());
+                return copyUniqueID;
+            case LOJACK:
+                LoJackFunctionAndID originalLoJackFunctionAndID = (LoJackFunctionAndID)id;
+                LoJackFunctionAndID copyLoJackFunctionAndID = new LoJackFunctionAndID();
+                copyLoJackFunctionAndID.setFunction(originalLoJackFunctionAndID.getFunction());
+                copyLoJackFunctionAndID.setID(originalLoJackFunctionAndID.getID());
+                return copyLoJackFunctionAndID;
+            case MIN:
+                Min originalMin = (Min)id;
+                Min copyMin = new Min();
+                copyMin.setMin(originalMin.getMin());
+                return copyMin;
+            case PRIORITY:
+                Priority originalPriority = (Priority)id;
+                Priority copyPriority = new Priority();
+                copyPriority.setPriority(originalPriority.getPriority());
+                return copyPriority;
+            case RECORD:
+                return new Record();
+            case SITE:
+                SiteID originalSiteID = (SiteID)id;
+                SiteID copySiteID = new SiteID();
+                copySiteID.setSite(originalSiteID.getSite());
+                return copySiteID;
+            case STATUS:
+                StatusID originalStatusID = (StatusID)id;
+                StatusID copyStatusID = new StatusID();
+                copyStatusID.setStatus(originalStatusID.getStatus());
+                return copyStatusID;
+            case TALKGROUP:
+                Talkgroup originalTalkgroup = (Talkgroup)id;
+                Talkgroup copyTalkgroup = new Talkgroup(originalTalkgroup.getProtocol(), originalTalkgroup.getValue());
+                return copyTalkgroup;
+            case TALKGROUP_RANGE:
+                TalkgroupRange originalRange = (TalkgroupRange)id;
+                TalkgroupRange copyRange = new TalkgroupRange(originalRange.getProtocol(), originalRange.getMinTalkgroup(),
+                    originalRange.getMaxTalkgroup());
+                return copyRange;
 
-		return null;
-	}
-	
-	public static AliasAction copyOf( AliasAction action )
-	{
-		if( action instanceof BeepAction )
-		{
-			return new BeepAction();
-		}
-		else if( action instanceof ClipAction)
-		{
-			ClipAction originalClip = (ClipAction)action;
-			ClipAction copyClip = new ClipAction();
-			copyClip.setInterval( originalClip.getInterval() );
-			copyClip.setPath( originalClip.getPath() );
-			copyClip.setPeriod( originalClip.getPeriod() );
-			return copyClip;
-		}
-		else if( action instanceof ScriptAction )
-		{
-			ScriptAction originalScript = (ScriptAction)action;
-			ScriptAction copyScript = new ScriptAction();
-			copyScript.setInterval( originalScript.getInterval() );
-			copyScript.setPeriod( originalScript.getPeriod() );
-			copyScript.setScript( originalScript.getScript() );
-			return copyScript;
-		}
-		
-		return null;
-	}
-	
-	public static Alias copyOf( Alias original )
-	{
-		Alias copy = new Alias( original.getName() );
-		copy.setList( original.getList() );
-		copy.setGroup( original.getGroup() );
-		copy.setColor( original.getColor() );
-		copy.setIconName( original.getIconName() );
-		
-		for( AliasID id: original.getId() )
-		{
-			AliasID copyID = copyOf( id );
-			
-			if( copyID != null )
-			{
-				copy.addAliasID( copyID );
-			}
-		}
+            //Legacy identifiers ... not supported
+            case FLEETSYNC:
+            case LEGACY_TALKGROUP:
+            case MDC1200:
+            case MPT1327:
+            case NON_RECORDABLE:
+            default:
+        }
 
-		for( AliasAction action: original.getAction() )
-		{
-			AliasAction copyAction = copyOf( action );
-			
-			if( copyAction != null )
-			{
-				copy.addAliasAction( copyAction );
-			}
-		}
-		
-		return copy;
-	}
+        return null;
+    }
+
+    public static AliasAction copyOf(AliasAction action)
+    {
+        if(action instanceof BeepAction)
+        {
+            return new BeepAction();
+        }
+        else if(action instanceof ClipAction)
+        {
+            ClipAction originalClip = (ClipAction)action;
+            ClipAction copyClip = new ClipAction();
+            copyClip.setInterval(originalClip.getInterval());
+            copyClip.setPath(originalClip.getPath());
+            copyClip.setPeriod(originalClip.getPeriod());
+            return copyClip;
+        }
+        else if(action instanceof ScriptAction)
+        {
+            ScriptAction originalScript = (ScriptAction)action;
+            ScriptAction copyScript = new ScriptAction();
+            copyScript.setInterval(originalScript.getInterval());
+            copyScript.setPeriod(originalScript.getPeriod());
+            copyScript.setScript(originalScript.getScript());
+            return copyScript;
+        }
+
+        return null;
+    }
+
+    public static Alias copyOf(Alias original)
+    {
+        Alias copy = new Alias(original.getName());
+        copy.setList(original.getList());
+        copy.setGroup(original.getGroup());
+        copy.setColor(original.getColor());
+        copy.setIconName(original.getIconName());
+
+        for(AliasID id : original.getId())
+        {
+            AliasID copyID = copyOf(id);
+
+            if(copyID != null)
+            {
+                copy.addAliasID(copyID);
+            }
+        }
+
+        for(AliasAction action : original.getAction())
+        {
+            AliasAction copyAction = copyOf(action);
+
+            if(copyAction != null)
+            {
+                copy.addAliasAction(copyAction);
+            }
+        }
+
+        return copy;
+    }
+
+    public static Editor<AliasID> getEditor(AliasID aliasID, BroadcastModel broadcastModel)
+    {
+        if(aliasID != null)
+        {
+            switch(aliasID.getType())
+            {
+                case BROADCAST_CHANNEL:
+                    return new BroadcastChannelEditor(aliasID, broadcastModel);
+                case ESN:
+                    return new ESNEditor(aliasID);
+                case LTR_NET_UID:
+                    return new UniqueIDEditor(aliasID);
+                case LOJACK:
+                    return new LoJackIDEditor(aliasID);
+                case MIN:
+                    return new MINEditor(aliasID);
+                case PRIORITY:
+                    return new PriorityEditor(aliasID);
+                case RECORD:
+                    return new RecordEditor(aliasID);
+                case SITE:
+                    return new SiteIDEditor(aliasID);
+                case STATUS:
+                    return new StatusIDEditor(aliasID);
+                case TALKGROUP:
+                    return new TalkgroupEditor(aliasID);
+                case TALKGROUP_RANGE:
+                    return new TalkgroupRangeEditor(aliasID);
+
+                case FLEETSYNC:
+                    return new FleetsyncIDEditor(aliasID);
+                case LEGACY_TALKGROUP:
+                    return new LegacyTalkgroupIDEditor(aliasID);
+                case MDC1200:
+                    return new MDC1200IDEditor(aliasID);
+                case MPT1327:
+                    return new MPT1327IDEditor(aliasID);
+                case NON_RECORDABLE:
+                    return new NonRecordableEditor(aliasID);
+                default:
+                    break;
+            }
+        }
+
+        return new EmptyEditor<AliasID>();
+    }
+
+    public static Editor<AliasAction> getEditor(AliasAction aliasAction)
+    {
+        if(aliasAction != null)
+        {
+            switch(aliasAction.getType())
+            {
+                case BEEP:
+                    return new BeepActionEditor(aliasAction);
+                case CLIP:
+                    return new ClipActionEditor(aliasAction);
+                case SCRIPT:
+                    return new ScriptActionEditor(aliasAction);
+                default:
+                    break;
+            }
+        }
+
+        return new EmptyEditor<AliasAction>();
+    }
+
+    public static AliasID getAliasID(AliasIDType type)
+    {
+        switch(type)
+        {
+            case BROADCAST_CHANNEL:
+                return new BroadcastChannel();
+            case ESN:
+                return new Esn();
+            case FLEETSYNC:
+                return new FleetsyncID();
+            case LTR_NET_UID:
+                return new UniqueID();
+            case LOJACK:
+                return new LoJackFunctionAndID();
+            case MDC1200:
+                return new MDC1200ID();
+            case MIN:
+                return new Min();
+            case MPT1327:
+                return new MPT1327ID();
+            case NON_RECORDABLE:
+                return new NonRecordable();
+            case PRIORITY:
+                return new Priority();
+            case RECORD:
+                return new Record();
+            case TALKGROUP:
+                return new Talkgroup();
+            case TALKGROUP_RANGE:
+                return new TalkgroupRange();
+            case SITE:
+                return new SiteID();
+            case STATUS:
+                return new StatusID();
+            case LEGACY_TALKGROUP:
+                return new LegacyTalkgroupID();
+            default:
+                throw new IllegalArgumentException("Unrecognized Alias ID type: " + type);
+        }
+    }
+
+    public static AliasAction getAliasAction(AliasActionType type)
+    {
+        switch(type)
+        {
+            case BEEP:
+                return new BeepAction();
+            case CLIP:
+                return new ClipAction();
+            case SCRIPT:
+                return new ScriptAction();
+            default:
+                throw new IllegalArgumentException("Unrecognized Alias Action type: " + type);
+        }
+    }
 
-	public static Editor<AliasID> getEditor( AliasID aliasID, BroadcastModel broadcastModel )
-	{
-		if( aliasID != null )
-		{
-			switch( aliasID.getType() )
-			{
-				case BROADCAST_CHANNEL:
-					return new BroadcastChannelEditor(aliasID, broadcastModel);
-				case ESN:
-					return new ESNEditor( aliasID );
-				case FLEETSYNC:
-					return new FleetsyncIDEditor( aliasID );
-				case LTR_NET_UID:
-					return new UniqueIDEditor( aliasID );
-				case LOJACK:
-					return new LoJackIDEditor( aliasID );
-				case MDC1200:
-					return new MDC1200IDEditor( aliasID );
-				case MIN:
-					return new MINEditor( aliasID );
-				case MPT1327:
-					return new MPT1327IDEditor( aliasID );
-				case NON_RECORDABLE:
-					return new NonRecordableEditor( aliasID );
-				case PRIORITY:
-					return new PriorityEditor( aliasID );
-				case SITE:
-					return new SiteIDEditor( aliasID );
-				case STATUS:
-					return new StatusIDEditor( aliasID );
-				case TALKGROUP:
-					return new TalkgroupIDEditor( aliasID );
-				default:
-					break;
-			}
-		}
-		
-		return new EmptyEditor<AliasID>();
-	}
-	
-	public static Editor<AliasAction> getEditor( AliasAction aliasAction )
-	{
-		if( aliasAction != null )
-		{
-			switch( aliasAction.getType() )
-			{
-				case BEEP:
-					return new BeepActionEditor( aliasAction );
-				case CLIP:
-					return new ClipActionEditor( aliasAction );
-				case SCRIPT:
-					return new ScriptActionEditor( aliasAction );
-				default:
-					break;
-			}
-		}
-		
-		return new EmptyEditor<AliasAction>();
-	}
-	
-	public static AliasID getAliasID( AliasIDType type )
-	{
-		switch( type )
-		{
-			case BROADCAST_CHANNEL:
-				return new BroadcastChannel();
-			case ESN:
-				return new Esn();
-			case FLEETSYNC:
-				return new FleetsyncID();
-			case LTR_NET_UID:
-				return new UniqueID();
-			case LOJACK:
-				return new LoJackFunctionAndID();
-			case MDC1200:
-				return new MDC1200ID();
-			case MIN:
-				return new Min();
-			case MPT1327:
-				return new MPT1327ID();
-			case NON_RECORDABLE:
-				return new NonRecordable();
-			case PRIORITY:
-				return new Priority();
-			case SITE:
-				return new SiteID();
-			case STATUS:
-				return new StatusID();
-			case TALKGROUP:
-				return new TalkgroupID();
-			default:
-				throw new IllegalArgumentException( "Unrecognized Alias ID type: " + type );
-		}
-	}
-	
-	public static AliasAction getAliasAction( AliasActionType type )
-	{
-		switch( type )
-		{
-			case BEEP:
-				return new BeepAction();
-			case CLIP:
-				return new ClipAction();
-			case SCRIPT:
-				return new ScriptAction();
-			default:
-				throw new IllegalArgumentException( "Unrecognized Alias Action type: " + type );
-		}
-	}
-	
 }

src/main/java/io/github/dsheirer/alias/AliasList.java

@@ -1,6 +1,7 @@
-/*******************************************************************************
+/*
+ * ******************************************************************************
  * sdrtrunk
- * Copyright (C) 2014-2017 Dennis Sheirer
+ * 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
@@ -14,24 +15,27 @@
  *
  * 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;
 
 import com.fasterxml.jackson.dataformat.xml.annotation.JacksonXmlProperty;
 import io.github.dsheirer.alias.id.AliasID;
-import io.github.dsheirer.alias.id.WildcardID;
+import io.github.dsheirer.alias.id.broadcast.BroadcastChannel;
 import io.github.dsheirer.alias.id.esn.Esn;
-import io.github.dsheirer.alias.id.fleetsync.FleetsyncID;
-import io.github.dsheirer.alias.id.lojack.LoJackFunctionAndID;
-import io.github.dsheirer.alias.id.mdc.MDC1200ID;
-import io.github.dsheirer.alias.id.mobileID.Min;
-import io.github.dsheirer.alias.id.mpt1327.MPT1327ID;
-import io.github.dsheirer.alias.id.siteID.SiteID;
+import io.github.dsheirer.alias.id.priority.Priority;
 import io.github.dsheirer.alias.id.status.StatusID;
-import io.github.dsheirer.alias.id.talkgroup.TalkgroupID;
-import io.github.dsheirer.alias.id.uniqueID.UniqueID;
-import io.github.dsheirer.module.decode.lj1200.LJ1200Message;
+import io.github.dsheirer.alias.id.talkgroup.Talkgroup;
+import io.github.dsheirer.alias.id.talkgroup.TalkgroupRange;
+import io.github.dsheirer.identifier.Identifier;
+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.status.UnitStatusIdentifier;
+import io.github.dsheirer.identifier.status.UserStatusIdentifier;
+import io.github.dsheirer.identifier.talkgroup.TalkgroupIdentifier;
+import io.github.dsheirer.protocol.Protocol;
 import io.github.dsheirer.sample.Listener;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -39,34 +43,18 @@ import org.slf4j.LoggerFactory;
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.HashMap;
+import java.util.Iterator;
 import java.util.List;
 import java.util.Map;
+import java.util.TreeMap;
 
 public class AliasList implements Listener<AliasEvent>
 {
     private final static Logger mLog = LoggerFactory.getLogger(AliasList.class);
-    public static final String WILDCARD = "*";
-    public static final String REGEX_WILDCARD = ".";
-
-    private Map<String,Alias> mESN = new HashMap<>();
-    private Map<String,Alias> mFleetsync = new HashMap<>();
-    private Map<LoJackFunctionAndID,Alias> mLoJack = new HashMap<>();
-    private Map<String,Alias> mMDC1200 = new HashMap<>();
-    private Map<String,Alias> mMobileID = new HashMap<>();
-    private Map<String,Alias> mMPT1327 = new HashMap<>();
-    private Map<String,Alias> mSiteID = new HashMap<>();
-    private Map<Integer,Alias> mStatus = new HashMap<>();
-    private Map<String,Alias> mTalkgroup = new HashMap<>();
-    private Map<Integer,Alias> mUniqueID = new HashMap<>();
-
-    private List<WildcardID> mESNWildcards = new ArrayList<>();
-    private List<WildcardID> mMobileIDWildcards = new ArrayList<>();
-    private List<WildcardID> mFleetsyncWildcards = new ArrayList<>();
-    private List<WildcardID> mMDC1200Wildcards = new ArrayList<>();
-    private List<WildcardID> mMPT1327Wildcards = new ArrayList<>();
-    private List<WildcardID> mSiteWildcards = new ArrayList<>();
-    private List<WildcardID> mTalkgroupWildcards = new ArrayList<>();
-
+    private Map<Protocol,TalkgroupAliasList> mTalkgroupProtocolMap = new HashMap<>();
+    private Map<String,Alias> mESNMap = new HashMap<>();
+    private Map<Integer,Alias> mStatusMap = new HashMap<>();
+    private boolean mHasAliasActions = false;
     private String mName;
 
     /**
@@ -92,6 +80,11 @@ public class AliasList implements Listener<AliasEvent>
                 addAliasID(aliasID, alias);
             }
         }
+
+        if(alias.hasActions())
+        {
+            mHasAliasActions = true;
+        }
     }
 
     /**
@@ -105,120 +98,42 @@ public class AliasList implements Listener<AliasEvent>
             {
                 switch(id.getType())
                 {
+                    case TALKGROUP:
+                        Talkgroup talkgroup = (Talkgroup)id;
+
+                        TalkgroupAliasList talkgroupAliasList = mTalkgroupProtocolMap.get(talkgroup.getProtocol());
+
+                        if(talkgroupAliasList == null)
+                        {
+                            talkgroupAliasList = new TalkgroupAliasList();
+                            mTalkgroupProtocolMap.put(talkgroup.getProtocol(), talkgroupAliasList);
+                        }
+
+                        talkgroupAliasList.add(talkgroup, alias);
+                        break;
+                    case TALKGROUP_RANGE:
+                        TalkgroupRange talkgroupRange = (TalkgroupRange)id;
+
+                        TalkgroupAliasList talkgroupRangeAliasList = mTalkgroupProtocolMap.get(talkgroupRange.getProtocol());
+
+                        if(talkgroupRangeAliasList == null)
+                        {
+                            talkgroupRangeAliasList = new TalkgroupAliasList();
+                            mTalkgroupProtocolMap.put(talkgroupRange.getProtocol(), talkgroupRangeAliasList);
+                        }
+
+                        talkgroupRangeAliasList.add(talkgroupRange, alias);
+                        break;
                     case ESN:
                         String esn = ((Esn) id).getEsn();
 
-                        if(esn != null)
+                        if(esn != null && !esn.isEmpty())
                         {
-                            if(esn.contains(WILDCARD))
-                            {
-                                mESNWildcards.add(new WildcardID(esn));
-                                Collections.sort(mESNWildcards);
-                            }
-
-                            mESN.put(esn, alias);
-                        }
-                        break;
-                    case FLEETSYNC:
-                        String fleetsync = ((FleetsyncID) id).getIdent();
-
-                        if(fleetsync != null)
-                        {
-                            if(fleetsync.contains(WILDCARD))
-                            {
-                                mFleetsyncWildcards.add(new WildcardID(fleetsync));
-                                Collections.sort(mFleetsyncWildcards);
-                            }
-
-                            mFleetsync.put(fleetsync, alias);
-                        }
-                        break;
-                    case LOJACK:
-                        mLoJack.put((LoJackFunctionAndID) id, alias);
-                        break;
-                    case MDC1200:
-                        String mdc = ((MDC1200ID) id).getIdent();
-
-                        if(mdc != null)
-                        {
-                            if(mdc.contains(WILDCARD))
-                            {
-                                mMDC1200Wildcards.add(new WildcardID(mdc));
-                                Collections.sort(mMDC1200Wildcards);
-                            }
-
-                            mMDC1200.put(mdc, alias);
-                        }
-                        break;
-                    case MPT1327:
-                        String mpt = ((MPT1327ID) id).getIdent();
-
-                        if(mpt != null)
-                        {
-                            if(mpt.contains(WILDCARD))
-                            {
-                                mMPT1327Wildcards.add(new WildcardID(mpt));
-                                Collections.sort(mMPT1327Wildcards);
-                            }
-
-                            mMPT1327.put(mpt, alias);
-                        }
-                        break;
-                    case MIN:
-                        String min = ((Min) id).getMin();
-
-                        if(min != null)
-                        {
-                            if(min.contains(WILDCARD))
-                            {
-                                mMobileIDWildcards.add(new WildcardID(min));
-                                Collections.sort(mMobileIDWildcards);
-                            }
-
-                            mMobileID.put(min, alias);
-                        }
-                        break;
-                    case LTR_NET_UID:
-                        mUniqueID.put(((UniqueID) id).getUid(), alias);
-                        break;
-                    case SITE:
-                        String siteID = ((SiteID) id).getSite();
-
-                        if(siteID != null)
-                        {
-                            if(siteID.contains(WILDCARD))
-                            {
-                                mSiteWildcards.add(new WildcardID(siteID));
-                                Collections.sort(mSiteWildcards);
-                            }
-
-                            mSiteID.put(siteID, alias);
+                            mESNMap.put(esn.toLowerCase(), alias);
                         }
                         break;
                     case STATUS:
-                        mStatus.put(((StatusID) id).getStatus(), alias);
-                        break;
-                    case TALKGROUP:
-                        String tgid = ((TalkgroupID) id).getTalkgroup();
-
-                        if(tgid != null)
-                        {
-                            if(tgid.contains(WILDCARD))
-                            {
-                                mTalkgroupWildcards.add(new WildcardID(tgid));
-                                Collections.sort(mTalkgroupWildcards);
-                            }
-
-                            mTalkgroup.put(tgid, alias);
-                        }
-                        break;
-                    case BROADCAST_CHANNEL:
-                    case NON_RECORDABLE:
-                    case PRIORITY:
-                        //We don't maintain lookups for these items
-                        break;
-                    default:
-                        mLog.warn("Unrecognized Alias ID Type:" + id.getType().name() + " - can't ADD to lookup table");
+                        mStatusMap.put(((StatusID) id).getStatus(), alias);
                         break;
                 }
             }
@@ -234,203 +149,13 @@ public class AliasList implements Listener<AliasEvent>
      */
     public void removeAlias(Alias alias)
     {
-        if(alias != null)
+        for(TalkgroupAliasList talkgroupAliasList: mTalkgroupProtocolMap.values())
         {
-            for(AliasID aliasID : alias.getId())
-            {
-                removeAliasID(aliasID, alias);
-            }
-        }
-    }
-
-    private void removeWildcard(String value, List<WildcardID> wildcards)
-    {
-        if(value != null)
-        {
-            for(WildcardID wildcardID : wildcards)
-            {
-                if(wildcardID.value().equals(value))
-                {
-                    wildcards.remove(wildcardID);
-                }
-            }
-        }
-    }
-
-    /**
-     * Removes the alias and alias identifier from internal mappings.
-     */
-    private void removeAliasID(AliasID id, Alias alias)
-    {
-        if(id.isValid())
-        {
-            switch(id.getType())
-            {
-                case ESN:
-                    String esn = ((Esn) id).getEsn();
-
-                    if(esn != null)
-                    {
-                        if(esn.contains(WILDCARD))
-                        {
-                            removeWildcard(esn, mESNWildcards);
-                        }
-                    }
-
-                    mESN.remove(esn);
-                    break;
-                case FLEETSYNC:
-                    String fleetsync = ((FleetsyncID) id).getIdent();
-
-                    if(fleetsync != null)
-                    {
-                        if(fleetsync.contains(WILDCARD))
-                        {
-                            removeWildcard(fleetsync, mFleetsyncWildcards);
-                        }
-
-                        mFleetsync.remove(fleetsync);
-                    }
-                    break;
-                case LOJACK:
-                    mLoJack.remove((LoJackFunctionAndID) id);
-                    break;
-                case MDC1200:
-                    String mdc = ((MDC1200ID) id).getIdent();
-
-                    if(mdc != null)
-                    {
-                        if(mdc.contains(WILDCARD))
-                        {
-                            removeWildcard(mdc, mMDC1200Wildcards);
-                        }
-
-                        mMDC1200.remove(mdc);
-                    }
-                    break;
-                case MPT1327:
-                    String mpt = ((MPT1327ID) id).getIdent();
-
-                    if(mpt != null)
-                    {
-                        if(mpt.contains(WILDCARD))
-                        {
-                            removeWildcard(mpt, mMPT1327Wildcards);
-                        }
-
-                        mMPT1327.remove(mpt);
-                    }
-                    break;
-                case MIN:
-                    String min = ((Min) id).getMin();
-
-                    if(min != null)
-                    {
-                        if(min.contains(WILDCARD))
-                        {
-                            removeWildcard(min, mMobileIDWildcards);
-                        }
-
-                        mMobileID.remove(min);
-                    }
-                    break;
-                case LTR_NET_UID:
-                    mUniqueID.remove(((UniqueID) id).getUid());
-                    break;
-                case SITE:
-                    mSiteID.remove(((SiteID) id).getSite());
-                    break;
-                case STATUS:
-                    mStatus.remove(((StatusID) id).getStatus());
-                    break;
-                case TALKGROUP:
-                    String tgid = ((TalkgroupID) id).getTalkgroup();
-
-                    if(tgid != null)
-                    {
-                        if(tgid.contains(WILDCARD))
-                        {
-                            removeWildcard(tgid, mTalkgroupWildcards);
-                        }
-
-                        mTalkgroup.remove(tgid);
-                    }
-                    break;
-                case NON_RECORDABLE:
-                case PRIORITY:
-                case BROADCAST_CHANNEL:
-                    //We don't maintain lookups for these items
-                    break;
-                default:
-                    mLog.warn("Unrecognized Alias ID Type:" + id.getType().name() + " - can't REMOVE from lookup table");
-                    break;
-            }
-        }
-    }
-
-    /**
-     * Returns the first matching regex wildcard from the list of wildcards that matches the
-     * identifier.
-     *
-     * @param id to match
-     * @param wildcards to match against
-     * @return matching wildcard ID or null
-     */
-    private String getWildcardMatch(String id, List<WildcardID> wildcards)
-    {
-        if(id != null)
-        {
-            for(WildcardID wildcard : wildcards)
-            {
-                if(wildcard.matches(id))
-                {
-                    return wildcard.value();
-                }
-            }
+            talkgroupAliasList.remove(alias);
         }
 
-        return null;
-    }
-
-    /**
-     * Lookup alias by site ID
-     */
-    public Alias getSiteID(String siteID)
-    {
-        Alias alias = null;
-
-        if(siteID != null)
-        {
-            alias = mSiteID.get(siteID);
-
-            if(alias == null)
-            {
-                String wildcard = getWildcardMatch(siteID, mSiteWildcards);
-
-                if(wildcard != null)
-                {
-                    alias = mSiteID.get(wildcard);
-                }
-            }
-        }
-
-        return alias;
-    }
-
-    /**
-     * Lookup alias by status ID
-     */
-    public Alias getStatus(int status)
-    {
-        return mStatus.get(status);
-    }
-
-    /**
-     * Lookup alias by Unique ID (UID)
-     */
-    public Alias getUniqueID(int uniqueID)
-    {
-        return mUniqueID.get(uniqueID);
+        remove(alias, mStatusMap);
+        remove(alias, mESNMap);
     }
 
     /**
@@ -442,178 +167,12 @@ public class AliasList implements Listener<AliasEvent>
 
         if(esn != null)
         {
-            alias = mESN.get(esn);
-
-            if(alias == null)
-            {
-                String wildcard = getWildcardMatch(esn, mESNWildcards);
-
-                if(wildcard != null)
-                {
-                    alias = mESN.get(wildcard);
-                }
-            }
+            alias = mESNMap.get(esn);
         }
 
         return alias;
     }
 
-    /**
-     * Lookup alias by fleetsync ID
-     */
-    public Alias getFleetsyncAlias(String ident)
-    {
-        Alias alias = null;
-
-        if(ident != null)
-        {
-            alias = mFleetsync.get(ident);
-
-            if(alias == null)
-            {
-                String wildcard = getWildcardMatch(ident, mFleetsyncWildcards);
-
-                if(wildcard != null)
-                {
-                    alias = mFleetsync.get(wildcard);
-                }
-            }
-        }
-
-        return alias;
-    }
-
-    /**
-     * Lookup alias by lojack function and ID
-     */
-    public Alias getLoJackAlias(LJ1200Message.Function function, String id)
-    {
-        if(id != null)
-        {
-            for(LoJackFunctionAndID lojack : mLoJack.keySet())
-            {
-                if(lojack.matches(function, id))
-                {
-                    return mLoJack.get(lojack);
-                }
-            }
-        }
-
-        return null;
-    }
-
-    /**
-     * Lookup alias by MDC1200 ID
-     */
-    public Alias getMDC1200Alias(String ident)
-    {
-        Alias alias = null;
-
-        if(ident != null)
-        {
-            alias = mMDC1200.get(ident);
-
-            if(alias == null)
-            {
-                String wildcard = getWildcardMatch(ident, mMDC1200Wildcards);
-
-                if(wildcard != null)
-                {
-                    alias = mMDC1200.get(wildcard);
-                }
-            }
-        }
-
-        return alias;
-    }
-
-    /**
-     * Lookup alias by MPT1327 Ident
-     */
-    public Alias getMPT1327Alias(String ident)
-    {
-        Alias alias = null;
-
-        if(ident != null)
-        {
-            alias = mMPT1327.get(ident);
-
-            if(alias == null)
-            {
-                String wildcard = getWildcardMatch(ident, mMPT1327Wildcards);
-
-                if(wildcard != null)
-                {
-                    alias = mMPT1327.get(wildcard);
-                }
-            }
-        }
-
-        return alias;
-    }
-
-    /**
-     * Lookup alias by Mobile ID Number (MIN)
-     */
-    public Alias getMobileIDNumberAlias(String ident)
-    {
-        Alias alias = null;
-
-        if(ident != null)
-        {
-            alias = mMobileID.get(ident);
-
-            if(alias == null)
-            {
-                String wildcard = getWildcardMatch(ident, mMobileIDWildcards);
-
-                if(wildcard != null)
-                {
-                    alias = mMobileID.get(wildcard);
-                }
-            }
-        }
-
-        return alias;
-    }
-
-    /**
-     * Lookup alias by talkgroup
-     *
-     * @param tgid to use when searching for an alias
-     * @param includeWildcards true if you want to additionally search for a matching alias that contains wildcard(s)
-     * when there is not a direct match to the TGID.
-     */
-    public Alias getTalkgroupAlias(String tgid, boolean includeWildcards)
-    {
-        Alias alias = null;
-
-        if(tgid != null)
-        {
-            alias = mTalkgroup.get(tgid);
-
-            if(alias == null && includeWildcards)
-            {
-                String wildcard = getWildcardMatch(tgid, mTalkgroupWildcards);
-
-                if(wildcard != null)
-                {
-                    alias = mTalkgroup.get(wildcard);
-                }
-            }
-        }
-
-        return alias;
-    }
-
-    /**
-     * Lookup alias by talkgroup.  Defaults to matching to wildcard talkgroups.
-     */
-    public Alias getTalkgroupAlias(String tgid)
-    {
-        return getTalkgroupAlias(tgid, true);
-    }
-
     /**
      * Alias list name
      */
@@ -660,6 +219,7 @@ public class AliasList implements Listener<AliasEvent>
                 case CHANGE:
                     if(alias.getList() != null && getName().equalsIgnoreCase(alias.getList()))
                     {
+                        removeAlias(alias);
                         addAlias(alias);
                     }
                     break;
@@ -674,4 +234,302 @@ public class AliasList implements Listener<AliasEvent>
             }
         }
     }
+
+    /**
+     * Returns an optional alias that is associated with the identifier
+      * @param identifier to alias
+     * @return list of alias or empty list
+     */
+    public List<Alias> getAliases(Identifier identifier)
+    {
+        if(identifier != null)
+        {
+            switch(identifier.getForm())
+            {
+                case TALKGROUP:
+                    TalkgroupIdentifier talkgroup = (TalkgroupIdentifier)identifier;
+
+                    TalkgroupAliasList talkgroupAliasList = mTalkgroupProtocolMap.get(identifier.getProtocol());
+
+                    if(talkgroupAliasList != null)
+                    {
+                        Alias alias = talkgroupAliasList.getAlias(talkgroup);
+
+                        if(alias != null)
+                        {
+                            List<Alias> aliases = new ArrayList<>();
+                            aliases.add(alias);
+                            return aliases;
+                        }
+                    }
+                    break;
+                case PATCH_GROUP:
+                    PatchGroupIdentifier patchGroupIdentifier = (PatchGroupIdentifier)identifier;
+                    PatchGroup patchGroup = patchGroupIdentifier.getValue();
+
+                    TalkgroupAliasList patchGroupAliasList = mTalkgroupProtocolMap.get(patchGroupIdentifier.getProtocol());
+
+                    if(patchGroupAliasList != null)
+                    {
+                        List<Alias> aliases = new ArrayList<>();
+
+                        Alias alias = patchGroupAliasList.getAlias(patchGroup.getPatchGroup());
+
+                        if(alias != null)
+                        {
+                            aliases.add(alias);
+                        }
+
+                        for(TalkgroupIdentifier patchedGroup: patchGroup.getPatchedGroupIdentifiers())
+                        {
+                            Alias patchedAlias = patchGroupAliasList.getAlias(patchedGroup);
+
+                            if(patchedAlias != null && !aliases.contains(patchedAlias))
+                            {
+                                aliases.add(patchedAlias);
+                            }
+                        }
+
+                        return aliases;
+                    }
+                    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;
+                        }
+                    }
+                    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;
+                        }
+                    }
+                    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;
+                        }
+                    }
+                    break;
+            }
+        }
+
+        return Collections.EMPTY_LIST;
+    }
+
+    /**
+     * Indicates if any of the identifiers contain a broadcast channel for streaming of audio.
+     * @param identifierCollection to inspect
+     * @return true if the identifier collection is designated for streaming to one or more channels.
+     */
+    public boolean isStreamable(IdentifierCollection identifierCollection)
+    {
+        for(Identifier identifier: identifierCollection.getIdentifiers())
+        {
+            List<Alias> aliases = getAliases(identifier);
+
+            for(Alias alias: aliases)
+            {
+                if(alias != null && alias.isStreamable())
+                {
+                    return true;
+                }
+            }
+        }
+
+        return false;
+    }
+
+    /**
+     * Indicates if any of the identifiers have been identified for recording.
+     * @param identifierCollection to inspect
+     * @return true if recordable.
+     */
+    public boolean isRecordable(IdentifierCollection identifierCollection)
+    {
+        for(Identifier identifier: identifierCollection.getIdentifiers())
+        {
+            List<Alias> aliases = getAliases(identifier);
+
+            for(Alias alias: aliases)
+            {
+                if(alias != null && alias.isRecordable())
+                {
+                    return true;
+                }
+            }
+        }
+
+        return false;
+    }
+
+    /**
+     * Indicates if any of the aliases in this list have an associated alias action
+     */
+    public boolean hasAliasActions()
+    {
+        return mHasAliasActions;
+    }
+
+    /**
+     * Returns the lowest audio playback priority specified by aliases for identifiers in the
+     * identifier collection.
+     *
+     * @param identifierCollection to inspect for audio priority
+     * @return audio playback priority
+     */
+    public int getAudioPlaybackPriority(IdentifierCollection identifierCollection)
+    {
+        int priority = Priority.DEFAULT_PRIORITY;
+
+        for(Identifier identifier: identifierCollection.getIdentifiers())
+        {
+            List<Alias> aliases = getAliases(identifier);
+
+            for(Alias alias: aliases)
+            {
+                if(alias != null && alias.getPlaybackPriority() < priority)
+                {
+                    priority = alias.getPlaybackPriority();
+                }
+            }
+        }
+
+        return priority;
+    }
+
+    /**
+     * Returns a list of streaming broadcast channels specified for any of the identifiers in the collection.
+     *
+     * @return list of broadcast channels or an empty list
+     */
+    public List<BroadcastChannel> getBroadcastChannels(IdentifierCollection identifierCollection)
+    {
+        List<BroadcastChannel> channels = new ArrayList<>();
+
+        for(Identifier identifier: identifierCollection.getIdentifiers())
+        {
+            List<Alias> aliases = getAliases(identifier);
+
+            for(Alias alias: aliases)
+            {
+                if(alias != null && alias.isStreamable())
+                {
+                    for(BroadcastChannel broadcastChannel: alias.getBroadcastChannels())
+                    {
+                        if(!channels.contains(broadcastChannel))
+                        {
+                            channels.add(broadcastChannel);
+                        }
+                    }
+                }
+            }
+        }
+
+        return channels;
+    }
+
+    /**
+     * Removes the alias (as a value) from the specified map
+     */
+    public static void remove(Alias alias, Map map)
+    {
+        Iterator<Map.Entry> it = map.entrySet().iterator();
+
+        while(it.hasNext())
+        {
+            if(it.next().getValue().equals(alias))
+            {
+                it.remove();
+            }
+        }
+    }
+
+
+    /**
+     * Listing of talkgroups and ranges for a specific protocol
+     */
+    public class TalkgroupAliasList
+    {
+        private Map<Integer,Alias> mTalkgroupAliasMap = new TreeMap<>();
+        private Map<TalkgroupRange, Alias> mTalkgroupRangeAliasMap = new HashMap<>();
+
+        public TalkgroupAliasList()
+        {
+        }
+
+        public Alias getAlias(TalkgroupIdentifier identifier)
+        {
+            int value = identifier.getValue();
+
+            if(mTalkgroupAliasMap.containsKey(value))
+            {
+                return mTalkgroupAliasMap.get(value);
+            }
+
+            for(TalkgroupRange talkgroupRange: mTalkgroupRangeAliasMap.keySet())
+            {
+                if(talkgroupRange.contains(value))
+                {
+                    return mTalkgroupRangeAliasMap.get(talkgroupRange);
+                }
+            }
+
+            return null;
+        }
+
+        public void add(Talkgroup talkgroup, Alias alias)
+        {
+            mTalkgroupAliasMap.put(talkgroup.getValue(), alias);
+        }
+
+        public void add(TalkgroupRange talkgroupRange, Alias alias)
+        {
+            mTalkgroupRangeAliasMap.put(talkgroupRange, alias);
+        }
+
+        public void remove(Talkgroup talkgroup)
+        {
+            mTalkgroupAliasMap.remove(talkgroup.getValue());
+        }
+
+        public void remove(TalkgroupRange talkgroupRange)
+        {
+            mTalkgroupRangeAliasMap.remove(talkgroupRange);
+        }
+
+        /**
+         * Removes the alias from all internal maps
+         */
+        public void remove(Alias alias)
+        {
+            AliasList.remove(alias, mTalkgroupAliasMap);
+            AliasList.remove(alias, mTalkgroupRangeAliasMap);
+        }
+    }
 }

src/main/java/io/github/dsheirer/alias/AliasModel.java

@@ -1,23 +1,27 @@
-/*******************************************************************************
- *     SDR Trunk 
- *     Copyright (C) 2014-2016 Dennis Sheirer
+/*
+ * ******************************************************************************
+ * 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.
+ * 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.
+ * 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/>
- ******************************************************************************/
+ * 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;
 
 import io.github.dsheirer.alias.id.broadcast.BroadcastChannel;
+import io.github.dsheirer.identifier.IdentifierCollection;
+import io.github.dsheirer.identifier.configuration.AliasListConfigurationIdentifier;
 import io.github.dsheirer.sample.Broadcaster;
 import io.github.dsheirer.sample.Listener;
 
@@ -30,7 +34,9 @@ import java.util.Map;
 import java.util.concurrent.CopyOnWriteArrayList;
 
 /**
- * Alias Model
+ * Alias Model contains all aliases and is responsible for creation and management of alias lists.  Alias lists are a
+ * set of aliases that all share a common alias list name and can be attached to a decoding channel for aliasing
+ * identifiers produced by channel decoder(s).
  */
 public class AliasModel extends AbstractTableModel
 {
@@ -68,31 +74,69 @@ public class AliasModel extends AbstractTableModel
         return null;
     }
 
+    /**
+     * Returns an optional alias list associated with the identifier collection
+     *
+     * @return alias list or null
+     */
+    public AliasList getAliasList(IdentifierCollection identifierCollection)
+    {
+        if(identifierCollection != null)
+        {
+            return getAliasList(identifierCollection.getAliasListConfiguration());
+        }
+
+        return null;
+    }
+
+    /**
+     * Retrieves an alias list specified by the alias list configuration identifier
+     *
+     * @param configurationIdentifier containing the name of an alias list
+     * @return alias list or null.
+     */
+    public AliasList getAliasList(AliasListConfigurationIdentifier configurationIdentifier)
+    {
+        if(configurationIdentifier != null && configurationIdentifier.isValid())
+        {
+            return getAliasList(configurationIdentifier.getValue());
+        }
+
+        return null;
+    }
+
+    /**
+     * Creates a new alias list containing all aliases that match the alias name, or returns a previously created and
+     * cached alias list.  Returned alias list is automatically registered as a listener to this model so that any
+     * updates to the list by the user will automatically be reflected in constructed alias lists.
+     */
     public AliasList getAliasList(String name)
     {
-        if(name != null && mAliasListMap.containsKey(name))
+        if(name == null || name.isEmpty())
+        {
+            return new AliasList(name);
+        }
+
+        if(mAliasListMap.containsKey(name))
         {
             return mAliasListMap.get(name);
         }
 
         AliasList aliasList = new AliasList(name);
 
-        if(name != null)
+        for(Alias alias : mAliases)
         {
-            for(Alias alias : mAliases)
+            if(alias.hasList() && alias.getList().equalsIgnoreCase(name))
             {
-                if(alias.hasList() && alias.getList().equalsIgnoreCase(name))
-                {
-                    aliasList.addAlias(alias);
-                }
+                aliasList.addAlias(alias);
             }
-
-            mAliasListMap.put(name, aliasList);
-
-            //Register the new alias list to receive updates from this model
-            addListener(aliasList);
         }
 
+        mAliasListMap.put(name, aliasList);
+
+        //Register the new alias list to receive updates from this model
+        addListener(aliasList);
+
         return aliasList;
     }
 

src/main/java/io/github/dsheirer/alias/PatchGroupAlias.java

@@ -1,379 +0,0 @@
-/*******************************************************************************
- * sdrtrunk
- * Copyright (C) 2014-2017 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;
-
-import io.github.dsheirer.alias.action.AliasAction;
-import io.github.dsheirer.alias.id.AliasID;
-import io.github.dsheirer.alias.id.AliasIDType;
-import io.github.dsheirer.alias.id.broadcast.BroadcastChannel;
-import io.github.dsheirer.alias.id.priority.Priority;
-import io.github.dsheirer.alias.id.talkgroup.TalkgroupID;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Set;
-import java.util.TreeSet;
-
-public class PatchGroupAlias extends Alias
-{
-    private final static Logger mLog = LoggerFactory.getLogger(PatchGroupAlias.class);
-
-    private Alias mPatchGroupAlias;
-    private List<Alias> mPatchedAliases = new ArrayList<>();
-    private List<String> mPatchedTalkgroupIDs = new ArrayList<>();
-
-    /**
-     * Patch group alias is a single alias for a group of aliases that are temporarily patched together.  This will
-     * normally be used for patched talkgroups, but could be used with any type of alias identifiers that can be
-     * temporarily joined to form a patch group.
-     *
-     * Alias properties such as recordable, streamable and call priority are an aggregation from the set of patched
-     * aliases contained in this patch group alias and the patch group ID alias and where applicable, return the highest
-     * value/priority from the group of patched aliases.
-     */
-    public PatchGroupAlias()
-    {
-    }
-
-    @Override
-    public int getColor()
-    {
-        if(mPatchGroupAlias != null)
-        {
-            return mPatchGroupAlias.getColor();
-        }
-
-        return super.getColor();
-    }
-
-    /**
-     * Sets an alias for this patch group ID
-     */
-    public void setPatchGroupAlias(Alias alias)
-    {
-        mPatchGroupAlias = alias;
-    }
-
-    /**
-     * Alias for this patch group
-     */
-    public Alias getPatchGroupAlias()
-    {
-        return mPatchGroupAlias;
-    }
-
-    /**
-     * Indicates if this patch group has an alias
-     */
-    public boolean hasPatchGroupAlias()
-    {
-        return mPatchGroupAlias != null;
-    }
-
-    /**
-     * List of patched aliases contained in this patch group
-     */
-    public List<Alias> getPatchedAliases()
-    {
-        return mPatchedAliases;
-    }
-
-    /**
-     * Removes/clears all patched aliases from this patch alias group
-     */
-    public void clearPatchedAliases()
-    {
-        mPatchedAliases.clear();
-    }
-
-    /**
-     * Adds the patched alias to this patch alias group
-     */
-    public void addPatchedAlias(Alias alias)
-    {
-        if(alias == PatchGroupAlias.this)
-        {
-            throw new IllegalArgumentException("Can't add patch group alias to itself - would create an infinite loop");
-        }
-
-        mPatchedAliases.add(alias);
-    }
-
-    /**
-     * Removes the patched alias from this patch alias group
-     */
-    public void removePatchedAlias(Alias alias)
-    {
-        mPatchedAliases.remove(alias);
-    }
-
-    /**
-     * Sets the list of patched talkgroup IDs for this patch group
-     */
-    public void setPatchedTalkgroupIDs(List<String> talkgroupIDs)
-    {
-        mPatchedTalkgroupIDs = talkgroupIDs;
-    }
-
-    /**
-     * List of patched talkgroup IDs for this patch group
-     */
-    public List<String> getPatchedTalkgroupIDs()
-    {
-        return mPatchedTalkgroupIDs;
-    }
-
-    @Override
-    public String getName()
-    {
-        if(hasPatchGroupAlias())
-        {
-            return getPatchGroupAlias().getName();
-        }
-        else
-        {
-            for(AliasID id: getId())
-            {
-                if(id.getType() == AliasIDType.TALKGROUP)
-                {
-                    return "PATCH:" + ((TalkgroupID)id).getTalkgroup();
-                }
-            }
-        }
-
-        return "PATCH:****";
-    }
-
-    @Override
-    public List<AliasAction> getAction()
-    {
-        List<AliasAction> aliasActions = new ArrayList<>();
-
-        if(hasPatchGroupAlias())
-        {
-            aliasActions.addAll(getPatchGroupAlias().getAction());
-        }
-
-        for(Alias alias: mPatchedAliases)
-        {
-            if(!(alias instanceof PatchGroupAlias))
-            {
-                for(AliasAction action: alias.getAction())
-                {
-                    if(!aliasActions.contains(action))
-                    {
-                        aliasActions.add(action);
-                    }
-                }
-            }
-        }
-
-        return aliasActions;
-    }
-
-    @Override
-    public boolean hasActions()
-    {
-        for(Alias alias: mPatchedAliases)
-        {
-            if(!(alias instanceof PatchGroupAlias) && alias.hasActions())
-            {
-                return true;
-            }
-        }
-
-        return hasPatchGroupAlias() && getPatchGroupAlias().hasActions();
-    }
-
-    /**
-     * Returns the highest listenable audio priority defined among the aliases in the group, or returns 'Do Not Monitor'
-     * if that is the only priority defined.  Otherwise, returns default (100) priority.
-     */
-    @Override
-    public int getCallPriority()
-    {
-        boolean hasDoNotMonitor = false;
-
-        int highestPriority = (hasPatchGroupAlias() ? getPatchGroupAlias().getCallPriority() : Priority.DEFAULT_PRIORITY + 1);
-
-        for(Alias alias: mPatchedAliases)
-        {
-            if(!(alias instanceof PatchGroupAlias) && alias.hasCallPriority() && alias.getCallPriority() < highestPriority)
-            {
-                if(alias.getCallPriority() == Priority.DO_NOT_MONITOR)
-                {
-                    hasDoNotMonitor = true;
-                }
-                else
-                {
-                    highestPriority = alias.getCallPriority();
-                }
-            }
-        }
-
-        if(highestPriority <= Priority.DEFAULT_PRIORITY)
-        {
-            return highestPriority;
-        }
-        else if(hasDoNotMonitor)
-        {
-            return Priority.DO_NOT_MONITOR;
-        }
-        else
-        {
-            return Priority.DEFAULT_PRIORITY;
-        }
-    }
-
-    @Override
-    public boolean hasCallPriority()
-    {
-        if(hasPatchGroupAlias() && getPatchGroupAlias().hasCallPriority())
-        {
-            return true;
-        }
-
-        for(Alias alias: mPatchedAliases)
-        {
-            if(!(alias instanceof PatchGroupAlias) && alias.hasCallPriority())
-            {
-                return true;
-            }
-        }
-
-        return false;
-    }
-
-    @Override
-    public boolean isRecordable()
-    {
-        if(hasPatchGroupAlias() && getPatchGroupAlias().isRecordable())
-        {
-            return true;
-        }
-
-        for(Alias alias: mPatchedAliases)
-        {
-            if(!(alias instanceof PatchGroupAlias) && alias.isRecordable())
-            {
-                return true;
-            }
-        }
-
-        return false;
-    }
-
-    @Override
-    public boolean isStreamable()
-    {
-        if(hasPatchGroupAlias() && getPatchGroupAlias().isStreamable())
-        {
-            return true;
-        }
-
-        for(Alias alias: mPatchedAliases)
-        {
-            if(!(alias instanceof PatchGroupAlias) && alias.isStreamable())
-            {
-                return true;
-            }
-        }
-
-        return false;
-    }
-
-    @Override
-    public Set<BroadcastChannel> getBroadcastChannels()
-    {
-        Set<BroadcastChannel> broadcastChannels = new TreeSet<>();
-
-        if(hasPatchGroupAlias())
-        {
-            broadcastChannels.addAll(getPatchGroupAlias().getBroadcastChannels());
-        }
-
-        for(Alias alias: mPatchedAliases)
-        {
-            if(!(alias instanceof PatchGroupAlias))
-            {
-                broadcastChannels.addAll(alias.getBroadcastChannels());
-            }
-        }
-
-        return broadcastChannels;
-    }
-
-    @Override
-    public boolean hasBroadcastChannel(String channel)
-    {
-        if(hasPatchGroupAlias() && getPatchGroupAlias().hasBroadcastChannel(channel))
-        {
-            return true;
-        }
-
-        for(Alias alias: mPatchedAliases)
-        {
-            if(!(alias instanceof PatchGroupAlias) && alias.hasBroadcastChannel(channel))
-            {
-                return true;
-            }
-        }
-
-        return false;
-    }
-
-    public static void main(String[] args)
-    {
-        Alias a1 = new Alias("Alias 1");
-        a1.addAliasID(new BroadcastChannel("Channel 1"));
-        a1.addAliasID(new BroadcastChannel("Channel 2"));
-        a1.addAliasID(new BroadcastChannel("Channel 3"));
-        a1.addAliasID(new BroadcastChannel("Channel 4"));
-
-        Alias a2 = new Alias("Alias 1");
-        a1.addAliasID(new BroadcastChannel("Channel 1"));
-        a1.addAliasID(new BroadcastChannel("Channel 2"));
-        a1.addAliasID(new BroadcastChannel("Channel 3"));
-        a1.addAliasID(new BroadcastChannel("Channel 4"));
-
-        Alias a3 = new Alias("Alias 1");
-        a1.addAliasID(new BroadcastChannel("Channel 1"));
-        a1.addAliasID(new BroadcastChannel("Channel 2"));
-        a1.addAliasID(new BroadcastChannel("Channel 3"));
-        a1.addAliasID(new BroadcastChannel("Channel 4"));
-
-        Alias a4 = new Alias("Alias 1");
-        a1.addAliasID(new BroadcastChannel("Channel 1"));
-        a1.addAliasID(new BroadcastChannel("Channel 2"));
-        a1.addAliasID(new BroadcastChannel("Channel 3"));
-        a1.addAliasID(new BroadcastChannel("Channel 4"));
-
-        PatchGroupAlias pga = new PatchGroupAlias();
-        pga.setPatchGroupAlias(a1);
-        pga.addPatchedAlias(a2);
-        pga.addPatchedAlias(a3);
-        pga.addPatchedAlias(a4);
-
-        Set<BroadcastChannel> bc = pga.getBroadcastChannels();
-
-        mLog.debug("Channels:" + bc);
-    }
-}

src/main/java/io/github/dsheirer/alias/action/AliasAction.java

@@ -26,9 +26,7 @@ import io.github.dsheirer.alias.Alias;
 import io.github.dsheirer.alias.action.beep.BeepAction;
 import io.github.dsheirer.alias.action.clip.ClipAction;
 import io.github.dsheirer.alias.action.script.ScriptAction;
-import io.github.dsheirer.message.Message;
-
-import java.util.concurrent.ScheduledExecutorService;
+import io.github.dsheirer.message.IMessage;
 
 /**
  * Alias action defines an action to execute when an alias is detected active.
@@ -56,7 +54,7 @@ public abstract class AliasAction
      * action attached.  The alias argument is the parent alias containing the
      * alias action.
      */
-    public abstract void execute(ScheduledExecutorService scheduledExecutorService, Alias alias, Message message);
+    public abstract void execute(Alias alias, IMessage message);
 
     /**
      * Dismiss a persistent alias action

src/main/java/io/github/dsheirer/alias/action/AliasActionManager.java

@@ -1,6 +1,7 @@
-/*******************************************************************************
+/*
+ * ******************************************************************************
  * sdrtrunk
- * Copyright (C) 2014-2017 Dennis Sheirer
+ * 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
@@ -14,56 +15,94 @@
  *
  * 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.action;
 
 import io.github.dsheirer.alias.Alias;
-import io.github.dsheirer.message.Message;
+import io.github.dsheirer.alias.AliasList;
+import io.github.dsheirer.identifier.Identifier;
+import io.github.dsheirer.message.IMessage;
+import io.github.dsheirer.message.IMessageListener;
+import io.github.dsheirer.module.Module;
 import io.github.dsheirer.sample.Listener;
-import io.github.dsheirer.util.ThreadPool;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 import java.util.List;
 
 /**
- * Manages all alias action events.  Each received message is interrogated for
- * any alias entries and then each alias is interrogated for any alias actions.
+ * Manages all alias action events.  Each received message is interrogated for any identifiers that may be aliasable
+ * and have associated alias actions.
  *
- * Each alias action is executed and provided a copy of the source message so
- * that the contents of the message can be used as part of the action.
+ * Each alias action is executed and provided a copy of the source message so that the contents of the message can be
+ * used as part of the action.
  */
-public class AliasActionManager implements Listener<Message>
+public class AliasActionManager extends Module implements IMessageListener, Listener<IMessage>
 {
-    public AliasActionManager()
+    private final static Logger mLog = LoggerFactory.getLogger(AliasActionManager.class);
+    private AliasList mAliasList;
+
+    public AliasActionManager(AliasList aliasList)
     {
+        mAliasList = aliasList;
     }
 
     @Override
-    public void receive(Message message)
+    public void receive(IMessage message)
     {
-        if(message.isValid())
+        if(mAliasList != null && message.isValid())
         {
-            List<Alias> aliases = message.getAliases();
+            List<Identifier> identifiers = message.getIdentifiers();
 
-            if(aliases != null)
+            for(Identifier identifier: identifiers)
             {
-                for(Alias alias : aliases)
-                {
-                    if(alias.hasActions())
-                    {
-                        List<AliasAction> actions = alias.getAction();
+                List<Alias> aliases = mAliasList.getAliases(identifier);
 
-                        for(AliasAction action : actions)
+                for(Alias alias: aliases)
+                {
+                    if(alias != null && alias.hasActions())
+                    {
+                        for(AliasAction action: alias.getAction())
                         {
-                            /* Provide access to the thread pool manager in case the
-							 * action needs to setup a timer, and provide the original
-							 * message to be used as part of the action (e.g. sending
-							 * the message as a text message to a cell phone */
-                            action.execute(ThreadPool.SCHEDULED, alias, message);
+                            action.execute(alias, message);
                         }
                     }
                 }
             }
         }
     }
+
+    @Override
+    public void reset()
+    {
+        //No actions neeeded
+    }
+
+    @Override
+    public void start()
+    {
+        //No actions neeeded
+    }
+
+    @Override
+    public void stop()
+    {
+        //No actions neeeded
+    }
+
+    @Override
+    public void dispose()
+    {
+        //No actions neeeded
+    }
+
+    /**
+     * IMessageListener interface ... delegates to this class implementation of Listener<Message>
+     */
+    @Override
+    public Listener<IMessage> getMessageListener()
+    {
+        return this;
+    }
 }

src/main/java/io/github/dsheirer/alias/action/RecurringAction.java

@@ -1,13 +1,33 @@
+/*
+ * ******************************************************************************
+ * 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.
+ *
+ * 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.action;
 
 import com.fasterxml.jackson.annotation.JsonIgnore;
 import com.fasterxml.jackson.dataformat.xml.annotation.JacksonXmlProperty;
 import io.github.dsheirer.alias.Alias;
-import io.github.dsheirer.message.Message;
+import io.github.dsheirer.message.IMessage;
+import io.github.dsheirer.util.ThreadPool;
 
-import javax.swing.*;
-import java.awt.*;
-import java.util.concurrent.ScheduledExecutorService;
+import javax.swing.JOptionPane;
+import java.awt.EventQueue;
 import java.util.concurrent.ScheduledFuture;
 import java.util.concurrent.TimeUnit;
 import java.util.concurrent.atomic.AtomicBoolean;
@@ -18,19 +38,15 @@ public abstract class RecurringAction extends AliasAction
     protected AtomicBoolean mRunning = new AtomicBoolean(false);
     @JsonIgnore
     private ScheduledFuture<?> mPerpetualAction;
-    @JsonIgnore
-    protected ScheduledExecutorService mScheduledExecutorService;
 
     protected Interval mInterval = Interval.ONCE;
     protected int mPeriod = 5;
 
-    public abstract void performAction(Alias alias, Message message);
+    public abstract void performAction(Alias alias, IMessage message);
 
     @Override
-    public void execute(ScheduledExecutorService scheduledExecutorService, Alias alias, Message message)
+    public void execute(Alias alias, IMessage message)
     {
-        mScheduledExecutorService = scheduledExecutorService;
-
         if(mRunning.compareAndSet(false, true))
         {
             switch(mInterval)
@@ -41,10 +57,10 @@ public abstract class RecurringAction extends AliasAction
                     break;
                 case DELAYED_RESET:
                     performThreadedAction(alias, message);
-                    mScheduledExecutorService.schedule(new ResetTask(), mPeriod, TimeUnit.SECONDS);
+                    ThreadPool.SCHEDULED.schedule(new ResetTask(), mPeriod, TimeUnit.SECONDS);
                     break;
                 case UNTIL_DISMISSED:
-                    mPerpetualAction = mScheduledExecutorService.scheduleAtFixedRate(
+                    mPerpetualAction = ThreadPool.SCHEDULED.scheduleAtFixedRate(
                         new PerformActionTask(alias, message), mPeriod, mPeriod, TimeUnit.SECONDS);
 
                     StringBuilder sb = new StringBuilder();
@@ -56,18 +72,13 @@ public abstract class RecurringAction extends AliasAction
 
                     final String text = sb.toString();
 
-                    EventQueue.invokeLater(new Runnable()
-                    {
-                        @Override
-                        public void run()
-                        {
-                            JOptionPane.showMessageDialog(null, text,
-                                "Alias Alert", JOptionPane.INFORMATION_MESSAGE);
+                    EventQueue.invokeLater(() -> {
+                        JOptionPane.showMessageDialog(null, text,
+                            "Alias Alert", JOptionPane.INFORMATION_MESSAGE);
 
-                            dismiss(false);
+                        dismiss(false);
 
-                            mScheduledExecutorService.schedule(new ResetTask(), 15, TimeUnit.SECONDS);
-                        }
+                        ThreadPool.SCHEDULED.schedule(new ResetTask(), 15, TimeUnit.SECONDS);
                     });
                     break;
                 default:
@@ -79,16 +90,9 @@ public abstract class RecurringAction extends AliasAction
      * Spawns the performAction() event into a new thread so that it doesn't
      * delay any decoder actions.
      */
-    private void performThreadedAction(final Alias alias, final Message message)
+    private void performThreadedAction(final Alias alias, final IMessage message)
     {
-        mScheduledExecutorService.schedule(new Runnable()
-        {
-            @Override
-            public void run()
-            {
-                performAction(alias, message);
-            }
-        }, 0, TimeUnit.SECONDS);
+        ThreadPool.SCHEDULED.schedule(() -> performAction(alias, message), 0, TimeUnit.SECONDS);
     }
 
     @Override
@@ -139,7 +143,7 @@ public abstract class RecurringAction extends AliasAction
 
         private String mLabel;
 
-        private Interval(String label)
+        Interval(String label)
         {
             mLabel = label;
         }
@@ -153,9 +157,9 @@ public abstract class RecurringAction extends AliasAction
     public class PerformActionTask implements Runnable
     {
         private Alias mAlias;
-        private Message mMessage;
+        private IMessage mMessage;
 
-        public PerformActionTask(Alias alias, Message message)
+        public PerformActionTask(Alias alias, IMessage message)
         {
             mAlias = alias;
             mMessage = message;

src/main/java/io/github/dsheirer/alias/action/beep/BeepAction.java

@@ -1,10 +1,30 @@
+/*
+ * ******************************************************************************
+ * 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.
+ *
+ * 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.action.beep;
 
 import com.fasterxml.jackson.dataformat.xml.annotation.JacksonXmlProperty;
 import io.github.dsheirer.alias.Alias;
 import io.github.dsheirer.alias.action.AliasActionType;
 import io.github.dsheirer.alias.action.RecurringAction;
-import io.github.dsheirer.message.Message;
+import io.github.dsheirer.message.IMessage;
 
 public class BeepAction extends RecurringAction
 {
@@ -17,7 +37,7 @@ public class BeepAction extends RecurringAction
 	}
 
 	@Override
-	public void performAction(Alias alias, Message message )
+	public void performAction(Alias alias, IMessage message )
 	{
 		System.out.println( "\007" );
 	}

src/main/java/io/github/dsheirer/alias/action/clip/ClipAction.java

@@ -1,3 +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.
+ *
+ * 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.action.clip;
 
 import com.fasterxml.jackson.annotation.JsonIgnore;
@@ -5,7 +25,7 @@ import com.fasterxml.jackson.dataformat.xml.annotation.JacksonXmlProperty;
 import io.github.dsheirer.alias.Alias;
 import io.github.dsheirer.alias.action.AliasActionType;
 import io.github.dsheirer.alias.action.RecurringAction;
-import io.github.dsheirer.message.Message;
+import io.github.dsheirer.message.IMessage;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -45,7 +65,7 @@ public class ClipAction extends RecurringAction
     }
 
     @Override
-    public void performAction(Alias alias, Message message)
+    public void performAction(Alias alias, IMessage message)
     {
         try
         {

src/main/java/io/github/dsheirer/alias/action/script/ScriptAction.java

@@ -1,10 +1,30 @@
+/*
+ * ******************************************************************************
+ * 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.
+ *
+ * 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.action.script;
 
 import com.fasterxml.jackson.dataformat.xml.annotation.JacksonXmlProperty;
 import io.github.dsheirer.alias.Alias;
 import io.github.dsheirer.alias.action.AliasActionType;
 import io.github.dsheirer.alias.action.RecurringAction;
-import io.github.dsheirer.message.Message;
+import io.github.dsheirer.message.IMessage;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -39,7 +59,7 @@ public class ScriptAction extends RecurringAction
     }
 
     @Override
-    public void performAction(Alias alias, Message message)
+    public void performAction(Alias alias, IMessage message)
     {
         try
         {
@@ -63,8 +83,7 @@ public class ScriptAction extends RecurringAction
 
             int exitCode = p.waitFor();
 
-            BufferedReader reader = new BufferedReader(
-                new InputStreamReader(p.getInputStream()));
+            BufferedReader reader = new BufferedReader(new InputStreamReader(p.getInputStream()));
 
             String line = "";
 
@@ -77,8 +96,7 @@ public class ScriptAction extends RecurringAction
 
             if(exitCode != 0)
             {
-                throw new RuntimeException("Exit Code: " + exitCode +
-                    " Console:" + sb.toString());
+                throw new RuntimeException("Exit Code: " + exitCode + " Console:" + sb.toString());
             }
         }
     }

src/main/java/io/github/dsheirer/alias/id/AliasID.java

@@ -1,17 +1,17 @@
 /*******************************************************************************
  *     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.
- * 
+ *
  *     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/>
  ******************************************************************************/
@@ -23,46 +23,52 @@ import com.fasterxml.jackson.annotation.JsonTypeInfo;
 import com.fasterxml.jackson.dataformat.xml.annotation.JacksonXmlRootElement;
 import io.github.dsheirer.alias.id.broadcast.BroadcastChannel;
 import io.github.dsheirer.alias.id.esn.Esn;
-import io.github.dsheirer.alias.id.fleetsync.FleetsyncID;
+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.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.mdc.MDC1200ID;
-import io.github.dsheirer.alias.id.mobileID.Min;
-import io.github.dsheirer.alias.id.mpt1327.MPT1327ID;
-import io.github.dsheirer.alias.id.nonrecordable.NonRecordable;
+import io.github.dsheirer.alias.id.legacy.mobileID.Min;
 import io.github.dsheirer.alias.id.priority.Priority;
-import io.github.dsheirer.alias.id.siteID.SiteID;
+import io.github.dsheirer.alias.id.record.Record;
+import io.github.dsheirer.alias.id.legacy.siteID.SiteID;
 import io.github.dsheirer.alias.id.status.StatusID;
-import io.github.dsheirer.alias.id.talkgroup.TalkgroupID;
-import io.github.dsheirer.alias.id.uniqueID.UniqueID;
+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")
+@JsonTypeInfo(use = JsonTypeInfo.Id.NAME, include = JsonTypeInfo.As.PROPERTY, property = "type")
 @JsonSubTypes({
-    @JsonSubTypes.Type(value=BroadcastChannel.class, name="broadcastChannel"),
-    @JsonSubTypes.Type(value=Esn.class, name="esn"),
-    @JsonSubTypes.Type(value=FleetsyncID.class, name="fleetsyncID"),
+    @JsonSubTypes.Type(value = BroadcastChannel.class, name = "broadcastChannel"),
+    @JsonSubTypes.Type(value = Esn.class, name = "esn"),
+    @JsonSubTypes.Type(value = FleetsyncID.class, name = "fleetsyncID"),
     @JsonSubTypes.Type(value = LoJackFunctionAndID.class, name = "loJackFunctionAndID"),
     @JsonSubTypes.Type(value = MDC1200ID.class, name = "mdc1200ID"),
     @JsonSubTypes.Type(value = Min.class, name = "min"),
     @JsonSubTypes.Type(value = MPT1327ID.class, name = "mpt1327ID"),
     @JsonSubTypes.Type(value = NonRecordable.class, name = "nonRecordable"),
+    @JsonSubTypes.Type(value = Talkgroup.class, name = "talkgroup"),
+    @JsonSubTypes.Type(value = TalkgroupRange.class, name = "talkgroupRange"),
     @JsonSubTypes.Type(value = Priority.class, name = "priority"),
+    @JsonSubTypes.Type(value = Record.class, name = "record"),
     @JsonSubTypes.Type(value = SiteID.class, name = "siteID"),
     @JsonSubTypes.Type(value = StatusID.class, name = "statusID"),
-    @JsonSubTypes.Type(value = TalkgroupID.class, name = "talkgroupID"),
+    @JsonSubTypes.Type(value = LegacyTalkgroupID.class, name = "talkgroupID"),
     @JsonSubTypes.Type(value = UniqueID.class, name = "uniqueID")
 })
-@JacksonXmlRootElement( localName = "id" )
+@JacksonXmlRootElement(localName = "id")
 public abstract class AliasID
 {
-	public AliasID()
-	{
-	}
+    public AliasID()
+    {
+    }
 
-	@JsonIgnore
-	public abstract AliasIDType getType();
-	
-	public abstract boolean matches( AliasID id );
+    @JsonIgnore
+    public abstract AliasIDType getType();
 
-	@JsonIgnore
-	public abstract boolean isValid();
+    public abstract boolean matches(AliasID id);
+
+    @JsonIgnore
+    public abstract boolean isValid();
 }

src/main/java/io/github/dsheirer/alias/id/AliasIDType.java

@@ -1,49 +1,55 @@
-/*******************************************************************************
- *     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.
- * 
- *     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/>
- ******************************************************************************/
+/*
+ * ******************************************************************************
+ * 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.
+ *
+ * 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;
 
 public enum AliasIDType
 {
-	ESN( "ESN" ),
-	FLEETSYNC( "Fleetsync" ),
-	LOJACK( "LoJack" ),
-	LTR_NET_UID( "LTR-Net UID" ),
-	MDC1200( "MDC-1200" ),
-	MIN( "Passport MIN" ),
-	MPT1327( "MPT-1327" ),
-	SITE( "Site" ),
-	STATUS( "Status" ),
-	TALKGROUP( "Talkgroup" ),
+    BROADCAST_CHANNEL("Audio Broadcast Channel"),
+    ESN("ESN"),
+    INVERT("Audio Inversion"),
+    LOJACK("LoJack"),
+    LTR_NET_UID("LTR-Net UID"),
+    MIN("Passport MIN"),
+    PRIORITY("Audio Priority"),
+    RECORD("Record"),
+    SITE("Site"),
+    STATUS("Status"),
+    TALKGROUP("Talkgroup"),
+    TALKGROUP_RANGE("Talkgroup Range"),
 
-	INVERT( "Audio Inversion" ),
-	PRIORITY( "Audio Priority" ),
-	NON_RECORDABLE( "Audio Non-Recordable" ),
-	BROADCAST_CHANNEL( "Audio Broadcast Channel" );
-	
-	private String mLabel;
-	
-	private AliasIDType( String label )
-	{
-		mLabel = label;
-	}
-	
-	public String toString()
-	{
-		return mLabel;
-	}
+    //Legacy identifier types - no longer used
+    FLEETSYNC("Fleetsync"),
+    LEGACY_TALKGROUP("Legacy Talkgroup"),
+    MDC1200("MDC-1200"),
+    MPT1327("MPT-1327"),
+    NON_RECORDABLE("Audio Non-Recordable");
+
+    private String mLabel;
+
+    AliasIDType(String label)
+    {
+        mLabel = label;
+    }
+
+    public String toString()
+    {
+        return mLabel;
+    }
 }

src/main/java/io/github/dsheirer/alias/id/AliasIdentifierEditor.java

@@ -1,20 +1,22 @@
-/*******************************************************************************
- *     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.
- * 
- *     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/>
- ******************************************************************************/
+/*
+ * ******************************************************************************
+ * 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.
+ *
+ * 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 io.github.dsheirer.alias.Alias;
@@ -26,10 +28,19 @@ import io.github.dsheirer.gui.editor.Editor;
 import io.github.dsheirer.gui.editor.EmptyEditor;
 import net.miginfocom.swing.MigLayout;
 
-import javax.swing.*;
+import javax.swing.DefaultListModel;
+import javax.swing.JButton;
+import javax.swing.JList;
+import javax.swing.JMenuItem;
+import javax.swing.JOptionPane;
+import javax.swing.JPanel;
+import javax.swing.JPopupMenu;
+import javax.swing.JScrollPane;
+import javax.swing.ListModel;
+import javax.swing.ListSelectionModel;
 import javax.swing.event.ListSelectionEvent;
 import javax.swing.event.ListSelectionListener;
-import java.awt.*;
+import java.awt.EventQueue;
 import java.awt.event.ActionEvent;
 import java.awt.event.ActionListener;
 import java.awt.event.MouseAdapter;
@@ -40,328 +51,323 @@ import java.util.List;
 
 public class AliasIdentifierEditor extends Editor<Alias>
 {
-	private static final long serialVersionUID = 1L;
+    private static final long serialVersionUID = 1L;
 
-	private static ListModel<AliasID> EMPTY_MODEL = new DefaultListModel<>();
-	private JList<AliasID> mAliasIDList = new JList<>( EMPTY_MODEL );
-	private JButton mNewIDButton;
-	private JButton mCloneIDButton;
-	private JButton mDeleteIDButton;
-	private EditorContainer mEditorContainer = new EditorContainer();
+    private static ListModel<AliasID> EMPTY_MODEL = new DefaultListModel<>();
+    private JList<AliasID> mAliasIDList = new JList<>(EMPTY_MODEL);
+    private JButton mNewIDButton;
+    private JButton mCloneIDButton;
+    private JButton mDeleteIDButton;
+    private EditorContainer mEditorContainer = new EditorContainer();
 
-	private AliasModel mAliasModel;
+    private AliasModel mAliasModel;
     private BroadcastModel mBroadcastModel;
-	
-	public AliasIdentifierEditor( AliasModel aliasModel, BroadcastModel broadcastModel )
-	{
-		mAliasModel = aliasModel;
+
+    public AliasIdentifierEditor(AliasModel aliasModel, BroadcastModel broadcastModel)
+    {
+        mAliasModel = aliasModel;
         mBroadcastModel = broadcastModel;
 
-		init();
-	}
+        init();
+    }
 
-	private void init()
-	{
-		setLayout( new MigLayout( "fill,wrap 3", 
-			"[grow,fill][grow,fill][grow,fill]", "[][grow,fill][]" ) );
+    private void init()
+    {
+        setLayout(new MigLayout("fill,wrap 3",
+            "[grow,fill][grow,fill][grow,fill]", "[][grow,fill][]"));
 
-		mAliasIDList.setVisibleRowCount( 6 );
-		mAliasIDList.setSelectionMode( ListSelectionModel.SINGLE_SELECTION );
-		mAliasIDList.setLayoutOrientation( JList.VERTICAL );
-		mAliasIDList.addListSelectionListener( new ListSelectionListener()
-		{
-			@Override
-			public void valueChanged( ListSelectionEvent event )
-			{
-				if( !event.getValueIsAdjusting() )
-				{
-					JList<?> list = (JList<?>)event.getSource();
-					
-					Object selectedItem = list.getSelectedValue();
-					
-					if( selectedItem != null && selectedItem instanceof AliasID )
-					{
-						AliasID selected = (AliasID)selectedItem;
+        mAliasIDList.setVisibleRowCount(6);
+        mAliasIDList.setSelectionMode(ListSelectionModel.SINGLE_SELECTION);
+        mAliasIDList.setLayoutOrientation(JList.VERTICAL);
+        mAliasIDList.addListSelectionListener(new ListSelectionListener()
+        {
+            @Override
+            public void valueChanged(ListSelectionEvent event)
+            {
+                if(!event.getValueIsAdjusting())
+                {
+                    JList<?> list = (JList<?>)event.getSource();
 
-						mEditorContainer.setAliasID( selected );
-						
-						mCloneIDButton.setEnabled( true );
-						mDeleteIDButton.setEnabled( true );
-					}
-					else
-					{
-						mCloneIDButton.setEnabled( false );
-						mDeleteIDButton.setEnabled( false );
-					}
-				}
-			}
-		} );
-		
-		JScrollPane scroller = new JScrollPane( mAliasIDList );
-		add( scroller, "span,grow" );
-		
-		add( mEditorContainer, "span,grow" );
+                    Object selectedItem = list.getSelectedValue();
 
-		mNewIDButton = new JButton( "New ..." );
-		mNewIDButton.setToolTipText( "Create a new Alias Identifier" );
-		mNewIDButton.addMouseListener( new MouseAdapter()
-		{
-			@Override
-			public void mouseClicked( MouseEvent e )
-			{
-				JPopupMenu menu = new JPopupMenu();
+                    if(selectedItem != null && selectedItem instanceof AliasID)
+                    {
+                        AliasID selected = (AliasID)selectedItem;
 
-				menu.add( new AddAliasIdentifierItem( AliasIDType.ESN ) );
-				menu.add( new AddAliasIdentifierItem( AliasIDType.FLEETSYNC) );
-				menu.add( new AddAliasIdentifierItem( AliasIDType.LOJACK) );
-				menu.add( new AddAliasIdentifierItem( AliasIDType.LTR_NET_UID) );
-				menu.add( new AddAliasIdentifierItem( AliasIDType.MDC1200 ) );
-				menu.add( new AddAliasIdentifierItem( AliasIDType.MPT1327 ) );
-				menu.add( new AddAliasIdentifierItem( AliasIDType.MIN ) );
-				menu.add( new AddAliasIdentifierItem( AliasIDType.SITE) );
-				menu.add( new AddAliasIdentifierItem( AliasIDType.STATUS) );
-				menu.add( new AddAliasIdentifierItem( AliasIDType.TALKGROUP) );
+                        mEditorContainer.setAliasID(selected);
 
-				menu.addSeparator();
+                        mCloneIDButton.setEnabled(true);
+                        mDeleteIDButton.setEnabled(true);
+                    }
+                    else
+                    {
+                        mCloneIDButton.setEnabled(false);
+                        mDeleteIDButton.setEnabled(false);
+                    }
+                }
+            }
+        });
 
-                menu.add( new AddAliasIdentifierItem( AliasIDType.BROADCAST_CHANNEL) );
+        JScrollPane scroller = new JScrollPane(mAliasIDList);
+        add(scroller, "span,grow");
 
-				if( hasItem() )
-				{
-					Alias alias = getItem();
+        add(mEditorContainer, "span,grow");
 
-					if( alias.isRecordable() )
-					{
-						menu.add( new AddAliasIdentifierItem( AliasIDType.NON_RECORDABLE) );
-					}
+        mNewIDButton = new JButton("New ...");
+        mNewIDButton.setToolTipText("Create a new Alias Identifier");
+        mNewIDButton.addMouseListener(new MouseAdapter()
+        {
+            @Override
+            public void mouseClicked(MouseEvent e)
+            {
+                JPopupMenu menu = new JPopupMenu();
 
-					if( !alias.hasCallPriority() )
-					{
-						menu.add( new AddAliasIdentifierItem( AliasIDType.PRIORITY) );
-					}
-				}
+                menu.add(new AddAliasIdentifierItem(AliasIDType.TALKGROUP));
+                menu.add(new AddAliasIdentifierItem(AliasIDType.TALKGROUP_RANGE));
+                menu.add(new AddAliasIdentifierItem(AliasIDType.ESN));
+//                menu.add(new AddAliasIdentifierItem(AliasIDType.LOJACK));
+                menu.add(new AddAliasIdentifierItem(AliasIDType.STATUS));
 
-				menu.show( e.getComponent(), e.getX(), e.getY() );
-			}
-		} );
-		
-		add( mNewIDButton );
-		
-		mCloneIDButton = new JButton( "Clone" );
-		mCloneIDButton.setToolTipText( "Create a copy of the currently selected identifier" );
-		mCloneIDButton.setEnabled( false );
-		mCloneIDButton.addActionListener( new ActionListener()
-		{
-			@Override
-			public void actionPerformed( ActionEvent e )
-			{
-				AliasID selected = mAliasIDList.getSelectedValue();
-				
-				if( selected != null )
-				{
-					AliasID clone = AliasFactory.copyOf( selected );
+                menu.addSeparator();
 
-					if( clone != null )
-					{
-						addAliasIDToList( clone );
-					}
-				}
-			}
-		} );
-		add( mCloneIDButton );
-		
-		mDeleteIDButton = new JButton( "Delete" );
-		mDeleteIDButton.setToolTipText( "Delete the currently selected identifier" );
-		mDeleteIDButton.setEnabled( false );
-		mDeleteIDButton.addActionListener( new ActionListener()
-		{
-			@Override
-			public void actionPerformed( ActionEvent e )
-			{
-				final AliasID selected = mAliasIDList.getSelectedValue();
-				
-				if( selected != null )
-				{
-					int choice = JOptionPane.showConfirmDialog( mDeleteIDButton, 
-						"Do you want to delete [" + selected.toString() + "]", 
-						"Are you sure?", JOptionPane.YES_NO_OPTION );
-					
-					if( choice == JOptionPane.YES_OPTION && hasItem() )
-					{
-						Alias alias = getItem();
-						
-						alias.removeAliasID( selected );
-						
-						mAliasModel.broadcast( new AliasEvent( alias, AliasEvent.Event.CHANGE ) );
+                menu.add(new AddAliasIdentifierItem(AliasIDType.BROADCAST_CHANNEL));
 
-						setItem( alias );
-					}
-				}
-			}
-		} );
-		add( mDeleteIDButton, "wrap" );
-	}
-	
-	@Override
-	public void setItem( Alias alias )
-	{
-		super.setItem( alias );
-		
-		if( alias == null || alias.getId().isEmpty() )
-		{
-			mAliasIDList.setModel( EMPTY_MODEL );
-		}
-		else
-		{
-			DefaultListModel<AliasID> model = new DefaultListModel<AliasID>();
+                if(hasItem())
+                {
+                    Alias alias = getItem();
 
-			List<AliasID> ids = alias.getId();
-			
-			Collections.sort( ids, new Comparator<AliasID>()
-			{
-				@Override
-				public int compare( AliasID o1, AliasID o2 )
-				{
-					return o1.toString().compareTo( o2.toString() );
-				}
-			} );
-			
-			for( AliasID id: ids )
-			{
-				model.addElement( id );
-			}
-			
-			mAliasIDList.setModel( model );
-		}
-		
-		mEditorContainer.setAliasID( null );
-	}
-	
-	@Override
-	public void save()
-	{
-		if( isModified() || mEditorContainer.isModified() )
-		{
-			if( mEditorContainer.isModified() )
-			{
-				mEditorContainer.save();
-			}
-			
-			setModified( false );
-			
-			if( hasItem() )
-			{
-				mAliasModel.broadcast( new AliasEvent( getItem(), AliasEvent.Event.CHANGE ) );
-			}
-		}
-	}
-	
-	public class EditorContainer extends JPanel
-	{
-		private static final long serialVersionUID = 1L;
+                    if(!alias.isRecordable())
+                    {
+                        menu.add(new AddAliasIdentifierItem(AliasIDType.RECORD));
+                    }
 
-		private Editor<AliasID> mEditor = new EmptyEditor<>();
+                    if(!alias.hasCallPriority())
+                    {
+                        menu.add(new AddAliasIdentifierItem(AliasIDType.PRIORITY));
+                    }
+                }
 
-		public EditorContainer()
-		{
-			setLayout( new MigLayout( "","[grow,fill]", "[grow,fill]" ) );
+                menu.show(e.getComponent(), e.getX(), e.getY());
+            }
+        });
 
-			add( mEditor );
-		}
-		
-		public boolean isModified()
-		{
-			if( mEditor != null )
-			{
-				return mEditor.isModified();
-			}
-			
-			return false;
-		}
-		
-		public void save()
-		{
-			if( mEditor != null )
-			{
-				mEditor.save();
-			}
-		}
-		
-		public void setAliasID( AliasID aliasID )
-		{
-			if( mEditor != null )
-			{
-				if( mEditor.isModified() )
-				{
-					int option = JOptionPane.showConfirmDialog( 
-							EditorContainer.this, 
-							"Identifier settings have changed.  Do you want to save these changes?",
-							"Save Changes?",
-							JOptionPane.YES_NO_OPTION,
-							JOptionPane.QUESTION_MESSAGE );
-					
-					if( option == JOptionPane.YES_OPTION )
-					{
-						mEditor.save();
-					}
-				}
-			}
-			removeAll();
-			
-			//This will always give us an editor
-			mEditor = AliasFactory.getEditor( aliasID, mBroadcastModel );
-			
-			add( mEditor );
+        add(mNewIDButton);
 
-			revalidate();
-		}
-	}
-	
-	private void addAliasIDToList( final AliasID id )
-	{
-		if( id != null && hasItem() )
-		{
-			final Alias alias = getItem();
-			
-			alias.addAliasID( id );
-			
-			EventQueue.invokeLater( new Runnable()
-			{
-				@Override
-				public void run()
-				{
-					setItem( alias );
-					
-					mAliasIDList.setSelectedValue( id, true );
-					
-					AliasIdentifierEditor.this.setModified( true );
-				}
-			} );
-		}
-	}
-	
-	public class AddAliasIdentifierItem extends JMenuItem
-	{
-		private static final long serialVersionUID = 1L;
-		
-		private AliasIDType mAliasIDType;
+        mCloneIDButton = new JButton("Clone");
+        mCloneIDButton.setToolTipText("Create a copy of the currently selected identifier");
+        mCloneIDButton.setEnabled(false);
+        mCloneIDButton.addActionListener(new ActionListener()
+        {
+            @Override
+            public void actionPerformed(ActionEvent e)
+            {
+                AliasID selected = mAliasIDList.getSelectedValue();
 
-		public AddAliasIdentifierItem( AliasIDType type )
-		{
-			super( type.toString() );
-			
-			mAliasIDType = type;
-			
-			addActionListener( new ActionListener()
-			{
-				@Override
-				public void actionPerformed( ActionEvent e )
-				{
-					final AliasID id = AliasFactory.getAliasID( mAliasIDType );
-					
-					addAliasIDToList( id );
-				}
-			} );
-		}
-	}
+                if(selected != null)
+                {
+                    AliasID clone = AliasFactory.copyOf(selected);
+
+                    if(clone != null)
+                    {
+                        addAliasIDToList(clone);
+                    }
+                }
+            }
+        });
+        add(mCloneIDButton);
+
+        mDeleteIDButton = new JButton("Delete");
+        mDeleteIDButton.setToolTipText("Delete the currently selected identifier");
+        mDeleteIDButton.setEnabled(false);
+        mDeleteIDButton.addActionListener(new ActionListener()
+        {
+            @Override
+            public void actionPerformed(ActionEvent e)
+            {
+                final AliasID selected = mAliasIDList.getSelectedValue();
+
+                if(selected != null)
+                {
+                    int choice = JOptionPane.showConfirmDialog(mDeleteIDButton,
+                        "Do you want to delete [" + selected.toString() + "]",
+                        "Are you sure?", JOptionPane.YES_NO_OPTION);
+
+                    if(choice == JOptionPane.YES_OPTION && hasItem())
+                    {
+                        Alias alias = getItem();
+
+                        alias.removeAliasID(selected);
+
+                        mAliasModel.broadcast(new AliasEvent(alias, AliasEvent.Event.CHANGE));
+
+                        setItem(alias);
+                    }
+                }
+            }
+        });
+        add(mDeleteIDButton, "wrap");
+    }
+
+    @Override
+    public void setItem(Alias alias)
+    {
+        super.setItem(alias);
+
+        if(alias == null || alias.getId().isEmpty())
+        {
+            mAliasIDList.setModel(EMPTY_MODEL);
+        }
+        else
+        {
+            DefaultListModel<AliasID> model = new DefaultListModel<AliasID>();
+
+            List<AliasID> ids = alias.getId();
+
+            Collections.sort(ids, new Comparator<AliasID>()
+            {
+                @Override
+                public int compare(AliasID o1, AliasID o2)
+                {
+                    return o1.toString().compareTo(o2.toString());
+                }
+            });
+
+            for(AliasID id : ids)
+            {
+                model.addElement(id);
+            }
+
+            mAliasIDList.setModel(model);
+        }
+
+        mEditorContainer.setAliasID(null);
+    }
+
+    @Override
+    public void save()
+    {
+        if(isModified() || mEditorContainer.isModified())
+        {
+            if(mEditorContainer.isModified())
+            {
+                mEditorContainer.save();
+            }
+
+            setModified(false);
+
+            if(hasItem())
+            {
+                mAliasModel.broadcast(new AliasEvent(getItem(), AliasEvent.Event.CHANGE));
+            }
+        }
+    }
+
+    public class EditorContainer extends JPanel
+    {
+        private static final long serialVersionUID = 1L;
+
+        private Editor<AliasID> mEditor = new EmptyEditor<>();
+
+        public EditorContainer()
+        {
+            setLayout(new MigLayout("", "[grow,fill]", "[grow,fill]"));
+
+            add(mEditor);
+        }
+
+        public boolean isModified()
+        {
+            if(mEditor != null)
+            {
+                return mEditor.isModified();
+            }
+
+            return false;
+        }
+
+        public void save()
+        {
+            if(mEditor != null)
+            {
+                mEditor.save();
+            }
+        }
+
+        public void setAliasID(AliasID aliasID)
+        {
+            if(mEditor != null)
+            {
+                if(mEditor.isModified())
+                {
+                    int option = JOptionPane.showConfirmDialog(
+                        EditorContainer.this,
+                        "Identifier settings have changed.  Do you want to save these changes?",
+                        "Save Changes?",
+                        JOptionPane.YES_NO_OPTION,
+                        JOptionPane.QUESTION_MESSAGE);
+
+                    if(option == JOptionPane.YES_OPTION)
+                    {
+                        mEditor.save();
+                    }
+                }
+            }
+            removeAll();
+
+            //This will always give us an editor
+            mEditor = AliasFactory.getEditor(aliasID, mBroadcastModel);
+
+            add(mEditor);
+
+            revalidate();
+        }
+    }
+
+    private void addAliasIDToList(final AliasID id)
+    {
+        if(id != null && hasItem())
+        {
+            final Alias alias = getItem();
+
+            alias.addAliasID(id);
+
+            EventQueue.invokeLater(new Runnable()
+            {
+                @Override
+                public void run()
+                {
+                    setItem(alias);
+
+                    mAliasIDList.setSelectedValue(id, true);
+
+                    AliasIdentifierEditor.this.setModified(true);
+                }
+            });
+        }
+    }
+
+    public class AddAliasIdentifierItem extends JMenuItem
+    {
+        private static final long serialVersionUID = 1L;
+
+        private AliasIDType mAliasIDType;
+
+        public AddAliasIdentifierItem(AliasIDType type)
+        {
+            super(type.toString());
+
+            mAliasIDType = type;
+
+            addActionListener(new ActionListener()
+            {
+                @Override
+                public void actionPerformed(ActionEvent e)
+                {
+                    final AliasID id = AliasFactory.getAliasID(mAliasIDType);
+
+                    addAliasIDToList(id);
+                }
+            });
+        }
+    }
 }

src/main/java/io/github/dsheirer/alias/id/esn/Esn.java

@@ -48,7 +48,13 @@ public class Esn extends AliasID
 	
 	public String toString()
 	{
-		return "ESN: " + mEsn;
+		StringBuilder sb = new StringBuilder();
+		sb.append("ESN: ").append(mEsn != null ? mEsn : "(empty)");
+		if(!isValid())
+		{
+			sb.append(" **NOT VALID**");
+		}
+		return sb.toString();
 	}
 
 	@Override

src/main/java/io/github/dsheirer/alias/id/legacy/fleetsync/FleetsyncID.java

@@ -1,21 +1,23 @@
-/*******************************************************************************
- *     SDR Trunk 
- *     Copyright (C) 2014 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.fleetsync;
+/*
+ * ******************************************************************************
+ * 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.
+ *
+ * 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.legacy.fleetsync;
 
 import com.fasterxml.jackson.dataformat.xml.annotation.JacksonXmlProperty;
 import io.github.dsheirer.alias.id.AliasID;
@@ -48,7 +50,7 @@ public class FleetsyncID extends AliasID
 
 	public String toString()
 	{
-		return "Fleetsync: " + mID;
+		return "Fleetsync: " + (mID != null ? mID : "(empty)") + " **INVALID - USE TALKGROUP INSTEAD";
 	}
 
 	@Override

src/main/java/io/github/dsheirer/alias/id/legacy/fleetsync/FleetsyncIDEditor.java

@@ -1,21 +1,23 @@
-/*******************************************************************************
- *     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.
- * 
- *     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.fleetsync;
+/*
+ * ******************************************************************************
+ * 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.
+ *
+ * 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.legacy.fleetsync;
 
 import io.github.dsheirer.alias.id.AliasID;
 import io.github.dsheirer.gui.editor.DocumentListenerEditor;
@@ -23,9 +25,13 @@ import net.miginfocom.swing.MigLayout;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-import javax.swing.*;
+import javax.swing.JFormattedTextField;
+import javax.swing.JLabel;
+import javax.swing.JOptionPane;
+import javax.swing.JTextField;
 import javax.swing.text.MaskFormatter;
-import java.awt.*;
+import java.awt.Color;
+import java.awt.Cursor;
 import java.awt.event.MouseAdapter;
 import java.awt.event.MouseEvent;
 

src/main/java/io/github/dsheirer/alias/id/legacy/mdc/MDC1200ID.java

@@ -1,21 +1,23 @@
-/*******************************************************************************
- *     SDR Trunk 
- *     Copyright (C) 2014 Dennis Sheirer
+/*
+ * ******************************************************************************
+ * 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.
+ * 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.
+ * 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.mdc;
+ * 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.legacy.mdc;
 
 
 import com.fasterxml.jackson.dataformat.xml.annotation.JacksonXmlProperty;
@@ -49,7 +51,7 @@ public class MDC1200ID extends AliasID
 
     public String toString()
     {
-        return "MDC-1200: " + mID;
+        return "MDC-1200: " + (mID != null ? mID : "(empty)") + " **INVALID - USE TALKGROUP INSTEAD**";
     }
 
     @Override

src/main/java/io/github/dsheirer/alias/id/legacy/mdc/MDC1200IDEditor.java

@@ -0,0 +1,133 @@
+/*
+ * ******************************************************************************
+ * 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.
+ *
+ * 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.legacy.mdc;
+
+import io.github.dsheirer.alias.id.AliasID;
+import io.github.dsheirer.gui.editor.DocumentListenerEditor;
+import net.miginfocom.swing.MigLayout;
+
+import javax.swing.JFormattedTextField;
+import javax.swing.JLabel;
+import javax.swing.JOptionPane;
+import javax.swing.JTextField;
+import javax.swing.text.MaskFormatter;
+import java.awt.Color;
+import java.awt.Cursor;
+import java.awt.event.MouseAdapter;
+import java.awt.event.MouseEvent;
+
+public class MDC1200IDEditor extends DocumentListenerEditor<AliasID>
+{
+    private static final long serialVersionUID = 1L;
+
+    private static final String HELP_TEXT = "<html>"
+        + "<h3>MDC-1200 Identifier</h3>"
+        + "<b>MDC-1200:</b> four digit [0-9] value (e.g. <u>1234</u>)<br>"
+        + "<b>Wildcard:</b> use an asterisk (*) to wildcard individual<br>"
+        + "digits (e.g. <u>123*</u> or <u>**34</u>)"
+        + "</html>";
+
+    private JTextField mTextField;
+
+    public MDC1200IDEditor(AliasID aliasID)
+    {
+        initGUI();
+
+        setItem(aliasID);
+    }
+
+    private void initGUI()
+    {
+        setLayout(new MigLayout("fill,wrap 2", "[right][left]", "[][]"));
+
+        add(new JLabel("MDC-1200 ID:"));
+
+        MaskFormatter formatter = null;
+
+        try
+        {
+            //Mask: 4 digits
+            formatter = new MaskFormatter("####");
+        }
+        catch(Exception e)
+        {
+            //Do nothing, the mask was invalid
+        }
+
+        mTextField = new JFormattedTextField(formatter);
+        mTextField.getDocument().addDocumentListener(this);
+        mTextField.setToolTipText(HELP_TEXT);
+        add(mTextField, "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)
+            {
+                JOptionPane.showMessageDialog(MDC1200IDEditor.this,
+                    HELP_TEXT, "Help", JOptionPane.INFORMATION_MESSAGE);
+            }
+        });
+        add(help, "align left");
+    }
+
+    public MDC1200ID getMDC1200ID()
+    {
+        if(getItem() instanceof MDC1200ID)
+        {
+            return (MDC1200ID)getItem();
+        }
+
+        return null;
+    }
+
+    @Override
+    public void setItem(AliasID aliasID)
+    {
+        super.setItem(aliasID);
+
+        MDC1200ID mdc = getMDC1200ID();
+
+        if(mdc != null)
+        {
+            mTextField.setText(mdc.getIdent());
+        }
+
+        setModified(false);
+
+        repaint();
+    }
+
+    @Override
+    public void save()
+    {
+        MDC1200ID mdc = getMDC1200ID();
+
+        if(mdc != null)
+        {
+            mdc.setIdent(mTextField.getText());
+        }
+
+        setModified(false);
+    }
+}

src/main/java/io/github/dsheirer/alias/id/legacy/mobileID/MINEditor.java

@@ -15,7 +15,7 @@
  *     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.mobileID;
+package io.github.dsheirer.alias.id.legacy.mobileID;
 
 import io.github.dsheirer.alias.id.AliasID;
 import io.github.dsheirer.gui.editor.DocumentListenerEditor;

src/main/java/io/github/dsheirer/alias/id/legacy/mobileID/Min.java

@@ -15,7 +15,7 @@
  *     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.mobileID;
+package io.github.dsheirer.alias.id.legacy.mobileID;
 
 
 import com.fasterxml.jackson.dataformat.xml.annotation.JacksonXmlProperty;
@@ -52,7 +52,7 @@ public class Min extends AliasID
 
     public String toString()
     {
-        return "MIN: " + mMin;
+        return "MIN: " + (mMin != null ? mMin : "(empty)") + (isValid() ? "" : " **INVALID - USE TALKGROUP INSTEAD");
     }
 
     @Override

src/main/java/io/github/dsheirer/alias/id/legacy/mpt1327/MPT1327ID.java

@@ -1,21 +1,23 @@
-/*******************************************************************************
- *     SDR Trunk 
- *     Copyright (C) 2014 Dennis Sheirer
+/*
+ * ******************************************************************************
+ * 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.
+ * 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.
+ * 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.mpt1327;
+ * 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.legacy.mpt1327;
 
 
 import com.fasterxml.jackson.dataformat.xml.annotation.JacksonXmlProperty;
@@ -49,7 +51,7 @@ public class MPT1327ID extends AliasID
 
     public String toString()
     {
-        return "MPT-1327: " + mID;
+        return "MPT-1327: " + (mID != null ? mID : "(empty)") + " **INVALID - USE TALKGROUP INSTEAD**";
     }
 
     @Override

src/main/java/io/github/dsheirer/alias/id/legacy/mpt1327/MPT1327IDEditor.java

@@ -1,29 +1,35 @@
-/*******************************************************************************
- *     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.
- * 
- *     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.mpt1327;
+/*
+ * ******************************************************************************
+ * 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.
+ *
+ * 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.legacy.mpt1327;
 
 import io.github.dsheirer.alias.id.AliasID;
 import io.github.dsheirer.gui.editor.DocumentListenerEditor;
 import net.miginfocom.swing.MigLayout;
 
-import javax.swing.*;
+import javax.swing.JFormattedTextField;
+import javax.swing.JLabel;
+import javax.swing.JOptionPane;
+import javax.swing.JTextField;
 import javax.swing.text.MaskFormatter;
-import java.awt.*;
+import java.awt.Color;
+import java.awt.Cursor;
 import java.awt.event.MouseAdapter;
 import java.awt.event.MouseEvent;
 

src/main/java/io/github/dsheirer/alias/id/legacy/nonrecordable/NonRecordable.java

@@ -0,0 +1,53 @@
+/*
+ * ******************************************************************************
+ * 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.
+ *
+ * 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.legacy.nonrecordable;
+
+import com.fasterxml.jackson.dataformat.xml.annotation.JacksonXmlProperty;
+import io.github.dsheirer.alias.id.AliasID;
+import io.github.dsheirer.alias.id.AliasIDType;
+
+public class NonRecordable extends AliasID
+{
+    @JacksonXmlProperty(isAttribute = true, localName = "type", namespace = "http://www.w3.org/2001/XMLSchema-instance")
+    @Override
+    public AliasIDType getType()
+    {
+        return AliasIDType.NON_RECORDABLE;
+    }
+
+    @Override
+    public boolean isValid()
+    {
+        return true;
+    }
+
+    @Override
+    public boolean matches(AliasID id)
+    {
+        return false;
+    }
+
+    @Override
+    public String toString()
+    {
+        return "Audio Non-Recordable - **INVALID - USE RECORD INSTEAD**";
+    }
+}

src/main/java/io/github/dsheirer/alias/id/legacy/nonrecordable/NonRecordableEditor.java

@@ -0,0 +1,78 @@
+/*
+ * ******************************************************************************
+ * 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.
+ *
+ * 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.legacy.nonrecordable;
+
+import io.github.dsheirer.alias.id.AliasID;
+import io.github.dsheirer.gui.editor.DocumentListenerEditor;
+import net.miginfocom.swing.MigLayout;
+
+import javax.swing.JLabel;
+import javax.swing.JOptionPane;
+import java.awt.Color;
+import java.awt.Cursor;
+import java.awt.event.MouseAdapter;
+import java.awt.event.MouseEvent;
+
+public class NonRecordableEditor extends DocumentListenerEditor<AliasID>
+{
+    private static final long serialVersionUID = 1L;
+
+    private static final String HELP_TEXT = "<html>"
+        + "<h3>Audio Non-Recordable</h3>"
+        + "This identifies an alias as non-recordable.<br><br>"
+        + "The alias can still be monitored but associated audio will<br>"
+        + "not be recorded.<br><br>"
+        + "The default behavior when audio recording is enabled for a<br>"
+        + "channel is to record all aliases except any alias with a<br>"
+        + "non-recordable identifier";
+
+    public NonRecordableEditor(AliasID aliasID)
+    {
+        initGUI();
+
+        setItem(aliasID);
+    }
+
+    private void initGUI()
+    {
+        setLayout(new MigLayout("fill,wrap 1", "[]", "[][]"));
+
+        add(new JLabel("Non-Recordable"), "wrap");
+
+        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)
+            {
+                JOptionPane.showMessageDialog(NonRecordableEditor.this,
+                    HELP_TEXT, "Help", JOptionPane.INFORMATION_MESSAGE);
+            }
+        });
+        add(help, "align left");
+    }
+
+    @Override
+    public void save()
+    {
+    }
+}

src/main/java/io/github/dsheirer/alias/id/legacy/siteID/SiteID.java

@@ -15,7 +15,7 @@
  *     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.siteID;
+package io.github.dsheirer.alias.id.legacy.siteID;
 
 import com.fasterxml.jackson.dataformat.xml.annotation.JacksonXmlProperty;
 import io.github.dsheirer.alias.id.AliasID;
@@ -48,7 +48,7 @@ public class SiteID extends AliasID
 
     public String toString()
     {
-        return "Site: " + mSite;
+        return "Site: " + (mSite != null ? mSite : "(empty)") + (isValid() ? "" : " **NOT VALID**");
     }
 
     @Override

src/main/java/io/github/dsheirer/alias/id/legacy/siteID/SiteIDEditor.java

@@ -15,7 +15,7 @@
  *     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.siteID;
+package io.github.dsheirer.alias.id.legacy.siteID;
 
 import io.github.dsheirer.alias.id.AliasID;
 import io.github.dsheirer.gui.editor.DocumentListenerEditor;

src/main/java/io/github/dsheirer/alias/id/legacy/talkgroup/LegacyTalkgroupID.java

@@ -1,37 +1,39 @@
-/*******************************************************************************
- *     SDR Trunk 
- *     Copyright (C) 2014 Dennis Sheirer
+/*
+ * ******************************************************************************
+ * 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.
+ * 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.
+ * 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.talkgroup;
+ * 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.legacy.talkgroup;
 
 
 import com.fasterxml.jackson.dataformat.xml.annotation.JacksonXmlProperty;
 import io.github.dsheirer.alias.id.AliasID;
 import io.github.dsheirer.alias.id.AliasIDType;
 
-public class TalkgroupID extends AliasID
+public class LegacyTalkgroupID extends AliasID
 {
     private String mTalkgroup;
 
-    public TalkgroupID()
+    public LegacyTalkgroupID()
     {
         //No arg JAXB constructor
     }
 
-    public TalkgroupID(String talkgroup)
+    public LegacyTalkgroupID(String talkgroup)
     {
         mTalkgroup = talkgroup;
     }
@@ -57,7 +59,7 @@ public class TalkgroupID extends AliasID
     {
         StringBuilder sb = new StringBuilder();
 
-        sb.append("Talkgroup: " + mTalkgroup);
+        sb.append("Legacy Talkgroup:").append(mTalkgroup).append(" *Disabled - Please use Talkgroup instead");
 
         return sb.toString();
     }
@@ -67,9 +69,9 @@ public class TalkgroupID extends AliasID
     {
         boolean retVal = false;
 
-        if(id instanceof TalkgroupID)
+        if(id instanceof LegacyTalkgroupID)
         {
-            TalkgroupID tgid = (TalkgroupID)id;
+            LegacyTalkgroupID tgid = (LegacyTalkgroupID)id;
 
             //Create a pattern - replace * wildcards with regex single-char wildcard
             String pattern = mTalkgroup.replace("*", ".?");
@@ -84,6 +86,6 @@ public class TalkgroupID extends AliasID
     @Override
     public AliasIDType getType()
     {
-        return AliasIDType.TALKGROUP;
+        return AliasIDType.LEGACY_TALKGROUP;
     }
 }

src/main/java/io/github/dsheirer/alias/id/legacy/talkgroup/LegacyTalkgroupIDEditor.java

@@ -0,0 +1,121 @@
+/*
+ * ******************************************************************************
+ * 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.
+ *
+ * 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.legacy.talkgroup;
+
+import io.github.dsheirer.alias.id.AliasID;
+import io.github.dsheirer.gui.editor.DocumentListenerEditor;
+import net.miginfocom.swing.MigLayout;
+
+import javax.swing.JLabel;
+import javax.swing.JOptionPane;
+import javax.swing.JTextField;
+import java.awt.Color;
+import java.awt.Cursor;
+import java.awt.event.MouseAdapter;
+import java.awt.event.MouseEvent;
+
+public class LegacyTalkgroupIDEditor extends DocumentListenerEditor<AliasID>
+{
+    private static final long serialVersionUID = 1L;
+
+    private static final String HELP_TEXT =
+        "<html><h3>Talkgroup Identifier</h3>"
+            + "<b>P25:</b> 4 or 6 hex characters (e.g. <u>AB12</u> or <u>ABC123</u>)<br>"
+            + "<b>LTR:</b> A-HH-TTT where A=Area H=Home T=Talkgroup (<u>0-01-128</u>)<br>"
+            + "<b>Passport</b>: 5-digit number (<u>12345</u> or <u>00023</u>)<br>"
+            + "<br>"
+            + "<b>Wildcard:</b> use an asterisk (*) in place of each talkgroup digit (e.g. <u>0*1*5</u>)"
+            + "</html>";
+
+    private JTextField mTextField;
+
+    public LegacyTalkgroupIDEditor(AliasID aliasID)
+    {
+        initGUI();
+
+        setItem(aliasID);
+    }
+
+    private void initGUI()
+    {
+        setLayout(new MigLayout("fill,wrap 2", "[right][left]", "[][]"));
+
+        add(new JLabel("Talkgroup:"));
+
+        mTextField = new JTextField();
+        mTextField.getDocument().addDocumentListener(this);
+        mTextField.setToolTipText(HELP_TEXT);
+        add(mTextField, "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)
+            {
+                JOptionPane.showMessageDialog(LegacyTalkgroupIDEditor.this,
+                    HELP_TEXT, "Help", JOptionPane.INFORMATION_MESSAGE);
+            }
+        });
+        add(help, "align left");
+    }
+
+    public LegacyTalkgroupID getTalkgroupID()
+    {
+        if(getItem() instanceof LegacyTalkgroupID)
+        {
+            return (LegacyTalkgroupID)getItem();
+        }
+
+        return null;
+    }
+
+    @Override
+    public void setItem(AliasID aliasID)
+    {
+        super.setItem(aliasID);
+
+        LegacyTalkgroupID talkgroup = getTalkgroupID();
+
+        if(talkgroup != null)
+        {
+            mTextField.setText(talkgroup.getTalkgroup());
+        }
+
+        setModified(false);
+
+        repaint();
+    }
+
+    @Override
+    public void save()
+    {
+        LegacyTalkgroupID talkgroup = getTalkgroupID();
+
+        if(talkgroup != null)
+        {
+            talkgroup.setTalkgroup(mTextField.getText());
+        }
+
+        setModified(false);
+    }
+}

src/main/java/io/github/dsheirer/alias/id/legacy/uniqueID/UniqueID.java

@@ -15,7 +15,7 @@
  *     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.uniqueID;
+package io.github.dsheirer.alias.id.legacy.uniqueID;
 
 import com.fasterxml.jackson.dataformat.xml.annotation.JacksonXmlProperty;
 import io.github.dsheirer.alias.id.AliasID;
@@ -48,7 +48,7 @@ public class UniqueID extends AliasID
 
     public String toString()
     {
-        return "UniqueID: " + mUid;
+        return "UniqueID: " + mUid + " **INVALID - USE TALKGROUP INSTEAD";
     }
 
     @Override

src/main/java/io/github/dsheirer/alias/id/legacy/uniqueID/UniqueIDEditor.java

@@ -15,7 +15,7 @@
  *     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.uniqueID;
+package io.github.dsheirer.alias.id.legacy.uniqueID;
 
 import io.github.dsheirer.alias.id.AliasID;
 import io.github.dsheirer.gui.editor.DocumentListenerEditor;

src/main/java/io/github/dsheirer/alias/id/lojack/LoJackFunctionAndID.java

@@ -26,7 +26,7 @@ import io.github.dsheirer.module.decode.lj1200.LJ1200Message;
 public class LoJackFunctionAndID extends AliasID
 {
     private LJ1200Message.Function mFunction = LJ1200Message.Function.F0_UNKNOWN;
-    private String mID = "*****";
+    private String mID = null;
 
     public LoJackFunctionAndID()
     {
@@ -62,7 +62,8 @@ public class LoJackFunctionAndID extends AliasID
 
     public String toString()
     {
-        return "LoJack FUNC: " + mFunction.getLabel() + " ID:" + (mID == null ? "" : mID);
+        return "LoJack FUNCTION: " + mFunction.getLabel() +
+            " ID:" + (mID == null ? "" : mID) + (isValid() ? "" : " **NOT VALID**");
     }
 
     /**

src/main/java/io/github/dsheirer/alias/id/mdc/MDC1200IDEditor.java

@@ -1,127 +0,0 @@
-/*******************************************************************************
- *     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.
- * 
- *     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.mdc;
-
-import io.github.dsheirer.alias.id.AliasID;
-import io.github.dsheirer.gui.editor.DocumentListenerEditor;
-import net.miginfocom.swing.MigLayout;
-
-import javax.swing.*;
-import javax.swing.text.MaskFormatter;
-import java.awt.*;
-import java.awt.event.MouseAdapter;
-import java.awt.event.MouseEvent;
-
-public class MDC1200IDEditor extends DocumentListenerEditor<AliasID>
-{
-    private static final long serialVersionUID = 1L;
-
-    private static final String HELP_TEXT = "<html>"
-    		+ "<h3>MDC-1200 Identifier</h3>"
-    		+ "<b>MDC-1200:</b> four digit [0-9] value (e.g. <u>1234</u>)<br>"
-    		+ "<b>Wildcard:</b> use an asterisk (*) to wildcard individual<br>" 
-    		+ "digits (e.g. <u>123*</u> or <u>**34</u>)"
-    		+ "</html>";
-
-    private JTextField mTextField;
-
-	public MDC1200IDEditor( AliasID aliasID )
-	{
-		initGUI();
-		
-		setItem( aliasID );
-	}
-	
-	private void initGUI()
-	{
-		setLayout( new MigLayout( "fill,wrap 2", "[right][left]", "[][]" ) );
-
-		add( new JLabel( "MDC-1200 ID:" ) );
-
-		MaskFormatter formatter = null;
-
-		try
-		{
-			//Mask: 4 digits
-			formatter = new MaskFormatter( "####" );
-		}
-		catch( Exception e )
-		{
-			//Do nothing, the mask was invalid
-		}
-		
-		mTextField = new JFormattedTextField( formatter );
-		mTextField.getDocument().addDocumentListener( this );
-		mTextField.setToolTipText( HELP_TEXT );
-		add( mTextField, "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 )
-			{
-				JOptionPane.showMessageDialog( MDC1200IDEditor.this, 
-					HELP_TEXT, "Help", JOptionPane.INFORMATION_MESSAGE );
-			}
-		} );
-		add( help, "align left" );
-	}
-	
-	public MDC1200ID getMDC1200ID()
-	{
-		if( getItem() instanceof MDC1200ID )
-		{
-			return (MDC1200ID)getItem();
-		}
-		
-		return null;
-	}
-
-	@Override
-	public void setItem( AliasID aliasID )
-	{
-		super.setItem( aliasID );
-		
-		MDC1200ID mdc = getMDC1200ID();
-		
-		if( mdc != null )
-		{
-			mTextField.setText( mdc.getIdent() );
-		}
-		
-		setModified( false );
-		
-		repaint();
-	}
-
-	@Override
-	public void save()
-	{
-		MDC1200ID mdc = getMDC1200ID();
-		
-		if( mdc != null )
-		{
-			mdc.setIdent( mTextField.getText() );
-		}
-		
-		setModified( false );
-	}
-}

src/main/java/io/github/dsheirer/alias/id/nonrecordable/NonRecordable.java

@@ -1,33 +0,0 @@
-package io.github.dsheirer.alias.id.nonrecordable;
-
-import com.fasterxml.jackson.dataformat.xml.annotation.JacksonXmlProperty;
-import io.github.dsheirer.alias.id.AliasID;
-import io.github.dsheirer.alias.id.AliasIDType;
-
-public class NonRecordable extends AliasID
-{
-    @JacksonXmlProperty(isAttribute = true, localName = "type", namespace = "http://www.w3.org/2001/XMLSchema-instance")
-    @Override
-    public AliasIDType getType()
-    {
-        return AliasIDType.NON_RECORDABLE;
-    }
-
-    @Override
-    public boolean isValid()
-    {
-        return true;
-    }
-
-    @Override
-    public boolean matches(AliasID id)
-    {
-        return false;
-    }
-
-    @Override
-    public String toString()
-    {
-        return "Audio Non-Recordable";
-    }
-}

src/main/java/io/github/dsheirer/alias/id/nonrecordable/NonRecordableEditor.java

@@ -1,74 +0,0 @@
-/*******************************************************************************
- *     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.
- * 
- *     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.nonrecordable;
-
-import io.github.dsheirer.alias.id.AliasID;
-import io.github.dsheirer.gui.editor.DocumentListenerEditor;
-import net.miginfocom.swing.MigLayout;
-
-import javax.swing.*;
-import java.awt.*;
-import java.awt.event.MouseAdapter;
-import java.awt.event.MouseEvent;
-
-public class NonRecordableEditor extends DocumentListenerEditor<AliasID>
-{
-    private static final long serialVersionUID = 1L;
-
-    private static final String HELP_TEXT = "<html>"
-    		+ "<h3>Audio Non-Recordable</h3>"
-    		+ "This identifies an alias as non-recordable.<br><br>"
-    		+ "The alias can still be monitored but associated audio will<br>"
-    		+ "not be recorded.<br><br>"
-    		+ "The default behavior when audio recording is enabled for a<br>"
-    		+ "channel is to record all aliases except any alias with a<br>"
-    		+ "non-recordable identifier";
-
-	public NonRecordableEditor( AliasID aliasID )
-	{
-		initGUI();
-		
-		setItem( aliasID );
-	}
-	
-	private void initGUI()
-	{
-		setLayout( new MigLayout( "fill,wrap 1", "[]", "[][]" ) );
-
-		add( new JLabel( "Non-Recordable" ), "wrap" );
-		
-		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 )
-			{
-				JOptionPane.showMessageDialog( NonRecordableEditor.this, 
-					HELP_TEXT, "Help", JOptionPane.INFORMATION_MESSAGE );
-			}
-		} );
-		add( help, "align left" );
-	}
-	
-	@Override
-	public void save()
-	{
-	}
-}

src/main/java/io/github/dsheirer/alias/id/record/Record.java

@@ -0,0 +1,56 @@
+/*
+ * ******************************************************************************
+ * 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.
+ *
+ * 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.record;
+
+import com.fasterxml.jackson.dataformat.xml.annotation.JacksonXmlProperty;
+import io.github.dsheirer.alias.id.AliasID;
+import io.github.dsheirer.alias.id.AliasIDType;
+
+/**
+ * Alias identifier to flag an alias for audio recording
+ */
+public class Record extends AliasID
+{
+    @JacksonXmlProperty(isAttribute = true, localName = "type", namespace = "http://www.w3.org/2001/XMLSchema-instance")
+    @Override
+    public AliasIDType getType()
+    {
+        return AliasIDType.RECORD;
+    }
+
+    @Override
+    public boolean isValid()
+    {
+        return true;
+    }
+
+    @Override
+    public boolean matches(AliasID id)
+    {
+        return false;
+    }
+
+    @Override
+    public String toString()
+    {
+        return "Record Audio";
+    }
+}

src/main/java/io/github/dsheirer/alias/id/record/RecordEditor.java

@@ -0,0 +1,73 @@
+/*
+ * ******************************************************************************
+ * 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.
+ *
+ * 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.record;
+
+import io.github.dsheirer.alias.id.AliasID;
+import io.github.dsheirer.gui.editor.DocumentListenerEditor;
+import net.miginfocom.swing.MigLayout;
+
+import javax.swing.JLabel;
+import javax.swing.JOptionPane;
+import java.awt.Color;
+import java.awt.Cursor;
+import java.awt.event.MouseAdapter;
+import java.awt.event.MouseEvent;
+
+public class RecordEditor extends DocumentListenerEditor<AliasID>
+{
+    private static final long serialVersionUID = 1L;
+
+    private static final String HELP_TEXT = "<html>"
+    		+ "<h3>Record Audio</h3>"
+    		+ "Any audio associated with this alias will be recorded.<br><br>";
+
+	public RecordEditor(AliasID aliasID )
+	{
+		initGUI();
+		
+		setItem( aliasID );
+	}
+	
+	private void initGUI()
+	{
+		setLayout( new MigLayout( "fill,wrap 1", "[]", "[][]" ) );
+
+		add( new JLabel( "Record Audio" ), "wrap" );
+		
+		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 )
+			{
+				JOptionPane.showMessageDialog( RecordEditor.this,
+					HELP_TEXT, "Help", JOptionPane.INFORMATION_MESSAGE );
+			}
+		} );
+		add( help, "align left" );
+	}
+	
+	@Override
+	public void save()
+	{
+	}
+}

src/main/java/io/github/dsheirer/alias/id/talkgroup/Talkgroup.java

@@ -0,0 +1,114 @@
+/*
+ * ******************************************************************************
+ * 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.
+ *
+ * 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.talkgroup;
+
+
+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 talkgroup identifier with protocol.
+ */
+public class Talkgroup extends AliasID
+{
+    private Protocol mProtocol = Protocol.UNKNOWN;
+    private int mValue;
+
+    public Talkgroup()
+    {
+        //No arg JAXB constructor
+    }
+
+    public Talkgroup(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("Talkgroup:").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 Talkgroup)
+        {
+            Talkgroup tgid = (Talkgroup)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.TALKGROUP;
+    }
+}

src/main/java/io/github/dsheirer/alias/id/talkgroup/TalkgroupEditor.java

@@ -0,0 +1,228 @@
+/*
+ * ******************************************************************************
+ * 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.
+ *
+ * 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.talkgroup;
+
+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 TalkgroupEditor extends DocumentListenerEditor<AliasID>
+{
+    private final static Logger mLog = LoggerFactory.getLogger(TalkgroupEditor.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 mTalkgroupField;
+
+
+    public TalkgroupEditor(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.TALKGROUP_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:"));
+
+        mTalkgroupField = new JFormattedTextField(mMaskFormatter);
+        mTalkgroupField.getDocument().addDocumentListener(this);
+        add(mTalkgroupField, "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)
+            {
+                TalkgroupFormat talkgroupFormat = TalkgroupFormat.get(getCurrentProtocol());
+                JOptionPane.showMessageDialog(TalkgroupEditor.this,
+                    talkgroupFormat.getValidRangeHelpText(), "Help", JOptionPane.INFORMATION_MESSAGE);
+            }
+        });
+        add(help, "align left");
+    }
+
+    private void updateEditor(Protocol protocol)
+    {
+        TalkgroupFormat mask = TalkgroupFormat.get(protocol);
+        int currentValue = 0;
+        Talkgroup talkgroup = getTalkgroup();
+
+        if(talkgroup != null)
+        {
+            currentValue = talkgroup.getValue();
+        }
+
+        try
+        {
+            mTalkgroupField.setValue(null);
+            mTalkgroupField.setToolTipText(mask.getValidRangeHelpText());
+            mMaskFormatter.setMask(mask.getMask());
+            if(mask.getMask().contains("*"))
+            {
+                mMaskFormatter.setValidCharacters(VALID_CHARACTERS_FOR_ASTERISK_MASKS);
+            }
+            mTalkgroupField.setValue(TalkgroupFormatter.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 Talkgroup getTalkgroup()
+    {
+        if(getItem() instanceof Talkgroup)
+        {
+            return (Talkgroup)getItem();
+        }
+
+        return null;
+    }
+
+    @Override
+    public void setItem(AliasID aliasID)
+    {
+        super.setItem(aliasID);
+
+        Talkgroup talkgroup = getTalkgroup();
+
+        if(talkgroup != null)
+        {
+            Protocol currentProtocol = getCurrentProtocol();
+            if(currentProtocol == talkgroup.getProtocol())
+            {
+                updateEditor(talkgroup.getProtocol());
+            }
+            mComboProtocol.getModel().setSelectedItem(talkgroup.getProtocol());
+
+            String formatted = TalkgroupFormatter.format(talkgroup.getProtocol(), talkgroup.getValue());
+            mTalkgroupField.setValue(formatted);
+        }
+        else
+        {
+            mComboProtocol.getModel().setSelectedItem(Protocol.UNKNOWN);
+            mTalkgroupField.setValue(TalkgroupFormatter.format(getCurrentProtocol(), 0));
+        }
+
+        setModified(false);
+
+        repaint();
+    }
+
+    @Override
+    public void save()
+    {
+        Talkgroup talkgroup = getTalkgroup();
+
+        if(talkgroup != null)
+        {
+            Protocol protocol = mComboProtocol.getItemAt(mComboProtocol.getSelectedIndex());
+
+            int value = -1;
+
+            try
+            {
+                value = TalkgroupFormatter.parse(protocol, mTalkgroupField.getText());
+            }
+            catch(ParseException pe)
+            {
+                //ignore ... value is still -1 and outside valid value range
+            }
+
+            TalkgroupFormat mask = TalkgroupFormat.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 [" + mTalkgroupField.getText() + "].  " + protocol.name() +
+                    " valid range is [" + mask.getValidRangeDescription() + "]";
+
+                JOptionPane.showMessageDialog(TalkgroupEditor.this, message, "Invalid Talkgroup Value",
+                    JOptionPane.ERROR_MESSAGE);
+            }
+            else
+            {
+                talkgroup.setValue(value);
+            }
+
+            talkgroup.setProtocol(protocol);
+        }
+
+        setModified(false);
+    }
+}

src/main/java/io/github/dsheirer/alias/id/talkgroup/TalkgroupFormat.java

@@ -0,0 +1,124 @@
+/*
+ * ******************************************************************************
+ * 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.
+ *
+ * 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.talkgroup;
+
+import io.github.dsheirer.protocol.Protocol;
+
+/**
+ * Talkgroup 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 TalkgroupFormat
+{
+    APCO25("********", 1, 0xFFFFFF, "1 to 16,777,215",
+        "<html>APCO25 valid range is 1 to 65,535(talkgroup)<br>or 1 to 16,777,215 (radio ID)"),
+    FLEETSYNC("###-####", 1, 0x7FFFFF, "001-0001 to 127-8192",
+        "<html>Fleetsync valid ranges are 1-127(prefix)<br>and 1-8192(ident) (ie. 001-0001 to 127-8192)"),
+    LTR("##-###", 257, 5375, "01-001 to 20-255",
+        "<html>LTR valid ranges are 1-20(repeater) and 1-255(talkgroup) (ie. 01-001 to 20-255)"),
+    MDC1200("*****", 1, 0xFFFF, "1 to 65,535",
+        "MDC-1200 valid value range is 1-65,535"),
+    MPT1327("###-####", 1, 0x7FFFFF, "000-0001 to 127-8192",
+        "<html>MPT-1327 valid ranges are 0-127(prefix)<br>and 1-8192(ident) (ie. 000-0001 to 127-8192)"),
+    PASSPORT("*****", 1, 0xFFFF, "1 to 65,535",
+        "Passport valid value range is 1-65,535"),
+    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;
+
+    TalkgroupFormat(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;
+    }
+
+    /**
+     * 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 TalkgroupFormat get(Protocol prococol)
+    {
+        switch(prococol)
+        {
+            case APCO25:
+                return APCO25;
+            case FLEETSYNC:
+                return FLEETSYNC;
+            case LTR:
+            case LTR_NET:
+            case LTR_STANDARD:
+                return LTR;
+            case MDC1200:
+                return MDC1200;
+            case MPT1327:
+                return MPT1327;
+            case PASSPORT:
+                return PASSPORT;
+            default:
+                return UNKNOWN;
+        }
+    }
+}

src/main/java/io/github/dsheirer/alias/id/talkgroup/TalkgroupFormatter.java

@@ -0,0 +1,93 @@
+/*
+ * ******************************************************************************
+ * 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.
+ *
+ * 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.talkgroup;
+
+import io.github.dsheirer.preference.identifier.talkgroup.APCO25TalkgroupFormatter;
+import io.github.dsheirer.preference.identifier.talkgroup.FleetsyncTalkgroupFormatter;
+import io.github.dsheirer.preference.identifier.talkgroup.IntegerFormatter;
+import io.github.dsheirer.preference.identifier.talkgroup.LTRTalkgroupFormatter;
+import io.github.dsheirer.preference.identifier.talkgroup.MDC1200TalkgroupFormatter;
+import io.github.dsheirer.preference.identifier.talkgroup.MPT1327TalkgroupFormatter;
+import io.github.dsheirer.preference.identifier.talkgroup.PassportTalkgroupFormatter;
+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 talkgroup values and parsing of formatted talkgroup values.
+ */
+public class TalkgroupFormatter
+{
+    private final static Logger mLog = LoggerFactory.getLogger(TalkgroupFormatter.class);
+    private static Map<Protocol,IntegerFormatter> mFormatterMap = new HashMap<>();
+
+    static
+    {
+        mFormatterMap.put(Protocol.APCO25, new APCO25TalkgroupFormatter());
+        mFormatterMap.put(Protocol.FLEETSYNC, new FleetsyncTalkgroupFormatter());
+        LTRTalkgroupFormatter ltr = new LTRTalkgroupFormatter();
+        mFormatterMap.put(Protocol.LTR, ltr);
+        mFormatterMap.put(Protocol.LTR_NET, ltr);
+        mFormatterMap.put(Protocol.LTR_STANDARD, ltr);
+        mFormatterMap.put(Protocol.MDC1200, new MDC1200TalkgroupFormatter());
+        mFormatterMap.put(Protocol.MPT1327, new MPT1327TalkgroupFormatter());
+        mFormatterMap.put(Protocol.PASSPORT, new PassportTalkgroupFormatter());
+        mFormatterMap.put(Protocol.UNKNOWN, new IntegerFormatter());
+    }
+
+    public TalkgroupFormatter()
+    {
+    }
+
+    /**
+     * 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);
+    }
+}

src/main/java/io/github/dsheirer/alias/id/talkgroup/TalkgroupIDEditor.java

@@ -1,116 +0,0 @@
-/*******************************************************************************
- *     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.
- * 
- *     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.talkgroup;
-
-import io.github.dsheirer.alias.id.AliasID;
-import io.github.dsheirer.gui.editor.DocumentListenerEditor;
-import net.miginfocom.swing.MigLayout;
-
-import javax.swing.*;
-import java.awt.*;
-import java.awt.event.MouseAdapter;
-import java.awt.event.MouseEvent;
-
-public class TalkgroupIDEditor extends DocumentListenerEditor<AliasID>
-{
-    private static final long serialVersionUID = 1L;
-
-    private static final String HELP_TEXT = 
-    		"<html><h3>Talkgroup Identifier</h3>"
-    		+ "<b>P25:</b> 4 or 6 hex characters (e.g. <u>AB12</u> or <u>ABC123</u>)<br>"
-    		+ "<b>LTR:</b> A-HH-TTT where A=Area H=Home T=Talkgroup (<u>0-01-128</u>)<br>"
-    		+ "<b>Passport</b>: 5-digit number (<u>12345</u> or <u>00023</u>)<br>"
-    		+ "<br>"
-            + "<b>Wildcard:</b> use an asterisk (*) in place of each talkgroup digit (e.g. <u>0*1*5</u>)"
-    		+ "</html>";
-
-    private JTextField mTextField;
-
-	public TalkgroupIDEditor( AliasID aliasID )
-	{
-		initGUI();
-		
-		setItem( aliasID );
-	}
-	
-	private void initGUI()
-	{
-		setLayout( new MigLayout( "fill,wrap 2", "[right][left]", "[][]" ) );
-
-		add( new JLabel( "Talkgroup:" ) );
-		
-		mTextField = new JTextField();
-		mTextField.getDocument().addDocumentListener( this );
-		mTextField.setToolTipText( HELP_TEXT );
-		add( mTextField, "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 )
-			{
-				JOptionPane.showMessageDialog( TalkgroupIDEditor.this, 
-					HELP_TEXT, "Help", JOptionPane.INFORMATION_MESSAGE );
-			}
-		} );
-		add( help, "align left" );
-	}
-	
-	public TalkgroupID getTalkgroupID()
-	{
-		if( getItem() instanceof TalkgroupID )
-		{
-			return (TalkgroupID)getItem();
-		}
-		
-		return null;
-	}
-
-	@Override
-	public void setItem( AliasID aliasID )
-	{
-		super.setItem( aliasID );
-		
-		TalkgroupID talkgroup = getTalkgroupID();
-		
-		if( talkgroup != null )
-		{
-			mTextField.setText( talkgroup.getTalkgroup() );
-		}
-		
-		setModified( false );
-		
-		repaint();
-	}
-
-	@Override
-	public void save()
-	{
-		TalkgroupID talkgroup = getTalkgroupID();
-		
-		if( talkgroup != null )
-		{
-			talkgroup.setTalkgroup( mTextField.getText() );
-		}
-		
-		setModified( false );
-	}
-}

src/main/java/io/github/dsheirer/alias/id/talkgroup/TalkgroupRange.java

@@ -0,0 +1,149 @@
+/*
+ * ******************************************************************************
+ * 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.
+ *
+ * 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.talkgroup;
+
+
+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 talkgroup identifier range of values with protocol.
+ */
+public class TalkgroupRange extends AliasID
+{
+    private Protocol mProtocol = Protocol.UNKNOWN;
+    private int mMinTalkgroup;
+    private int mMaxTalkgroup;
+
+    public TalkgroupRange()
+    {
+        //No arg JAXB constructor
+    }
+
+    /**
+     * Creates a talkgroup range of from - to talkgroup values (inclusive) for the specified protocol
+     * @param protocol for the talkgroup range
+     * @param minTalkgroup starting or minimum talkgroup value
+     * @param maxTalkgroup ending or maximum talkgroup value
+     */
+    public TalkgroupRange(Protocol protocol, int minTalkgroup, int maxTalkgroup)
+    {
+        mProtocol = protocol;
+        mMinTalkgroup = minTalkgroup;
+        mMaxTalkgroup = maxTalkgroup;
+    }
+
+    @JacksonXmlProperty(isAttribute = true, localName = "min")
+    public int getMinTalkgroup()
+    {
+        return mMinTalkgroup;
+    }
+
+    public void setMinTalkgroup(int minTalkgroup)
+    {
+        mMinTalkgroup = minTalkgroup;
+    }
+
+    @JacksonXmlProperty(isAttribute = true, localName = "max")
+    public int getMaxTalkgroup()
+    {
+        return mMaxTalkgroup;
+    }
+
+    public void setMaxTalkgroup(int maxTalkgroup)
+    {
+        mMaxTalkgroup = maxTalkgroup;
+    }
+
+    @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() <= mMinTalkgroup &&
+               mMinTalkgroup <= talkgroupFormat.getMaximumValidValue() &&
+               talkgroupFormat.getMinimumValidValue() <= mMaxTalkgroup &&
+               mMaxTalkgroup <= talkgroupFormat.getMaximumValidValue();
+    }
+
+    public String toString()
+    {
+        StringBuilder sb = new StringBuilder();
+
+        sb.append("Talkgroup Range:").append(TalkgroupFormatter.format(mProtocol, mMinTalkgroup));
+        sb.append(" to ").append(TalkgroupFormatter.format(mProtocol, mMaxTalkgroup));
+        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 TalkgroupRange)
+        {
+            TalkgroupRange tgid = (TalkgroupRange)id;
+            return (getProtocol() == tgid.getProtocol()) &&
+                (getMinTalkgroup() == tgid.getMinTalkgroup()) &&
+                (getMaxTalkgroup() == tgid.getMaxTalkgroup());
+        }
+
+        return false;
+    }
+
+    /**
+     * Indicates if this talkgroup range contains/includes the talkgroup value
+     * @param talkgroupValue
+     * @return
+     */
+    public boolean contains(int talkgroupValue)
+    {
+        return getMinTalkgroup() <= talkgroupValue && talkgroupValue <= getMaxTalkgroup();
+    }
+
+    @JacksonXmlProperty(isAttribute = true, localName = "type", namespace = "http://www.w3.org/2001/XMLSchema-instance")
+    @Override
+    public AliasIDType getType()
+    {
+        return AliasIDType.TALKGROUP_RANGE;
+    }
+}

src/main/java/io/github/dsheirer/alias/id/talkgroup/TalkgroupRangeEditor.java

@@ -0,0 +1,263 @@
+/*
+ * ******************************************************************************
+ * 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.
+ *
+ * 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.talkgroup;
+
+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 TalkgroupRangeEditor extends DocumentListenerEditor<AliasID>
+{
+    private final static Logger mLog = LoggerFactory.getLogger(TalkgroupRangeEditor.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 mMinTalkgroupField;
+    private JFormattedTextField mMaxTalkgroupField;
+
+    public TalkgroupRangeEditor(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.TALKGROUP_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:"));
+
+        mMinTalkgroupField = new JFormattedTextField(mMaskFormatter);
+        mMinTalkgroupField.getDocument().addDocumentListener(this);
+        add(mMinTalkgroupField, "growx,push");
+
+        add(new JLabel("Max:"));
+
+        mMaxTalkgroupField = new JFormattedTextField(mMaskFormatter);
+        mMaxTalkgroupField.getDocument().addDocumentListener(this);
+        add(mMaxTalkgroupField, "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)
+            {
+                TalkgroupFormat talkgroupFormat = TalkgroupFormat.get(getCurrentProtocol());
+                JOptionPane.showMessageDialog(TalkgroupRangeEditor.this,
+                    talkgroupFormat.getValidRangeHelpText(), "Help", JOptionPane.INFORMATION_MESSAGE);
+            }
+        });
+        add(help, "align left");
+    }
+
+    private void updateEditor(Protocol protocol)
+    {
+        TalkgroupFormat mask = TalkgroupFormat.get(protocol);
+        int currentMinValue = 0;
+        int currentMaxValue = 0;
+        TalkgroupRange talkgroupRange = getTalkgroupRange();
+
+        if(talkgroupRange != null)
+        {
+            currentMinValue = talkgroupRange.getMinTalkgroup();
+            currentMaxValue = talkgroupRange.getMaxTalkgroup();
+        }
+
+        try
+        {
+            mMinTalkgroupField.setValue(null);
+            mMaxTalkgroupField.setValue(null);
+
+            mMinTalkgroupField.setToolTipText(mask.getValidRangeHelpText());
+            mMaxTalkgroupField.setToolTipText(mask.getValidRangeHelpText());
+            mMaskFormatter.setMask(mask.getMask());
+            if(mask.getMask().contains("*"))
+            {
+                mMaskFormatter.setValidCharacters(VALID_CHARACTERS_FOR_ASTERISK_MASKS);
+            }
+
+            mMinTalkgroupField.setValue(TalkgroupFormatter.format(protocol, currentMinValue));
+            mMaxTalkgroupField.setValue(TalkgroupFormatter.format(protocol, currentMaxValue));
+        }
+        catch(ParseException pe)
+        {
+            mLog.error("Error applying talkgroup editor mask to mask formatter [" + mask.getMask() + "]");
+        }
+    }
+
+    private Protocol getCurrentProtocol()
+    {
+        return mComboProtocol.getItemAt(mComboProtocol.getSelectedIndex());
+    }
+
+
+
+    public TalkgroupRange getTalkgroupRange()
+    {
+        if(getItem() instanceof TalkgroupRange)
+        {
+            return (TalkgroupRange)getItem();
+        }
+
+        return null;
+    }
+
+    @Override
+    public void setItem(AliasID aliasID)
+    {
+        super.setItem(aliasID);
+
+        TalkgroupRange talkgroupRange = getTalkgroupRange();
+
+        if(talkgroupRange != null)
+        {
+            mComboProtocol.getModel().setSelectedItem(talkgroupRange.getProtocol());
+            String minFormatted = TalkgroupFormatter.format(talkgroupRange.getProtocol(), talkgroupRange.getMinTalkgroup());
+            mMinTalkgroupField.setValue(minFormatted);
+            String maxFormatted = TalkgroupFormatter.format(talkgroupRange.getProtocol(), talkgroupRange.getMaxTalkgroup());
+            mMaxTalkgroupField.setValue(maxFormatted);
+        }
+        else
+        {
+            mComboProtocol.getModel().setSelectedItem(Protocol.UNKNOWN);
+            mMinTalkgroupField.setValue(TalkgroupFormatter.format(getCurrentProtocol(), 0));
+            mMaxTalkgroupField.setValue(TalkgroupFormatter.format(getCurrentProtocol(), 0));
+        }
+
+        setModified(false);
+
+        repaint();
+    }
+
+    @Override
+    public void save()
+    {
+        TalkgroupRange talkgroupRange = getTalkgroupRange();
+
+        if(talkgroupRange != null)
+        {
+            Protocol protocol = mComboProtocol.getItemAt(mComboProtocol.getSelectedIndex());
+            talkgroupRange.setProtocol(protocol);
+
+            int minValue = -1;
+            int maxValue = -1;
+
+            try
+            {
+                minValue = TalkgroupFormatter.parse(protocol, mMinTalkgroupField.getText());
+            }
+            catch(ParseException pe)
+            {
+                //ignore ... value is still -1 and outside valid value range
+            }
+
+            try
+            {
+                maxValue = TalkgroupFormatter.parse(protocol, mMaxTalkgroupField.getText());
+            }
+            catch(ParseException pe)
+            {
+                //ignore ... value is still -1 and outside valid value range
+            }
+
+            TalkgroupFormat mask = TalkgroupFormat.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 [" + mMinTalkgroupField.getText() + "].  " + protocol.name() +
+                    " valid range is [" + mask.getValidRangeDescription() + "]";
+
+                JOptionPane.showMessageDialog(TalkgroupRangeEditor.this, message,
+                    "Invalid Talkgroup Value", JOptionPane.ERROR_MESSAGE);
+            }
+            else
+            {
+                talkgroupRange.setMinTalkgroup(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 [" + mMaxTalkgroupField.getText() + "].  " + protocol.name() +
+                    " valid range is [" + mask.getValidRangeDescription() + "]";
+
+                JOptionPane.showMessageDialog(TalkgroupRangeEditor.this, message,
+                    "Invalid Talkgroup Value", JOptionPane.ERROR_MESSAGE);
+            }
+            else
+            {
+                talkgroupRange.setMaxTalkgroup(maxValue);
+            }
+
+            talkgroupRange.setProtocol(protocol);
+        }
+
+        setModified(false);
+    }
+}

src/main/java/io/github/dsheirer/audio/AbstractAudioModule.java

@@ -0,0 +1,111 @@
+/*
+ * ******************************************************************************
+ * 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.
+ *
+ * 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.audio;
+
+import io.github.dsheirer.audio.squelch.ISquelchStateListener;
+import io.github.dsheirer.identifier.IdentifierUpdateListener;
+import io.github.dsheirer.identifier.IdentifierUpdateNotification;
+import io.github.dsheirer.identifier.MutableIdentifierCollection;
+import io.github.dsheirer.module.Module;
+import io.github.dsheirer.sample.Listener;
+import io.github.dsheirer.sample.buffer.ReusableAudioPacket;
+
+/**
+ * Base audio module implementation.
+ */
+public abstract class AbstractAudioModule extends Module implements IAudioPacketProvider, IdentifierUpdateListener,
+    ISquelchStateListener
+{
+    //Static unique audio channel identifier.
+    private static int AUDIO_CHANNEL_ID_GENERATOR = 1;
+
+    private int mAudioChannelId = AUDIO_CHANNEL_ID_GENERATOR++;
+    private Listener<ReusableAudioPacket> mAudioPacketListener;
+    private MutableIdentifierCollection mIdentifierCollection = new MutableIdentifierCollection();
+
+    /**
+     * Constructs an abstract audio module
+     */
+    public AbstractAudioModule()
+    {
+    }
+
+    /**
+     * Unique channel identifier for use in tagging audio packets with an audio channel ID so that they can
+     * be identified within a combined audio packet stream
+     */
+    public int getAudioChannelId()
+    {
+        return mAudioChannelId;
+    }
+
+    /**
+     * Receive updated identifiers from decoder state(s).
+     */
+    @Override
+    public Listener<IdentifierUpdateNotification> getIdentifierUpdateListener()
+    {
+        return mIdentifierCollection;
+    }
+
+    /**
+     * Identifier collection containing the current set of identifiers received from the decoder state(s).
+     */
+    public MutableIdentifierCollection getIdentifierCollection()
+    {
+        return mIdentifierCollection;
+    }
+
+    /**
+     * Registers an audio packet listener to receive the output from this audio module.
+     */
+    @Override
+    public void setAudioPacketListener(Listener<ReusableAudioPacket> listener)
+    {
+        mAudioPacketListener = listener;
+    }
+
+    /**
+     * Unregisters the audio packet listener from receiving audio packets from this module.
+     */
+    @Override
+    public void removeAudioPacketListener()
+    {
+        mAudioPacketListener = null;
+    }
+
+    /**
+     * Registered listener for receiving audio packets produced by this module
+     */
+    public Listener<ReusableAudioPacket> getAudioPacketListener()
+    {
+        return mAudioPacketListener;
+    }
+
+    /**
+     * Indicates if there is a listener registered to receive audio packets from this audio module.
+     */
+    public boolean hasAudioPacketListener()
+    {
+        return mAudioPacketListener != null;
+    }
+
+}

src/main/java/io/github/dsheirer/audio/AudioMetadataProcessor.java

@@ -0,0 +1,85 @@
+/*
+ * ******************************************************************************
+ * 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.
+ *
+ * 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.audio;
+
+import io.github.dsheirer.alias.AliasList;
+import io.github.dsheirer.alias.AliasModel;
+import io.github.dsheirer.sample.buffer.ReusableAudioPacket;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import java.util.HashMap;
+import java.util.Map;
+import java.util.Set;
+import java.util.TreeSet;
+
+/**
+ * Processes audio packets to assign attributes to each packet based on alias list settings.  Updates the
+ * monitoring, recording and streaming attributes.
+ */
+public class AudioMetadataProcessor
+{
+    private static final Logger mLog = LoggerFactory.getLogger(AudioMetadataProcessor.class);
+    private AliasModel mAliasModel;
+    private Map<Integer, AliasList> mAliasListMap = new HashMap<>();
+    private Set<Integer> mAliasListRetrievedSet = new TreeSet<>();
+
+    public AudioMetadataProcessor(AliasModel aliasModel)
+    {
+        mAliasModel = aliasModel;
+    }
+
+    public void process(ReusableAudioPacket audioPacket)
+    {
+        if(audioPacket.hasIdentifierCollection() && audioPacket.getIdentifierCollection().hasAliasListConfiguration())
+        {
+            AliasList aliasList = null;
+
+            if(mAliasListRetrievedSet.contains(audioPacket.getAudioChannelId()))
+            {
+                aliasList = mAliasListMap.get(audioPacket.getAudioChannelId());
+            }
+            else
+            {
+                aliasList = mAliasModel.getAliasList(audioPacket.getIdentifierCollection().getAliasListConfiguration());
+
+                if(aliasList != null)
+                {
+                    mAliasListMap.put(audioPacket.getAudioChannelId(), aliasList);
+                    mAliasListRetrievedSet.add(audioPacket.getAudioChannelId());
+                }
+            }
+
+            if(aliasList != null)
+            {
+                audioPacket.addBroadcastChannels(aliasList.getBroadcastChannels(audioPacket.getIdentifierCollection()));
+                audioPacket.setMonitoringPriority(aliasList.getAudioPlaybackPriority(audioPacket.getIdentifierCollection()));
+
+                //If the audio packet is already marked recordable, leave it alone, otherwise attempt to determine
+                //if we should record the audio packet from the aliased identifiers
+                if(!audioPacket.isRecordable())
+                {
+                    audioPacket.setRecordable(aliasList.isRecordable(audioPacket.getIdentifierCollection()));
+                }
+            }
+        }
+    }
+}

src/main/java/io/github/dsheirer/audio/AudioModule.java

@@ -1,33 +1,34 @@
-/*******************************************************************************
- * sdr-trunk
- * Copyright (C) 2014-2018 Dennis Sheirer
+/*
+ * ******************************************************************************
+ * 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.
+ * 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.
+ * 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/>
- *
- ******************************************************************************/
+ * 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.audio;
 
-import io.github.dsheirer.audio.squelch.ISquelchStateListener;
 import io.github.dsheirer.audio.squelch.SquelchState;
-import io.github.dsheirer.channel.metadata.Metadata;
 import io.github.dsheirer.dsp.filter.design.FilterDesignException;
 import io.github.dsheirer.dsp.filter.fir.FIRFilterSpecification;
 import io.github.dsheirer.dsp.filter.fir.real.RealFIRFilter2;
 import io.github.dsheirer.dsp.filter.fir.remez.RemezFIRFilterDesigner;
-import io.github.dsheirer.module.Module;
 import io.github.dsheirer.sample.Listener;
 import io.github.dsheirer.sample.buffer.IReusableBufferListener;
 import io.github.dsheirer.sample.buffer.ReusableAudioPacket;
 import io.github.dsheirer.sample.buffer.ReusableAudioPacketQueue;
-import io.github.dsheirer.sample.buffer.ReusableBuffer;
+import io.github.dsheirer.sample.buffer.ReusableFloatBuffer;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -39,12 +40,10 @@ import org.slf4j.LoggerFactory;
  *
  * This class is designed to support 8 kHz sample rate demodulated audio.
  */
-public class AudioModule extends Module implements IAudioPacketProvider, IReusableBufferListener,
-    ISquelchStateListener, Listener<ReusableBuffer>
+public class AudioModule extends AbstractAudioModule implements IReusableBufferListener, Listener<ReusableFloatBuffer>
 {
-    protected static final Logger mLog = LoggerFactory.getLogger(AudioModule.class);
-    private ReusableAudioPacketQueue mAudioPacketQueue = new ReusableAudioPacketQueue("AudioModule");
 
+    private static final Logger mLog = LoggerFactory.getLogger(AudioModule.class);
     private static float[] sHighPassFilterCoefficients;
 
     static
@@ -73,32 +72,40 @@ public class AudioModule extends Module implements IAudioPacketProvider, IReusab
         }
     }
 
+    private ReusableAudioPacketQueue mAudioPacketQueue = new ReusableAudioPacketQueue("AudioModule");
     private RealFIRFilter2 mHighPassFilter = new RealFIRFilter2(sHighPassFilterCoefficients);
     private SquelchStateListener mSquelchStateListener = new SquelchStateListener();
     private SquelchState mSquelchState = SquelchState.SQUELCH;
-    private Listener<ReusableAudioPacket> mAudioPacketListener;
-    private Metadata mMetadata;
+    private boolean mRecordAudioOverride;
 
     /**
      * Creates an Audio Module.
-     *
-     * @param metadata to use for audio packets produced by this audio module.
      */
-    public AudioModule(Metadata metadata)
+    public AudioModule()
     {
-        mMetadata = metadata;
     }
 
     @Override
     public void dispose()
     {
-        mAudioPacketListener = null;
+        removeAudioPacketListener();
         mSquelchStateListener = null;
     }
 
+    /**
+     * Sets all audio packets as recordable when the argument is true.  Otherwise, defers to the aliased identifiers
+     * from the identifier collection to determine whether to record the audio or not.
+     * @param recordAudio set to true to mark all audio as recordable.
+     */
+    public void setRecordAudio(boolean recordAudio)
+    {
+        mRecordAudioOverride = recordAudio;
+    }
+
     @Override
     public void reset()
     {
+        getIdentifierCollection().clear();
     }
 
     @Override
@@ -111,26 +118,22 @@ public class AudioModule extends Module implements IAudioPacketProvider, IReusab
     public void stop()
     {
         /* Issue an end-audio packet in case a recorder is still rolling */
-        if(mAudioPacketListener != null)
+        if(hasAudioPacketListener())
         {
             ReusableAudioPacket endAudioPacket = mAudioPacketQueue.getEndAudioBuffer();
-            endAudioPacket.setMetadata(mMetadata.copyOf());
+            endAudioPacket.resetAttributes();
+            endAudioPacket.setAudioChannelId(getAudioChannelId());
+            endAudioPacket.setIdentifierCollection(getIdentifierCollection().copyOf());
+
+            if(mRecordAudioOverride)
+            {
+                endAudioPacket.setRecordable(true);
+            }
             endAudioPacket.incrementUserCount();
-            mAudioPacketListener.receive(endAudioPacket);
+            getAudioPacketListener().receive(endAudioPacket);
         }
     }
 
-    @Override
-    public void setAudioPacketListener(Listener<ReusableAudioPacket> listener)
-    {
-        mAudioPacketListener = listener;
-    }
-
-    @Override
-    public void removeAudioPacketListener()
-    {
-        mAudioPacketListener = null;
-    }
 
     @Override
     public Listener<SquelchState> getSquelchStateListener()
@@ -139,23 +142,29 @@ public class AudioModule extends Module implements IAudioPacketProvider, IReusab
     }
 
     @Override
-    public void receive(ReusableBuffer reusableBuffer)
+    public void receive(ReusableFloatBuffer reusableFloatBuffer)
     {
-        if(mAudioPacketListener != null && mSquelchState == SquelchState.UNSQUELCH)
+        if(hasAudioPacketListener() && mSquelchState == SquelchState.UNSQUELCH)
         {
-            ReusableBuffer highPassFiltered = mHighPassFilter.filter(reusableBuffer);
+            ReusableFloatBuffer highPassFiltered = mHighPassFilter.filter(reusableFloatBuffer);
 
             ReusableAudioPacket audioPacket = mAudioPacketQueue.getBuffer(highPassFiltered.getSampleCount());
+            audioPacket.resetAttributes();
+            audioPacket.setAudioChannelId(getAudioChannelId());
             audioPacket.loadAudioFrom(highPassFiltered);
-            audioPacket.setMetadata(mMetadata.copyOf());
+            if(mRecordAudioOverride)
+            {
+                audioPacket.setRecordable(true);
+            }
+            audioPacket.setIdentifierCollection(getIdentifierCollection().copyOf());
 
-            mAudioPacketListener.receive(audioPacket);
+            getAudioPacketListener().receive(audioPacket);
 
             highPassFiltered.decrementUserCount();
         }
         else
         {
-            reusableBuffer.decrementUserCount();
+            reusableFloatBuffer.decrementUserCount();
         }
     }
 
@@ -174,11 +183,13 @@ public class AudioModule extends Module implements IAudioPacketProvider, IReusab
         @Override
         public void receive(SquelchState state)
         {
-            if(state == SquelchState.SQUELCH && mAudioPacketListener != null)
+            if(state == SquelchState.SQUELCH && hasAudioPacketListener())
             {
                 ReusableAudioPacket endAudioPacket = mAudioPacketQueue.getEndAudioBuffer();
-                endAudioPacket.setMetadata(mMetadata.copyOf());
-                mAudioPacketListener.receive(endAudioPacket);
+                endAudioPacket.resetAttributes();
+                endAudioPacket.setAudioChannelId(getAudioChannelId());
+                endAudioPacket.setIdentifierCollection(getIdentifierCollection().copyOf());
+                getAudioPacketListener().receive(endAudioPacket);
             }
 
             mSquelchState = state;

src/main/java/io/github/dsheirer/audio/AudioPacketManager.java

@@ -0,0 +1,98 @@
+/*
+ * ******************************************************************************
+ * 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.
+ *
+ * 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.audio;
+
+import io.github.dsheirer.alias.AliasModel;
+import io.github.dsheirer.dsp.filter.channelizer.ContinuousReusableBufferProcessor;
+import io.github.dsheirer.sample.Listener;
+import io.github.dsheirer.sample.buffer.ReusableAudioPacket;
+import io.github.dsheirer.sample.buffer.ReusableBufferBroadcaster;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import java.util.List;
+
+/**
+ * Processes audio packets from all decoder channels, assigns alias attributes and distributes packets
+ * for playback, streaming and recording.
+ */
+public class AudioPacketManager implements Listener<ReusableAudioPacket>
+{
+    private final static Logger mLog = LoggerFactory.getLogger(AudioPacketManager.class);
+    private AudioMetadataProcessor mAudioMetadataProcessor;
+    private ReusableBufferBroadcaster<ReusableAudioPacket> mBroadcaster = new ReusableBufferBroadcaster<>();
+    private ContinuousReusableBufferProcessor<ReusableAudioPacket> mBufferProcessor;
+
+    public AudioPacketManager(AliasModel aliasModel)
+    {
+        mAudioMetadataProcessor = new AudioMetadataProcessor(aliasModel);
+        mBufferProcessor = new ContinuousReusableBufferProcessor<>(10000, 500);
+        mBufferProcessor.setListener(new Listener<List<ReusableAudioPacket>>()
+        {
+            @Override
+            public void receive(List<ReusableAudioPacket> reusableAudioPackets)
+            {
+                for(ReusableAudioPacket audioPacket: reusableAudioPackets)
+                {
+                    mAudioMetadataProcessor.process(audioPacket);
+                    mBroadcaster.broadcast(audioPacket);
+                }
+            }
+        });
+    }
+
+    public void start()
+    {
+        mLog.info("Audio packet manager started");
+        mBufferProcessor.start();
+    }
+
+    public void stop()
+    {
+        mLog.info("Audio packet manager stopped");
+        mBufferProcessor.stop();
+    }
+
+    /**
+     * Primary processing method for receiving audio packets from all processing channels.
+     */
+    @Override
+    public void receive(ReusableAudioPacket audioPacket)
+    {
+        mBufferProcessor.receive(audioPacket);
+    }
+
+    /**
+     * Adds the listener to receive enriched audio packets from this manager
+     */
+    public void addListener(Listener<ReusableAudioPacket> listener)
+    {
+        mBroadcaster.addListener(listener);
+    }
+
+    /**
+     * Removes the listener from receiving enriched audio packets from this manager
+     */
+    public void removeListener(Listener<ReusableAudioPacket> listener)
+    {
+        mBroadcaster.removeListener(listener);
+    }
+}

src/main/java/io/github/dsheirer/audio/IAudioController.java

@@ -1,6 +1,6 @@
 package io.github.dsheirer.audio;
 
-import io.github.dsheirer.audio.output.AudioOutput;
+import io.github.dsheirer.audio.playback.AudioOutput;
 import io.github.dsheirer.sample.Listener;
 import io.github.dsheirer.source.mixer.MixerChannelConfiguration;
 

src/main/java/io/github/dsheirer/audio/InversionFrequency.java

@@ -1,59 +0,0 @@
-/*******************************************************************************
- *     SDR Trunk 
- *     Copyright (C) 2014 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.audio;
-
-/**
- * Standard voice inversion foldover frequencies
- * 
- * Reference: http://en.wikipedia.org/wiki/Voice_inversion
- */
-public enum InversionFrequency
-{
-	HZ_2500( 2500 ),
-	HZ_2550( 2550 ),
-	HZ_2600( 2600 ),
-	HZ_2632( 2632 ),
-	HZ_2675( 2675 ),
-	HZ_2718( 2718 ),
-	HZ_2800( 2800 ),
-	HZ_2868( 2868 ),
-	HZ_2950( 2950 ),
-	HZ_3023( 3023 ),
-	HZ_3075( 3075 ),
-	HZ_3107( 3107 ),
-	HZ_3150( 3150 ),
-	HZ_3196( 3196 ),
-	HZ_3333( 3333 ),
-	HZ_3339( 3339 ),
-	HZ_3400( 3400 ),
-	HZ_3496( 3496 ),
-	HZ_3729( 3729 ),
-	HZ_4096( 4096 );
-	
-	private int mFrequency;
-	
-	private InversionFrequency( int frequency )
-	{
-		mFrequency = frequency;
-	}
-
-	public int getFrequency()
-	{
-		return mFrequency;
-	}
-}

src/main/java/io/github/dsheirer/audio/broadcast/AudioBroadcaster.java

@@ -19,7 +19,7 @@
 package io.github.dsheirer.audio.broadcast;
 
 import io.github.dsheirer.audio.convert.ISilenceGenerator;
-import io.github.dsheirer.channel.metadata.Metadata;
+import io.github.dsheirer.identifier.IdentifierCollection;
 import io.github.dsheirer.sample.Listener;
 import io.github.dsheirer.util.ThreadPool;
 import org.slf4j.Logger;
@@ -99,15 +99,15 @@ public abstract class AudioBroadcaster implements Listener<AudioRecording>
     /**
      * Broadcasts the next song's audio metadata prior to streaming the next song.
      *
-     * @param metadata for the next recording that will be streamed
+     * @param identifierCollection for the next recording that will be streamed
      */
-    protected void broadcastMetadata(Metadata metadata)
+    protected void broadcastMetadata(IdentifierCollection identifierCollection)
     {
         IBroadcastMetadataUpdater metadataUpdater = getMetadataUpdater();
 
         if(metadataUpdater != null)
         {
-            metadataUpdater.update(metadata);
+            metadataUpdater.update(identifierCollection);
         }
     }
 
@@ -442,7 +442,7 @@ public abstract class AudioBroadcaster implements Listener<AudioRecording>
 
                             if(connected())
                             {
-                                broadcastMetadata(nextRecording.getMetadata());
+                                broadcastMetadata(nextRecording.getIdentifierCollection());
                             }
 
                             metadataUpdateRequired = false;

src/main/java/io/github/dsheirer/audio/broadcast/AudioRecording.java

@@ -18,7 +18,7 @@
  ******************************************************************************/
 package io.github.dsheirer.audio.broadcast;
 
-import io.github.dsheirer.channel.metadata.Metadata;
+import io.github.dsheirer.identifier.IdentifierCollection;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -33,20 +33,20 @@ public class AudioRecording implements Comparable<AudioRecording>
     private long mStartTime;
     private long mRecordingLength;
     private AtomicInteger mPendingReplayCount = new AtomicInteger();
-    private Metadata mMetadata;
+    private IdentifierCollection mIdentifierCollection;
 
     /**
      * Audio recording that is ready to be streamed
      *
      * @param path to the audio recording file
-     * @param metadata associated with the recording
+     * @param identifierCollection associated with the recording
      * @param start time of recording in milliseconds since epoch
      * @param recordingLength in milliseconds
      */
-    public AudioRecording(Path path, Metadata metadata, long start, long recordingLength)
+    public AudioRecording(Path path, IdentifierCollection identifierCollection, long start, long recordingLength)
     {
         mPath = path;
-        mMetadata = metadata;
+        mIdentifierCollection = identifierCollection;
         mStartTime = start;
         mRecordingLength = recordingLength;
     }
@@ -60,11 +60,19 @@ public class AudioRecording implements Comparable<AudioRecording>
     }
 
     /**
-     * Optional audio metadata for the recording.
+     * Optional audio metadata/identifiers for the recording.
      */
-    public Metadata getMetadata()
+    public IdentifierCollection getIdentifierCollection()
     {
-        return mMetadata;
+        return mIdentifierCollection;
+    }
+
+    /**
+     * Indicates if this recording contains an optional identifier collection.
+     */
+    public boolean hasIdentifierCollection()
+    {
+        return mIdentifierCollection != null;
     }
 
     /**

src/main/java/io/github/dsheirer/audio/broadcast/BroadcastFactory.java

@@ -60,7 +60,7 @@ public class BroadcastFactory
      * @param configuration describing the server and audio types
      * @return configured broadcaster or null
      */
-    public static AudioBroadcaster getBroadcaster(BroadcastConfiguration configuration)
+    public static AudioBroadcaster getBroadcaster(BroadcastConfiguration configuration, AliasModel aliasModel)
     {
         if(configuration != null)
         {
@@ -71,15 +71,15 @@ public class BroadcastFactory
                 switch(configuration.getBroadcastServerType())
                 {
                     case BROADCASTIFY:
-                        return new IcecastTCPAudioBroadcaster((BroadcastifyConfiguration) configuration);
+                        return new IcecastTCPAudioBroadcaster((BroadcastifyConfiguration) configuration, aliasModel);
                     case ICECAST_TCP:
-                        return new IcecastTCPAudioBroadcaster((IcecastTCPConfiguration) configuration);
+                        return new IcecastTCPAudioBroadcaster((IcecastTCPConfiguration) configuration, aliasModel);
                     case ICECAST_HTTP:
-                        return new IcecastHTTPAudioBroadcaster((IcecastHTTPConfiguration) configuration);
+                        return new IcecastHTTPAudioBroadcaster((IcecastHTTPConfiguration) configuration, aliasModel);
                     case SHOUTCAST_V1:
-                        return new ShoutcastV1AudioBroadcaster((ShoutcastV1Configuration) configuration);
+                        return new ShoutcastV1AudioBroadcaster((ShoutcastV1Configuration) configuration, aliasModel);
                     case SHOUTCAST_V2:
-                        return new ShoutcastV2AudioBroadcaster((ShoutcastV2Configuration) configuration);
+                        return new ShoutcastV2AudioBroadcaster((ShoutcastV2Configuration) configuration, aliasModel);
                     case UNKNOWN:
                     default:
                         mLog.info("Unrecognized broadcastAudio configuration: " + configuration.getBroadcastFormat().name());

src/main/java/io/github/dsheirer/audio/broadcast/BroadcastModel.java

@@ -1,6 +1,7 @@
-/*******************************************************************************
+/*
+ * ******************************************************************************
  * sdrtrunk
- * Copyright (C) 2014-2016 Dennis Sheirer
+ * 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
@@ -14,13 +15,15 @@
  *
  * 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.audio.broadcast;
 
+import io.github.dsheirer.alias.AliasList;
+import io.github.dsheirer.alias.AliasModel;
 import io.github.dsheirer.alias.id.broadcast.BroadcastChannel;
-import io.github.dsheirer.channel.metadata.Metadata;
 import io.github.dsheirer.icon.IconManager;
+import io.github.dsheirer.preference.UserPreferences;
 import io.github.dsheirer.properties.SystemProperties;
 import io.github.dsheirer.sample.Broadcaster;
 import io.github.dsheirer.sample.Listener;
@@ -72,21 +75,21 @@ public class BroadcastModel extends AbstractTableModel implements Listener<Reusa
     private Map<String,AudioBroadcaster> mBroadcasterMap = new HashMap<>();
     private IconManager mIconManager;
     private StreamManager mStreamManager;
+    private AliasModel mAliasModel;
     private Broadcaster<BroadcastEvent> mBroadcastEventBroadcaster = new Broadcaster<>();
 
     /**
      * Model for managing Broadcast configurations and any associated broadcaster instances.
      */
-    public BroadcastModel(IconManager iconManager)
+    public BroadcastModel(AliasModel aliasModel, IconManager iconManager, UserPreferences userPreferences)
     {
+        mAliasModel = aliasModel;
         mIconManager = iconManager;
-        mStreamManager = new StreamManager(new CompletedRecordingListener(), BroadcastFormat.MP3,
-            SystemProperties.getInstance().getApplicationFolder(TEMPORARY_STREAM_DIRECTORY));
+        mStreamManager = new StreamManager(new CompletedRecordingListener(), BroadcastFormat.MP3, userPreferences);
         mStreamManager.start();
 
         //Monitor to remove temporary recording files that have been streamed by all audio broadcasters
-        ThreadPool.SCHEDULED.scheduleAtFixedRate(new RecordingDeletionMonitor(),
-            15l, 15l, TimeUnit.SECONDS);
+        ThreadPool.SCHEDULED.scheduleAtFixedRate(new RecordingDeletionMonitor(), 15l, 15l, TimeUnit.SECONDS);
 
         removeOrphanedTemporaryRecordings();
     }
@@ -278,9 +281,9 @@ public class BroadcastModel extends AbstractTableModel implements Listener<Reusa
     @Override
     public void receive(ReusableAudioPacket audioPacket)
     {
-        if(audioPacket.hasMetadata() && audioPacket.getMetadata().isStreamable())
+        if(audioPacket.isStreamable())
         {
-            for(BroadcastChannel channel: audioPacket.getMetadata().getBroadcastChannels())
+            for(BroadcastChannel channel: audioPacket.getBroadcastChannels())
             {
                 if(mBroadcasterMap.containsKey(channel.getChannelName()))
                 {
@@ -302,7 +305,7 @@ public class BroadcastModel extends AbstractTableModel implements Listener<Reusa
         if(broadcastConfiguration != null && broadcastConfiguration.isEnabled() && broadcastConfiguration.isValid() &&
             !mBroadcasterMap.containsKey(broadcastConfiguration.getName()))
         {
-            AudioBroadcaster audioBroadcaster = BroadcastFactory.getBroadcaster(broadcastConfiguration);
+            AudioBroadcaster audioBroadcaster = BroadcastFactory.getBroadcaster(broadcastConfiguration, mAliasModel);
 
             if(audioBroadcaster != null)
             {
@@ -706,22 +709,25 @@ public class BroadcastModel extends AbstractTableModel implements Listener<Reusa
         @Override
         public void receive(AudioRecording audioRecording)
         {
-            Metadata metadata = audioRecording.getMetadata();
-
-            if(metadata != null && metadata.isStreamable())
+            if(audioRecording != null && audioRecording.hasIdentifierCollection())
             {
-                for(BroadcastChannel broadcastChannel : metadata.getBroadcastChannels())
+                AliasList aliasList = mAliasModel.getAliasList(audioRecording.getIdentifierCollection());
+
+                if(aliasList != null)
                 {
-                    String channelName = broadcastChannel.getChannelName();
-
-                    if(channelName != null)
+                    for(BroadcastChannel broadcastChannel : aliasList.getBroadcastChannels(audioRecording.getIdentifierCollection()))
                     {
-                        AudioBroadcaster audioBroadcaster = getBroadcaster(channelName);
+                        String channelName = broadcastChannel.getChannelName();
 
-                        if(audioBroadcaster != null)
+                        if(channelName != null)
                         {
-                            audioRecording.addPendingReplay();
-                            audioBroadcaster.receive(audioRecording);
+                            AudioBroadcaster audioBroadcaster = getBroadcaster(channelName);
+
+                            if(audioBroadcaster != null)
+                            {
+                                audioRecording.addPendingReplay();
+                                audioBroadcaster.receive(audioRecording);
+                            }
                         }
                     }
                 }

src/main/java/io/github/dsheirer/audio/broadcast/IBroadcastMetadataUpdater.java

@@ -18,14 +18,14 @@
  ******************************************************************************/
 package io.github.dsheirer.audio.broadcast;
 
-import io.github.dsheirer.channel.metadata.Metadata;
+import io.github.dsheirer.identifier.IdentifierCollection;
 
 public interface IBroadcastMetadataUpdater
 {
     /**
      * Updates broadcast audio metadata
      *
-     * @param metadata containing metadata attributes
+     * @param identifierCollection containing metadata attributes
      */
-    void update(Metadata metadata);
+    void update(IdentifierCollection identifierCollection);
 }

src/main/java/io/github/dsheirer/audio/broadcast/StreamManager.java

@@ -1,6 +1,7 @@
-/*******************************************************************************
+/*
+ * ******************************************************************************
  * sdrtrunk
- * Copyright (C) 2014-2017 Dennis Sheirer
+ * 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
@@ -14,10 +15,11 @@
  *
  * 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.audio.broadcast;
 
+import io.github.dsheirer.preference.UserPreferences;
 import io.github.dsheirer.record.AudioRecorder;
 import io.github.dsheirer.sample.Listener;
 import io.github.dsheirer.sample.buffer.ReusableAudioPacket;
@@ -26,7 +28,6 @@ import io.github.dsheirer.util.TimeStamp;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-import java.nio.file.Files;
 import java.nio.file.Path;
 import java.util.ArrayList;
 import java.util.HashMap;
@@ -46,7 +47,7 @@ public class StreamManager implements Listener<ReusableAudioPacket>
 
     private Listener<AudioRecording> mAudioRecordingListener;
     private BroadcastFormat mBroadcastFormat;
-    private Path mTempDirectory;
+    private UserPreferences mUserPreferences;
     private Map<Integer,AudioRecorder> mStreamRecorders = new HashMap<>();
     private Runnable mRecorderMonitor;
     private ScheduledFuture<?> mRecorderMonitorFuture;
@@ -61,15 +62,14 @@ public class StreamManager implements Listener<ReusableAudioPacket>
      * Completed streamable audio recordings are nominated to the output listener (for broadcast) upon completion
      *
      * @param listener to receive completed audio recordings
-     * @param tempDirectory where to store temporary audio recordings
+     * @param broadcastFormat for the stream
+     * @param userPreferences to obtain the temporary streaming recording directory
      */
-    public StreamManager(Listener<AudioRecording> listener, BroadcastFormat broadcastFormat, Path tempDirectory)
+    public StreamManager(Listener<AudioRecording> listener, BroadcastFormat broadcastFormat, UserPreferences userPreferences)
     {
-        assert (tempDirectory != null && Files.isDirectory(tempDirectory));
-
         mAudioRecordingListener = listener;
         mBroadcastFormat = broadcastFormat;
-        mTempDirectory = tempDirectory;
+        mUserPreferences = userPreferences;
     }
 
     /**
@@ -117,11 +117,11 @@ public class StreamManager implements Listener<ReusableAudioPacket>
     @Override
     public void receive(ReusableAudioPacket audioPacket)
     {
-        if(mRunning.get() && audioPacket.hasMetadata())
+        if(mRunning.get() && audioPacket.hasIdentifierCollection())
         {
             synchronized(mStreamRecorders)
             {
-                int channelMetadataID = audioPacket.getMetadata().getMetadataID();
+                int channelMetadataID = audioPacket.getAudioChannelId();
 
                 ReusableAudioPacket.Type type = audioPacket.getType();
 
@@ -139,8 +139,7 @@ public class StreamManager implements Listener<ReusableAudioPacket>
                     }
                     else
                     {
-                        AudioRecorder recorder = BroadcastFactory.getAudioRecorder(getTemporaryRecordingPath(),
-                            mBroadcastFormat);
+                        AudioRecorder recorder = BroadcastFactory.getAudioRecorder(getTemporaryRecordingPath(), mBroadcastFormat);
                         recorder.start();
                         audioPacket.incrementUserCount();
                         recorder.receive(audioPacket);
@@ -181,7 +180,7 @@ public class StreamManager implements Listener<ReusableAudioPacket>
                 public void receive(AudioRecorder audioRecorder)
                 {
                     AudioRecording audioRecording =
-                        new AudioRecording(audioRecorder.getPath(), audioRecorder.getMetadata(),
+                        new AudioRecording(audioRecorder.getPath(), audioRecorder.getIdentifierCollection(),
                             audioRecorder.getTimeRecordingStart(), audioRecorder.getRecordingLength());
 
                     if(mAudioRecordingListener != null)
@@ -205,7 +204,7 @@ public class StreamManager implements Listener<ReusableAudioPacket>
         sb.append(TimeStamp.getLongTimeStamp("_"));
         sb.append(mBroadcastFormat.getFileExtension());
 
-        Path temporaryRecordingPath = mTempDirectory.resolve(sb.toString());
+        Path temporaryRecordingPath = mUserPreferences.getDirectoryPreference().getDirectoryStreaming().resolve(sb.toString());
 
         return temporaryRecordingPath;
     }

src/main/java/io/github/dsheirer/audio/broadcast/icecast/IcecastAudioBroadcaster.java

@@ -18,6 +18,7 @@
  ******************************************************************************/
 package io.github.dsheirer.audio.broadcast.icecast;
 
+import io.github.dsheirer.alias.AliasModel;
 import io.github.dsheirer.audio.broadcast.AudioBroadcaster;
 import io.github.dsheirer.audio.broadcast.BroadcastConfiguration;
 import io.github.dsheirer.audio.broadcast.IBroadcastMetadataUpdater;
@@ -25,10 +26,12 @@ import io.github.dsheirer.audio.broadcast.IBroadcastMetadataUpdater;
 public abstract class IcecastAudioBroadcaster extends AudioBroadcaster
 {
     private IBroadcastMetadataUpdater mMetadataUpdater;
+    private AliasModel mAliasModel;
 
-    public IcecastAudioBroadcaster(BroadcastConfiguration broadcastConfiguration)
+    public IcecastAudioBroadcaster(BroadcastConfiguration broadcastConfiguration, AliasModel aliasModel)
     {
         super(broadcastConfiguration);
+        mAliasModel = aliasModel;
     }
 
     /**
@@ -44,7 +47,7 @@ public abstract class IcecastAudioBroadcaster extends AudioBroadcaster
     {
         if(mMetadataUpdater == null)
         {
-            mMetadataUpdater = new IcecastBroadcastMetadataUpdater(getConfiguration());
+            mMetadataUpdater = new IcecastBroadcastMetadataUpdater(getConfiguration(), mAliasModel);
         }
 
         return mMetadataUpdater;

src/main/java/io/github/dsheirer/audio/broadcast/icecast/IcecastBroadcastMetadataUpdater.java

@@ -1,6 +1,7 @@
-/*******************************************************************************
+/*
+ * ******************************************************************************
  * sdrtrunk
- * Copyright (C) 2014-2017 Dennis Sheirer
+ * 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
@@ -14,12 +15,20 @@
  *
  * 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.audio.broadcast.icecast;
 
+import com.google.common.base.Joiner;
+import io.github.dsheirer.alias.Alias;
+import io.github.dsheirer.alias.AliasList;
+import io.github.dsheirer.alias.AliasModel;
 import io.github.dsheirer.audio.broadcast.IBroadcastMetadataUpdater;
-import io.github.dsheirer.channel.metadata.Metadata;
+import io.github.dsheirer.identifier.Form;
+import io.github.dsheirer.identifier.Identifier;
+import io.github.dsheirer.identifier.IdentifierClass;
+import io.github.dsheirer.identifier.IdentifierCollection;
+import io.github.dsheirer.identifier.Role;
 import io.github.dsheirer.properties.SystemProperties;
 import io.github.dsheirer.util.ThreadPool;
 import org.apache.mina.core.RuntimeIoException;
@@ -40,6 +49,7 @@ import java.net.InetSocketAddress;
 import java.net.URLEncoder;
 import java.nio.channels.UnresolvedAddressException;
 import java.util.HashMap;
+import java.util.List;
 import java.util.Map;
 import java.util.Queue;
 import java.util.concurrent.LinkedTransferQueue;
@@ -52,7 +62,7 @@ public class IcecastBroadcastMetadataUpdater implements IBroadcastMetadataUpdate
     private final static String UTF8 = "UTF-8";
 
     private IcecastConfiguration mIcecastConfiguration;
-
+    private AliasModel mAliasModel;
     private NioSocketConnector mSocketConnector;
     private AtomicBoolean mUpdating = new AtomicBoolean();
     private Queue<String> mMetadataQueue = new LinkedTransferQueue<>();
@@ -65,9 +75,10 @@ public class IcecastBroadcastMetadataUpdater implements IBroadcastMetadataUpdate
      * broadcaster.  When multiple metadata updates are received prior to completion of the current ongoing update
      * sequence, those updates will be queued and processed in the order received.
      */
-    public IcecastBroadcastMetadataUpdater(IcecastConfiguration icecastConfiguration)
+    public IcecastBroadcastMetadataUpdater(IcecastConfiguration icecastConfiguration, AliasModel aliasModel)
     {
         mIcecastConfiguration = icecastConfiguration;
+        mAliasModel = aliasModel;
     }
 
     /**
@@ -113,9 +124,9 @@ public class IcecastBroadcastMetadataUpdater implements IBroadcastMetadataUpdate
      * and will remain in the update queue until the next metadata update is requested.  However, this is a design
      * trade-off to avoid having a scheduled runnable repeatedly processing the update queue.
      */
-    public void update(Metadata metadata)
+    public void update(IdentifierCollection identifierCollection)
     {
-        mMetadataQueue.offer(getSong(metadata));
+        mMetadataQueue.offer(getSong(identifierCollection));
 
         if(!mUpdating.get() && !mMetadataQueue.isEmpty())
         {
@@ -181,45 +192,54 @@ public class IcecastBroadcastMetadataUpdater implements IBroadcastMetadataUpdate
     /**
      * Creates the song information for a metadata update
      */
-    private static String getSong(Metadata metadata)
+    private String getSong(IdentifierCollection identifierCollection)
     {
         StringBuilder sb = new StringBuilder();
 
-        if(metadata != null)
+        if(identifierCollection != null)
         {
-            String to = metadata.getPrimaryAddressTo().getIdentifier();
+            AliasList aliasList = mAliasModel.getAliasList(identifierCollection);
 
-            sb.append("TO:");
+            Identifier to = identifierCollection.getIdentifier(IdentifierClass.USER, Form.PATCH_GROUP, Role.TO);
 
-            if(metadata.getPrimaryAddressTo().hasAlias())
+            if(to == null)
             {
-                sb.append(metadata.getPrimaryAddressTo().getAlias().getName());
+                to = identifierCollection.getIdentifier(IdentifierClass.USER, Form.TALKGROUP, Role.TO);
             }
-            else if(metadata.getPrimaryAddressTo().hasIdentifier())
+
+            if(to != null)
             {
-                sb.append(metadata.getPrimaryAddressTo().getIdentifier());
+                sb.append("TO:").append(to);
+
+                List<Alias> aliases = aliasList.getAliases(to);
+
+                if(!aliases.isEmpty())
+                {
+                    sb.append(" ").append(Joiner.on(", ").skipNulls().join(aliases));
+                }
             }
             else
             {
-                sb.append("UNKNOWN");
+                sb.append("TO:UNKNOWN");
             }
 
+            Identifier from = identifierCollection.getIdentifier(IdentifierClass.USER, Form.TALKGROUP, Role.FROM);
 
-            sb.append(" FROM:");
+            if(from != null)
+            {
+                sb.append(" FROM:").append(from);
 
-            if(metadata.getPrimaryAddressFrom().hasAlias())
-            {
-                sb.append(metadata.getPrimaryAddressFrom().getAlias().getName());
-            }
-            else if(metadata.getPrimaryAddressFrom().hasIdentifier())
-            {
-                sb.append(metadata.getPrimaryAddressFrom().getIdentifier());
+                List<Alias> aliases = aliasList.getAliases(from);
+
+                if(!aliases.isEmpty())
+                {
+                    sb.append(" ").append(Joiner.on(", ").skipNulls().join(aliases));
+                }
             }
             else
             {
-                sb.append("UNKNOWN");
+                sb.append(" FROM:UNKNOWN");
             }
-
         }
         else
         {

src/main/java/io/github/dsheirer/audio/broadcast/icecast/IcecastHTTPAudioBroadcaster.java

@@ -18,6 +18,7 @@
  ******************************************************************************/
 package io.github.dsheirer.audio.broadcast.icecast;
 
+import io.github.dsheirer.alias.AliasModel;
 import io.github.dsheirer.audio.broadcast.BroadcastState;
 import io.github.dsheirer.audio.convert.MP3AudioConverter;
 import io.github.dsheirer.properties.SystemProperties;
@@ -69,9 +70,9 @@ public class IcecastHTTPAudioBroadcaster extends IcecastAudioBroadcaster
      *
      * @param configuration for the Icecast stream
      */
-    public IcecastHTTPAudioBroadcaster(IcecastHTTPConfiguration configuration)
+    public IcecastHTTPAudioBroadcaster(IcecastHTTPConfiguration configuration, AliasModel aliasModel)
     {
-        super(configuration);
+        super(configuration, aliasModel);
     }
 
     /**

src/main/java/io/github/dsheirer/audio/broadcast/icecast/IcecastTCPAudioBroadcaster.java

@@ -18,6 +18,7 @@
  ******************************************************************************/
 package io.github.dsheirer.audio.broadcast.icecast;
 
+import io.github.dsheirer.alias.AliasModel;
 import io.github.dsheirer.audio.broadcast.BroadcastState;
 import io.github.dsheirer.audio.broadcast.icecast.codec.IcecastCodecFactory;
 import io.github.dsheirer.audio.convert.MP3AudioConverter;
@@ -65,9 +66,9 @@ public class IcecastTCPAudioBroadcaster extends IcecastAudioBroadcaster
      *
      * @param configuration for the Icecast stream
      */
-    public IcecastTCPAudioBroadcaster(IcecastTCPConfiguration configuration)
+    public IcecastTCPAudioBroadcaster(IcecastTCPConfiguration configuration, AliasModel aliasModel)
     {
-        super(configuration);
+        super(configuration, aliasModel);
     }
 
     /**

src/main/java/io/github/dsheirer/audio/broadcast/shoutcast/v1/ShoutcastV1AudioBroadcaster.java

@@ -18,6 +18,7 @@
  ******************************************************************************/
 package io.github.dsheirer.audio.broadcast.shoutcast.v1;
 
+import io.github.dsheirer.alias.AliasModel;
 import io.github.dsheirer.audio.broadcast.AudioBroadcaster;
 import io.github.dsheirer.audio.broadcast.BroadcastState;
 import io.github.dsheirer.audio.broadcast.IBroadcastMetadataUpdater;
@@ -47,7 +48,7 @@ public class ShoutcastV1AudioBroadcaster extends AudioBroadcaster
     private NioSocketConnector mSocketConnector;
     private IoSession mStreamingSession = null;
     private IBroadcastMetadataUpdater mMetadataUpdater;
-
+    private AliasModel mAliasModel;
     private long mLastConnectionAttempt = 0;
     private AtomicBoolean mConnecting = new AtomicBoolean();
 
@@ -61,9 +62,10 @@ public class ShoutcastV1AudioBroadcaster extends AudioBroadcaster
      *
      * @param configuration for the Shoutcast stream
      */
-    public ShoutcastV1AudioBroadcaster(ShoutcastV1Configuration configuration)
+    public ShoutcastV1AudioBroadcaster(ShoutcastV1Configuration configuration, AliasModel aliasModel)
     {
         super(configuration);
+        mAliasModel = aliasModel;
     }
 
     /**
@@ -79,7 +81,7 @@ public class ShoutcastV1AudioBroadcaster extends AudioBroadcaster
     {
         if(mMetadataUpdater == null)
         {
-            mMetadataUpdater = new ShoutcastV1BroadcastMetadataUpdater(getConfiguration());
+            mMetadataUpdater = new ShoutcastV1BroadcastMetadataUpdater(getConfiguration(), mAliasModel);
         }
 
         return mMetadataUpdater;

src/main/java/io/github/dsheirer/audio/broadcast/shoutcast/v1/ShoutcastV1BroadcastMetadataUpdater.java

@@ -1,6 +1,7 @@
-/*******************************************************************************
+/*
+ * ******************************************************************************
  * sdrtrunk
- * Copyright (C) 2014-2017 Dennis Sheirer
+ * 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
@@ -14,12 +15,20 @@
  *
  * 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.audio.broadcast.shoutcast.v1;
 
+import com.google.common.base.Joiner;
+import io.github.dsheirer.alias.Alias;
+import io.github.dsheirer.alias.AliasList;
+import io.github.dsheirer.alias.AliasModel;
 import io.github.dsheirer.audio.broadcast.IBroadcastMetadataUpdater;
-import io.github.dsheirer.channel.metadata.Metadata;
+import io.github.dsheirer.identifier.Form;
+import io.github.dsheirer.identifier.Identifier;
+import io.github.dsheirer.identifier.IdentifierClass;
+import io.github.dsheirer.identifier.IdentifierCollection;
+import io.github.dsheirer.identifier.Role;
 import io.github.dsheirer.util.ThreadPool;
 import org.apache.mina.core.future.ConnectFuture;
 import org.apache.mina.core.service.IoHandlerAdapter;
@@ -38,6 +47,7 @@ import java.net.ConnectException;
 import java.net.InetSocketAddress;
 import java.net.URLEncoder;
 import java.util.HashMap;
+import java.util.List;
 import java.util.Map;
 import java.util.Queue;
 import java.util.concurrent.LinkedTransferQueue;
@@ -50,7 +60,7 @@ public class ShoutcastV1BroadcastMetadataUpdater implements IBroadcastMetadataUp
     private final static String UTF8 = "UTF-8";
 
     private ShoutcastV1Configuration mShoutcastV1Configuration;
-
+    private AliasModel mAliasModel;
     private NioSocketConnector mSocketConnector;
     private AtomicBoolean mUpdating = new AtomicBoolean();
     private Queue<String> mMetadataQueue = new LinkedTransferQueue<>();
@@ -62,9 +72,10 @@ public class ShoutcastV1BroadcastMetadataUpdater implements IBroadcastMetadataUp
      * broadcaster.  When multiple metadata updates are received prior to completion of the current ongoing update
      * sequence, those updates will be queued and processed in the order received.
      */
-    public ShoutcastV1BroadcastMetadataUpdater(ShoutcastV1Configuration shoutcastV1Configuration)
+    public ShoutcastV1BroadcastMetadataUpdater(ShoutcastV1Configuration shoutcastV1Configuration, AliasModel aliasModel)
     {
         mShoutcastV1Configuration = shoutcastV1Configuration;
+        mAliasModel = aliasModel;
     }
 
     /**
@@ -111,9 +122,9 @@ public class ShoutcastV1BroadcastMetadataUpdater implements IBroadcastMetadataUp
      * and will remain in the update queue until the next metadata update is requested.  However, this is a design
      * trade-off to avoid having a scheduled runnable repeatedly processing the update queue.
      */
-    public void update(Metadata metadata)
+    public void update(IdentifierCollection identifierCollection)
     {
-        mMetadataQueue.offer(getSong(metadata));
+        mMetadataQueue.offer(getSong(identifierCollection));
 
         if(mUpdating.compareAndSet(false, true))
         {
@@ -177,45 +188,54 @@ public class ShoutcastV1BroadcastMetadataUpdater implements IBroadcastMetadataUp
     /**
      * Creates the song information for a metadata update
      */
-    private static String getSong(Metadata metadata)
+    private String getSong(IdentifierCollection identifierCollection)
     {
         StringBuilder sb = new StringBuilder();
 
-        if(metadata != null)
+        if(identifierCollection != null)
         {
-            String to = metadata.getPrimaryAddressTo().getIdentifier();
+            AliasList aliasList = mAliasModel.getAliasList(identifierCollection);
 
-            sb.append("TO:");
+            Identifier to = identifierCollection.getIdentifier(IdentifierClass.USER, Form.PATCH_GROUP, Role.TO);
 
-            if(metadata.getPrimaryAddressTo().hasAlias())
+            if(to == null)
             {
-                sb.append(metadata.getPrimaryAddressTo().getAlias().getName());
+                to = identifierCollection.getIdentifier(IdentifierClass.USER, Form.TALKGROUP, Role.TO);
             }
-            else if(metadata.getPrimaryAddressTo().hasIdentifier())
+
+            if(to != null)
             {
-                sb.append(metadata.getPrimaryAddressTo().getIdentifier());
+                sb.append("TO:").append(to);
+
+                List<Alias> aliases = aliasList.getAliases(to);
+
+                if(!aliases.isEmpty())
+                {
+                    sb.append(" ").append(Joiner.on(", ").skipNulls().join(aliases));
+                }
             }
             else
             {
-                sb.append("UNKNOWN");
+                sb.append("TO:UNKNOWN");
             }
 
+            Identifier from = identifierCollection.getIdentifier(IdentifierClass.USER, Form.TALKGROUP, Role.FROM);
 
-            sb.append(" FROM:");
+            if(from != null)
+            {
+                sb.append(" FROM:").append(from);
 
-            if(metadata.getPrimaryAddressFrom().hasAlias())
-            {
-                sb.append(metadata.getPrimaryAddressFrom().getAlias().getName());
-            }
-            else if(metadata.getPrimaryAddressFrom().hasIdentifier())
-            {
-                sb.append(metadata.getPrimaryAddressFrom().getIdentifier());
+                List<Alias> aliases = aliasList.getAliases(from);
+
+                if(!aliases.isEmpty())
+                {
+                    sb.append(" ").append(Joiner.on(", ").skipNulls().join(aliases));
+                }
             }
             else
             {
-                sb.append("UNKNOWN");
+                sb.append(" FROM:UNKNOWN");
             }
-
         }
         else
         {

src/main/java/io/github/dsheirer/audio/broadcast/shoutcast/v2/ShoutcastV2AudioBroadcaster.java

@@ -1,6 +1,7 @@
-/*******************************************************************************
+/*
+ * ******************************************************************************
  * sdrtrunk
- * Copyright (C) 2014-2017 Dennis Sheirer
+ * 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
@@ -14,10 +15,14 @@
  *
  * 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.audio.broadcast.shoutcast.v2;
 
+import com.google.common.base.Joiner;
+import io.github.dsheirer.alias.Alias;
+import io.github.dsheirer.alias.AliasList;
+import io.github.dsheirer.alias.AliasModel;
 import io.github.dsheirer.audio.broadcast.AudioBroadcaster;
 import io.github.dsheirer.audio.broadcast.BroadcastState;
 import io.github.dsheirer.audio.broadcast.IBroadcastMetadataUpdater;
@@ -36,7 +41,11 @@ import io.github.dsheirer.audio.broadcast.shoutcast.v2.ultravox.UltravoxMessageF
 import io.github.dsheirer.audio.broadcast.shoutcast.v2.ultravox.UltravoxMessageType;
 import io.github.dsheirer.audio.broadcast.shoutcast.v2.ultravox.UltravoxMetadata;
 import io.github.dsheirer.audio.broadcast.shoutcast.v2.ultravox.UltravoxProtocolFactory;
-import io.github.dsheirer.channel.metadata.Metadata;
+import io.github.dsheirer.identifier.Form;
+import io.github.dsheirer.identifier.Identifier;
+import io.github.dsheirer.identifier.IdentifierClass;
+import io.github.dsheirer.identifier.IdentifierCollection;
+import io.github.dsheirer.identifier.Role;
 import io.github.dsheirer.properties.SystemProperties;
 import io.github.dsheirer.util.ThreadPool;
 import org.apache.mina.core.RuntimeIoException;
@@ -66,7 +75,7 @@ public class ShoutcastV2AudioBroadcaster extends AudioBroadcaster implements IBr
 
     private NioSocketConnector mSocketConnector;
     private IoSession mStreamingSession = null;
-
+    private AliasModel mAliasModel;
     private long mLastConnectionAttempt = 0;
     private AtomicBoolean mConnecting = new AtomicBoolean();
     private LinkedTransferQueue<UltravoxMessage> mMetadataMessageQueue = new LinkedTransferQueue<>();
@@ -83,9 +92,10 @@ public class ShoutcastV2AudioBroadcaster extends AudioBroadcaster implements IBr
      *
      * @param configuration for the Shoutcast V2 stream
      */
-    public ShoutcastV2AudioBroadcaster(ShoutcastV2Configuration configuration)
+    public ShoutcastV2AudioBroadcaster(ShoutcastV2Configuration configuration, AliasModel aliasModel)
     {
         super(configuration);
+        mAliasModel = aliasModel;
     }
 
     public ShoutcastV2Configuration getConfiguration()
@@ -119,9 +129,9 @@ public class ShoutcastV2AudioBroadcaster extends AudioBroadcaster implements IBr
     }
 
     @Override
-    public void update(Metadata metadata)
+    public void update(IdentifierCollection identifierCollection)
     {
-        List<UltravoxMessage> metadataMessages = getMetadataMessages(metadata);
+        List<UltravoxMessage> metadataMessages = getMetadataMessages(identifierCollection);
 
         if(!metadataMessages.isEmpty())
         {
@@ -241,10 +251,10 @@ public class ShoutcastV2AudioBroadcaster extends AudioBroadcaster implements IBr
      *
      * See UltravoxMetadata.TAG.asXML(String value)
      *
-     * @param metadata containing audio metadata tags and attributes
+     * @param identifierCollection containing audio metadata tags and attributes
      * @return a sequence of CacheableXMLMetadata messages sufficient to carry the complete set of metadata
      */
-    private List<UltravoxMessage> getMetadataMessages(Metadata metadata)
+    private List<UltravoxMessage> getMetadataMessages(IdentifierCollection identifierCollection)
     {
         StringBuilder sb = new StringBuilder();
 
@@ -266,24 +276,49 @@ public class ShoutcastV2AudioBroadcaster extends AudioBroadcaster implements IBr
                 sb.append(UltravoxMetadata.URL.asXML(getConfiguration().getURL()));
             }
 
-            if(metadata != null)
+            if(identifierCollection != null)
             {
-                if(metadata.getPrimaryAddressTo().hasAlias())
+                AliasList aliasList = mAliasModel.getAliasList(identifierCollection);
+
+                Identifier to = identifierCollection.getIdentifier(IdentifierClass.USER, Form.PATCH_GROUP, Role.TO);
+
+                if(to == null)
                 {
-                    sb.append(UltravoxMetadata.TITLE_2.asXML(metadata.getPrimaryAddressTo().getAlias().getName()));
-                }
-                else if(metadata.getPrimaryAddressTo().hasIdentifier())
-                {
-                    sb.append(UltravoxMetadata.TITLE_2.asXML(metadata.getPrimaryAddressTo().getIdentifier()));
+                    to = identifierCollection.getIdentifier(IdentifierClass.USER, Form.TALKGROUP, Role.TO);
                 }
 
-                if(metadata.getPrimaryAddressFrom().hasAlias())
+                if(to != null)
                 {
-                    sb.append(UltravoxMetadata.TITLE_3.asXML("From:" + metadata.getPrimaryAddressFrom().getAlias().getName()));
+                    sb.append("TO:").append(to);
+
+                    List<Alias> aliases = aliasList.getAliases(to);
+
+                    if(!aliases.isEmpty())
+                    {
+                        sb.append(" ").append(Joiner.on(", ").skipNulls().join(aliases));
+                    }
                 }
-                else if(metadata.getPrimaryAddressFrom().hasIdentifier())
+                else
                 {
-                    sb.append(UltravoxMetadata.TITLE_3.asXML("From:" + metadata.getPrimaryAddressFrom().getIdentifier()));
+                    sb.append("TO:UNKNOWN");
+                }
+
+                Identifier from = identifierCollection.getIdentifier(IdentifierClass.USER, Form.TALKGROUP, Role.FROM);
+
+                if(from != null)
+                {
+                    sb.append(" FROM:").append(from);
+
+                    List<Alias> aliases = aliasList.getAliases(from);
+
+                    if(!aliases.isEmpty())
+                    {
+                        sb.append(" ").append(Joiner.on(", ").skipNulls().join(aliases));
+                    }
+                }
+                else
+                {
+                    sb.append(" FROM:UNKNOWN");
                 }
             }
             else

src/main/java/io/github/dsheirer/audio/invert/AudioInverter.java

@@ -17,7 +17,6 @@
  ******************************************************************************/
 package io.github.dsheirer.audio.invert;
 
-import io.github.dsheirer.audio.InversionFrequency;
 import io.github.dsheirer.dsp.filter.Filters;
 import io.github.dsheirer.dsp.filter.FloatFIRFilter;
 import io.github.dsheirer.dsp.mixer.IOscillator;

src/main/java/io/github/dsheirer/audio/invert/InversionFrequency.java

@@ -0,0 +1,61 @@
+/*
+ * ******************************************************************************
+ * 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.
+ *
+ * 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.audio.invert;
+
+/**
+ * Standard voice inversion foldover frequencies
+ * 
+ * Reference: http://en.wikipedia.org/wiki/Voice_inversion
+ */
+public enum InversionFrequency
+{
+	HZ_2500( 2500 ),
+	HZ_2550( 2550 ),
+	HZ_2600( 2600 ),
+	HZ_2632( 2632 ),
+	HZ_2675( 2675 ),
+	HZ_2718( 2718 ),
+	HZ_2800( 2800 ),
+	HZ_2868( 2868 ),
+	HZ_2950( 2950 ),
+	HZ_3023( 3023 ),
+	HZ_3075( 3075 ),
+	HZ_3107( 3107 ),
+	HZ_3150( 3150 ),
+	HZ_3196( 3196 ),
+	HZ_3333( 3333 ),
+	HZ_3339( 3339 ),
+	HZ_3400( 3400 ),
+	HZ_3496( 3496 ),
+	HZ_3729( 3729 ),
+	HZ_4096( 4096 );
+	
+	private int mFrequency;
+	
+	private InversionFrequency( int frequency )
+	{
+		mFrequency = frequency;
+	}
+
+	public int getFrequency()
+	{
+		return mFrequency;
+	}
+}

src/main/java/io/github/dsheirer/audio/playback/AudioChannelPanel.java

@@ -1,6 +1,7 @@
-/*******************************************************************************
+/*
+ * ******************************************************************************
  * sdrtrunk
- * Copyright (C) 2014-2017 Dennis Sheirer
+ * 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
@@ -14,14 +15,25 @@
  *
  * 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.audio;
+ * *****************************************************************************
+ */
+package io.github.dsheirer.audio.playback;
 
+import com.google.common.base.Joiner;
+import com.google.common.eventbus.Subscribe;
 import io.github.dsheirer.alias.Alias;
-import io.github.dsheirer.audio.output.AudioOutput;
-import io.github.dsheirer.channel.metadata.Metadata;
+import io.github.dsheirer.alias.AliasList;
+import io.github.dsheirer.alias.AliasModel;
+import io.github.dsheirer.audio.AudioEvent;
+import io.github.dsheirer.eventbus.MyEventBus;
 import io.github.dsheirer.icon.IconManager;
+import io.github.dsheirer.identifier.Identifier;
+import io.github.dsheirer.identifier.IdentifierClass;
+import io.github.dsheirer.identifier.IdentifierCollection;
+import io.github.dsheirer.identifier.Role;
+import io.github.dsheirer.preference.PreferenceType;
+import io.github.dsheirer.preference.UserPreferences;
+import io.github.dsheirer.preference.identifier.TalkgroupFormatPreference;
 import io.github.dsheirer.properties.SystemProperties;
 import io.github.dsheirer.sample.Listener;
 import io.github.dsheirer.settings.ColorSetting;
@@ -32,11 +44,16 @@ import net.miginfocom.swing.MigLayout;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-import javax.swing.*;
-import java.awt.*;
+import javax.swing.ImageIcon;
+import javax.swing.JLabel;
+import javax.swing.JPanel;
+import java.awt.Color;
+import java.awt.EventQueue;
+import java.awt.Font;
+import java.util.Collections;
+import java.util.List;
 
-public class AudioChannelPanel extends JPanel
-    implements Listener<AudioEvent>, SettingChangeListener
+public class AudioChannelPanel extends JPanel implements Listener<AudioEvent>, SettingChangeListener
 {
     private static final long serialVersionUID = 1L;
     private static final Logger mLog = LoggerFactory.getLogger(AudioChannelPanel.class);
@@ -56,27 +73,35 @@ public class AudioChannelPanel extends JPanel
 
     private IconManager mIconManager;
     private SettingsManager mSettingsManager;
+    private UserPreferences mUserPreferences;
+    private TalkgroupFormatPreference mTalkgroupFormatPreference;
     private AudioOutput mAudioOutput;
 
     private JLabel mMutedLabel = new JLabel("M");
     private JLabel mChannelName = new JLabel(" ");
-    private JLabel mToAlias = new JLabel(" ");
-    private JLabel mTo = new JLabel("-----");
+    private JLabel mIconLabel = new JLabel(" ");
+    private JLabel mIdentifierLabel = new JLabel("-----");
+    private Identifier mIdentifier;
+    private List<Alias> mAliases = Collections.EMPTY_LIST;
 
     private boolean mConfigured = false;
+    private AliasModel mAliasModel;
 
-    public AudioChannelPanel(IconManager iconManager, SettingsManager settingsManager, AudioOutput audioOutput)
+    public AudioChannelPanel(IconManager iconManager, UserPreferences userPreferences, SettingsManager settingsManager,
+                             AudioOutput audioOutput, AliasModel aliasModel)
     {
         mIconManager = iconManager;
         mSettingsManager = settingsManager;
         mSettingsManager.addListener(this);
-
+        mAliasModel = aliasModel;
+        mUserPreferences = userPreferences;
+        mTalkgroupFormatPreference = mUserPreferences.getTalkgroupFormatPreference();
         mAudioOutput = audioOutput;
 
         if(mAudioOutput != null)
         {
             mAudioOutput.addAudioEventListener(this);
-            mAudioOutput.setMetadataListener(new AudioMetadataProcessor());
+            mAudioOutput.setIdentifierCollectionListener(new AudioMetadataProcessor());
         }
 
         mBackgroundColor = SystemProperties.getInstance().get(PROPERTY_COLOR_BACKGROUND, Color.BLACK);
@@ -87,8 +112,30 @@ public class AudioChannelPanel extends JPanel
         init();
     }
 
+    /**
+     * Receives preference update notifications via the event bus
+     * @param preferenceType that was updated
+     */
+    @Subscribe
+    public void preferenceUpdated(PreferenceType preferenceType)
+    {
+        if(preferenceType == PreferenceType.IDENTIFIER)
+        {
+            updateLabels();
+        }
+    }
+
+    public void dispose()
+    {
+        //Deregister from receiving preference update notifications
+        MyEventBus.getEventBus().unregister(this);
+    }
+
     private void init()
     {
+        //Register to receive preference updates
+        MyEventBus.getEventBus().register(this);
+
         setLayout(new MigLayout("align center center, insets 0 0 0 0",
             "[][][align right]0[grow,fill]", ""));
         setBackground(mBackgroundColor);
@@ -103,13 +150,13 @@ public class AudioChannelPanel extends JPanel
         mChannelName.setForeground(mLabelColor);
         add(mChannelName);
 
-        mToAlias.setFont(mFont);
-        mToAlias.setForeground(mValueColor);
-        add(mToAlias);
+        mIconLabel.setFont(mFont);
+        mIconLabel.setForeground(mValueColor);
+        add(mIconLabel);
 
-        mTo.setFont(mFont);
-        mTo.setForeground(mValueColor);
-        add(mTo,"wmin 10lp");
+        mIdentifierLabel.setFont(mFont);
+        mIdentifierLabel.setForeground(mValueColor);
+        add(mIdentifierLabel, "wmin 10lp");
     }
 
     @Override
@@ -149,72 +196,94 @@ public class AudioChannelPanel extends JPanel
      */
     private void resetLabels()
     {
-        updateLabel(mTo, null, mToAlias, null);
-
+        mIdentifier = null;
+        mAliases = Collections.EMPTY_LIST;
+        updateLabels();
         mConfigured = false;
     }
 
+    /**
+     * Truncates the string to the specified length using an ellipses at the end
+     * @param value to optionally truncate
+     * @param length of the final formatted string
+     * @return formatted string or null
+     */
+    private static String truncate(String value, int length)
+    {
+        if(value != null && value.length() > length)
+        {
+            return value.substring(0, length - 3) + "...";
+        }
+
+        return value;
+    }
+
     /**
      * Updates the alias label with text and icon from the alias.  Note: this
      * does not occur on the Swing event thread -- wrap any calls to this
      * method with an event thread call.
      */
-    private void updateLabel(JLabel textLabel, String value, JLabel iconLabel, Alias alias)
+    private void updateLabels()
     {
-        if(value != null)
+        String identifier = null;
+        String iconName = null;
+
+        if(mAliases.size() == 1)
         {
-
-            if(alias != null)
-            {
-                iconLabel.setIcon(mIconManager.getIcon(alias.getIconName(), 18));
-
-                String aliasName = alias.getName();
-
-                //Truncate label if length exceeds 33 characters - hack!
-                if(aliasName.length() > 33)
-                {
-                    textLabel.setText(aliasName.substring(0,30) + "...");
-                }
-                else
-                {
-                    textLabel.setText(aliasName);
-                }
-            }
-            else
-            {
-                iconLabel.setIcon(null);
-                textLabel.setText(value);
-            }
+            identifier = mAliases.get(0).getName();
+            iconName = mAliases.get(0).getIconName();
         }
-        else
+        else if(mAliases.size() > 1)
         {
-            iconLabel.setIcon(null);
-            textLabel.setText("-----");
+            identifier = Joiner.on(", ").skipNulls().join(mAliases);
         }
+
+        if(identifier == null && mIdentifier != null)
+        {
+            identifier = mTalkgroupFormatPreference.format(mIdentifier);
+        }
+
+        if(identifier == null)
+        {
+            identifier = "-----";
+        }
+
+        final ImageIcon icon = iconName != null ? mIconManager.getIcon(iconName, 18) : null;
+        final String identifierText = truncate(identifier, 33);
+
+        EventQueue.invokeLater(new Runnable()
+        {
+            @Override
+            public void run()
+            {
+                mIdentifierLabel.setText(identifierText);
+                mIconLabel.setIcon(icon);
+                mConfigured = true;
+            }
+        });
+
     }
 
     /**
      * Processes audio metadata to update this panel's display values
      */
-    public class AudioMetadataProcessor implements Listener<Metadata>
+    public class AudioMetadataProcessor implements Listener<IdentifierCollection>
     {
         @Override
-        public void receive(final Metadata metadata)
+        public void receive(final IdentifierCollection identifierCollection)
         {
-            if(metadata.isUpdated() || !mConfigured)
+            if(identifierCollection != null && (identifierCollection.isUpdated() || !mConfigured))
             {
-                EventQueue.invokeLater(new Runnable()
+                List<Identifier> toIds = identifierCollection.getIdentifiers(IdentifierClass.USER, Role.TO);
+                mIdentifier = !toIds.isEmpty() ? toIds.get(0) : null;
+                AliasList aliasList = mAliasModel.getAliasList(identifierCollection);
+
+                if(aliasList != null)
                 {
-                    @Override
-                    public void run()
-                    {
-                        updateLabel(mTo, metadata.getPrimaryAddressTo().getIdentifier(),
-                            mToAlias, metadata.getPrimaryAddressTo().getAlias());
-
-                        mConfigured = true;
-                    }
-                });
+                    mAliases = aliasList.getAliases(mIdentifier);
+                }
 
+                updateLabels();
             }
         }
     }
@@ -225,18 +294,18 @@ public class AudioChannelPanel extends JPanel
     {
         if(setting instanceof ColorSetting)
         {
-            ColorSetting colorSetting = (ColorSetting) setting;
+            ColorSetting colorSetting = (ColorSetting)setting;
 
             switch(colorSetting.getColorSettingName())
             {
                 case CHANNEL_STATE_LABEL_DECODER:
-                    if(mTo != null)
+                    if(mIdentifierLabel != null)
                     {
-                        mTo.setForeground(mLabelColor);
+                        mIdentifierLabel.setForeground(mLabelColor);
                     }
-                    if(mToAlias != null)
+                    if(mIconLabel != null)
                     {
-                        mToAlias.setForeground(mLabelColor);
+                        mIconLabel.setForeground(mLabelColor);
                     }
                     break;
                 default:

src/main/java/io/github/dsheirer/audio/playback/AudioChannelsPanel.java

@@ -1,6 +1,7 @@
-/*******************************************************************************
+/*
+ * ******************************************************************************
  * sdrtrunk
- * Copyright (C) 2014-2017 Dennis Sheirer
+ * 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
@@ -14,24 +15,29 @@
  *
  * 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.audio;
+ * *****************************************************************************
+ */
+package io.github.dsheirer.audio.playback;
 
-import io.github.dsheirer.audio.output.AudioOutput;
+import io.github.dsheirer.alias.AliasModel;
+import io.github.dsheirer.audio.IAudioController;
 import io.github.dsheirer.icon.IconManager;
+import io.github.dsheirer.preference.UserPreferences;
 import io.github.dsheirer.settings.SettingsManager;
 import net.miginfocom.swing.MigLayout;
 
-import javax.swing.*;
-import java.awt.*;
+import javax.swing.JPanel;
+import javax.swing.JSeparator;
+import java.awt.Color;
+import java.awt.Component;
 import java.util.List;
 
 public class AudioChannelsPanel extends JPanel
 {
     private static final long serialVersionUID = 1L;
 
-    public AudioChannelsPanel(IconManager iconManager, SettingsManager settingsManager, IAudioController controller)
+    public AudioChannelsPanel(IconManager iconManager, UserPreferences userPreferences, SettingsManager settingsManager,
+                              IAudioController controller, AliasModel aliasModel)
     {
         setLayout(new MigLayout("insets 0 0 0 0", "[][sg abc,grow,fill][][sg abc,grow,fill]", "[grow,fill]"));
 
@@ -43,7 +49,7 @@ public class AudioChannelsPanel extends JPanel
 
         for(int x = 0; x < outputs.size(); x++)
         {
-            add(new AudioChannelPanel(iconManager, settingsManager, outputs.get(x)));
+            add(new AudioChannelPanel(iconManager, userPreferences, settingsManager, outputs.get(x), aliasModel));
 
             if(x < outputs.size() - 1)
             {
@@ -56,7 +62,21 @@ public class AudioChannelsPanel extends JPanel
         if(outputs.size() == 1)
         {
             addSeparator();
-            add(new AudioChannelPanel(iconManager, settingsManager, null), "growx");
+            add(new AudioChannelPanel(iconManager, userPreferences, settingsManager, null, aliasModel), "growx");
+        }
+    }
+
+    /**
+     * Prepares for dispose to allow deregistering from services
+     */
+    public void dispose()
+    {
+        for(Component component: getComponents())
+        {
+            if(component instanceof AudioChannelPanel)
+            {
+                ((AudioChannelPanel)component).dispose();
+            }
         }
     }
 

src/main/java/io/github/dsheirer/audio/playback/AudioOutput.java

@@ -1,6 +1,7 @@
-/*******************************************************************************
+/*
+ * ******************************************************************************
  * sdrtrunk
- * Copyright (C) 2014-2017 Dennis Sheirer
+ * 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
@@ -14,12 +15,12 @@
  *
  * 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.audio.output;
+ * *****************************************************************************
+ */
+package io.github.dsheirer.audio.playback;
 
 import io.github.dsheirer.audio.AudioEvent;
-import io.github.dsheirer.channel.metadata.Metadata;
+import io.github.dsheirer.identifier.IdentifierCollection;
 import io.github.dsheirer.sample.Broadcaster;
 import io.github.dsheirer.sample.Listener;
 import io.github.dsheirer.sample.buffer.ReusableAudioPacket;
@@ -54,7 +55,7 @@ public abstract class AudioOutput implements Listener<ReusableAudioPacket>, Line
     private int mBufferStartThreshold;
     private int mBufferStopThreshold;
 
-    private Listener<Metadata> mMetadataListener;
+    private Listener<IdentifierCollection> mIdentifierCollectionListener;
     private Broadcaster<AudioEvent> mAudioEventBroadcaster = new Broadcaster<>();
 
     private ScheduledFuture<?> mProcessorTask;
@@ -85,10 +86,7 @@ public abstract class AudioOutput implements Listener<ReusableAudioPacket>, Line
      * @param lineInfo to use when obtaining the source data line
      * @param requestedBufferSize of approximately 1 second of audio
      */
-    public AudioOutput(Mixer mixer,
-                       MixerChannel mixerChannel,
-                       AudioFormat audioFormat,
-                       Line.Info lineInfo,
+    public AudioOutput(Mixer mixer, MixerChannel mixerChannel, AudioFormat audioFormat, Line.Info lineInfo,
                        int requestedBufferSize)
     {
         mMixer = mixer;
@@ -174,7 +172,7 @@ public abstract class AudioOutput implements Listener<ReusableAudioPacket>, Line
 
         mAudioEventBroadcaster.dispose();
         mAudioEventBroadcaster = null;
-        mMetadataListener = null;
+        mIdentifierCollectionListener = null;
 
         if(mOutput != null)
         {
@@ -233,24 +231,24 @@ public abstract class AudioOutput implements Listener<ReusableAudioPacket>, Line
      * Registers a single listener to receive the audio metadata from each
      * audio packet
      */
-    public void setMetadataListener(Listener<Metadata> listener)
+    public void setIdentifierCollectionListener(Listener<IdentifierCollection> listener)
     {
-        mMetadataListener = listener;
+        mIdentifierCollectionListener = listener;
     }
 
     public void removeAudioMetadataListener()
     {
-        mMetadataListener = null;
+        mIdentifierCollectionListener = null;
     }
 
     /**
-     * Broadcasts audio metadata to the registered listener
+     * Broadcasts audio identifier collection metadata to the registered listener
      */
-    private void broadcast(Metadata metadata)
+    private void broadcast(IdentifierCollection identifierCollection)
     {
-        if(mMetadataListener != null)
+        if(mIdentifierCollectionListener != null)
         {
-            mMetadataListener.receive(metadata);
+            mIdentifierCollectionListener.receive(identifierCollection);
         }
     }
 
@@ -312,7 +310,7 @@ public abstract class AudioOutput implements Listener<ReusableAudioPacket>, Line
                     {
                         if(packet.getType() == ReusableAudioPacket.Type.AUDIO)
                         {
-                            broadcast(packet.getMetadata());
+                            broadcast(packet.getIdentifierCollection());
 
                             ByteBuffer buffer = convert(packet);
 

src/main/java/io/github/dsheirer/audio/playback/AudioPanel.java

@@ -1,6 +1,7 @@
-/*******************************************************************************
+/*
+ * ******************************************************************************
  * sdrtrunk
- * Copyright (C) 2014-2017 Dennis Sheirer
+ * 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
@@ -14,12 +15,16 @@
  *
  * 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.audio;
+ * *****************************************************************************
+ */
+package io.github.dsheirer.audio.playback;
 
-import io.github.dsheirer.audio.output.AudioOutput;
+import io.github.dsheirer.alias.AliasModel;
+import io.github.dsheirer.audio.AudioEvent;
+import io.github.dsheirer.audio.AudioException;
+import io.github.dsheirer.audio.IAudioController;
 import io.github.dsheirer.icon.IconManager;
+import io.github.dsheirer.preference.UserPreferences;
 import io.github.dsheirer.sample.Listener;
 import io.github.dsheirer.settings.SettingsManager;
 import io.github.dsheirer.source.SourceManager;
@@ -60,17 +65,21 @@ public class AudioPanel extends JPanel implements Listener<AudioEvent>
     private SettingsManager mSettingsManager;
     private SourceManager mSourceManager;
     private IAudioController mController;
+    private AliasModel mAliasModel;
+    private UserPreferences mUserPreferences;
 
     private JButton mMuteButton;
     private AudioChannelsPanel mAudioChannelsPanel;
 
-    public AudioPanel(IconManager iconManager, SettingsManager settingsManager, SourceManager sourceManager,
-                      IAudioController controller)
+    public AudioPanel(IconManager iconManager, UserPreferences userPreferences, SettingsManager settingsManager,
+                      SourceManager sourceManager, IAudioController controller, AliasModel aliasModel)
     {
         mIconManager = iconManager;
         mSettingsManager = settingsManager;
         mSourceManager = sourceManager;
         mController = controller;
+        mAliasModel = aliasModel;
+        mUserPreferences = userPreferences;
 
         mController.addControllerListener(this);
 
@@ -86,7 +95,7 @@ public class AudioPanel extends JPanel implements Listener<AudioEvent>
         mMuteButton.setBackground(getBackground());
         add(mMuteButton);
 
-        mAudioChannelsPanel = new AudioChannelsPanel(mIconManager, mSettingsManager, mController);
+        mAudioChannelsPanel = new AudioChannelsPanel(mIconManager, mUserPreferences, mSettingsManager, mController, mAliasModel);
 
         add(mAudioChannelsPanel);
 
@@ -107,13 +116,10 @@ public class AudioPanel extends JPanel implements Listener<AudioEvent>
                     public void run()
                     {
                         remove(mAudioChannelsPanel);
-
-                        mAudioChannelsPanel = new AudioChannelsPanel(mIconManager, mSettingsManager, mController);
-
+                        mAudioChannelsPanel.dispose();
+                        mAudioChannelsPanel = new AudioChannelsPanel(mIconManager, mUserPreferences, mSettingsManager, mController, mAliasModel);
                         add(mAudioChannelsPanel);
-
                         mAudioChannelsPanel.repaint();
-
                         revalidate();
                         repaint();
                     }

src/main/java/io/github/dsheirer/audio/playback/AudioPlaybackManager.java

@@ -1,6 +1,7 @@
-/*******************************************************************************
+/*
+ * ******************************************************************************
  * sdrtrunk
- * Copyright (C) 2014-2017 Dennis Sheirer
+ * 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
@@ -14,13 +15,13 @@
  *
  * 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.audio;
+ * *****************************************************************************
+ */
+package io.github.dsheirer.audio.playback;
 
-import io.github.dsheirer.audio.output.AudioOutput;
-import io.github.dsheirer.audio.output.MonoAudioOutput;
-import io.github.dsheirer.audio.output.StereoAudioOutput;
+import io.github.dsheirer.audio.AudioEvent;
+import io.github.dsheirer.audio.AudioException;
+import io.github.dsheirer.audio.IAudioController;
 import io.github.dsheirer.properties.SystemProperties;
 import io.github.dsheirer.sample.Broadcaster;
 import io.github.dsheirer.sample.Listener;
@@ -44,9 +45,9 @@ import java.util.concurrent.LinkedTransferQueue;
 import java.util.concurrent.ScheduledFuture;
 import java.util.concurrent.TimeUnit;
 
-public class AudioManager implements Listener<ReusableAudioPacket>, IAudioController
+public class AudioPlaybackManager implements Listener<ReusableAudioPacket>, IAudioController
 {
-    private static final Logger mLog = LoggerFactory.getLogger(AudioManager.class);
+    private static final Logger mLog = LoggerFactory.getLogger(AudioPlaybackManager.class);
 
     public static final int AUDIO_TIMEOUT = 1000; //1 second
 
@@ -79,7 +80,7 @@ public class AudioManager implements Listener<ReusableAudioPacket>, IAudioContro
      * packets to any combination of outputs based on any alias audio routing
      * options specified by the user.
      */
-    public AudioManager(MixerManager mixerManager)
+    public AudioPlaybackManager(MixerManager mixerManager)
     {
         mMixerManager = mixerManager;
 
@@ -185,9 +186,9 @@ public class AudioManager implements Listener<ReusableAudioPacket>, IAudioContro
 
         for(AudioOutputConnection connection : mAudioOutputConnections)
         {
-            if(connection.isInactive() && mChannelConnectionMap.containsKey(connection.getChannelMetadataID()))
+            if(connection.isInactive() && mChannelConnectionMap.containsKey(connection.getAudioChannelId()))
             {
-                mChannelConnectionMap.remove(connection.getChannelMetadataID());
+                mChannelConnectionMap.remove(connection.getAudioChannelId());
                 connection.disconnect();
                 mAvailableConnectionCount++;
                 changed = true;
@@ -365,12 +366,12 @@ public class AudioManager implements Listener<ReusableAudioPacket>, IAudioContro
      */
     private AudioOutputConnection getConnection(ReusableAudioPacket audioPacket)
     {
-        int channelMetadataID = audioPacket.getMetadata().getMetadataID();
+        int audioChannelId = audioPacket.getAudioChannelId();
 
         //Use an existing connection
-        if(mChannelConnectionMap.containsKey(channelMetadataID))
+        if(mChannelConnectionMap.containsKey(audioChannelId))
         {
-            return mChannelConnectionMap.get(channelMetadataID);
+            return mChannelConnectionMap.get(audioChannelId);
         }
 
         //Connect to an unused, available connection
@@ -380,8 +381,8 @@ public class AudioManager implements Listener<ReusableAudioPacket>, IAudioContro
             {
                 if(connection.isDisconnected())
                 {
-                    connection.connect(channelMetadataID, audioPacket.getMetadata().getAudioPriority());
-                    mChannelConnectionMap.put(channelMetadataID, connection);
+                    connection.connect(audioChannelId, audioPacket.getMonitoringPriority());
+                    mChannelConnectionMap.put(audioChannelId, connection);
                     mAvailableConnectionCount--;
                     return connection;
                 }
@@ -390,17 +391,17 @@ public class AudioManager implements Listener<ReusableAudioPacket>, IAudioContro
         //Preempt an existing lower priority connection and connect when this is a higher priority packet
         else
         {
-            int priority = audioPacket.getMetadata().getAudioPriority();
+            int priority = audioPacket.getMonitoringPriority();
 
             AudioOutputConnection connection = mLowestPriorityConnection;
 
             if(connection != null && priority < connection.getPriority())
             {
-                mChannelConnectionMap.remove(connection.getChannelMetadataID());
+                mChannelConnectionMap.remove(connection.getAudioChannelId());
 
-                connection.connect(channelMetadataID, priority);
+                connection.connect(audioChannelId, priority);
 
-                mChannelConnectionMap.put(channelMetadataID, connection);
+                mChannelConnectionMap.put(audioChannelId, connection);
 
                 return connection;
             }
@@ -427,7 +428,7 @@ public class AudioManager implements Listener<ReusableAudioPacket>, IAudioContro
                     for(ReusableAudioPacket packet : mPackets)
                     {
                         /* Don't process any packet's marked as do not monitor */
-                        if(!packet.getMetadata().isDoNotMonitor() && packet.getType() == ReusableAudioPacket.Type.AUDIO)
+                        if(!packet.isDoNotMonitor() && packet.getType() == ReusableAudioPacket.Type.AUDIO)
                         {
                             AudioOutputConnection connection = getConnection(packet);
 
@@ -469,11 +470,11 @@ public class AudioManager implements Listener<ReusableAudioPacket>, IAudioContro
      */
     public class AudioOutputConnection
     {
-        private static final int DISCONNECTED = -1;
+        private static final int DISCONNECTED = Integer.MIN_VALUE;
 
         private AudioOutput mAudioOutput;
         private int mPriority = 0;
-        private int mChannelMetadataID = DISCONNECTED;
+        private int mAudioChannelId = DISCONNECTED;
 
         public AudioOutputConnection(AudioOutput audioOutput)
         {
@@ -482,9 +483,9 @@ public class AudioManager implements Listener<ReusableAudioPacket>, IAudioContro
 
         public void receive(ReusableAudioPacket packet)
         {
-            if(packet.hasMetadata() && packet.getMetadata().getMetadataID() == mChannelMetadataID)
+            if(packet.hasIdentifierCollection() && packet.getAudioChannelId() == mAudioChannelId)
             {
-                int priority = packet.getMetadata().getAudioPriority();
+                int priority = packet.getMonitoringPriority();
 
                 if(mPriority != priority)
                 {
@@ -499,10 +500,10 @@ public class AudioManager implements Listener<ReusableAudioPacket>, IAudioContro
             }
             else
             {
-                if(packet.hasMetadata())
+                if(packet.hasIdentifierCollection())
                 {
-                    mLog.error("Received audio packet from channel metadata [" + packet.getMetadata().getMetadataID() +
-                        "] however this assignment is currently connected to metadata [" + mChannelMetadataID + "]");
+                    mLog.error("Received audio packet from channel metadata [" + packet.getAudioChannelId() +
+                        "] however this assignment is currently connected to metadata [" + mAudioChannelId + "]");
                 }
                 else
                 {
@@ -525,7 +526,7 @@ public class AudioManager implements Listener<ReusableAudioPacket>, IAudioContro
          */
         public boolean isDisconnected()
         {
-            return mChannelMetadataID == DISCONNECTED;
+            return mAudioChannelId == DISCONNECTED;
         }
 
         /**
@@ -542,7 +543,7 @@ public class AudioManager implements Listener<ReusableAudioPacket>, IAudioContro
          */
         public void connect(int source, int priority)
         {
-            mChannelMetadataID = source;
+            mAudioChannelId = source;
             mPriority = priority;
             updateLowestPriorityAssignment();
 
@@ -552,9 +553,9 @@ public class AudioManager implements Listener<ReusableAudioPacket>, IAudioContro
         /**
          * Currently connected source or -1 if disconnected
          */
-        public int getChannelMetadataID()
+        public int getAudioChannelId()
         {
-            return mChannelMetadataID;
+            return mAudioChannelId;
         }
 
         /**
@@ -563,7 +564,7 @@ public class AudioManager implements Listener<ReusableAudioPacket>, IAudioContro
          */
         public void disconnect()
         {
-            mChannelMetadataID = DISCONNECTED;
+            mAudioChannelId = DISCONNECTED;
             mPriority = 0;
         }
 

src/main/java/io/github/dsheirer/audio/playback/MonoAudioOutput.java

@@ -16,7 +16,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>
  *
  ******************************************************************************/
-package io.github.dsheirer.audio.output;
+package io.github.dsheirer.audio.playback;
 
 import io.github.dsheirer.audio.AudioFormats;
 import io.github.dsheirer.sample.buffer.ReusableAudioPacket;

src/main/java/io/github/dsheirer/audio/playback/StereoAudioOutput.java

@@ -16,7 +16,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>
  *
  ******************************************************************************/
-package io.github.dsheirer.audio.output;
+package io.github.dsheirer.audio.playback;
 
 import io.github.dsheirer.audio.AudioFormats;
 import io.github.dsheirer.sample.buffer.ReusableAudioPacket;

src/main/java/io/github/dsheirer/bits/CorrectedBinaryMessage.java

@@ -62,4 +62,14 @@ public class CorrectedBinaryMessage extends BinaryMessage
     {
         mCorrectedBitCount = count;
     }
+
+    /**
+     * Increases the current corrected bit count by the argument value.
+     * @param additionalCount to add to the current corrected bit count
+     */
+    public void incrementCorrectedBitCount(int additionalCount)
+    {
+        mCorrectedBitCount += additionalCount;
+    }
+
 }

src/main/java/io/github/dsheirer/bits/IBinarySymbolProcessor.java

@@ -1,21 +1,25 @@
-/*******************************************************************************
- * sdr-trunk
+/*
+ * ******************************************************************************
+ * 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.
+ * 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.
+ * 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/>
- *
- ******************************************************************************/
+ * 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.bits;
 
 public interface IBinarySymbolProcessor
 {
-    void receive(boolean symbol);
+    void process(boolean symbol);
 }

src/main/java/io/github/dsheirer/bits/MessageFramer.java

@@ -1,18 +1,22 @@
-/*******************************************************************************
- * sdr-trunk
+/*
+ * ******************************************************************************
+ * 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.
+ * 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.
+ * 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/>
- *
- ******************************************************************************/
+ * 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.bits;
 
 import io.github.dsheirer.dsp.symbol.ISyncDetectListener;
@@ -37,9 +41,9 @@ public class MessageFramer implements IBinarySymbolProcessor, Listener<Boolean>,
     private boolean[] mSyncPattern;
     private int mMessageLength;
     private ISyncDetectListener mSyncDetectListener;
-    private Broadcaster<BinaryMessage> mBroadcaster = new Broadcaster<BinaryMessage>();
-    private List<MessageAssembler> mMessageAssemblers = new ArrayList<MessageAssembler>();
-    private List<MessageAssembler> mCompletedMessageAssemblers = new ArrayList<MessageAssembler>();
+    private Broadcaster<CorrectedBinaryMessage> mBroadcaster = new Broadcaster<>();
+    private List<MessageAssembler> mMessageAssemblers = new ArrayList<>();
+    private List<MessageAssembler> mCompletedMessageAssemblers = new ArrayList<>();
     private SyncPatternMatcher mMatcher;
 
     public MessageFramer(boolean[] syncPattern, int messageLength)
@@ -63,10 +67,9 @@ public class MessageFramer implements IBinarySymbolProcessor, Listener<Boolean>,
     {
         mBroadcaster.dispose();
         mCompletedMessageAssemblers.clear();
-        mMessageAssemblers.clear();
     }
 
-    public void receive(boolean bit)
+    public void process(boolean bit)
     {
         mMatcher.receive(bit);
 
@@ -99,7 +102,7 @@ public class MessageFramer implements IBinarySymbolProcessor, Listener<Boolean>,
             /* Notify any sync detect listener(s) */
             if(mSyncDetectListener != null)
             {
-                mSyncDetectListener.syncDetected();
+                mSyncDetectListener.syncDetected(0);
             }
         }
     }
@@ -108,20 +111,7 @@ public class MessageFramer implements IBinarySymbolProcessor, Listener<Boolean>,
     @Override
     public void receive(Boolean bit)
     {
-        receive(bit);
-    }
-
-    /**
-     * Causes all messages currently under assembly to be forcibly
-     * sent (ie flushed) to all registered message listeners, and
-     * subsequently, all assemblers to be deleted
-     */
-    public void flush()
-    {
-        for(MessageAssembler assembler : mMessageAssemblers)
-        {
-            assembler.flush();
-        }
+        process(bit);
     }
 
     @Override
@@ -134,12 +124,12 @@ public class MessageFramer implements IBinarySymbolProcessor, Listener<Boolean>,
      * Allow a message listener to register with this framer to receive
      * all framed messages
      */
-    public void addMessageListener(Listener<BinaryMessage> listener)
+    public void addMessageListener(Listener<CorrectedBinaryMessage> listener)
     {
         mBroadcaster.addListener(listener);
     }
 
-    public void removeMessageListener(Listener<BinaryMessage> listener)
+    public void removeMessageListener(Listener<CorrectedBinaryMessage> listener)
     {
         mBroadcaster.removeListener(listener);
     }
@@ -152,7 +142,6 @@ public class MessageFramer implements IBinarySymbolProcessor, Listener<Boolean>,
         mMessageAssemblers.add(assembler);
     }
 
-    @SuppressWarnings("unused")
     private void removeMessageAssembler(MessageAssembler assembler)
     {
         mMessageAssemblers.remove(assembler);
@@ -169,12 +158,12 @@ public class MessageFramer implements IBinarySymbolProcessor, Listener<Boolean>,
      */
     private class MessageAssembler implements Listener<Boolean>
     {
-        BinaryMessage mMessage;
+        CorrectedBinaryMessage mMessage;
         boolean mComplete = false;
 
         MessageAssembler(int messageLength)
         {
-            mMessage = new BinaryMessage(messageLength);
+            mMessage = new CorrectedBinaryMessage(messageLength);
         }
 
         MessageAssembler(int messageLength, boolean[] initialFill)

src/main/java/io/github/dsheirer/bits/MultiSyncPatternMatcher.java

@@ -88,7 +88,6 @@ public class MultiSyncPatternMatcher
         {
             if(processor.checkSync(mBits))
             {
-                mSyncDetectListener.syncDetected();
                 mBitCount = 0;
             }
         }
@@ -100,6 +99,15 @@ public class MultiSyncPatternMatcher
         }
     }
 
+    /**
+     * Returns the number of bit errors for the current value against the sync pattern.
+     * @return
+     */
+    public long getCurrentValue()
+    {
+        return mBits;
+    }
+
     /**
      * Processes one bit before checking sync processors for a match.
      */

src/main/java/io/github/dsheirer/bits/SoftSyncDetector.java

@@ -16,22 +16,19 @@
 package io.github.dsheirer.bits;
 
 import io.github.dsheirer.dsp.symbol.ISyncDetectListener;
+import org.apache.commons.lang3.Validate;
 
 public class SoftSyncDetector implements ISyncProcessor
 {
     private ISyncDetectListener mListener;
     private long mPattern;
     private int mThreshold;
+    private int mBitErrorCount;
 
-    public SoftSyncDetector(ISyncDetectListener listener, long pattern, int threshold)
+    public SoftSyncDetector(long pattern, int threshold, ISyncDetectListener listener)
     {
-        this(pattern, threshold);
-
+        Validate.notNull(listener, "Sync detect listener cannot be null");
         mListener = listener;
-    }
-
-    public SoftSyncDetector(long pattern, int threshold)
-    {
         mPattern = pattern;
         mThreshold = threshold;
     }
@@ -46,12 +43,21 @@ public class SoftSyncDetector implements ISyncProcessor
     {
         long difference = value ^ mPattern;
 
-        if((difference == 0 || Long.bitCount(difference) <= mThreshold) &&
-            mListener != null)
+        if(difference == 0)
         {
-            mListener.syncDetected();
+            mListener.syncDetected(0);
             return true;
         }
+        else
+        {
+            mBitErrorCount = Long.bitCount(difference);
+
+            if(mBitErrorCount <= mThreshold)
+            {
+                mListener.syncDetected(mBitErrorCount);
+                return true;
+            }
+        }
 
         return false;
     }

src/main/java/io/github/dsheirer/bits/SyncDetector.java

@@ -46,7 +46,7 @@ public class SyncDetector implements ISyncProcessor
         {
             if(mListener != null)
             {
-                mListener.syncDetected();
+                mListener.syncDetected(0);
             }
 
             return true;

src/main/java/io/github/dsheirer/channel/IChannelDescriptor.java

@@ -0,0 +1,67 @@
+/*
+ * ******************************************************************************
+ * 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.
+ *
+ * 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.channel;
+
+import io.github.dsheirer.module.decode.p25.message.IFrequencyBand;
+import io.github.dsheirer.protocol.Protocol;
+
+/**
+ * Channel descriptor
+ */
+public interface IChannelDescriptor
+{
+    /**
+     * Downlink frequency for the channel
+     * @return frequency in hertz
+     */
+    long getDownlinkFrequency();
+
+    /**
+     * Uplink frequency for the channel
+     * @return frequency in hertz
+     */
+    long getUplinkFrequency();
+
+    /**
+     * Frequency band identifiers (0 - 15)
+     */
+    int[] getFrequencyBandIdentifiers();
+
+    /**
+     * Assigns the frequency band message to the channel to use in calculating the up/downlink frequencies
+     * @param bandIdentifier
+     */
+    void setFrequencyBand(IFrequencyBand bandIdentifier);
+
+    /**
+     * Indicates if the timeslot count is greater than 1;
+     */
+    boolean isTDMAChannel();
+
+    /**
+     * Number of timeslots.  FDMA has 1 timeslot and TDMA has at least 2 timeslots
+     */
+    int getTimeslotCount();
+
+    /**
+     * Protocol associated with the channel
+     */
+    Protocol getProtocol();
+}

src/main/java/io/github/dsheirer/channel/metadata/AliasedIdentifier.java

@@ -1,111 +0,0 @@
-/*******************************************************************************
- * sdrtrunk
- * Copyright (C) 2014-2017 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.channel.metadata;
-
-import io.github.dsheirer.alias.Alias;
-
-public class AliasedIdentifier
-{
-    private String mIdentifier;
-    private Alias mAlias;
-
-    /**
-     * Identifier and corresponding optional alias
-     */
-    public AliasedIdentifier()
-    {
-    }
-
-    /**
-     * Resets alias and value to null
-     *
-     * Package Private - should only be changed within MutableMetadata
-     */
-    void reset()
-    {
-        mIdentifier = null;
-        mAlias = null;
-    }
-
-    /**
-     * Identifier
-     */
-    public String getIdentifier()
-    {
-        return mIdentifier;
-    }
-
-    /**
-     * Sets the identifier to the argument value
-     *
-     * Package Private - should only be changed within MutableMetadata
-     */
-    void setIdentifier(String identifier)
-    {
-        mIdentifier = identifier;
-    }
-
-    /**
-     * Indicates if there is a non-null, non-empty identifier
-     */
-    public boolean hasIdentifier()
-    {
-        return mIdentifier != null && !mIdentifier.isEmpty();
-    }
-
-    /**
-     * Alias for the identifier.
-     */
-    public Alias getAlias()
-    {
-        return mAlias;
-    }
-
-    /**
-     * Sets the alias to the argument
-     *
-     * Package Private - should only be changed within MutableMetadata
-     */
-    void setAlias(Alias alias)
-    {
-        mAlias = alias;
-    }
-
-    /**
-     * Indicates if there is an alias corresponding to the identifier
-     */
-    public boolean hasAlias()
-    {
-        return mAlias != null;
-    }
-
-    public AliasedIdentifier copyOf()
-    {
-        AliasedIdentifier copy = new AliasedIdentifier();
-
-        copy.setAlias(mAlias);
-
-        if(mIdentifier != null)
-        {
-            copy.setIdentifier(new String(mIdentifier));
-        }
-
-        return copy;
-    }
-}

src/main/java/io/github/dsheirer/channel/metadata/AliasedIntegerAttributeMonitor.java

@@ -1,101 +0,0 @@
-/*******************************************************************************
- * sdrtrunk
- * Copyright (C) 2014-2017 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.channel.metadata;
-
-import io.github.dsheirer.alias.Alias;
-import io.github.dsheirer.alias.AliasList;
-import io.github.dsheirer.alias.id.AliasIDType;
-import io.github.dsheirer.sample.Listener;
-
-import static io.github.dsheirer.alias.id.AliasIDType.LTR_NET_UID;
-import static io.github.dsheirer.alias.id.AliasIDType.STATUS;
-
-
-public class AliasedIntegerAttributeMonitor extends AttributeMonitor<Integer>
-{
-    private static final AliasIDType[] VALID_ID_TYPES =  {STATUS, LTR_NET_UID};
-
-    private AliasList mAliasList;
-    private AliasIDType mAliasIDType;
-
-    /**
-     * Provides monitoring of a String attribute's values with occurrence heuristics enabled and alias lookup with each
-     * change in the attribute's value.
-     *
-     * @param attribute to monitor
-     * @param listener to receive change requests
-     * @param aliasList to lookup alias from
-     * @param aliasIDType to determine correct alias lookup method in alias list
-     */
-    public AliasedIntegerAttributeMonitor(Attribute attribute, Listener<AttributeChangeRequest> listener, AliasList aliasList,
-                                          AliasIDType aliasIDType)
-    {
-        super(attribute, listener);
-
-        if(!isValidIDType(aliasIDType))
-        {
-            throw new IllegalArgumentException("Alias ID Type [" + aliasIDType.name() + "] is not supported");
-        }
-        mAliasList = aliasList;
-        mAliasIDType = aliasIDType;
-    }
-
-    /**
-     * Indicates if the alias ID type is a supported/valid type for this monitor.
-     */
-    public static boolean isValidIDType(AliasIDType type)
-    {
-        for(AliasIDType validType: VALID_ID_TYPES)
-        {
-            if(type == validType)
-            {
-                return true;
-            }
-        }
-
-        return false;
-    }
-
-    /**
-     * Lookup of the alias that corresponds to the value's alias ID type
-     */
-    @Override
-    protected Alias getAlias()
-    {
-        Alias alias = null;
-
-        if(mAliasList != null)
-        {
-            if(hasValue())
-            {
-                switch(mAliasIDType)
-                {
-                    case STATUS:
-                        alias = mAliasList.getStatus(getValue());
-                        break;
-                    case LTR_NET_UID:
-                        alias = mAliasList.getUniqueID(getValue());
-                        break;
-                }
-            }
-        }
-
-        return alias;
-    }
-}

src/main/java/io/github/dsheirer/channel/metadata/AliasedStringAttributeMonitor.java

@@ -1,121 +0,0 @@
-/*******************************************************************************
- * sdrtrunk
- * Copyright (C) 2014-2017 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.channel.metadata;
-
-import io.github.dsheirer.alias.Alias;
-import io.github.dsheirer.alias.AliasList;
-import io.github.dsheirer.alias.id.AliasIDType;
-import io.github.dsheirer.sample.Listener;
-
-import static io.github.dsheirer.alias.id.AliasIDType.ESN;
-import static io.github.dsheirer.alias.id.AliasIDType.FLEETSYNC;
-import static io.github.dsheirer.alias.id.AliasIDType.MDC1200;
-import static io.github.dsheirer.alias.id.AliasIDType.MIN;
-import static io.github.dsheirer.alias.id.AliasIDType.MPT1327;
-import static io.github.dsheirer.alias.id.AliasIDType.SITE;
-import static io.github.dsheirer.alias.id.AliasIDType.TALKGROUP;
-
-
-public class AliasedStringAttributeMonitor extends AttributeMonitor<String>
-{
-    private static final AliasIDType[] VALID_ID_TYPES =  {ESN, FLEETSYNC, MDC1200, MIN, MPT1327, SITE, TALKGROUP};
-
-    private AliasList mAliasList;
-    private AliasIDType mAliasIDType;
-
-    /**
-     * Provides monitoring of a String attribute's values with occurrence heuristics enabled and alias lookup with each
-     * change in the attribute's value.
-     *
-     * @param attribute to monitor
-     * @param listener to receive change requests
-     * @param aliasList to lookup alias from
-     * @param aliasIDType to determine correct alias lookup method in alias list
-     */
-    public AliasedStringAttributeMonitor(Attribute attribute, Listener<AttributeChangeRequest> listener, AliasList aliasList,
-                                         AliasIDType aliasIDType)
-    {
-        super(attribute, listener);
-
-        if(!isValidIDType(aliasIDType))
-        {
-            throw new IllegalArgumentException("Alias ID Type [" + aliasIDType.name() + "] is not supported");
-        }
-        mAliasList = aliasList;
-        mAliasIDType = aliasIDType;
-    }
-
-    /**
-     * Indicates if the alias ID type is a supported/valid type for this monitor.
-     */
-    public static boolean isValidIDType(AliasIDType type)
-    {
-        for(AliasIDType validType: VALID_ID_TYPES)
-        {
-            if(type == validType)
-            {
-                return true;
-            }
-        }
-
-        return false;
-    }
-
-    /**
-     * Lookup of the alias that corresponds to the value's alias ID type
-     */
-    @Override
-    protected Alias getAlias()
-    {
-        Alias alias = null;
-
-        if(mAliasList != null)
-        {
-            if(hasValue())
-            {
-                switch(mAliasIDType)
-                {
-                    case ESN:
-                        alias = mAliasList.getESNAlias(getValue());
-                        break;
-                    case FLEETSYNC:
-                        alias = mAliasList.getFleetsyncAlias(getValue());
-                        break;
-                    case MDC1200:
-                        alias = mAliasList.getMDC1200Alias(getValue());
-                        break;
-                    case MIN:
-                        alias = mAliasList.getMobileIDNumberAlias(getValue());
-                        break;
-                    case MPT1327:
-                        alias = mAliasList.getMPT1327Alias(getValue());
-                        break;
-                    case SITE:
-                        alias = mAliasList.getSiteID(getValue());
-                        break;
-                    case TALKGROUP:
-                        alias = mAliasList.getTalkgroupAlias(getValue());
-                        break;
-                }
-            }
-        }
-
-        return alias;
-    }
-}

src/main/java/io/github/dsheirer/channel/metadata/Attribute.java

@@ -20,6 +20,7 @@ package io.github.dsheirer.channel.metadata;
 
 public enum Attribute
 {
+    BUFFER_OVERFLOW,
     CHANNEL_CONFIGURATION_NAME,
     CHANNEL_CONFIGURATION_SITE,
     CHANNEL_CONFIGURATION_SYSTEM,

src/main/java/io/github/dsheirer/channel/metadata/AttributeChangeRequest.java

@@ -116,6 +116,16 @@ public class AttributeChangeRequest<T>
         return null;
     }
 
+    public Boolean getBooleanValue()
+    {
+        if(mValue instanceof Boolean)
+        {
+            return (Boolean)mValue;
+        }
+
+        return false;
+    }
+
     /**
      * Returns the value as a DecoderType or null if the value is not a DecoderType instance.
      */

src/main/java/io/github/dsheirer/channel/metadata/AttributeMonitor.java

@@ -1,154 +0,0 @@
-/*******************************************************************************
- * sdrtrunk
- * Copyright (C) 2014-2017 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.channel.metadata;
-
-import io.github.dsheirer.alias.Alias;
-import io.github.dsheirer.sample.Listener;
-
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
-public class AttributeMonitor<T>
-{
-    private Attribute mAttribute;
-    private Listener<AttributeChangeRequest> mListener;
-    private boolean mHeuristicsEnabled = true;
-    private Map<T,Integer> mOccurrenceCounts = new HashMap<>();
-    private T mCurrentValue;
-    private List<T> mIllegalValues = new ArrayList<>();
-
-    public AttributeMonitor(Attribute attribute, Listener<AttributeChangeRequest> listener)
-    {
-        mAttribute = attribute;
-        mListener = listener;
-    }
-
-    /**
-     * Processes the value and emits a change request if the value needs to be changed.  If heuristics are enabled,
-     * an internal mapping of values to occurrence counts is updated and a change is emitted once a value that is
-     * different from the current value, has a higher occurrence count than the current value.  If heuristics are
-     * disabled, then a change is emitted at each change in the value.
-     *
-     * @param t type
-     * @return true if the value was changed after processing
-     */
-    public boolean process(T t)
-    {
-        boolean changed = false;
-
-        if(t != null && !mIllegalValues.contains(t))
-        {
-            if(mHeuristicsEnabled)
-            {
-                if(mOccurrenceCounts.containsKey(t))
-                {
-                    mOccurrenceCounts.put(t, mOccurrenceCounts.get(t) + 1);
-                }
-                else
-                {
-                    mOccurrenceCounts.put(t, 1);
-                }
-            }
-
-            if(mCurrentValue == null)
-            {
-                mCurrentValue = t;
-                changed = true;
-            }
-            else if(!mCurrentValue.equals(t))
-            {
-                if(mHeuristicsEnabled)
-                {
-                    int count = mOccurrenceCounts.get(mCurrentValue);
-
-                    for(Map.Entry<T,Integer> entry : mOccurrenceCounts.entrySet())
-                    {
-                        if(entry.getValue() > count)
-                        {
-                            count = entry.getValue();
-                            mCurrentValue = entry.getKey();
-                            changed = true;
-                        }
-                    }
-                }
-                else
-                {
-                    mCurrentValue = t;
-                    changed = true;
-                }
-            }
-
-            if(changed && mListener != null)
-            {
-                mListener.receive(new AttributeChangeRequest(mAttribute, getValue(), getAlias()));
-            }
-        }
-
-        return changed;
-    }
-
-    /**
-     * Alias for the current value.  This class does not return an alias, but subclasses can return an alias that
-     * is appropriate for the monitored attribute value.
-     *
-     * @return an optional alias for the current value
-     */
-    protected Alias getAlias()
-    {
-        return null;
-    }
-
-    /**
-     * Resets the attribute value to null and resets occurrence heuristics.
-     */
-    public void reset()
-    {
-        mCurrentValue = null;
-        mOccurrenceCounts.clear();
-    }
-
-    /**
-     * Adds a value to the internal list of illegal values.  The monitor will not allow the attribute to be changed to
-     * any values contained in this list.
-     *
-     * @param illegalValue to prevent for the monitored alias
-     */
-    public void addIllegalValue(T illegalValue)
-    {
-        mIllegalValues.add(illegalValue);
-    }
-
-    /**
-     * Returns the current value or null if the monitor is newly started or reset.
-     */
-    public T getValue()
-    {
-        return mCurrentValue;
-    }
-
-    /**
-     * Indicates if the current value is non-null
-     */
-    public boolean hasValue()
-    {
-        return mCurrentValue != null;
-    }
-}

src/main/java/io/github/dsheirer/channel/metadata/ChannelMetadata.java

@@ -0,0 +1,388 @@
+/*
+ * ******************************************************************************
+ * 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.
+ *
+ * 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.channel.metadata;
+
+import io.github.dsheirer.alias.Alias;
+import io.github.dsheirer.alias.AliasList;
+import io.github.dsheirer.alias.AliasModel;
+import io.github.dsheirer.identifier.Identifier;
+import io.github.dsheirer.identifier.IdentifierUpdateListener;
+import io.github.dsheirer.identifier.IdentifierUpdateNotification;
+import io.github.dsheirer.identifier.Role;
+import io.github.dsheirer.identifier.configuration.AliasListConfigurationIdentifier;
+import io.github.dsheirer.identifier.configuration.ChannelNameConfigurationIdentifier;
+import io.github.dsheirer.identifier.configuration.DecoderTypeConfigurationIdentifier;
+import io.github.dsheirer.identifier.configuration.FrequencyConfigurationIdentifier;
+import io.github.dsheirer.identifier.configuration.SiteConfigurationIdentifier;
+import io.github.dsheirer.identifier.configuration.SystemConfigurationIdentifier;
+import io.github.dsheirer.identifier.decoder.ChannelStateIdentifier;
+import io.github.dsheirer.identifier.decoder.DecoderLogicalChannelNameIdentifier;
+import io.github.dsheirer.sample.Listener;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import java.util.Collections;
+import java.util.List;
+
+/**
+ * Channel metadata containing details about the channel configuration, decoder state and current
+ * set of decoded user identifiers (ie TO and FROM).
+ */
+public class ChannelMetadata implements Listener<IdentifierUpdateNotification>, IdentifierUpdateListener
+{
+    private final static Logger mLog = LoggerFactory.getLogger(ChannelMetadata.class);
+
+    private SystemConfigurationIdentifier mSystemConfigurationIdentifier;
+    private SiteConfigurationIdentifier mSiteConfigurationIdentifier;
+    private ChannelNameConfigurationIdentifier mChannelNameConfigurationIdentifier;
+    private FrequencyConfigurationIdentifier mFrequencyConfigurationIdentifier;
+    private ChannelStateIdentifier mChannelStateIdentifier = ChannelStateIdentifier.IDLE;
+    private DecoderLogicalChannelNameIdentifier mDecoderLogicalChannelNameIdentifier;
+    private DecoderTypeConfigurationIdentifier mDecoderTypeConfigurationIdentifier;
+    private Identifier mFromIdentifier;
+    private List<Alias> mFromIdentifierAliases;
+    private Identifier mToIdentifier;
+    private List<Alias> mToIdentifierAliases;
+
+    private IChannelMetadataUpdateListener mIChannelMetadataUpdateListener;
+    private AliasModel mAliasModel;
+    private AliasList mAliasList;
+
+    public ChannelMetadata(AliasModel aliasModel)
+    {
+        mAliasModel = aliasModel;
+    }
+
+    @Override
+    public Listener<IdentifierUpdateNotification> getIdentifierUpdateListener()
+    {
+        return this;
+    }
+
+    /**
+     * System configuration identifier
+     */
+    public SystemConfigurationIdentifier getSystemConfigurationIdentifier()
+    {
+        return mSystemConfigurationIdentifier;
+    }
+
+    public boolean hasSystemConfigurationIdentifier()
+    {
+        return mSystemConfigurationIdentifier != null;
+    }
+
+    /**
+     * Site configuration identifier
+     */
+    public SiteConfigurationIdentifier getSiteConfigurationIdentifier()
+    {
+        return mSiteConfigurationIdentifier;
+    }
+
+    public boolean hasSiteConfigurationIdentifier()
+    {
+        return mSiteConfigurationIdentifier != null;
+    }
+
+    /**
+     * Channel configuration identifier
+     */
+    public ChannelNameConfigurationIdentifier getChannelNameConfigurationIdentifier()
+    {
+        return mChannelNameConfigurationIdentifier;
+    }
+
+    public boolean hasChannelConfigurationIdentifier()
+    {
+        return mChannelNameConfigurationIdentifier != null;
+    }
+
+    /**
+     * Logical channel name/number expoded by the decoder
+     */
+    public DecoderLogicalChannelNameIdentifier getDecoderLogicalChannelNameIdentifier()
+    {
+        return mDecoderLogicalChannelNameIdentifier;
+    }
+
+    public boolean hasDecoderLogicalChannelNameIdentifier()
+    {
+        return mDecoderLogicalChannelNameIdentifier != null;
+    }
+
+    /**
+     * Frequency configuration identifier
+     */
+    public FrequencyConfigurationIdentifier getFrequencyConfigurationIdentifier()
+    {
+        return mFrequencyConfigurationIdentifier;
+    }
+
+    public boolean hasFrequencyConfigurationIdentifier()
+    {
+        return mFrequencyConfigurationIdentifier != null;
+    }
+
+    /**
+     * Decoder state identifier
+     */
+    public ChannelStateIdentifier getChannelStateIdentifier()
+    {
+        return mChannelStateIdentifier;
+    }
+
+    public boolean hasDecoderStateIdentifier()
+    {
+        return mChannelStateIdentifier != null;
+    }
+
+    /**
+     * Decoder type identifier
+     */
+    public DecoderTypeConfigurationIdentifier getDecoderTypeConfigurationIdentifier()
+    {
+        return mDecoderTypeConfigurationIdentifier;
+    }
+
+    public boolean hasDecoderTypeIdentifier()
+    {
+        return mDecoderTypeConfigurationIdentifier != null;
+    }
+
+    /**
+     * Current call event FROM identifier
+     */
+    public Identifier getFromIdentifier()
+    {
+        return mFromIdentifier;
+    }
+
+    public boolean hasFromIdentifier()
+    {
+        return mFromIdentifier != null;
+    }
+
+    /**
+     * Optional alias associated with the FROM identifier
+     */
+    public List<Alias> getFromIdentifierAliases()
+    {
+        return mFromIdentifierAliases;
+    }
+
+    /**
+     * Current call event TO identifier
+     */
+    public Identifier getToIdentifier()
+    {
+        return mToIdentifier;
+    }
+
+    public boolean hasToIdentifier()
+    {
+        return mToIdentifier != null;
+    }
+
+    /**
+     * Optional alias associated with the TO identifier
+     */
+    public List<Alias> getToIdentifierAliases()
+    {
+        return mToIdentifierAliases;
+    }
+
+    /**
+     * Registers the listener for receiving field update events
+     */
+    public void setUpdateEventListener(IChannelMetadataUpdateListener listener)
+    {
+        mIChannelMetadataUpdateListener = listener;
+    }
+
+    /**
+     * Deregisters the listener from receiving field update events
+     */
+    public void removeUpdateEventListener()
+    {
+        mIChannelMetadataUpdateListener = null;
+    }
+
+    /**
+     * Broadcasts this metadata and the field that has been updated
+     *
+     * @param field that has been updated
+     */
+    private void broadcastUpdate(ChannelMetadataField field)
+    {
+        if(mIChannelMetadataUpdateListener != null)
+        {
+            mIChannelMetadataUpdateListener.updated(this, field);
+        }
+    }
+
+    @Override
+    public void receive(IdentifierUpdateNotification update)
+    {
+        Identifier identifier = update.getIdentifier();
+
+        switch(identifier.getIdentifierClass())
+        {
+            case CONFIGURATION:
+                switch(identifier.getForm())
+                {
+                    case ALIAS_LIST:
+                        if(update.isAdd())
+                        {
+                            mAliasList = mAliasModel.getAliasList((AliasListConfigurationIdentifier)identifier);
+
+                            if(mAliasList != null)
+                            {
+                                if(mToIdentifier != null)
+                                {
+                                    mToIdentifierAliases = mAliasList.getAliases(mToIdentifier);
+                                }
+                                if(mFromIdentifier != null)
+                                {
+                                    mFromIdentifierAliases = mAliasList.getAliases(mFromIdentifier);
+                                }
+                            }
+                        }
+                        break;
+                    case CHANNEL:
+                        if(identifier instanceof ChannelNameConfigurationIdentifier && (update.isAdd() || update.isSilentAdd()))
+                        {
+                            mChannelNameConfigurationIdentifier = (ChannelNameConfigurationIdentifier)identifier;
+                        }
+                        else
+                        {
+                            mChannelNameConfigurationIdentifier = null;
+                        }
+                        broadcastUpdate(ChannelMetadataField.CONFIGURATION_CHANNEL);
+                        break;
+                    case CHANNEL_FREQUENCY:
+                        if(identifier instanceof FrequencyConfigurationIdentifier && (update.isAdd() || update.isSilentAdd()))
+                        {
+                            mFrequencyConfigurationIdentifier = (FrequencyConfigurationIdentifier)identifier;
+                        }
+                        else
+                        {
+                            mFrequencyConfigurationIdentifier = null;
+                        }
+                        broadcastUpdate(ChannelMetadataField.CONFIGURATION_FREQUENCY);
+                        break;
+                    case DECODER_TYPE:
+                        if(identifier instanceof DecoderTypeConfigurationIdentifier && (update.isAdd() || update.isSilentAdd()))
+                        {
+                            mDecoderTypeConfigurationIdentifier = (DecoderTypeConfigurationIdentifier)identifier;
+                        }
+                        else
+                        {
+                            mDecoderTypeConfigurationIdentifier = null;
+                        }
+                        broadcastUpdate(ChannelMetadataField.DECODER_TYPE);
+                        break;
+                    case SITE:
+                        if(identifier instanceof SiteConfigurationIdentifier && (update.isAdd() || update.isSilentAdd()))
+                        {
+                            mSiteConfigurationIdentifier = (SiteConfigurationIdentifier)identifier;
+                        }
+                        else
+                        {
+                            mSiteConfigurationIdentifier = null;
+                        }
+                        broadcastUpdate(ChannelMetadataField.CONFIGURATION_SITE);
+                        break;
+                    case SYSTEM:
+                        if(identifier instanceof SystemConfigurationIdentifier && (update.isAdd() || update.isSilentAdd()))
+                        {
+                            mSystemConfigurationIdentifier = (SystemConfigurationIdentifier)identifier;
+                        }
+                        else
+                        {
+                            mSystemConfigurationIdentifier = null;
+                        }
+                        broadcastUpdate(ChannelMetadataField.CONFIGURATION_SYSTEM);
+                        break;
+                }
+                break;
+            case DECODER:
+                switch(identifier.getForm())
+                {
+                    case CHANNEL_NAME:
+                        if(identifier instanceof DecoderLogicalChannelNameIdentifier && (update.isAdd() || update.isSilentAdd()))
+                        {
+                            mDecoderLogicalChannelNameIdentifier = (DecoderLogicalChannelNameIdentifier)identifier;
+                        }
+                        else
+                        {
+                            mDecoderLogicalChannelNameIdentifier = null;
+                        }
+                        broadcastUpdate(ChannelMetadataField.DECODER_CHANNEL_NAME);
+                        break;
+                    case STATE:
+                        if(identifier instanceof ChannelStateIdentifier && (update.isAdd() || update.isSilentAdd()))
+                        {
+                            mChannelStateIdentifier = (ChannelStateIdentifier)identifier;
+                        }
+                        else
+                        {
+                            mChannelStateIdentifier = null;
+                        }
+                        broadcastUpdate(ChannelMetadataField.DECODER_STATE);
+                        break;
+                }
+                break;
+            case USER:
+                if(identifier.getRole() == Role.FROM)
+                {
+                    mFromIdentifier = update.isAdd() ? identifier : null;
+
+                    if(mAliasList != null && mFromIdentifier != null)
+                    {
+                        mFromIdentifierAliases = mAliasList.getAliases(mFromIdentifier);
+                    }
+                    else
+                    {
+                        mFromIdentifierAliases = Collections.EMPTY_LIST;
+                    }
+
+                    broadcastUpdate(ChannelMetadataField.USER_FROM);
+                }
+                else if(identifier.getRole() == Role.TO)
+                {
+                    mToIdentifier = update.isAdd() ? identifier : null;
+
+                    if(mAliasList != null && mToIdentifier != null)
+                    {
+                        mToIdentifierAliases = mAliasList.getAliases(mToIdentifier);
+                    }
+                    else
+                    {
+                        mToIdentifierAliases = Collections.EMPTY_LIST;
+                    }
+
+                    broadcastUpdate(ChannelMetadataField.USER_TO);
+                }
+                break;
+        }
+    }
+}

src/main/java/io/github/dsheirer/channel/metadata/ChannelMetadataField.java

@@ -0,0 +1,34 @@
+/*
+ * ******************************************************************************
+ * 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.
+ *
+ * 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.channel.metadata;
+
+public enum ChannelMetadataField
+{
+    CONFIGURATION_CHANNEL,
+    CONFIGURATION_FREQUENCY,
+    CONFIGURATION_SITE,
+    CONFIGURATION_SYSTEM,
+    DECODER_CHANNEL_NAME,
+    DECODER_STATE,
+    DECODER_TYPE,
+    USER_FROM,
+    USER_TO;
+}

src/main/java/io/github/dsheirer/channel/metadata/ChannelMetadataModel.java

@@ -1,6 +1,7 @@
-/*******************************************************************************
+/*
+ * ******************************************************************************
  * sdrtrunk
- * Copyright (C) 2014-2017 Dennis Sheirer
+ * 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
@@ -14,44 +15,69 @@
  *
  * 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.channel.metadata;
 
-import io.github.dsheirer.channel.state.State;
+import com.google.common.eventbus.Subscribe;
+import io.github.dsheirer.alias.Alias;
 import io.github.dsheirer.controller.channel.Channel;
-import io.github.dsheirer.sample.Listener;
+import io.github.dsheirer.eventbus.MyEventBus;
+import io.github.dsheirer.identifier.Identifier;
+import io.github.dsheirer.preference.PreferenceType;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 import javax.swing.table.AbstractTableModel;
-import java.awt.*;
-import java.text.DecimalFormat;
+import java.awt.EventQueue;
 import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 
-public class ChannelMetadataModel extends AbstractTableModel implements Listener<MutableMetadataChangeEvent>
+public class ChannelMetadataModel extends AbstractTableModel implements IChannelMetadataUpdateListener
 {
-    private final DecimalFormat FREQUENCY_FORMATTER = new DecimalFormat( "#.00000" );
+    private final static Logger mLog = LoggerFactory.getLogger(ChannelMetadataModel.class);
 
-    public static final int COLUMN_STATE = 0;
-    public static final int COLUMN_DECODER = 1;
-    public static final int COLUMN_CHANNEL = 2;
-    public static final int COLUMN_FREQUENCY = 3;
-    public static final int COLUMN_PRIMARY_FROM = 4;
-    public static final int COLUMN_PRIMARY_TO = 5;
-    public static final int COLUMN_SECONDARY_FROM = 6;
-    public static final int COLUMN_SECONDARY_TO = 7;
-    public static final int COLUMN_CONFIGURATION_NAME = 8;
-    public static final int COLUMN_MESSAGE = 9;
+    public static final int COLUMN_DECODER_STATE = 0;
+    public static final int COLUMN_DECODER_TYPE = 1;
+    public static final int COLUMN_USER_FROM = 2;
+    public static final int COLUMN_USER_FROM_ALIAS = 3;
+    public static final int COLUMN_USER_TO = 4;
+    public static final int COLUMN_USER_TO_ALIAS = 5;
+    public static final int COLUMN_DECODER_LOGICAL_CHANNEL_NAME = 6;
+    public static final int COLUMN_CONFIGURATION_FREQUENCY = 7;
+    public static final int COLUMN_CONFIGURATION_CHANNEL = 8;
 
-    private static final String[] COLUMNS = {"State", "Decoder", "Channel", "Frequency", "Primary From", "Primary To",
-         "Secondary From", "Secondary To", "Channel Name", "Message"};
+    private static final String[] COLUMNS = {"Status", "Decoder", "From", "Alias", "To", "Alias", "Channel", "Frequency", "Channel Name"};
 
-    private List<MutableMetadata> mChannelMetadata = new ArrayList();
-    private Map<MutableMetadata,Channel> mMetadataChannelMap = new HashMap();
+    private List<ChannelMetadata> mChannelMetadata = new ArrayList();
+    private Map<ChannelMetadata,Channel> mMetadataChannelMap = new HashMap();
 
-    public void add(MutableMetadata metadata, Channel channel)
+    public ChannelMetadataModel()
+    {
+        MyEventBus.getEventBus().register(this);
+    }
+
+    /**
+     * Receives preference update notifications via the event bus
+     * @param preferenceType that was updated
+     */
+    @Subscribe
+    public void preferenceUpdated(PreferenceType preferenceType)
+    {
+        if(preferenceType == PreferenceType.IDENTIFIER)
+        {
+            for(int row = 0; row < mChannelMetadata.size(); row++)
+            {
+                fireTableCellUpdated(row, COLUMN_USER_FROM);
+                fireTableCellUpdated(row, COLUMN_USER_TO);
+            }
+        }
+    }
+
+
+    public void add(ChannelMetadata channelMetadata, Channel channel)
     {
         //Execute on the swing thread to avoid threading issues
         EventQueue.invokeLater(new Runnable()
@@ -59,19 +85,16 @@ public class ChannelMetadataModel extends AbstractTableModel implements Listener
             @Override
             public void run()
             {
-                mChannelMetadata.add(metadata);
-                mMetadataChannelMap.put(metadata, channel);
-
-                int index = mChannelMetadata.indexOf(metadata);
-
+                mChannelMetadata.add(channelMetadata);
+                mMetadataChannelMap.put(channelMetadata, channel);
+                int index = mChannelMetadata.indexOf(channelMetadata);
                 fireTableRowsInserted(index, index);
-
-                metadata.addListener(ChannelMetadataModel.this);
+                channelMetadata.setUpdateEventListener(ChannelMetadataModel.this);
             }
         });
     }
 
-    public void remove(MutableMetadata metadata)
+    public void remove(ChannelMetadata channelMetadata)
     {
         //Execute on the swing thread to avoid threading issues
         EventQueue.invokeLater(new Runnable()
@@ -79,13 +102,10 @@ public class ChannelMetadataModel extends AbstractTableModel implements Listener
             @Override
             public void run()
             {
-                metadata.removeListener(ChannelMetadataModel.this);
-
-                int index = mChannelMetadata.indexOf(metadata);
-
-                mChannelMetadata.remove(metadata);
-                mMetadataChannelMap.remove(metadata);
-
+                channelMetadata.removeUpdateEventListener();
+                int index = mChannelMetadata.indexOf(channelMetadata);
+                mChannelMetadata.remove(channelMetadata);
+                mMetadataChannelMap.remove(channelMetadata);
                 fireTableRowsDeleted(index, index);
             }
         });
@@ -94,7 +114,7 @@ public class ChannelMetadataModel extends AbstractTableModel implements Listener
     /**
      * Get the channel metadata at the specified model row index
      */
-    public Metadata getMetadata(int row)
+    public ChannelMetadata getChannelMetadata(int row)
     {
         if(row < mChannelMetadata.size())
         {
@@ -107,9 +127,9 @@ public class ChannelMetadataModel extends AbstractTableModel implements Listener
     /**
      * Returns the channel that matches the metadata or null
      */
-    public Channel getChannelFromMetadata(Metadata metadata)
+    public Channel getChannelFromMetadata(ChannelMetadata channelMetadata)
     {
-        return mMetadataChannelMap.get(metadata);
+        return mMetadataChannelMap.get(channelMetadata);
     }
 
     @Override
@@ -135,24 +155,14 @@ public class ChannelMetadataModel extends AbstractTableModel implements Listener
     {
         switch(columnIndex)
         {
-            case COLUMN_STATE:
-                return State.class;
-
-            case COLUMN_DECODER:
-            case COLUMN_CHANNEL:
-            case COLUMN_FREQUENCY:
-            case COLUMN_MESSAGE:
-            case COLUMN_CONFIGURATION_NAME:
-                return String.class;
-
-            case COLUMN_PRIMARY_TO:
-            case COLUMN_PRIMARY_FROM:
-            case COLUMN_SECONDARY_TO:
-            case COLUMN_SECONDARY_FROM:
-                return MutableMetadata.class;
-
+            case COLUMN_USER_FROM:
+            case COLUMN_USER_TO:
+                return ChannelMetadata.class;
+            case COLUMN_USER_FROM_ALIAS:
+            case COLUMN_USER_TO_ALIAS:
+                return Alias.class;
             default:
-                return String.class;
+                return Identifier.class;
         }
     }
 
@@ -161,56 +171,28 @@ public class ChannelMetadataModel extends AbstractTableModel implements Listener
     {
         if(rowIndex <= mChannelMetadata.size())
         {
-            Metadata metadata = mChannelMetadata.get(rowIndex);
+            ChannelMetadata channelMetadata = mChannelMetadata.get(rowIndex);
 
             switch(columnIndex)
             {
-                case COLUMN_STATE:
-                    return metadata.getState();
-                case COLUMN_DECODER:
-                    if(metadata.hasPrimaryDecoderType())
-                    {
-                        return metadata.getPrimaryDecoderType().getShortDisplayString();
-                    }
-
-                    return null;
-                case COLUMN_CHANNEL:
-                    return metadata.getChannelFrequencyLabel();
-                case COLUMN_FREQUENCY:
-                    if(metadata.hasChannelFrequency())
-                    {
-                        return FREQUENCY_FORMATTER.format((double)metadata.getChannelFrequency() / 1E6d);
-                    }
-
-                    return null;
-                case COLUMN_MESSAGE:
-                    if(metadata.hasMessageType() | metadata.hasMessage())
-                    {
-                        StringBuilder sb = new StringBuilder();
-                        if(metadata.hasMessageType())
-                        {
-                            sb.append(metadata.getMessageType()).append(" ");
-                        }
-
-                        if(metadata.hasMessage())
-                        {
-                            sb.append(metadata.getMessage());
-                        }
-
-                        return sb.toString();
-                    }
-
-                    return null;
-                case COLUMN_CONFIGURATION_NAME:
-                    return metadata.getChannelConfigurationName();
-                case COLUMN_PRIMARY_TO:
-                case COLUMN_PRIMARY_FROM:
-                case COLUMN_SECONDARY_TO:
-                case COLUMN_SECONDARY_FROM:
-                    return metadata;
-
-                default:
-                    return String.class;
+                case COLUMN_DECODER_STATE:
+                    return channelMetadata.getChannelStateIdentifier();
+                case COLUMN_DECODER_TYPE:
+                    return channelMetadata.getDecoderTypeConfigurationIdentifier();
+                case COLUMN_DECODER_LOGICAL_CHANNEL_NAME:
+                    return channelMetadata.getDecoderLogicalChannelNameIdentifier();
+                case COLUMN_CONFIGURATION_FREQUENCY:
+                    return channelMetadata.getFrequencyConfigurationIdentifier();
+                case COLUMN_CONFIGURATION_CHANNEL:
+                    return channelMetadata.getChannelNameConfigurationIdentifier();
+                case COLUMN_USER_TO:
+                    return channelMetadata;
+                case COLUMN_USER_FROM:
+                    return channelMetadata;
+                case COLUMN_USER_FROM_ALIAS:
+                    return channelMetadata.getFromIdentifierAliases();
+                case COLUMN_USER_TO_ALIAS:
+                    return channelMetadata.getToIdentifierAliases();
             }
         }
 
@@ -218,58 +200,46 @@ public class ChannelMetadataModel extends AbstractTableModel implements Listener
     }
 
     @Override
-    public void receive(MutableMetadataChangeEvent mutableMetadataChangeEvent)
+    public void updated(ChannelMetadata channelMetadata, ChannelMetadataField channelMetadataField)
     {
-        //Execute on the swing thread to avoid threading issues
-        EventQueue.invokeLater(new Runnable()
-        {
-            @Override
-            public void run()
-            {
-                int rowIndex = mChannelMetadata.indexOf(mutableMetadataChangeEvent.getMetadata());
+        final int rowIndex = mChannelMetadata.indexOf(channelMetadata);
 
-                if(rowIndex >= 0)
+        if(rowIndex >= 0)
+        {
+            //Execute on the swing thread to avoid threading issues
+            EventQueue.invokeLater(new Runnable()
+            {
+                @Override
+                public void run()
                 {
-                    switch(mutableMetadataChangeEvent.getAttribute())
+                    switch(channelMetadataField)
                     {
-                        case CHANNEL_CONFIGURATION_SYSTEM:
+                        case CONFIGURATION_CHANNEL:
+                            fireTableCellUpdated(rowIndex, COLUMN_CONFIGURATION_CHANNEL);
                             break;
-                        case CHANNEL_CONFIGURATION_SITE:
+                        case CONFIGURATION_FREQUENCY:
+                            fireTableCellUpdated(rowIndex, COLUMN_CONFIGURATION_FREQUENCY);
                             break;
-                        case CHANNEL_CONFIGURATION_NAME:
-                            fireTableCellUpdated(rowIndex, COLUMN_CONFIGURATION_NAME);
+                        case DECODER_CHANNEL_NAME:
+                            fireTableCellUpdated(rowIndex, COLUMN_DECODER_LOGICAL_CHANNEL_NAME);
                             break;
-                        case CHANNEL_FREQUENCY:
-                            fireTableCellUpdated(rowIndex, COLUMN_FREQUENCY);
+                        case DECODER_TYPE:
+                            fireTableCellUpdated(rowIndex, COLUMN_DECODER_TYPE);
                             break;
-                        case CHANNEL_FREQUENCY_LABEL:
-                            fireTableCellUpdated(rowIndex, COLUMN_CHANNEL);
+                        case DECODER_STATE:
+                            fireTableCellUpdated(rowIndex, COLUMN_DECODER_STATE);
                             break;
-                        case CHANNEL_STATE:
-                            fireTableCellUpdated(rowIndex, COLUMN_STATE);
+                        case USER_FROM:
+                            fireTableCellUpdated(rowIndex, COLUMN_USER_FROM);
+                            fireTableCellUpdated(rowIndex, COLUMN_USER_FROM_ALIAS);
                             break;
-                        case MESSAGE:
-                        case MESSAGE_TYPE:
-                            fireTableCellUpdated(rowIndex, COLUMN_MESSAGE);
-                            break;
-                        case PRIMARY_ADDRESS_FROM:
-                            fireTableCellUpdated(rowIndex, COLUMN_PRIMARY_FROM);
-                            break;
-                        case PRIMARY_ADDRESS_TO:
-                            fireTableCellUpdated(rowIndex, COLUMN_PRIMARY_TO);
-                            break;
-                        case PRIMARY_DECODER_TYPE:
-                            fireTableCellUpdated(rowIndex, COLUMN_DECODER);
-                            break;
-                        case SECONDARY_ADDRESS_FROM:
-                            fireTableCellUpdated(rowIndex, COLUMN_SECONDARY_FROM);
-                            break;
-                        case SECONDARY_ADDRESS_TO:
-                            fireTableCellUpdated(rowIndex, COLUMN_SECONDARY_TO);
+                        case USER_TO:
+                            fireTableCellUpdated(rowIndex, COLUMN_USER_TO);
+                            fireTableCellUpdated(rowIndex, COLUMN_USER_TO_ALIAS);
                             break;
                     }
                 }
-            }
-        });
+            });
+        }
     }
 }