Updates build to 0.3.2 (final)

241 LJ1200 Error Correction (v0.3.2 branch)

.classpath

@@ -0,0 +1,34 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<classpath>
+	<classpathentry kind="src" path="src"/>
+	<classpathentry kind="lib" path="imports/commons-lang3-3.2.1.jar"/>
+	<classpathentry kind="lib" path="imports/jide-oss-3.5.15.jar"/>
+	<classpathentry kind="lib" path="imports/jsr80-1.0.1.jar"/>
+	<classpathentry kind="lib" path="imports/libusb4java-1.2.0-linux-arm.jar"/>
+	<classpathentry kind="lib" path="imports/libusb4java-1.2.0-linux-x86_64.jar"/>
+	<classpathentry kind="lib" path="imports/libusb4java-1.2.0-linux-x86.jar"/>
+	<classpathentry kind="lib" path="imports/libusb4java-1.2.0-osx-x86_64.jar"/>
+	<classpathentry kind="lib" path="imports/libusb4java-1.2.0-osx-x86.jar"/>
+	<classpathentry kind="lib" path="imports/libusb4java-1.2.0-windows-x86_64.jar"/>
+	<classpathentry kind="lib" path="imports/libusb4java-1.2.0-windows-x86.jar"/>
+	<classpathentry kind="lib" path="imports/miglayout-4.0-swing.jar"/>
+	<classpathentry kind="lib" path="imports/usb-api-1.0.2.jar"/>
+	<classpathentry kind="lib" path="imports/usb4java-1.2.0.jar"/>
+	<classpathentry kind="lib" path="imports/usb4java-javax-1.2.0.jar"/>
+	<classpathentry kind="lib" path="config"/>
+	<classpathentry kind="lib" path="imports/JTransforms-3.0.jar" sourcepath="/home/denny/.m2/repository/com/github/wendykierp/JTransforms/3.0/JTransforms-3.0-sources.jar"/>
+	<classpathentry kind="lib" path="imports/libusb4java-1.2.0-linux-ppc.jar"/>
+	<classpathentry kind="lib" path="imports/JLargeArrays-1.2.jar"/>
+	<classpathentry kind="lib" path="imports/slf4j-api-1.7.7.jar"/>
+	<classpathentry kind="lib" path="imports/logback-classic-1.1.2.jar"/>
+	<classpathentry kind="lib" path="imports/logback-core-1.1.2.jar"/>
+	<classpathentry kind="lib" path="imports/commons-io-2.4.jar"/>
+	<classpathentry kind="lib" path="imports/jmbe-interface-0.3.2.jar"/>
+	<classpathentry kind="lib" path="imports/tablefilter-swing-5.2.1.jar">
+		<attributes>
+			<attribute name="javadoc_location" value="jar:file:/home/denny/Downloads/tablefilter-swing-5.2.1-javadoc.jar!/"/>
+		</attributes>
+	</classpathentry>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
+	<classpathentry kind="output" path="bin"/>
+</classpath>

.directory

@@ -0,0 +1,4 @@
+[Dolphin]
+Timestamp=2015,9,8,20,39,49
+Version=3
+ViewMode=1

.gitignore

@@ -1,35 +1,6 @@
-### JetBrains template
+*.class
-.idea/
 /classes*
 /product*
-out/
+/bin*
 .directory
 .settings
-
-## File-based project format:
-*.iws
-*.iml
-
-# mpeltonen/sbt-idea plugin
-.idea_modules/
-
-### Java template
-*.class
-*.log
-# Package Files #
-*.jar
-
-# virtual machine crash logs, see http://www.java.com/en/download/help/error_hotspot.xml
-hs_err_pid*
-### Gradle template
-.gradle
-/build/
-
-# Ignore Gradle GUI config
-gradle-app.setting
-
-# Avoid ignoring Gradle wrapper jar file (.jar files are usually ignored)
-!gradle-wrapper.jar
-
-# Cache of project
-.gradletasknamecache

.idea/codeStyleSettings.xml

@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="ProjectCodeStyleSettingsManager">
+    <option name="PER_PROJECT_SETTINGS">
+      <value />
+    </option>
+    <option name="PREFERRED_PROJECT_CODE_STYLE" value="Default (1)" />
+  </component>
+</project>

.idea/compiler.xml

@@ -1,9 +1,22 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
   <component name="CompilerConfiguration">
-    <bytecodeTargetLevel>
+    <resourceExtensions />
-      <module name="sdr-trunk_main" target="1.8" />
+    <wildcardResourcePatterns>
-      <module name="sdr-trunk_test" target="1.8" />
+      <entry name="!?*.java" />
-    </bytecodeTargetLevel>
+      <entry name="!?*.form" />
+      <entry name="!?*.class" />
+      <entry name="!?*.groovy" />
+      <entry name="!?*.scala" />
+      <entry name="!?*.flex" />
+      <entry name="!?*.kt" />
+      <entry name="!?*.clj" />
+      <entry name="!?*.aj" />
+    </wildcardResourcePatterns>
+    <annotationProcessing>
+      <profile default="true" name="Default" enabled="false">
+        <processorPath useClasspath="true" />
+      </profile>
+    </annotationProcessing>
   </component>
 </project>

.idea/copyright/profiles_settings.xml

@@ -0,0 +1,9 @@
+<component name="CopyrightManager">
+  <settings default="sdrtrunk">
+    <LanguageOptions name="__TEMPLATE__">
+      <option name="addBlankAfter" value="false" />
+      <option name="separateBefore" value="true" />
+      <option name="separateAfter" value="true" />
+    </LanguageOptions>
+  </settings>
+</component>

.idea/copyright/sdrtrunk.xml

@@ -0,0 +1,6 @@
+<component name="CopyrightManager">
+  <copyright>
+    <option name="myName" value="sdrtrunk" />
+    <option name="notice" value="sdrtrunk &#10;Copyright (C) 2014-&amp;#36;today.year Dennis Sheirer&#10;&#10;This program is free software: you can redistribute it and/or modify&#10;it under the terms of the GNU General Public License as published by&#10;the Free Software Foundation, either version 3 of the License, or&#10;(at your option) any later version.&#10;&#10;This program is distributed in the hope that it will be useful,&#10;but WITHOUT ANY WARRANTY; without even the implied warranty of&#10;MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the&#10;GNU General Public License for more details.&#10; &#10;You should have received a copy of the GNU General Public License&#10;along with this program.  If not, see &lt;http://www.gnu.org/licenses/&gt;&#10;" />
+  </copyright>
+</component>

.idea/dictionaries/denny.xml

@@ -0,0 +1,25 @@
+<component name="ProjectDictionaryState">
+  <dictionary name="denny">
+    <words>
+      <w>bahroo</w>
+      <w>broadcastify</w>
+      <w>esnid</w>
+      <w>fleetsync</w>
+      <w>icecast</w>
+      <w>ident</w>
+      <w>overflowable</w>
+      <w>polyphase</w>
+      <w>remez</w>
+      <w>samplerate</w>
+      <w>sdrtrunk</w>
+      <w>sheirer</w>
+      <w>shoutcast</w>
+      <w>streamable</w>
+      <w>talkgroup</w>
+      <w>tgid</w>
+      <w>ultravox</w>
+      <w>wacn</w>
+      <w>xtea</w>
+    </words>
+  </dictionary>
+</component>

.idea/libraries/imports.xml

@@ -0,0 +1,35 @@
+<component name="libraryTable">
+  <library name="imports">
+    <CLASSES>
+      <root url="jar://$PROJECT_DIR$/imports/logback-classic-1.1.2.jar!/" />
+      <root url="jar://$PROJECT_DIR$/imports/usb-api-1.0.2.jar!/" />
+      <root url="jar://$PROJECT_DIR$/imports/commons-io-2.4.jar!/" />
+      <root url="jar://$PROJECT_DIR$/imports/commons-lang3-3.2.1.jar!/" />
+      <root url="jar://$PROJECT_DIR$/imports/tablefilter-swing-5.2.1.jar!/" />
+      <root url="jar://$PROJECT_DIR$/imports/libusb4java-1.2.0-linux-x86.jar!/" />
+      <root url="jar://$PROJECT_DIR$/imports/JLargeArrays-1.2.jar!/" />
+      <root url="jar://$PROJECT_DIR$/imports/libusb4java-1.2.0-linux-ppc.jar!/" />
+      <root url="jar://$PROJECT_DIR$/imports/libusb4java-1.2.0-windows-x86.jar!/" />
+      <root url="jar://$PROJECT_DIR$/imports/libusb4java-1.2.0-osx-x86.jar!/" />
+      <root url="jar://$PROJECT_DIR$/imports/miglayout-4.0-swing.jar!/" />
+      <root url="jar://$PROJECT_DIR$/imports/libusb4java-1.2.0-windows-x86_64.jar!/" />
+      <root url="jar://$PROJECT_DIR$/imports/usb4java-1.2.0.jar!/" />
+      <root url="jar://$PROJECT_DIR$/imports/jide-oss-3.5.15.jar!/" />
+      <root url="jar://$PROJECT_DIR$/imports/libusb4java-1.2.0-linux-x86_64.jar!/" />
+      <root url="jar://$PROJECT_DIR$/imports/logback-core-1.1.2.jar!/" />
+      <root url="jar://$PROJECT_DIR$/imports/usb4java-javax-1.2.0.jar!/" />
+      <root url="jar://$PROJECT_DIR$/imports/jsr80-1.0.1.jar!/" />
+      <root url="jar://$PROJECT_DIR$/imports/libusb4java-1.2.0-linux-arm.jar!/" />
+      <root url="jar://$PROJECT_DIR$/imports/libusb4java-1.2.0-osx-x86_64.jar!/" />
+      <root url="jar://$PROJECT_DIR$/imports/JTransforms-3.0.jar!/" />
+      <root url="jar://$PROJECT_DIR$/imports/jmbe-interface-0.3.3.jar!/" />
+      <root url="jar://$PROJECT_DIR$/imports/java-lame-3.98.4.jar!/" />
+      <root url="jar://$PROJECT_DIR$/imports/commons-codec-1.9.jar!/" />
+      <root url="jar://$PROJECT_DIR$/imports/commons-logging-1.2.jar!/" />
+      <root url="jar://$PROJECT_DIR$/imports/slf4j-api-1.7.21.jar!/" />
+      <root url="jar://$PROJECT_DIR$/imports/libusb4java-1.2.0-linux-aarch64.jar!/" />
+    </CLASSES>
+    <JAVADOC />
+    <SOURCES />
+  </library>
+</component>

.idea/libraries/org_asynchttpclient_async_http_client_2_0_18.xml

@@ -0,0 +1,20 @@
+<component name="libraryTable">
+  <library name="org.asynchttpclient:async-http-client:2.0.18" type="repository">
+    <properties maven-id="org.asynchttpclient:async-http-client:2.0.18" />
+    <CLASSES>
+      <root url="jar://$PROJECT_DIR$/imports/slf4j-api-1.7.21.jar!/" />
+      <root url="jar://$PROJECT_DIR$/imports/javassist-3.20.0-GA.jar!/" />
+      <root url="jar://$PROJECT_DIR$/imports/axis.jar!/" />
+      <root url="jar://$PROJECT_DIR$/imports/jaxrpc.jar!/" />
+      <root url="jar://$PROJECT_DIR$/imports/commons-discovery-0.2.jar!/" />
+      <root url="jar://$PROJECT_DIR$/imports/activation-1.1.jar!/" />
+      <root url="jar://$PROJECT_DIR$/imports/java-mail-1.4.jar!/" />
+      <root url="jar://$PROJECT_DIR$/imports/wsdl4j-1.5.1.jar!/" />
+      <root url="jar://$PROJECT_DIR$/imports/radioreference-14.jar!/" />
+      <root url="jar://$PROJECT_DIR$/imports/mina-core-2.0.16.jar!/" />
+      <root url="jar://$PROJECT_DIR$/imports/mina-http-2.0.16.jar!/" />
+    </CLASSES>
+    <JAVADOC />
+    <SOURCES />
+  </library>
+</component>

.idea/misc.xml

@@ -1,5 +1,43 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
+  <component name="ClientPropertiesManager">
+    <properties class="javax.swing.AbstractButton">
+      <property name="hideActionText" class="java.lang.Boolean" />
+    </properties>
+    <properties class="javax.swing.JComponent">
+      <property name="html.disable" class="java.lang.Boolean" />
+    </properties>
+    <properties class="javax.swing.JEditorPane">
+      <property name="JEditorPane.w3cLengthUnits" class="java.lang.Boolean" />
+      <property name="JEditorPane.honorDisplayProperties" class="java.lang.Boolean" />
+      <property name="charset" class="java.lang.String" />
+    </properties>
+    <properties class="javax.swing.JList">
+      <property name="List.isFileList" class="java.lang.Boolean" />
+    </properties>
+    <properties class="javax.swing.JPasswordField">
+      <property name="JPasswordField.cutCopyAllowed" class="java.lang.Boolean" />
+    </properties>
+    <properties class="javax.swing.JSlider">
+      <property name="Slider.paintThumbArrowShape" class="java.lang.Boolean" />
+      <property name="JSlider.isFilled" class="java.lang.Boolean" />
+    </properties>
+    <properties class="javax.swing.JTable">
+      <property name="Table.isFileList" class="java.lang.Boolean" />
+      <property name="JTable.autoStartsEdit" class="java.lang.Boolean" />
+      <property name="terminateEditOnFocusLost" class="java.lang.Boolean" />
+    </properties>
+    <properties class="javax.swing.JToolBar">
+      <property name="JToolBar.isRollover" class="java.lang.Boolean" />
+    </properties>
+    <properties class="javax.swing.JTree">
+      <property name="JTree.lineStyle" class="java.lang.String" />
+    </properties>
+    <properties class="javax.swing.text.JTextComponent">
+      <property name="caretAspectRatio" class="java.lang.Double" />
+      <property name="caretWidth" class="java.lang.Integer" />
+    </properties>
+  </component>
   <component name="ProjectRootManager" version="2" languageLevel="JDK_1_8" default="true" project-jdk-name="1.8" project-jdk-type="JavaSDK">
     <output url="file://$PROJECT_DIR$/out" />
   </component>

.idea/modules.xml

@@ -2,9 +2,7 @@
 <project version="4">
   <component name="ProjectModuleManager">
     <modules>
-      <module fileurl="file://$PROJECT_DIR$/.idea/modules/sdr-trunk.iml" filepath="$PROJECT_DIR$/.idea/modules/sdr-trunk.iml" />
+      <module fileurl="file://$PROJECT_DIR$/sdrtrunk.iml" filepath="$PROJECT_DIR$/sdrtrunk.iml" />
-      <module fileurl="file://$PROJECT_DIR$/.idea/modules/sdr-trunk_main.iml" filepath="$PROJECT_DIR$/.idea/modules/sdr-trunk_main.iml" group="sdr-trunk" />
-      <module fileurl="file://$PROJECT_DIR$/.idea/modules/sdr-trunk_test.iml" filepath="$PROJECT_DIR$/.idea/modules/sdr-trunk_test.iml" group="sdr-trunk" />
     </modules>
   </component>
 </project>

.idea/uiDesigner.xml

@@ -0,0 +1,124 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <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>
+</project>

.idea/vcs.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
   <component name="VcsDirectoryMappings">
-    <mapping directory="$PROJECT_DIR$" vcs="Git" />
+    <mapping directory="" vcs="Git" />
   </component>
 </project>

.project

@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+	<name>sdrtrunk</name>
+	<comment></comment>
+	<projects>
+	</projects>
+	<buildSpec>
+		<buildCommand>
+			<name>org.eclipse.xtext.ui.shared.xtextBuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.jdt.core.javabuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+	</buildSpec>
+	<natures>
+		<nature>org.eclipse.jdt.core.javanature</nature>
+		<nature>org.eclipse.xtext.ui.shared.xtextNature</nature>
+	</natures>
+</projectDescription>

.settings/org.eclipse.jdt.core.prefs

@@ -0,0 +1,12 @@
+eclipse.preferences.version=1
+org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
+org.eclipse.jdt.core.compiler.codegen.methodParameters=do not generate
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.8
+org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
+org.eclipse.jdt.core.compiler.compliance=1.8
+org.eclipse.jdt.core.compiler.debug.lineNumber=generate
+org.eclipse.jdt.core.compiler.debug.localVariable=generate
+org.eclipse.jdt.core.compiler.debug.sourceFile=generate
+org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
+org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
+org.eclipse.jdt.core.compiler.source=1.8

CHANGELOG

@@ -1,12 +1,8 @@
-0.4.0 ........ (in progress)
- - Changes build system from ant to gradle.  Thanks to: Roman Tsypuk https://github.com/tsypuk
-
 0.3.2 20171105
  - Resolves issue with tuner frequency adjustments that was causing channel processing
    to lockup and show persistent 'overflow' state in each channel status
  - Resolves issue with broadcastify 'mountpoint-in-use' error handling and updates
    memory usage logging
- - Resolves issue with Shoutcast 2 login error
 
 0.3.1 20171009
  - Resolves Java 9 incompatibility issues

README.md

@@ -8,47 +8,3 @@ A cross-platform java application for decoding, monitoring, recording and stream
 
 ![sdrtrunk Application Overview - Version 0.3.0](https://github.com/DSheirer/sdrtrunk/wiki/images/ApplicationOverview_V0.3.0.png)
 **Figure 1:** sdrtrunk **Version 0.3.0** Application Screenshot
-
-# Instructions:
-## Build the project
-Project uses gradle as build system. You can build it with locally installed gradle or if you do not have/want install gradle you can use preconfigured linux/windows wrapper.
-### Build with locally installed gradle 4.3.1
-```
-gradle clean buildSdr
-```
-### Build with preconfigured wrapper for linux/windows
-Linux
-```
-./gradlew clean buildSdr
-```
-Windows
-```
-gradle.bat clean buildSdr
-```
-This would add gradle, download all project dependencies and build JAR
-
-## Development
-All dependencies/versions are controlled from build.gradle.
-To change the new release version tag of artifact - change property:
-```
-version = '0.3.2'
-```
-
-## Run SDRTrunk
-SDRTrunk is packed into single uber-jar file. There is need to have folders with dependecies and
-adding them with classpath. Just run with java.
-### Use Java8
-```
-java -jar build/libs/sdr-trunk-all-0.3.2.jar 
-```
-
-## TODO ITEMS
-
-- [x] Move project to gradle build
-- [x] Changed folders structure, based on java project
-- [x] Dependencies are moved to gradle and versions are updated
-- [x] Create uberJAR with all dependencies
-- [ ] Some dependencies left in imports folder. Find them and include into gradle
-- [ ] Move images into resources of project
-- [ ] Add tests to project. This would guarantee that after refactoring part of functionality is not broken
-- [ ] Create modular OOP system (radio-module, gui, web-ui, etc). This would allow to use RADIO modules to call from CLI, GUI or Web UI. And use SDRTrunk as dependency for other projects.

bin/dsp/filter/design/FilterView.css

@@ -1,12 +1,12 @@
 /* ....Show License.... */
 .chart {
-    -fx-background-image: url("../../../images/Curve-fitted-background.png");
+    -fx-background-image: url("../../../../images/Curve-fitted-background.png");
     -fx-padding: 15 25 15 15;
 }
 .chart-plot-background {
     -fx-background-color: red;
-    -fx-background-image: url("../../../images/Curve-fitted-chart-background.png"),
+    -fx-background-image: url("../../../../images/Curve-fitted-chart-background.png"), 
-                url("../../../images/Curve-fitted-graph-gridlines.png");
+                url("../../../../images/Curve-fitted-graph-gridlines.png");
     -fx-background-size: cover, auto;
     -fx-background-repeat: no-repeat, repeat;
     -fx-background-position: 0% 0%, 0% 100%;

build.gradle

@@ -1,73 +0,0 @@
-buildscript {
-    repositories {
-        jcenter()
-        mavenCentral()
-    }
-    dependencies {
-    }
-}
-
-apply plugin: 'java'
-apply plugin: 'idea'
-
-repositories {
-    jcenter()
-    mavenCentral()
-}
-
-version = '0.3.2'
-sourceCompatibility = 1.8
-
-sourceSets {
-    main.java.srcDirs 'src/main'
-    test.java.srcDirs 'src/test'
-}
-
-idea {
-    module {
-        downloadJavadoc = true
-        downloadSources = true
-    }
-}
-
-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'
-}
-
-task wrapper(type: Wrapper) {
-    gradleVersion = '4.3.1'
-}
-
-task buildSdr(type: Jar) {
-    manifest {
-        attributes 'Implementation-Title': 'SdrTrunk project',
-                'Implementation-Version': version,
-                'Main-Class': 'io.github.dsheirer.gui.SDRTrunk',
-                'Class-Path': 'jmbe-0.3.2.jar jmbe-0.3.3.jar'
-    }
-    baseName = project.name + '-all'
-    from { configurations.compile.collect { it.isDirectory() ? it : zipTree(it) } }
-    with jar
-}

build/build.xml

@@ -0,0 +1,142 @@
+<project name="SDRTrunk" default="SDRTrunk" basedir=".">
+    <description>
+        Ant build script for SDRTrunk Decoder Application
+    </description>
+
+    <!-- version properties -->
+    <property name="major" value="0"/>
+    <property name="minor" value="3"/>
+    <property name="patch" value="2"/>
+    <property name="release" value=""/>
+    <property name="filename" value="sdrtrunk_${major}.${minor}.${patch}${release}"/>
+
+    <!-- Build properties -->
+    <property name="repo" location=".."/>
+    <property name="source.code" location="${repo}/src"/>
+    <property name="source.configs" location="${repo}/config"/>
+    <property name="source.images" location="${repo}/images"/>
+    <property name="source.libs" location="${repo}/imports"/>
+    <property name="source.scripts" location="${repo}/scripts"/>
+
+    <property name="output" location="${repo}/product"/>
+    <property name="output.classes" location="${repo}/classes"/>
+    <property name="output.folder" location="${output}/sdrtrunk"/>
+    <property name="output.config" location="${output.folder}/config"/>
+    <property name="output.images" location="${output.folder}/images"/>
+    <property name="output.libs" location="${output.folder}/libs"/>
+
+    <path id="classpath">
+        <fileset dir="${source.libs}" includes="*.jar"/>
+    </path>
+
+    <target name="init">
+        <!-- Create the classes folder to contain the compiled java classes -->
+        <mkdir dir="${output.classes}"/>
+
+        <!-- Create version file -->
+        <echo message="${major}.${minor}.${patch}-${release}" file="${output.classes}/sdrtrunk-version"/>
+    </target>
+
+    <target name="compile" depends="clean,init,compile-java-8,compile-java-9"
+            description="Compile java classes" />
+
+    <target name="compile-java-8" depends="check-java-version" if="java.8" description="Compiles code with Java 8 arguments">
+        <echo message="Compiling with Java 8 Options"/>
+        <javac srcdir="${source.code}" destdir="${output.classes}" classpathref="classpath" includeantruntime="false"/>
+    </target>
+
+    <target name="compile-java-9" depends="check-java-version" if="java.9" description="Compiles code with Java 9 arguments">
+        <echo message="Compiling with Java 9 Options"/>
+        <javac srcdir="${source.code}" destdir="${output.classes}" classpathref="classpath" includeantruntime="false">
+            <compilerarg value="--add-modules"/>
+            <compilerarg value="java.xml.bind"/>
+        </javac>
+    </target>
+
+    <target name="check-java-version" description="Determines if the compiler is Java 8 or 9">
+        <condition property="java.8" value="true">
+            <contains string="${java.version}" substring="1.8"/>
+        </condition>
+        <condition property="java.9" value="true">
+            <equals arg1="${java.version}" arg2="9"/>
+        </condition>
+        <echo message="Java Version: ${java.version}"/>
+    </target>
+
+    <target name="SDRTrunk" depends="compile" description="Create SDRTrunk application">
+        <!-- Create the distribution directory -->
+        <mkdir dir="${output.folder}"/>
+
+        <!-- Create jar file -->
+        <jar jarfile="${output.folder}/sdrtrunk.jar" basedir="${output.classes}">
+            <manifest>
+                <attribute name="Title" value="sdrtrunk"/>
+                <attribute name="Main-Class" value="gui.SDRTrunk"/>
+                <attribute name="Version" value="${major}.${minor}.${patch}-${release}"/>
+            </manifest>
+            <fileset dir="${source.configs}">
+                <exclude name="*.rules"/>
+            </fileset>
+
+            <fileset dir="${repo}">
+                <include name="LICENSE"/>
+            </fileset>
+        </jar>
+
+        <!-- Copy third-party libraries -->
+        <mkdir dir="${output.libs}"/>
+        <copy todir="${output.libs}">
+            <fileset dir="${source.libs}" includes="*.jar"/>
+        </copy>
+
+        <!-- Copy config files -->
+        <mkdir dir="${output.config}"/>
+
+        <copy todir="${output.config}">
+            <fileset dir="${source.configs}">
+                <include name="*.rules"/>
+            </fileset>
+        </copy>
+
+        <!-- Copy image files -->
+        <mkdir dir="${output.images}"/>
+        <copy todir="${output.images}">
+            <fileset dir="${source.images}"/>
+        </copy>
+
+        <!-- Copy license file -->
+        <copy todir="${output.folder}">
+            <fileset dir="${repo}">
+                <include name="LICENSE"/>
+            </fileset>
+        </copy>
+
+        <!-- Copy program scripts -->
+        <copy todir="${output.folder}">
+            <fileset dir="${source.scripts}"/>
+        </copy>
+
+
+        <!-- Bundle the files into .zip -->
+        <zip destfile="${output}/${filename}.zip" basedir="${output}"/>
+
+        <!-- Remove linux start script before tar task -->
+        <delete file="${output.folder}/run_sdrtrunk_linux.sh"/>
+
+        <!-- Bundle files into .tar.gz and copy/set permissions on linux start script -->
+        <tar destfile="${output}/${filename}.tar.gz" compression="gzip">
+            <tarfileset dir="${output.folder}" prefix="sdrtrunk"/>
+            <tarfileset dir="${source.scripts}" prefix="sdrtrunk" filemode="777">
+                <include name="run_sdrtrunk_linux.sh"/>
+            </tarfileset>
+        </tar>
+
+        <delete dir="${output.folder}"/>
+    </target>
+
+    <target name="clean" description="Clean previous build artifacts">
+        <delete dir="${output.classes}"/>
+        <delete dir="${output}"/>
+    </target>
+
+</project>

config/logback.xml

@@ -1,23 +1,5 @@
-<!--~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-  ~ 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/>
-  ~
-  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~-->
 <configuration>
-  <conversionRule conversionWord="memory_usage" converterClass="io.github.dsheirer.util.MemoryUsageLogger" />
+  <conversionRule conversionWord="memory_usage" converterClass="util.MemoryUsageLogger" />
 
   <timestamp key="appstart" datePattern="HHmmss"/>
 

gradle/wrapper/gradle-wrapper.properties

@@ -1,5 +0,0 @@
-distributionUrl=https\://services.gradle.org/distributions/gradle-4.3.1-bin.zip
-distributionBase=GRADLE_USER_HOME
-distributionPath=wrapper/dists
-zipStorePath=wrapper/dists
-zipStoreBase=GRADLE_USER_HOME

gradlew

@@ -1,172 +0,0 @@
-#!/usr/bin/env sh
-
-##############################################################################
-##
-##  Gradle start up script for UN*X
-##
-##############################################################################
-
-# Attempt to set APP_HOME
-# Resolve links: $0 may be a link
-PRG="$0"
-# Need this for relative symlinks.
-while [ -h "$PRG" ] ; do
-    ls=`ls -ld "$PRG"`
-    link=`expr "$ls" : '.*-> \(.*\)$'`
-    if expr "$link" : '/.*' > /dev/null; then
-        PRG="$link"
-    else
-        PRG=`dirname "$PRG"`"/$link"
-    fi
-done
-SAVED="`pwd`"
-cd "`dirname \"$PRG\"`/" >/dev/null
-APP_HOME="`pwd -P`"
-cd "$SAVED" >/dev/null
-
-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=""
-
-# Use the maximum available, or set MAX_FD != -1 to use that value.
-MAX_FD="maximum"
-
-warn () {
-    echo "$*"
-}
-
-die () {
-    echo
-    echo "$*"
-    echo
-    exit 1
-}
-
-# OS specific support (must be 'true' or 'false').
-cygwin=false
-msys=false
-darwin=false
-nonstop=false
-case "`uname`" in
-  CYGWIN* )
-    cygwin=true
-    ;;
-  Darwin* )
-    darwin=true
-    ;;
-  MINGW* )
-    msys=true
-    ;;
-  NONSTOP* )
-    nonstop=true
-    ;;
-esac
-
-CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar
-
-# Determine the Java command to use to start the JVM.
-if [ -n "$JAVA_HOME" ] ; then
-    if [ -x "$JAVA_HOME/jre/sh/java" ] ; then
-        # IBM's JDK on AIX uses strange locations for the executables
-        JAVACMD="$JAVA_HOME/jre/sh/java"
-    else
-        JAVACMD="$JAVA_HOME/bin/java"
-    fi
-    if [ ! -x "$JAVACMD" ] ; then
-        die "ERROR: JAVA_HOME is set to an invalid directory: $JAVA_HOME
-
-Please set the JAVA_HOME variable in your environment to match the
-location of your Java installation."
-    fi
-else
-    JAVACMD="java"
-    which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
-
-Please set the JAVA_HOME variable in your environment to match the
-location of your Java installation."
-fi
-
-# Increase the maximum file descriptors if we can.
-if [ "$cygwin" = "false" -a "$darwin" = "false" -a "$nonstop" = "false" ] ; then
-    MAX_FD_LIMIT=`ulimit -H -n`
-    if [ $? -eq 0 ] ; then
-        if [ "$MAX_FD" = "maximum" -o "$MAX_FD" = "max" ] ; then
-            MAX_FD="$MAX_FD_LIMIT"
-        fi
-        ulimit -n $MAX_FD
-        if [ $? -ne 0 ] ; then
-            warn "Could not set maximum file descriptor limit: $MAX_FD"
-        fi
-    else
-        warn "Could not query maximum file descriptor limit: $MAX_FD_LIMIT"
-    fi
-fi
-
-# For Darwin, add options to specify how the application appears in the dock
-if $darwin; then
-    GRADLE_OPTS="$GRADLE_OPTS \"-Xdock:name=$APP_NAME\" \"-Xdock:icon=$APP_HOME/media/gradle.icns\""
-fi
-
-# For Cygwin, switch paths to Windows format before running java
-if $cygwin ; then
-    APP_HOME=`cygpath --path --mixed "$APP_HOME"`
-    CLASSPATH=`cygpath --path --mixed "$CLASSPATH"`
-    JAVACMD=`cygpath --unix "$JAVACMD"`
-
-    # We build the pattern for arguments to be converted via cygpath
-    ROOTDIRSRAW=`find -L / -maxdepth 1 -mindepth 1 -type d 2>/dev/null`
-    SEP=""
-    for dir in $ROOTDIRSRAW ; do
-        ROOTDIRS="$ROOTDIRS$SEP$dir"
-        SEP="|"
-    done
-    OURCYGPATTERN="(^($ROOTDIRS))"
-    # Add a user-defined pattern to the cygpath arguments
-    if [ "$GRADLE_CYGPATTERN" != "" ] ; then
-        OURCYGPATTERN="$OURCYGPATTERN|($GRADLE_CYGPATTERN)"
-    fi
-    # Now convert the arguments - kludge to limit ourselves to /bin/sh
-    i=0
-    for arg in "$@" ; do
-        CHECK=`echo "$arg"|egrep -c "$OURCYGPATTERN" -`
-        CHECK2=`echo "$arg"|egrep -c "^-"`                                 ### Determine if an option
-
-        if [ $CHECK -ne 0 ] && [ $CHECK2 -eq 0 ] ; then                    ### Added a condition
-            eval `echo args$i`=`cygpath --path --ignore --mixed "$arg"`
-        else
-            eval `echo args$i`="\"$arg\""
-        fi
-        i=$((i+1))
-    done
-    case $i in
-        (0) set -- ;;
-        (1) set -- "$args0" ;;
-        (2) set -- "$args0" "$args1" ;;
-        (3) set -- "$args0" "$args1" "$args2" ;;
-        (4) set -- "$args0" "$args1" "$args2" "$args3" ;;
-        (5) set -- "$args0" "$args1" "$args2" "$args3" "$args4" ;;
-        (6) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" ;;
-        (7) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" ;;
-        (8) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" ;;
-        (9) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" "$args8" ;;
-    esac
-fi
-
-# Escape application args
-save () {
-    for i do printf %s\\n "$i" | sed "s/'/'\\\\''/g;1s/^/'/;\$s/\$/' \\\\/" ; done
-    echo " "
-}
-APP_ARGS=$(save "$@")
-
-# Collect all arguments for the java command, following the shell quoting and substitution rules
-eval set -- $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS "\"-Dorg.gradle.appname=$APP_BASE_NAME\"" -classpath "\"$CLASSPATH\"" org.gradle.wrapper.GradleWrapperMain "$APP_ARGS"
-
-# by default we should be in the correct project dir, but when run from Finder on Mac, the cwd is wrong
-if [ "$(uname)" = "Darwin" ] && [ "$HOME" = "$PWD" ]; then
-  cd "$(dirname "$0")"
-fi
-
-exec "$JAVACMD" "$@"

gradlew.bat

@@ -1,84 +0,0 @@
-@if "%DEBUG%" == "" @echo off
-@rem ##########################################################################
-@rem
-@rem  Gradle startup script for Windows
-@rem
-@rem ##########################################################################
-
-@rem Set local scope for the variables with windows NT shell
-if "%OS%"=="Windows_NT" setlocal
-
-set DIRNAME=%~dp0
-if "%DIRNAME%" == "" set DIRNAME=.
-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=
-
-@rem Find java.exe
-if defined JAVA_HOME goto findJavaFromJavaHome
-
-set JAVA_EXE=java.exe
-%JAVA_EXE% -version >NUL 2>&1
-if "%ERRORLEVEL%" == "0" goto init
-
-echo.
-echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
-echo.
-echo Please set the JAVA_HOME variable in your environment to match the
-echo location of your Java installation.
-
-goto fail
-
-:findJavaFromJavaHome
-set JAVA_HOME=%JAVA_HOME:"=%
-set JAVA_EXE=%JAVA_HOME%/bin/java.exe
-
-if exist "%JAVA_EXE%" goto init
-
-echo.
-echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME%
-echo.
-echo Please set the JAVA_HOME variable in your environment to match the
-echo location of your Java installation.
-
-goto fail
-
-:init
-@rem Get command-line arguments, handling Windows variants
-
-if not "%OS%" == "Windows_NT" goto win9xME_args
-
-:win9xME_args
-@rem Slurp the command line arguments.
-set CMD_LINE_ARGS=
-set _SKIP=2
-
-:win9xME_args_slurp
-if "x%~1" == "x" goto execute
-
-set CMD_LINE_ARGS=%*
-
-:execute
-@rem Setup the command line
-
-set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar
-
-@rem Execute Gradle
-"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %CMD_LINE_ARGS%
-
-:end
-@rem End local scope for the variables with windows NT shell
-if "%ERRORLEVEL%"=="0" goto mainEnd
-
-:fail
-rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of
-rem the _cmd.exe /c_ return code!
-if  not "" == "%GRADLE_EXIT_CONSOLE%" exit 1
-exit /b 1
-
-:mainEnd
-if "%OS%"=="Windows_NT" endlocal
-
-:omega

images/.directory

@@ -0,0 +1,4 @@
+[Dolphin]
+PreviewsShown=true
+Timestamp=2013,9,20,8,54,21
+Version=3

imports/.directory

@@ -0,0 +1,4 @@
+[Dolphin]
+Timestamp=2013,4,7,10,12,39
+Version=3
+ViewMode=1

scripts/run_sdrtrunk_linux.sh

@@ -0,0 +1,16 @@
+#!/bin/bash
+
+java -version
+
+# Test for java version 9
+JAVA_9=$(java -version 2>&1 | grep -i version | sed 's/.* "\([9]\).*/\1/')
+
+if [ -z ${JAVA_9+x} ]; then
+  echo Using Java 9 program options
+  # Java 9 uses the G1 garbage collector by default and requires that we specify the
+  # java.xml.bind package since it's been removed from the java se core library
+  java -cp "*:libs/*" --add-modules java.xml.bind gui.SDRTrunk;
+else
+  echo Using Java 8 program options
+  java -XX:+UseG1GC -cp "*:libs/*" gui.SDRTrunk;
+fi

scripts/run_sdrtrunk_windows.bat

@@ -0,0 +1,25 @@
+@echo off
+
+java -version
+
+SETLOCAL ENABLEDELAYEDEXPANSION
+
+for /f "usebackq tokens=3" %%a in (`java -version 2^>^&1 ^| find "version"`) do ( 
+	rem set b to the unquoted version string parsed from the java version command
+	set b=%%~a
+
+	rem set c to the first character of the unquoted version string
+	set c=!b:~0,1!
+
+	if !c! equ 9 (
+		echo Using Java 9 options		
+		java -cp "SDRTrunk.jar;*;libs/*;config/*;images/*" --add-modules java.xml.bind gui.SDRTrunk
+	) else (
+		echo Using Java 8 options		
+		java -XX:+UseG1GC -cp "SDRTrunk.jar;*;libs/*;config/*;images/*" gui.SDRTrunk
+	)
+)
+
+ENDLOCAL
+
+@echo on

sdrtrunk.iml

@@ -0,0 +1,25 @@
+<?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" />
+      <sourceFolder url="file://$MODULE_DIR$" type="java-resource" />
+    </content>
+    <orderEntry type="inheritedJdk" />
+    <orderEntry type="sourceFolder" forTests="false" />
+    <orderEntry type="library" name="imports" level="project" />
+    <orderEntry type="module-library">
+      <library>
+        <CLASSES>
+          <root url="jar://$MODULE_DIR$/../jmbe/jmbe/library/jmbe-0.3.3.jar!/" />
+        </CLASSES>
+        <JAVADOC />
+        <SOURCES />
+      </library>
+    </orderEntry>
+    <orderEntry type="library" name="org.asynchttpclient:async-http-client:2.0.18" level="project" />
+  </component>
+</module>

settings.gradle

@@ -1 +0,0 @@
-rootProject.name = 'sdr-trunk'

src/.directory

@@ -0,0 +1,4 @@
+[Dolphin]
+Timestamp=2015,9,1,6,42,59
+Version=3
+ViewMode=1

src/alias/Alias.java

@@ -0,0 +1,354 @@
+/*******************************************************************************
+ *     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 alias;
+
+import java.awt.Color;
+import java.util.ArrayList;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Set;
+import java.util.TreeSet;
+
+import javax.xml.bind.annotation.XmlAttribute;
+import javax.xml.bind.annotation.XmlElement;
+import javax.xml.bind.annotation.XmlRootElement;
+import javax.xml.bind.annotation.XmlSeeAlso;
+import javax.xml.bind.annotation.XmlTransient;
+
+import alias.action.AliasAction;
+import alias.id.AliasID;
+import alias.id.AliasIDType;
+import alias.id.broadcast.BroadcastChannel;
+import alias.id.nonrecordable.NonRecordable;
+import alias.id.priority.Priority;
+
+@XmlSeeAlso( { AliasID.class, AliasAction.class } )
+@XmlRootElement( name = "alias" )
+public class Alias
+{
+	private String mList;
+	private String mGroup;
+	private String mName;
+	private int mColor;
+	private String mIconName;
+	private List<AliasID> mAliasIDs = new ArrayList<AliasID>();
+	private List<AliasAction> mAliasActions = new ArrayList<AliasAction>();
+	
+	public Alias()
+	{
+	}
+
+	public Alias( String name )
+	{
+		mName = name;
+	}
+	
+	public String toString()
+	{
+		return getName();
+	}
+
+	@XmlAttribute( name="name" )
+	public String getName()
+	{
+		return mName;
+	}
+	
+	public void setName( String name )
+	{
+		mName = name;
+	}
+
+	@XmlAttribute( name="list" )
+	public String getList()
+	{
+		return mList;
+	}
+	
+	public void setList( String list )
+	{
+		mList = list;
+	}
+	
+	public boolean hasList()
+	{
+		return mList != null;
+	}
+
+	@XmlAttribute( name="group" )
+	public String getGroup()
+	{
+		return mGroup;
+	}
+	
+	public void setGroup( String group )
+	{
+		mGroup = group;
+	}
+	
+	public boolean hasGroup()
+	{
+		return mGroup != null;
+	}
+
+	@XmlAttribute
+	public int getColor()
+	{
+		return mColor;
+	}
+
+	public void setColor( int color )
+	{
+		mColor = color;
+	}
+
+	public Color getDisplayColor()
+	{
+		return new Color( getColor() );
+	}
+	
+	@XmlAttribute
+	public String getIconName()
+	{
+		return mIconName;
+	}
+	
+	public void setIconName( String iconName )
+	{
+		mIconName = iconName;
+	}
+	
+	@XmlElement( name="id" )
+	public List<AliasID> getId()
+	{
+		return mAliasIDs;
+	}
+	
+	public void setId( ArrayList<AliasID> id )
+	{
+		mAliasIDs = id;
+	}
+	
+	public void addAliasID( AliasID id )
+	{
+		mAliasIDs.add( id );
+	}
+	
+	public void removeAliasID( AliasID id )
+	{
+		mAliasIDs.remove( id );
+	}
+	
+	@XmlElement( name="action" )
+	public List<AliasAction> getAction()
+	{
+		return mAliasActions;
+	}
+	
+	public void setAction( List<AliasAction> actions )
+	{
+		mAliasActions = actions;
+	}
+	
+	public void addAliasAction( AliasAction action )
+	{
+		mAliasActions.add( action );
+	}
+	
+	public void removeAliasAction( AliasAction action )
+	{
+		mAliasActions.remove( action );
+	}
+	
+	public boolean hasActions()
+	{
+		return !mAliasActions.isEmpty();
+	}
+
+	/**
+	 * Perform any validation/cleanup actions on this alias.
+	 */
+	public void validate()
+	{
+	}
+	/**
+	 * Returns the priority level of this alias, if defined, or the default priority
+	 */
+	@XmlTransient
+	public int getCallPriority()
+	{
+		for( AliasID id: mAliasIDs )
+		{
+			if( id.getType() == AliasIDType.PRIORITY)
+			{
+				return ((Priority)id).getPriority();
+			}
+		}
+		
+		return Priority.DEFAULT_PRIORITY;
+	}
+	
+	public boolean hasCallPriority()
+	{
+		for( AliasID id: mAliasIDs )
+		{
+			if( id.getType() == AliasIDType.PRIORITY)
+			{
+				return true;
+			}
+		}
+
+		return false;
+	}
+
+	/**
+	 * Sets or updates the call priority
+	 */
+	public void setCallPriority( int priority )
+	{
+		if( priority == Priority.DO_NOT_MONITOR ||
+			( Priority.MIN_PRIORITY <= priority && priority <= Priority.MAX_PRIORITY ) )
+		{
+			for( AliasID id: mAliasIDs )
+			{
+				if( id.getType() == AliasIDType.PRIORITY)
+				{
+					((Priority)id).setPriority( priority );
+					return;
+				}
+			}
+			
+			//If we don't find a priority id, create one
+			Priority p = new Priority();
+			p.setPriority( priority );
+			addAliasID( p );
+		}
+	}
+
+	/**
+	 * Inspects the alias for a non-recordable alias id.  Default is true;
+	 */
+	@XmlTransient
+	public boolean isRecordable()
+	{
+		for( AliasID id: getId() )
+		{
+			if( id.getType() == AliasIDType.NON_RECORDABLE)
+			{
+				return false;
+			}
+		}
+		
+		return true;
+	}
+
+	/**
+	 * Sets or removes the non-recordable alias ID for this alias.
+	 */
+	public void setRecordable( boolean recordable )
+	{
+		if( recordable )
+		{
+			AliasID toRemove = null;
+			
+			for( AliasID id: getId() )
+			{
+				if( id.getType() == AliasIDType.NON_RECORDABLE)
+				{
+					toRemove = id;
+					break;
+				}
+			}
+			
+			if( toRemove != null )
+			{
+				removeAliasID( toRemove );
+			}
+		}
+		else
+		{
+			for( AliasID id: getId() )
+			{
+				if( id.getType() == AliasIDType.NON_RECORDABLE)
+				{
+					return;
+				}
+			}
+			
+			addAliasID( new NonRecordable() );
+		}
+	}
+
+    /**
+     * Inspects the alias for broadcast channel/streamable alias ids.  Default is false;
+     */
+    @XmlTransient
+    public boolean isStreamable()
+    {
+        for( AliasID id: getId() )
+        {
+            if( id.getType() == AliasIDType.BROADCAST_CHANNEL)
+            {
+                return true;
+            }
+        }
+
+        return false;
+    }
+
+    /**
+	 * List of broadcast channels specified for this alias.
+	 */
+    @XmlTransient
+	public Set<BroadcastChannel> getBroadcastChannels()
+	{
+		Set<BroadcastChannel> broadcastChannels = new TreeSet<>();
+
+		for(AliasID id: getId())
+		{
+			if(id.getType() == AliasIDType.BROADCAST_CHANNEL)
+			{
+				broadcastChannels.add((BroadcastChannel)id);
+			}
+		}
+
+		return broadcastChannels;
+	}
+
+	/**
+	 * Indicates if this alias contains a broadcast channel alias id with the channel name.
+	 */
+	public boolean hasBroadcastChannel(String channel)
+	{
+		if(channel == null || channel.isEmpty())
+		{
+			return false;
+		}
+
+		for(AliasID id: getId())
+		{
+			if(id.getType() == AliasIDType.BROADCAST_CHANNEL &&
+			   ((BroadcastChannel)id).getChannelName().contentEquals(channel))
+			{
+				return true;
+			}
+		}
+
+		return false;
+	}
+}

src/alias/AliasController.java

@@ -1,9 +1,9 @@
-package io.github.dsheirer.alias;
+package alias;
 
+import audio.broadcast.BroadcastModel;
 import com.jidesoft.swing.JideSplitPane;
-import io.github.dsheirer.audio.broadcast.BroadcastModel;
+import gui.editor.Editor;
-import io.github.dsheirer.gui.editor.Editor;
+import icon.IconManager;
-import io.github.dsheirer.icon.IconManager;
 import net.coderazzi.filters.gui.AutoChoices;
 import net.coderazzi.filters.gui.TableFilterHeader;
 import net.miginfocom.swing.MigLayout;

src/alias/AliasEditor.java

@@ -15,22 +15,28 @@
  *     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;
+package alias;
 
-import com.jidesoft.swing.JideTabbedPane;
+import audio.broadcast.BroadcastModel;
-import io.github.dsheirer.alias.action.AliasActionEditor;
+import gui.editor.Editor;
-import io.github.dsheirer.alias.id.AliasIdentifierEditor;
-import io.github.dsheirer.audio.broadcast.BroadcastModel;
-import io.github.dsheirer.gui.editor.Editor;
-import io.github.dsheirer.icon.IconManager;
-import io.github.dsheirer.sample.Listener;
-import net.miginfocom.swing.MigLayout;
 
-import javax.swing.*;
+import java.awt.Color;
-import java.awt.*;
 import java.awt.event.ActionEvent;
 import java.awt.event.ActionListener;
 
+import javax.swing.JButton;
+import javax.swing.JLabel;
+import javax.swing.JSeparator;
+
+import icon.IconManager;
+import net.miginfocom.swing.MigLayout;
+import sample.Listener;
+import settings.SettingsManager;
+import alias.action.AliasActionEditor;
+import alias.id.AliasIdentifierEditor;
+
+import com.jidesoft.swing.JideTabbedPane;
+
 public class AliasEditor extends Editor<Alias> 
 			implements ActionListener, Listener<AliasEvent>
 {

src/alias/AliasEvent.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;
+package alias;
 
 public class AliasEvent
 {

src/alias/AliasFactory.java

@@ -15,47 +15,47 @@
  *     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;
+package alias;
 
-import io.github.dsheirer.alias.action.AliasAction;
+import alias.action.AliasAction;
-import io.github.dsheirer.alias.action.AliasActionType;
+import alias.action.AliasActionType;
-import io.github.dsheirer.alias.action.beep.BeepAction;
+import alias.action.beep.BeepAction;
-import io.github.dsheirer.alias.action.beep.BeepActionEditor;
+import alias.action.beep.BeepActionEditor;
-import io.github.dsheirer.alias.action.clip.ClipAction;
+import alias.action.clip.ClipAction;
-import io.github.dsheirer.alias.action.clip.ClipActionEditor;
+import alias.action.clip.ClipActionEditor;
-import io.github.dsheirer.alias.action.script.ScriptAction;
+import alias.action.script.ScriptAction;
-import io.github.dsheirer.alias.action.script.ScriptActionEditor;
+import alias.action.script.ScriptActionEditor;
-import io.github.dsheirer.alias.id.AliasID;
+import alias.id.AliasID;
-import io.github.dsheirer.alias.id.AliasIDType;
+import alias.id.AliasIDType;
-import io.github.dsheirer.alias.id.broadcast.BroadcastChannel;
+import alias.id.broadcast.BroadcastChannel;
-import io.github.dsheirer.alias.id.broadcast.BroadcastChannelEditor;
+import alias.id.broadcast.BroadcastChannelEditor;
-import io.github.dsheirer.alias.id.esn.ESNEditor;
+import alias.id.esn.ESNEditor;
-import io.github.dsheirer.alias.id.esn.Esn;
+import alias.id.esn.Esn;
-import io.github.dsheirer.alias.id.fleetsync.FleetsyncID;
+import alias.id.fleetsync.FleetsyncID;
-import io.github.dsheirer.alias.id.fleetsync.FleetsyncIDEditor;
+import alias.id.fleetsync.FleetsyncIDEditor;
-import io.github.dsheirer.alias.id.lojack.LoJackFunctionAndID;
+import alias.id.lojack.LoJackFunctionAndID;
-import io.github.dsheirer.alias.id.lojack.LoJackIDEditor;
+import alias.id.lojack.LoJackIDEditor;
-import io.github.dsheirer.alias.id.mdc.MDC1200ID;
+import alias.id.mdc.MDC1200ID;
-import io.github.dsheirer.alias.id.mdc.MDC1200IDEditor;
+import alias.id.mdc.MDC1200IDEditor;
-import io.github.dsheirer.alias.id.mobileID.MINEditor;
+import alias.id.mobileID.MINEditor;
-import io.github.dsheirer.alias.id.mobileID.Min;
+import alias.id.mobileID.Min;
-import io.github.dsheirer.alias.id.mpt1327.MPT1327ID;
+import alias.id.mpt1327.MPT1327ID;
-import io.github.dsheirer.alias.id.mpt1327.MPT1327IDEditor;
+import alias.id.mpt1327.MPT1327IDEditor;
-import io.github.dsheirer.alias.id.nonrecordable.NonRecordable;
+import alias.id.nonrecordable.NonRecordable;
-import io.github.dsheirer.alias.id.nonrecordable.NonRecordableEditor;
+import alias.id.nonrecordable.NonRecordableEditor;
-import io.github.dsheirer.alias.id.priority.Priority;
+import alias.id.priority.Priority;
-import io.github.dsheirer.alias.id.priority.PriorityEditor;
+import alias.id.priority.PriorityEditor;
-import io.github.dsheirer.alias.id.siteID.SiteID;
+import alias.id.siteID.SiteID;
-import io.github.dsheirer.alias.id.siteID.SiteIDEditor;
+import alias.id.siteID.SiteIDEditor;
-import io.github.dsheirer.alias.id.status.StatusID;
+import alias.id.status.StatusID;
-import io.github.dsheirer.alias.id.status.StatusIDEditor;
+import alias.id.status.StatusIDEditor;
-import io.github.dsheirer.alias.id.talkgroup.TalkgroupID;
+import alias.id.talkgroup.TalkgroupID;
-import io.github.dsheirer.alias.id.talkgroup.TalkgroupIDEditor;
+import alias.id.talkgroup.TalkgroupIDEditor;
-import io.github.dsheirer.alias.id.uniqueID.UniqueID;
+import alias.id.uniqueID.UniqueID;
-import io.github.dsheirer.alias.id.uniqueID.UniqueIDEditor;
+import alias.id.uniqueID.UniqueIDEditor;
-import io.github.dsheirer.audio.broadcast.BroadcastModel;
+import audio.broadcast.BroadcastModel;
-import io.github.dsheirer.gui.editor.Editor;
+import gui.editor.Editor;
-import io.github.dsheirer.gui.editor.EmptyEditor;
+import gui.editor.EmptyEditor;
 
 public class AliasFactory
 {
@@ -138,7 +138,7 @@ public class AliasFactory
 		{
 			return new BeepAction();
 		}
-		else if( action instanceof ClipAction)
+		else if( action instanceof ClipAction )
 		{
 			ClipAction originalClip = (ClipAction)action;
 			ClipAction copyClip = new ClipAction();

src/alias/AliasList.java

@@ -16,26 +16,26 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>
  *
  ******************************************************************************/
-package io.github.dsheirer.alias;
+package alias;
 
-import com.fasterxml.jackson.dataformat.xml.annotation.JacksonXmlProperty;
+import alias.id.AliasID;
-import io.github.dsheirer.alias.id.AliasID;
+import alias.id.WildcardID;
-import io.github.dsheirer.alias.id.WildcardID;
+import alias.id.esn.Esn;
-import io.github.dsheirer.alias.id.esn.Esn;
+import alias.id.fleetsync.FleetsyncID;
-import io.github.dsheirer.alias.id.fleetsync.FleetsyncID;
+import alias.id.lojack.LoJackFunctionAndID;
-import io.github.dsheirer.alias.id.lojack.LoJackFunctionAndID;
+import alias.id.mdc.MDC1200ID;
-import io.github.dsheirer.alias.id.mdc.MDC1200ID;
+import alias.id.mobileID.Min;
-import io.github.dsheirer.alias.id.mobileID.Min;
+import alias.id.mpt1327.MPT1327ID;
-import io.github.dsheirer.alias.id.mpt1327.MPT1327ID;
+import alias.id.siteID.SiteID;
-import io.github.dsheirer.alias.id.siteID.SiteID;
+import alias.id.status.StatusID;
-import io.github.dsheirer.alias.id.status.StatusID;
+import alias.id.talkgroup.TalkgroupID;
-import io.github.dsheirer.alias.id.talkgroup.TalkgroupID;
+import alias.id.uniqueID.UniqueID;
-import io.github.dsheirer.alias.id.uniqueID.UniqueID;
+import module.decode.lj1200.LJ1200Message.Function;
-import io.github.dsheirer.module.decode.lj1200.LJ1200Message;
-import io.github.dsheirer.sample.Listener;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
+import sample.Listener;
 
+import javax.xml.bind.annotation.XmlAttribute;
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.HashMap;
@@ -486,7 +486,7 @@ public class AliasList implements Listener<AliasEvent>
     /**
      * Lookup alias by lojack function and ID
      */
-    public Alias getLoJackAlias(LJ1200Message.Function function, String id)
+    public Alias getLoJackAlias(Function function, String id)
     {
         if(id != null)
         {
@@ -625,7 +625,7 @@ public class AliasList implements Listener<AliasEvent>
     /**
      * Alias list name
      */
-    @JacksonXmlProperty(isAttribute = true, localName = "name")
+    @XmlAttribute
     public String getName()
     {
         return mName;

src/alias/AliasModel.java

@@ -15,11 +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.alias;
+package alias;
 
-import io.github.dsheirer.alias.id.broadcast.BroadcastChannel;
+import alias.AliasEvent.Event;
-import io.github.dsheirer.sample.Broadcaster;
+import alias.id.broadcast.BroadcastChannel;
-import io.github.dsheirer.sample.Listener;
+import sample.Broadcaster;
+import sample.Listener;
 
 import javax.swing.table.AbstractTableModel;
 import java.util.ArrayList;
@@ -187,7 +188,7 @@ public class AliasModel extends AbstractTableModel
 
             fireTableRowsInserted(index, index);
 
-            broadcast(new AliasEvent(alias, AliasEvent.Event.ADD));
+            broadcast(new AliasEvent(alias, Event.ADD));
 
             return index;
         }
@@ -208,7 +209,7 @@ public class AliasModel extends AbstractTableModel
 
             fireTableRowsDeleted(index, index);
 
-            broadcast(new AliasEvent(alias, AliasEvent.Event.DELETE));
+            broadcast(new AliasEvent(alias, Event.DELETE));
         }
     }
 
@@ -327,7 +328,7 @@ public class AliasModel extends AbstractTableModel
             alias.validate();
         }
 
-        if(event.getEvent() == AliasEvent.Event.CHANGE)
+        if(event.getEvent() == Event.CHANGE)
         {
             int index = mAliases.indexOf(event.getAlias());
 

src/alias/AliasNameEditor.java

@@ -16,13 +16,14 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>
  *
  ******************************************************************************/
-package io.github.dsheirer.alias;
+package alias;
 
-import io.github.dsheirer.gui.editor.Editor;
+import alias.AliasEvent.Event;
-import io.github.dsheirer.icon.Icon;
+import gui.editor.Editor;
-import io.github.dsheirer.icon.IconListCellRenderer;
+import icon.Icon;
-import io.github.dsheirer.icon.IconManager;
+import icon.IconListCellRenderer;
-import io.github.dsheirer.icon.IconTableModel;
+import icon.IconManager;
+import icon.IconTableModel;
 import net.miginfocom.swing.MigLayout;
 
 import javax.swing.*;
@@ -327,7 +328,7 @@ public class AliasNameEditor extends Editor<Alias>
             setModified(false);
 
             //Broadcast an alias change event to save the updates
-            mAliasModel.broadcast(new AliasEvent(getItem(), AliasEvent.Event.CHANGE));
+            mAliasModel.broadcast(new AliasEvent(getItem(), Event.CHANGE));
         }
     }
 }

src/alias/ComponentEditor.java

@@ -15,9 +15,9 @@
  *     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;
+package alias;
 
-import javax.swing.*;
+import javax.swing.JPanel;
 import javax.swing.event.DocumentListener;
 
 public abstract class ComponentEditor<T> extends JPanel implements DocumentListener

src/alias/ComponentValidationException.java

@@ -1,4 +1,4 @@
-package io.github.dsheirer.alias;
+package alias;
 
 public class ComponentValidationException extends Exception
 {

src/alias/MultipleAliasEditor.java

@@ -1,17 +1,18 @@
-package io.github.dsheirer.alias;
+package alias;
 
-import io.github.dsheirer.alias.id.AliasIDType;
+import alias.AliasEvent.Event;
-import io.github.dsheirer.alias.id.broadcast.BroadcastChannel;
+import alias.id.AliasIDType;
-import io.github.dsheirer.alias.id.priority.Priority;
+import alias.id.broadcast.BroadcastChannel;
-import io.github.dsheirer.audio.broadcast.BroadcastModel;
+import alias.id.priority.Priority;
-import io.github.dsheirer.gui.editor.Editor;
+import audio.broadcast.BroadcastModel;
-import io.github.dsheirer.icon.Icon;
+import gui.editor.Editor;
-import io.github.dsheirer.icon.IconListCellRenderer;
+import icon.Icon;
-import io.github.dsheirer.icon.IconManager;
+import icon.IconListCellRenderer;
-import io.github.dsheirer.sample.Listener;
+import icon.IconManager;
 import net.miginfocom.swing.MigLayout;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
+import sample.Listener;
 
 import javax.swing.*;
 import javax.swing.event.ChangeEvent;
@@ -429,7 +430,7 @@ public class MultipleAliasEditor extends Editor<List<Alias>>
             for (Alias alias : aliases)
             {
                 //Broadcast an alias change event to save the updates
-                mAliasModel.broadcast(new AliasEvent(alias, AliasEvent.Event.CHANGE));
+                mAliasModel.broadcast(new AliasEvent(alias, Event.CHANGE));
             }
         }
     }
@@ -437,7 +438,7 @@ public class MultipleAliasEditor extends Editor<List<Alias>>
     @Override
     public void receive(AliasEvent event)
     {
-        if (event.getEvent() == AliasEvent.Event.DELETE &&
+        if (event.getEvent() == Event.DELETE &&
                 hasItem() &&
                 getAliases().contains(event.getAlias()))
         {

src/alias/PatchGroupAlias.java

@@ -16,16 +16,18 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>
  *
  ******************************************************************************/
-package io.github.dsheirer.alias;
+package alias;
 
-import io.github.dsheirer.alias.action.AliasAction;
+import alias.action.AliasAction;
-import io.github.dsheirer.alias.id.AliasID;
+import alias.id.AliasID;
-import io.github.dsheirer.alias.id.AliasIDType;
+import alias.id.AliasIDType;
-import io.github.dsheirer.alias.id.broadcast.BroadcastChannel;
+import alias.id.broadcast.BroadcastChannel;
-import io.github.dsheirer.alias.id.priority.Priority;
+import alias.id.priority.Priority;
-import io.github.dsheirer.alias.id.talkgroup.TalkgroupID;
+import alias.id.talkgroup.TalkgroupID;
+import gui.SDRTrunk;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
+import playlist.version1.System;
 
 import java.util.ArrayList;
 import java.util.List;

src/alias/action/AliasAction.java

@@ -0,0 +1,58 @@
+/*******************************************************************************
+ * 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 alias.action;
+
+import alias.Alias;
+import alias.action.beep.BeepAction;
+import alias.action.clip.ClipAction;
+import alias.action.script.ScriptAction;
+import message.Message;
+
+import javax.xml.bind.annotation.XmlRootElement;
+import javax.xml.bind.annotation.XmlSeeAlso;
+import javax.xml.bind.annotation.XmlTransient;
+import java.util.concurrent.ScheduledExecutorService;
+
+/**
+ * Alias action defines an action to execute when an alias is detected active.
+ */
+@XmlSeeAlso( { BeepAction.class, ClipAction.class, ScriptAction.class } )
+@XmlRootElement( name = "action" )
+public abstract class AliasAction
+{
+	public AliasAction()
+	{
+	}
+
+	@XmlTransient
+	public abstract AliasActionType getType();
+	
+	/**
+	 * Task to execute when an alias action is defined.  The message argument is
+	 * the original message containing one or more aliases that have an alias
+	 * action attached.  The alias argument is the parent alias containing the
+	 * alias action.
+	 */
+	public abstract void execute( ScheduledExecutorService scheduledExecutorService, Alias alias, Message message );
+
+	/**
+	 * Dismiss a persistent alias action
+	 */
+	public abstract void dismiss( boolean reset );
+}

src/alias/action/AliasActionEditor.java

@@ -15,21 +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.alias.action;
+package alias.action;
 
-import io.github.dsheirer.alias.Alias;
+import gui.editor.Editor;
-import io.github.dsheirer.alias.AliasEvent;
+import gui.editor.EmptyEditor;
-import io.github.dsheirer.alias.AliasEvent.Event;
-import io.github.dsheirer.alias.AliasFactory;
-import io.github.dsheirer.alias.AliasModel;
-import io.github.dsheirer.gui.editor.Editor;
-import io.github.dsheirer.gui.editor.EmptyEditor;
-import net.miginfocom.swing.MigLayout;
 
-import javax.swing.*;
+import java.awt.EventQueue;
-import javax.swing.event.ListSelectionEvent;
-import javax.swing.event.ListSelectionListener;
-import java.awt.*;
 import java.awt.event.ActionEvent;
 import java.awt.event.ActionListener;
 import java.awt.event.MouseAdapter;
@@ -38,6 +29,26 @@ import java.util.Collections;
 import java.util.Comparator;
 import java.util.List;
 
+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 net.miginfocom.swing.MigLayout;
+import alias.Alias;
+import alias.AliasEvent;
+import alias.AliasEvent.Event;
+import alias.AliasFactory;
+import alias.AliasModel;
+
 public class AliasActionEditor extends Editor<Alias>
 {
 	private static final long serialVersionUID = 1L;

src/alias/action/AliasActionListener.java

@@ -15,9 +15,9 @@
  *     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;
+package alias.action;
 
-import io.github.dsheirer.alias.AliasEvent;
+import alias.AliasEvent;
 
 /**
  * Interface for receiving alias events.  Each listener will receive

src/alias/action/AliasActionManager.java

@@ -16,12 +16,12 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>
  *
  ******************************************************************************/
-package io.github.dsheirer.alias.action;
+package alias.action;
 
-import io.github.dsheirer.alias.Alias;
+import alias.Alias;
-import io.github.dsheirer.message.Message;
+import message.Message;
-import io.github.dsheirer.sample.Listener;
+import sample.Listener;
-import io.github.dsheirer.util.ThreadPool;
+import util.ThreadPool;
 
 import java.util.List;
 

src/alias/action/AliasActionType.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.action;
+package alias.action;
 
 public enum AliasActionType
 {

src/alias/action/RecurringAction.java

@@ -1,11 +1,11 @@
-package io.github.dsheirer.alias.action;
+package alias.action;
 
-import com.fasterxml.jackson.annotation.JsonIgnore;
+import alias.Alias;
-import com.fasterxml.jackson.dataformat.xml.annotation.JacksonXmlProperty;
+import message.Message;
-import io.github.dsheirer.alias.Alias;
-import io.github.dsheirer.message.Message;
 
 import javax.swing.*;
+import javax.xml.bind.annotation.XmlAttribute;
+import javax.xml.bind.annotation.XmlTransient;
 import java.awt.*;
 import java.util.concurrent.ScheduledExecutorService;
 import java.util.concurrent.ScheduledFuture;
@@ -14,11 +14,11 @@ import java.util.concurrent.atomic.AtomicBoolean;
 
 public abstract class RecurringAction extends AliasAction
 {
-    @JsonIgnore
+    @XmlTransient
     protected AtomicBoolean mRunning = new AtomicBoolean(false);
-    @JsonIgnore
+    @XmlTransient
     private ScheduledFuture<?> mPerpetualAction;
-    @JsonIgnore
+    @XmlTransient
     protected ScheduledExecutorService mScheduledExecutorService;
 
     protected Interval mInterval = Interval.ONCE;
@@ -107,7 +107,7 @@ public abstract class RecurringAction extends AliasAction
         }
     }
 
-    @JacksonXmlProperty(isAttribute = true, localName = "period")
+    @XmlAttribute
     public int getPeriod()
     {
         return mPeriod;
@@ -118,7 +118,7 @@ public abstract class RecurringAction extends AliasAction
         mPeriod = period;
     }
 
-    @JacksonXmlProperty(isAttribute = true, localName = "interval")
+    @XmlAttribute
     public Interval getInterval()
     {
         return mInterval;
@@ -164,8 +164,8 @@ public abstract class RecurringAction extends AliasAction
         @Override
         public void run()
         {
-            /* Don't use the performThreadedAction() method, since this is
+			/* Don't use the performThreadedAction() method, since this is
-             * already running in a separate thread */
+			 * already running in a separate thread */
             performAction(mAlias, mMessage);
         }
     }

src/alias/action/beep/BeepAction.java

@@ -0,0 +1,28 @@
+package alias.action.beep;
+
+import message.Message;
+import alias.Alias;
+import alias.action.AliasActionType;
+import alias.action.RecurringAction;
+
+public class BeepAction extends RecurringAction
+{
+
+	@Override
+	public AliasActionType getType()
+	{
+		return AliasActionType.BEEP;
+	}
+
+	@Override
+	public void performAction( Alias alias, Message message )
+	{
+		System.out.println( "\007" );
+	}
+
+	@Override
+	public String toString()
+	{
+		return "Beep";
+	}
+}

src/alias/action/beep/BeepActionEditor.java

@@ -15,22 +15,30 @@
  *     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;
+package alias.action.beep;
 
-import io.github.dsheirer.alias.action.AliasAction;
+import gui.editor.DocumentListenerEditor;
-import io.github.dsheirer.alias.action.RecurringAction;
-import io.github.dsheirer.gui.editor.DocumentListenerEditor;
-import net.miginfocom.swing.MigLayout;
 
-import javax.swing.*;
+import java.awt.Color;
-import javax.swing.event.ChangeEvent;
+import java.awt.Cursor;
-import javax.swing.event.ChangeListener;
-import java.awt.*;
 import java.awt.event.ActionEvent;
 import java.awt.event.ActionListener;
 import java.awt.event.MouseAdapter;
 import java.awt.event.MouseEvent;
 
+import javax.swing.JComboBox;
+import javax.swing.JLabel;
+import javax.swing.JOptionPane;
+import javax.swing.JSlider;
+import javax.swing.SpinnerModel;
+import javax.swing.SpinnerNumberModel;
+import javax.swing.event.ChangeEvent;
+import javax.swing.event.ChangeListener;
+
+import net.miginfocom.swing.MigLayout;
+import alias.action.AliasAction;
+import alias.action.RecurringAction.Interval;
+
 public class BeepActionEditor extends DocumentListenerEditor<AliasAction>
 {
     private static final long serialVersionUID = 1L;
@@ -49,7 +57,7 @@ public class BeepActionEditor extends DocumentListenerEditor<AliasAction>
 		+ "for 15 seconds after you click OK.<br>"
 		+ "</html>";
 
-    private JComboBox<RecurringAction.Interval> mComboInterval;
+    private JComboBox<Interval> mComboInterval;
     private JSlider mPeriodSlider;
     private JLabel mPeriodSliderLabel;
 
@@ -76,20 +84,20 @@ public class BeepActionEditor extends DocumentListenerEditor<AliasAction>
 
 		add( new JLabel( "Beep Interval:" ) );
 		
-		mComboInterval = new JComboBox<RecurringAction.Interval>( RecurringAction.Interval.values() );
+		mComboInterval = new JComboBox<Interval>( Interval.values() );
 		mComboInterval.setToolTipText( HELP_TEXT );
 		mComboInterval.addActionListener( new ActionListener()
 		{
 			@Override
            public void actionPerformed( ActionEvent e )
            {
-				RecurringAction.Interval selected = mComboInterval
+				Interval selected = mComboInterval
 						.getItemAt( mComboInterval.getSelectedIndex() );
 				
 				if( selected != null )
 				{
 					/* Enable/disable period spinner based on selection */
-					boolean enabled = selected != RecurringAction.Interval.ONCE;
+					boolean enabled = selected != Interval.ONCE;
 					
 					mPeriodSlider.setEnabled( enabled );
 					mPeriodSliderLabel.setEnabled( enabled );
@@ -155,11 +163,11 @@ public class BeepActionEditor extends DocumentListenerEditor<AliasAction>
 		{
 			BeepAction beep = getBeepAction();
 
-			RecurringAction.Interval interval = beep.getInterval();
+			Interval interval = beep.getInterval();
 			
 			mComboInterval.setSelectedItem( interval );
 
-			boolean enabled = interval != RecurringAction.Interval.ONCE;
+			boolean enabled = interval != Interval.ONCE;
 			
 			mPeriodSliderLabel.setEnabled( enabled );
 			mPeriodSlider.setEnabled( enabled );
@@ -176,7 +184,7 @@ public class BeepActionEditor extends DocumentListenerEditor<AliasAction>
 		{
 			BeepAction beep = getBeepAction();
 			
-			beep.setInterval( (RecurringAction.Interval)mComboInterval.getSelectedItem() );
+			beep.setInterval( (Interval)mComboInterval.getSelectedItem() );
 			beep.setPeriod( mPeriodSlider.getValue() );
 		}
 		

src/alias/action/clip/ClipAction.java

@@ -0,0 +1,110 @@
+package alias.action.clip;
+
+import java.io.File;
+
+import javax.sound.sampled.AudioInputStream;
+import javax.sound.sampled.AudioSystem;
+import javax.sound.sampled.Clip;
+import javax.xml.bind.annotation.XmlTransient;
+
+import message.Message;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import alias.Alias;
+import alias.action.AliasActionType;
+import alias.action.RecurringAction;
+
+public class ClipAction extends RecurringAction
+{
+	private final static Logger mLog = LoggerFactory.getLogger( ClipAction.class );
+
+	private String mFilePath;
+
+	@XmlTransient
+	private Clip mClip;
+	
+	public ClipAction()
+	{
+	}
+	
+	@Override
+	public AliasActionType getType()
+	{
+		return AliasActionType.CLIP;
+	}
+
+	public String getPath()
+	{
+		return mFilePath;
+	}
+	
+	public void setPath( String path )
+	{
+		mFilePath = path;
+	}
+	
+	@Override
+	public void performAction( Alias alias, Message message )
+	{
+		try
+		{
+			play();
+		}
+		catch( Exception e )
+		{
+			mLog.error( "Couldn't play audio clip", e );
+		}
+	}
+	
+	public void play() throws Exception
+	{
+		try
+		{
+			if( mFilePath != null )
+			{
+				if( mClip == null )
+				{
+					mClip = AudioSystem.getClip();
+					
+					AudioInputStream ais = 
+							AudioSystem.getAudioInputStream( new File( mFilePath ) );
+					
+					mClip.open( ais );
+				}
+
+				if( mClip.isRunning() )
+				{
+					mClip.stop();
+				}
+				
+				mClip.setFramePosition( 0 );
+				
+				mClip.start();
+			}
+		}
+		catch( Exception e )
+		{
+			mClip = null;
+
+			mLog.error( "Error playing sound clip [" + mFilePath + "] - " + e.getMessage() );
+			
+			throw e;
+		}
+	}
+	
+
+	@Override
+	public String toString()
+	{
+		if( mFilePath == null )
+		{
+			return "Play Clip";
+		}
+		else
+		{
+			return "Play Clip: " + mFilePath;
+		}
+	}
+}

src/alias/action/clip/ClipActionEditor.java

@@ -15,23 +15,34 @@
  *     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;
+package alias.action.clip;
 
-import io.github.dsheirer.alias.action.AliasAction;
+import gui.editor.DocumentListenerEditor;
-import io.github.dsheirer.alias.action.RecurringAction;
-import io.github.dsheirer.gui.editor.DocumentListenerEditor;
-import net.miginfocom.swing.MigLayout;
 
-import javax.swing.*;
+import java.awt.Color;
-import javax.swing.event.ChangeEvent;
+import java.awt.Cursor;
-import javax.swing.event.ChangeListener;
-import java.awt.*;
 import java.awt.event.ActionEvent;
 import java.awt.event.ActionListener;
 import java.awt.event.MouseAdapter;
 import java.awt.event.MouseEvent;
 import java.io.File;
 
+import javax.swing.JButton;
+import javax.swing.JComboBox;
+import javax.swing.JFileChooser;
+import javax.swing.JLabel;
+import javax.swing.JOptionPane;
+import javax.swing.JSlider;
+import javax.swing.JTextField;
+import javax.swing.SpinnerModel;
+import javax.swing.SpinnerNumberModel;
+import javax.swing.event.ChangeEvent;
+import javax.swing.event.ChangeListener;
+
+import net.miginfocom.swing.MigLayout;
+import alias.action.AliasAction;
+import alias.action.RecurringAction.Interval;
+
 public class ClipActionEditor extends DocumentListenerEditor<AliasAction>
 {
     private static final long serialVersionUID = 1L;
@@ -51,7 +62,7 @@ public class ClipActionEditor extends DocumentListenerEditor<AliasAction>
 		+ "for 15 seconds after you click OK.<br>"
 		+ "</html>";
 
-    private JComboBox<RecurringAction.Interval> mComboInterval;
+    private JComboBox<Interval> mComboInterval;
     private JSlider mPeriodSlider;
     private JLabel mPeriodSliderLabel;
     private JTextField mTextFilePath;
@@ -79,20 +90,20 @@ public class ClipActionEditor extends DocumentListenerEditor<AliasAction>
 
 		add( new JLabel( "Play Interval:" ) );
 		
-		mComboInterval = new JComboBox<RecurringAction.Interval>( RecurringAction.Interval.values() );
+		mComboInterval = new JComboBox<Interval>( Interval.values() );
 		mComboInterval.setToolTipText( HELP_TEXT );
 		mComboInterval.addActionListener( new ActionListener()
 		{
 			@Override
            public void actionPerformed( ActionEvent e )
            {
-				RecurringAction.Interval selected = mComboInterval
+				Interval selected = mComboInterval
 						.getItemAt( mComboInterval.getSelectedIndex() );
 				
 				if( selected != null )
 				{
 					/* Enable/disable period slider based on selection */
-					boolean enabled = selected != RecurringAction.Interval.ONCE;
+					boolean enabled = selected != Interval.ONCE;
 					
 					mPeriodSlider.setEnabled( enabled );
 					mPeriodSliderLabel.setEnabled( enabled );
@@ -243,11 +254,11 @@ public class ClipActionEditor extends DocumentListenerEditor<AliasAction>
 		{
 			ClipAction clip = getClipAction();
 
-			RecurringAction.Interval interval = clip.getInterval();
+			Interval interval = clip.getInterval();
 			
 			mComboInterval.setSelectedItem( interval );
 
-			boolean enabled = interval != RecurringAction.Interval.ONCE;
+			boolean enabled = interval != Interval.ONCE;
 			
 			mPeriodSliderLabel.setEnabled( enabled );
 			mPeriodSlider.setEnabled( enabled );
@@ -275,7 +286,7 @@ public class ClipActionEditor extends DocumentListenerEditor<AliasAction>
 		{
 			ClipAction script = getClipAction();
 			
-			script.setInterval( (RecurringAction.Interval)mComboInterval.getSelectedItem() );
+			script.setInterval( (Interval)mComboInterval.getSelectedItem() );
 			script.setPeriod( mPeriodSlider.getValue() );
 			script.setPath( mTextFilePath.getText() );
 		}

src/alias/action/script/ScriptAction.java

@@ -0,0 +1,98 @@
+package alias.action.script;
+
+import java.io.BufferedReader;
+import java.io.InputStreamReader;
+
+import message.Message;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import alias.Alias;
+import alias.action.AliasActionType;
+import alias.action.RecurringAction;
+
+public class ScriptAction extends RecurringAction
+{
+	private final static Logger mLog = LoggerFactory.getLogger( ScriptAction.class );
+
+	private String mScript;
+
+	public ScriptAction()
+	{
+	}
+	
+	@Override
+	public AliasActionType getType()
+	{
+		return AliasActionType.SCRIPT;
+	}
+
+	public String getScript()
+	{
+		return mScript;
+	}
+	
+	public void setScript( String script )
+	{
+		mScript = script;
+	}
+	
+	@Override
+	public void performAction( Alias alias, Message message )
+	{
+		try
+		{
+			play();
+		}
+		catch( Exception e )
+		{
+			mLog.error( "Couldn't execute script [" + mScript + "]", e );
+		}
+	}
+	
+	public void play() throws Exception
+	{
+		if( mScript != null )
+		{
+			ProcessBuilder pb = new ProcessBuilder( mScript );
+			
+			pb.redirectErrorStream( true );
+
+			Process p = pb.start();
+			
+			int exitCode = p.waitFor();
+			
+			BufferedReader reader = new BufferedReader( 
+					new InputStreamReader( p.getInputStream() ) );
+
+            String line = "";			
+
+            StringBuilder sb = new StringBuilder();
+            
+            while( ( line = reader.readLine() ) != null ) 
+            {
+            	sb.append(line + "\n");
+            }
+            
+            if( exitCode != 0 )
+            {
+            	throw new RuntimeException( "Exit Code: " + exitCode + 
+            			" Console:" + sb.toString() );
+            }
+		}
+	}
+	
+	@Override
+	public String toString()
+	{
+		if( mScript == null )
+		{
+			return "Run Script";
+		}
+		else
+		{
+			return "Run Script: " + mScript;
+		}
+	}
+}

src/alias/action/script/ScriptActionEditor.java

@@ -15,23 +15,34 @@
  *     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;
+package alias.action.script;
 
-import io.github.dsheirer.alias.action.AliasAction;
+import gui.editor.DocumentListenerEditor;
-import io.github.dsheirer.alias.action.RecurringAction;
-import io.github.dsheirer.gui.editor.DocumentListenerEditor;
-import net.miginfocom.swing.MigLayout;
 
-import javax.swing.*;
+import java.awt.Color;
-import javax.swing.event.ChangeEvent;
+import java.awt.Cursor;
-import javax.swing.event.ChangeListener;
-import java.awt.*;
 import java.awt.event.ActionEvent;
 import java.awt.event.ActionListener;
 import java.awt.event.MouseAdapter;
 import java.awt.event.MouseEvent;
 import java.io.File;
 
+import javax.swing.JButton;
+import javax.swing.JComboBox;
+import javax.swing.JFileChooser;
+import javax.swing.JLabel;
+import javax.swing.JOptionPane;
+import javax.swing.JSlider;
+import javax.swing.JTextField;
+import javax.swing.SpinnerModel;
+import javax.swing.SpinnerNumberModel;
+import javax.swing.event.ChangeEvent;
+import javax.swing.event.ChangeListener;
+
+import net.miginfocom.swing.MigLayout;
+import alias.action.AliasAction;
+import alias.action.RecurringAction.Interval;
+
 public class ScriptActionEditor extends DocumentListenerEditor<AliasAction>
 {
     private static final long serialVersionUID = 1L;
@@ -51,7 +62,7 @@ public class ScriptActionEditor extends DocumentListenerEditor<AliasAction>
 		+ "for 15 seconds after you click OK.<br>"
 		+ "</html>";
 
-    private JComboBox<RecurringAction.Interval> mComboInterval;
+    private JComboBox<Interval> mComboInterval;
     private JSlider mPeriodSlider;
     private JLabel mPeriodSliderLabel;
     private JTextField mTextFilePath;
@@ -79,20 +90,20 @@ public class ScriptActionEditor extends DocumentListenerEditor<AliasAction>
 
 		add( new JLabel( "Run Interval:" ) );
 		
-		mComboInterval = new JComboBox<RecurringAction.Interval>( RecurringAction.Interval.values() );
+		mComboInterval = new JComboBox<Interval>( Interval.values() );
 		mComboInterval.setToolTipText( HELP_TEXT );
 		mComboInterval.addActionListener( new ActionListener()
 		{
 			@Override
            public void actionPerformed( ActionEvent e )
            {
-				RecurringAction.Interval selected = mComboInterval
+				Interval selected = mComboInterval
 						.getItemAt( mComboInterval.getSelectedIndex() );
 				
 				if( selected != null )
 				{
 					/* Enable/disable period slider based on selection */
-					boolean enabled = selected != RecurringAction.Interval.ONCE;
+					boolean enabled = selected != Interval.ONCE;
 					
 					mPeriodSlider.setEnabled( enabled );
 					mPeriodSliderLabel.setEnabled( enabled );
@@ -239,11 +250,11 @@ public class ScriptActionEditor extends DocumentListenerEditor<AliasAction>
 		{
 			ScriptAction script = getScriptAction();
 
-			RecurringAction.Interval interval = script.getInterval();
+			Interval interval = script.getInterval();
 			
 			mComboInterval.setSelectedItem( interval );
 
-			boolean enabled = interval != RecurringAction.Interval.ONCE;
+			boolean enabled = interval != Interval.ONCE;
 			
 			mPeriodSliderLabel.setEnabled( enabled );
 			mPeriodSlider.setEnabled( enabled );
@@ -271,7 +282,7 @@ public class ScriptActionEditor extends DocumentListenerEditor<AliasAction>
 		{
 			ScriptAction script = getScriptAction();
 			
-			script.setInterval( (RecurringAction.Interval)mComboInterval.getSelectedItem() );
+			script.setInterval( (Interval)mComboInterval.getSelectedItem() );
 			script.setPeriod( mPeriodSlider.getValue() );
 			script.setScript( mTextFilePath.getText() );
 		}

src/alias/id/AliasID.java

@@ -0,0 +1,57 @@
+/*******************************************************************************
+ *     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 alias.id;
+
+import javax.xml.bind.annotation.XmlRootElement;
+import javax.xml.bind.annotation.XmlSeeAlso;
+import javax.xml.bind.annotation.XmlTransient;
+
+import alias.id.broadcast.BroadcastChannel;
+import playlist.version1.Group;
+import alias.id.esn.Esn;
+import alias.id.fleetsync.FleetsyncID;
+import alias.id.lojack.LoJackFunctionAndID;
+import alias.id.mdc.MDC1200ID;
+import alias.id.mobileID.Min;
+import alias.id.mpt1327.MPT1327ID;
+import alias.id.nonrecordable.NonRecordable;
+import alias.id.priority.Priority;
+import alias.id.siteID.SiteID;
+import alias.id.status.StatusID;
+import alias.id.talkgroup.TalkgroupID;
+import alias.id.uniqueID.UniqueID;
+
+@SuppressWarnings( "deprecation" )
+@XmlSeeAlso( {BroadcastChannel.class, Esn.class, FleetsyncID.class, Group.class, LoJackFunctionAndID.class,
+			   MDC1200ID.class, Min.class, MPT1327ID.class, NonRecordable.class,
+			   Priority.class, SiteID.class, StatusID.class, TalkgroupID.class,
+			   UniqueID.class } )
+@XmlRootElement( name = "id" )
+public abstract class AliasID
+{
+	public AliasID()
+	{
+	}
+	
+	public abstract AliasIDType getType();
+	
+	public abstract boolean matches( AliasID id );
+
+	@XmlTransient
+	public abstract boolean isValid();
+}

src/alias/id/AliasIDType.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;
+package alias.id;
 
 public enum AliasIDType
 {

src/alias/id/AliasIdentifierEditor.java

@@ -15,21 +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.alias.id;
+package alias.id;
 
-import io.github.dsheirer.alias.Alias;
+import audio.broadcast.BroadcastModel;
-import io.github.dsheirer.alias.AliasEvent;
+import gui.editor.Editor;
-import io.github.dsheirer.alias.AliasFactory;
+import gui.editor.EmptyEditor;
-import io.github.dsheirer.alias.AliasModel;
-import io.github.dsheirer.audio.broadcast.BroadcastModel;
-import io.github.dsheirer.gui.editor.Editor;
-import io.github.dsheirer.gui.editor.EmptyEditor;
-import net.miginfocom.swing.MigLayout;
 
-import javax.swing.*;
+import java.awt.EventQueue;
-import javax.swing.event.ListSelectionEvent;
-import javax.swing.event.ListSelectionListener;
-import java.awt.*;
 import java.awt.event.ActionEvent;
 import java.awt.event.ActionListener;
 import java.awt.event.MouseAdapter;
@@ -38,6 +30,26 @@ import java.util.Collections;
 import java.util.Comparator;
 import java.util.List;
 
+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 net.miginfocom.swing.MigLayout;
+import alias.Alias;
+import alias.AliasEvent;
+import alias.AliasEvent.Event;
+import alias.AliasFactory;
+import alias.AliasModel;
+
 public class AliasIdentifierEditor extends Editor<Alias>
 {
 	private static final long serialVersionUID = 1L;
@@ -192,7 +204,7 @@ public class AliasIdentifierEditor extends Editor<Alias>
 						
 						alias.removeAliasID( selected );
 						
-						mAliasModel.broadcast( new AliasEvent( alias, AliasEvent.Event.CHANGE ) );
+						mAliasModel.broadcast( new AliasEvent( alias, Event.CHANGE ) );
 
 						setItem( alias );
 					}
@@ -251,7 +263,7 @@ public class AliasIdentifierEditor extends Editor<Alias>
 			
 			if( hasItem() )
 			{
-				mAliasModel.broadcast( new AliasEvent( getItem(), AliasEvent.Event.CHANGE ) );
+				mAliasModel.broadcast( new AliasEvent( getItem(), Event.CHANGE ) );
 			}
 		}
 	}

src/alias/id/WildcardID.java

@@ -16,7 +16,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>
  *
  ******************************************************************************/
-package io.github.dsheirer.alias.id;
+package alias.id;
 
 import org.apache.commons.lang3.Validate;
 

src/alias/id/broadcast/BroadcastChannel.java

@@ -16,11 +16,12 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>
  *
  ******************************************************************************/
-package io.github.dsheirer.alias.id.broadcast;
+package alias.id.broadcast;
 
-import com.fasterxml.jackson.dataformat.xml.annotation.JacksonXmlProperty;
+import alias.id.AliasID;
-import io.github.dsheirer.alias.id.AliasID;
+import alias.id.AliasIDType;
-import io.github.dsheirer.alias.id.AliasIDType;
+
+import javax.xml.bind.annotation.XmlAttribute;
 
 public class BroadcastChannel extends AliasID implements Comparable<BroadcastChannel>
 {
@@ -82,7 +83,7 @@ public class BroadcastChannel extends AliasID implements Comparable<BroadcastCha
     /**
      * Name of the broadcastAudio channel configuration
      */
-    @JacksonXmlProperty(isAttribute = true, localName = "channel")
+    @XmlAttribute(name = "channel")
     public String getChannelName()
     {
         return mChannelName;
@@ -96,7 +97,6 @@ public class BroadcastChannel extends AliasID implements Comparable<BroadcastCha
         mChannelName = channel;
     }
 
-    @JacksonXmlProperty(isAttribute = true, localName = "type", namespace = "http://www.w3.org/2001/XMLSchema-instance")
     @Override
     public AliasIDType getType()
     {