Updates PlaylistManager to use faster jackson XML serialization.

Removes native xml.bind serialization for improved compatibility with
 Java 9.

 Global optimize imports on the entire project.

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

@@ -17,6 +17,10 @@
  ******************************************************************************/
 package io.github.dsheirer.alias.id;
 
+import com.fasterxml.jackson.annotation.JsonIgnore;
+import com.fasterxml.jackson.annotation.JsonSubTypes;
+import com.fasterxml.jackson.annotation.JsonTypeInfo;
+import com.fasterxml.jackson.dataformat.xml.annotation.JacksonXmlRootElement;
 import io.github.dsheirer.alias.id.broadcast.BroadcastChannel;
 import io.github.dsheirer.alias.id.esn.Esn;
 import io.github.dsheirer.alias.id.fleetsync.FleetsyncID;
@@ -30,28 +34,35 @@ import io.github.dsheirer.alias.id.siteID.SiteID;
 import io.github.dsheirer.alias.id.status.StatusID;
 import io.github.dsheirer.alias.id.talkgroup.TalkgroupID;
 import io.github.dsheirer.alias.id.uniqueID.UniqueID;
-import io.github.dsheirer.playlist.version1.Group;
 
-import javax.xml.bind.annotation.XmlRootElement;
-import javax.xml.bind.annotation.XmlSeeAlso;
-import javax.xml.bind.annotation.XmlTransient;
-
-@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" )
+@JsonTypeInfo(use = JsonTypeInfo.Id.NAME, include= JsonTypeInfo.As.PROPERTY, property="type")
+@JsonSubTypes({
+    @JsonSubTypes.Type(value=BroadcastChannel.class, name="broadcastChannel"),
+    @JsonSubTypes.Type(value=Esn.class, name="esn"),
+    @JsonSubTypes.Type(value=FleetsyncID.class, name="fleetsyncID"),
+    @JsonSubTypes.Type(value = LoJackFunctionAndID.class, name = "loJackFunctionAndID"),
+    @JsonSubTypes.Type(value = MDC1200ID.class, name = "mdc1200ID"),
+    @JsonSubTypes.Type(value = Min.class, name = "min"),
+    @JsonSubTypes.Type(value = MPT1327ID.class, name = "mpt1327ID"),
+    @JsonSubTypes.Type(value = NonRecordable.class, name = "nonRecordable"),
+    @JsonSubTypes.Type(value = Priority.class, name = "priority"),
+    @JsonSubTypes.Type(value = SiteID.class, name = "siteID"),
+    @JsonSubTypes.Type(value = StatusID.class, name = "statusID"),
+    @JsonSubTypes.Type(value = TalkgroupID.class, name = "talkgroupID"),
+    @JsonSubTypes.Type(value = UniqueID.class, name = "uniqueID")
+})
+@JacksonXmlRootElement( localName = "id" )
 public abstract class AliasID
 {
 	public AliasID()
 	{
 	}
-	
+
+	@JsonIgnore
 	public abstract AliasIDType getType();
 	
 	public abstract boolean matches( AliasID id );
 
-	@XmlTransient
+	@JsonIgnore
 	public abstract boolean isValid();
 }

src/main/java/io/github/dsheirer/alias/id/broadcast/BroadcastChannel.java

@@ -18,11 +18,10 @@
  ******************************************************************************/
 package io.github.dsheirer.alias.id.broadcast;
 
+import com.fasterxml.jackson.dataformat.xml.annotation.JacksonXmlProperty;
 import io.github.dsheirer.alias.id.AliasID;
 import io.github.dsheirer.alias.id.AliasIDType;
 
-import javax.xml.bind.annotation.XmlAttribute;
-
 public class BroadcastChannel extends AliasID implements Comparable<BroadcastChannel>
 {
     private String mChannelName;
@@ -83,7 +82,7 @@ public class BroadcastChannel extends AliasID implements Comparable<BroadcastCha
     /**
      * Name of the broadcastAudio channel configuration
      */
-    @XmlAttribute(name = "channel")
+    @JacksonXmlProperty(isAttribute = true, localName = "channel")
     public String getChannelName()
     {
         return mChannelName;
@@ -97,6 +96,7 @@ 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()
     {

src/main/java/io/github/dsheirer/alias/id/broadcast/BroadcastChannelEditor.java

@@ -18,11 +18,11 @@
  ******************************************************************************/
 package io.github.dsheirer.alias.id.broadcast;
 
+import io.github.dsheirer.alias.id.AliasID;
 import io.github.dsheirer.audio.broadcast.BroadcastConfiguration;
 import io.github.dsheirer.audio.broadcast.BroadcastModel;
 import io.github.dsheirer.gui.editor.DocumentListenerEditor;
 import net.miginfocom.swing.MigLayout;
-import io.github.dsheirer.alias.id.AliasID;
 
 import javax.swing.*;
 import java.awt.*;

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

@@ -17,9 +17,9 @@
  ******************************************************************************/
 package io.github.dsheirer.alias.id.esn;
 
+import io.github.dsheirer.alias.id.AliasID;
 import io.github.dsheirer.gui.editor.DocumentListenerEditor;
 import net.miginfocom.swing.MigLayout;
-import io.github.dsheirer.alias.id.AliasID;
 
 import javax.swing.*;
 import java.awt.*;

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

@@ -17,11 +17,10 @@
  ******************************************************************************/
 package io.github.dsheirer.alias.id.esn;
 
+import com.fasterxml.jackson.dataformat.xml.annotation.JacksonXmlProperty;
 import io.github.dsheirer.alias.id.AliasID;
 import io.github.dsheirer.alias.id.AliasIDType;
 
-import javax.xml.bind.annotation.XmlAttribute;
-
 public class Esn extends AliasID
 {
 	private String mEsn;
@@ -30,7 +29,7 @@ public class Esn extends AliasID
 	{
 	}
 
-	@XmlAttribute
+	@JacksonXmlProperty(isAttribute = true, localName = "esn")
 	public String getEsn()
 	{
 		return mEsn;
@@ -70,6 +69,7 @@ public class Esn extends AliasID
 	    return retVal;
     }
 
+	@JacksonXmlProperty(isAttribute = true, localName = "type", namespace = "http://www.w3.org/2001/XMLSchema-instance")
 	@Override
     public AliasIDType getType()
     {

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

@@ -17,12 +17,10 @@
  ******************************************************************************/
 package io.github.dsheirer.alias.id.fleetsync;
 
+import com.fasterxml.jackson.dataformat.xml.annotation.JacksonXmlProperty;
 import io.github.dsheirer.alias.id.AliasID;
 import io.github.dsheirer.alias.id.AliasIDType;
 
-import javax.xml.bind.annotation.XmlAttribute;
-
-
 public class FleetsyncID extends AliasID
 {
 	private String mID;
@@ -31,7 +29,7 @@ public class FleetsyncID extends AliasID
 	{
 	}
 
-	@XmlAttribute
+	@JacksonXmlProperty(isAttribute = true, localName = "ident")
 	public String getIdent()
 	{
 		return mID;
@@ -71,6 +69,7 @@ public class FleetsyncID extends AliasID
 	    return retVal;
     }
 
+	@JacksonXmlProperty(isAttribute = true, localName = "type", namespace = "http://www.w3.org/2001/XMLSchema-instance")
 	@Override
     public AliasIDType getType()
     {

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

@@ -17,11 +17,11 @@
  ******************************************************************************/
 package io.github.dsheirer.alias.id.fleetsync;
 
+import io.github.dsheirer.alias.id.AliasID;
 import io.github.dsheirer.gui.editor.DocumentListenerEditor;
 import net.miginfocom.swing.MigLayout;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
-import io.github.dsheirer.alias.id.AliasID;
 
 import javax.swing.*;
 import javax.swing.text.MaskFormatter;

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

@@ -1,138 +1,151 @@
 /*******************************************************************************
  *     SDR Trunk 
  *     Copyright (C) 2015 Dennis Sheirer
- * 
+ *
  *     This program is free software: you can redistribute it and/or modify
  *     it under the terms of the GNU General Public License as published by
  *     the Free Software Foundation, either version 3 of the License, or
  *     (at your option) any later version.
- * 
+ *
  *     This program is distributed in the hope that it will be useful,
  *     but WITHOUT ANY WARRANTY; without even the implied warranty of
  *     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  *     GNU General Public License for more details.
- * 
+ *
  *     You should have received a copy of the GNU General Public License
  *     along with this program.  If not, see <http://www.gnu.org/licenses/>
  ******************************************************************************/
 package io.github.dsheirer.alias.id.lojack;
 
 
+import com.fasterxml.jackson.dataformat.xml.annotation.JacksonXmlProperty;
 import io.github.dsheirer.alias.id.AliasID;
 import io.github.dsheirer.alias.id.AliasIDType;
 import io.github.dsheirer.module.decode.lj1200.LJ1200Message;
 
-import javax.xml.bind.annotation.XmlAttribute;
-
 public class LoJackFunctionAndID extends AliasID
 {
-	private LJ1200Message.Function mFunction = LJ1200Message.Function.F0_UNKNOWN;
-	private String mID = "*****";
-	
-	public LoJackFunctionAndID()
-	{
-	}
+    private LJ1200Message.Function mFunction = LJ1200Message.Function.F0_UNKNOWN;
+    private String mID = "*****";
 
-	@XmlAttribute( name="id" )
-	public String getID()
-	{
-		return mID;
-	}
-
-	public void setID( String id )
-	{
-		mID = id;
-	}
-
-	@XmlAttribute( name="function" )
-	public LJ1200Message.Function getFunction()
-	{
-		return mFunction;
-	}
-
-	public void setFunction( LJ1200Message.Function function )
-	{
-		mFunction = function;
-	}
-
-	@Override
-	public boolean isValid()
-	{
-		return mFunction != null && mID != null;
-	}
-
-	public String toString()
-	{
-		return "LoJack FUNC: " + mFunction.getLabel() + " ID:" + ( mID == null ? "" : mID );
-	}
-
-	/**
-	 * Indicates if the function and id combination match this alias id
-	 */
-	public boolean matches(LJ1200Message.Function function, String id )
-	{
-		return mFunction == function &&
-			   mID != null && 
-			   id != null &&
-			   id.matches( mID.replace( "*", ".?" ) );
-	}
-
-	@Override
-    public boolean matches( AliasID id )
+    public LoJackFunctionAndID()
     {
-		boolean retVal = false;
-		
-		if( mID != null && id instanceof LoJackFunctionAndID )
-		{
-			LoJackFunctionAndID otherLojack = (LoJackFunctionAndID)id;
-
-			if( otherLojack.getFunction() == mFunction )
-			{
-				//Create a pattern - replace * wildcards with regex single-char wildcard
-				String pattern = mID.replace( "*", ".?" );
-				
-				retVal = otherLojack.getID().matches( pattern );
-			}
-		}
-		
-	    return retVal;
     }
 
-	@Override
+    @JacksonXmlProperty(isAttribute = true, localName = "id")
+    public String getID()
+    {
+        return mID;
+    }
+
+    public void setID(String id)
+    {
+        mID = id;
+    }
+
+    @JacksonXmlProperty(isAttribute = true, localName = "function")
+    public LJ1200Message.Function getFunction()
+    {
+        return mFunction;
+    }
+
+    public void setFunction(LJ1200Message.Function function)
+    {
+        mFunction = function;
+    }
+
+    @Override
+    public boolean isValid()
+    {
+        return mFunction != null && mID != null;
+    }
+
+    public String toString()
+    {
+        return "LoJack FUNC: " + mFunction.getLabel() + " ID:" + (mID == null ? "" : mID);
+    }
+
+    /**
+     * Indicates if the function and id combination match this alias id
+     */
+    public boolean matches(LJ1200Message.Function function, String id)
+    {
+        return mFunction == function &&
+            mID != null &&
+            id != null &&
+            id.matches(mID.replace("*", ".?"));
+    }
+
+    @Override
+    public boolean matches(AliasID id)
+    {
+        boolean retVal = false;
+
+        if(mID != null && id instanceof LoJackFunctionAndID)
+        {
+            LoJackFunctionAndID otherLojack = (LoJackFunctionAndID)id;
+
+            if(otherLojack.getFunction() == mFunction)
+            {
+                //Create a pattern - replace * wildcards with regex single-char wildcard
+                String pattern = mID.replace("*", ".?");
+
+                retVal = otherLojack.getID().matches(pattern);
+            }
+        }
+
+        return retVal;
+    }
+
+    @JacksonXmlProperty(isAttribute = true, localName = "type", namespace = "http://www.w3.org/2001/XMLSchema-instance")
+    @Override
     public AliasIDType getType()
     {
-	    return AliasIDType.LOJACK;
+        return AliasIDType.LOJACK;
     }
-	
-	@Override
-	public int hashCode()
-	{
-		final int prime = 31;
-		int result = 1;
-		result = prime * result
-				+ ( ( mFunction == null ) ? 0 : mFunction.hashCode() );
-		result = prime * result + ( ( mID == null ) ? 0 : mID.hashCode() );
-		return result;
-	}
 
-	@Override
-	public boolean equals( Object obj )
-	{
-		if ( this == obj )
-			return true;
-		if ( obj == null )
-			return false;
-		if ( getClass() != obj.getClass() )
-			return false;
-		LoJackFunctionAndID other = (LoJackFunctionAndID) obj;
-		if ( mFunction != other.mFunction )
-			return false;
-		if ( mID == null )
-		{
-			if ( other.mID != null )
-				return false;
-		} else if ( !mID.equals( other.mID ) )
-			return false;
-		return true;
-	}
+    @Override
+    public int hashCode()
+    {
+        final int prime = 31;
+        int result = 1;
+        result = prime * result
+            + ((mFunction == null) ? 0 : mFunction.hashCode());
+        result = prime * result + ((mID == null) ? 0 : mID.hashCode());
+        return result;
+    }
+
+    @Override
+    public boolean equals(Object obj)
+    {
+        if(this == obj)
+        {
+            return true;
+        }
+        if(obj == null)
+        {
+            return false;
+        }
+        if(getClass() != obj.getClass())
+        {
+            return false;
+        }
+        LoJackFunctionAndID other = (LoJackFunctionAndID)obj;
+        if(mFunction != other.mFunction)
+        {
+            return false;
+        }
+        if(mID == null)
+        {
+            if(other.mID != null)
+            {
+                return false;
+            }
+        }
+        else if(!mID.equals(other.mID))
+        {
+            return false;
+        }
+        return true;
+    }
 }

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

@@ -17,11 +17,11 @@
  ******************************************************************************/
 package io.github.dsheirer.alias.id.lojack;
 
-import io.github.dsheirer.gui.editor.DocumentListenerEditor;
-import net.miginfocom.swing.MigLayout;
 import io.github.dsheirer.alias.id.AliasID;
+import io.github.dsheirer.gui.editor.DocumentListenerEditor;
 import io.github.dsheirer.module.decode.lj1200.LJ1200Message;
 import io.github.dsheirer.module.decode.lj1200.LJ1200Message.Function;
+import net.miginfocom.swing.MigLayout;
 
 import javax.swing.*;
 import javax.swing.text.MaskFormatter;

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

@@ -1,80 +1,79 @@
 /*******************************************************************************
  *     SDR Trunk 
  *     Copyright (C) 2014 Dennis Sheirer
- * 
+ *
  *     This program is free software: you can redistribute it and/or modify
  *     it under the terms of the GNU General Public License as published by
  *     the Free Software Foundation, either version 3 of the License, or
  *     (at your option) any later version.
- * 
+ *
  *     This program is distributed in the hope that it will be useful,
  *     but WITHOUT ANY WARRANTY; without even the implied warranty of
  *     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  *     GNU General Public License for more details.
- * 
+ *
  *     You should have received a copy of the GNU General Public License
  *     along with this program.  If not, see <http://www.gnu.org/licenses/>
  ******************************************************************************/
 package io.github.dsheirer.alias.id.mdc;
 
 
+import com.fasterxml.jackson.dataformat.xml.annotation.JacksonXmlProperty;
 import io.github.dsheirer.alias.id.AliasID;
 import io.github.dsheirer.alias.id.AliasIDType;
 
-import javax.xml.bind.annotation.XmlAttribute;
-
-
 public class MDC1200ID extends AliasID
 {
-	private String mID;
-	
-	public MDC1200ID()
-	{
-	}
+    private String mID;
 
-	@XmlAttribute
-	public String getIdent()
-	{
-		return mID;
-	}
-
-	public void setIdent( String ident )
-	{
-		mID = ident;
-	}
-
-	@Override
-	public boolean isValid()
-	{
-		return mID != null;
-	}
-
-	public String toString()
-	{
-		return "MDC-1200: " + mID;
-	}
-
-	@Override
-    public boolean matches( AliasID id )
+    public MDC1200ID()
     {
-		boolean retVal = false;
-		
-		if( mID != null && id instanceof MDC1200ID )
-		{
-			MDC1200ID tgid = (MDC1200ID)id;
-
-			//Create a pattern - replace * wildcards with regex single-char wildcard
-			String pattern = mID.replace( "*", ".?" );
-			
-			retVal = tgid.getIdent().matches( pattern );
-		}
-		
-	    return retVal;
     }
 
-	@Override
+    @JacksonXmlProperty(isAttribute = true, localName = "ident")
+    public String getIdent()
+    {
+        return mID;
+    }
+
+    public void setIdent(String ident)
+    {
+        mID = ident;
+    }
+
+    @Override
+    public boolean isValid()
+    {
+        return mID != null;
+    }
+
+    public String toString()
+    {
+        return "MDC-1200: " + mID;
+    }
+
+    @Override
+    public boolean matches(AliasID id)
+    {
+        boolean retVal = false;
+
+        if(mID != null && id instanceof MDC1200ID)
+        {
+            MDC1200ID tgid = (MDC1200ID)id;
+
+            //Create a pattern - replace * wildcards with regex single-char wildcard
+            String pattern = mID.replace("*", ".?");
+
+            retVal = tgid.getIdent().matches(pattern);
+        }
+
+        return retVal;
+    }
+
+    @JacksonXmlProperty(isAttribute = true, localName = "type", namespace = "http://www.w3.org/2001/XMLSchema-instance")
+    @Override
     public AliasIDType getType()
     {
-	    return AliasIDType.MDC1200;
+        return AliasIDType.MDC1200;
     }
 }

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

@@ -17,9 +17,9 @@
  ******************************************************************************/
 package io.github.dsheirer.alias.id.mdc;
 
+import io.github.dsheirer.alias.id.AliasID;
 import io.github.dsheirer.gui.editor.DocumentListenerEditor;
 import net.miginfocom.swing.MigLayout;
-import io.github.dsheirer.alias.id.AliasID;
 
 import javax.swing.*;
 import javax.swing.text.MaskFormatter;

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

@@ -1,82 +1,82 @@
 /*******************************************************************************
  *     SDR Trunk 
  *     Copyright (C) 2014 Dennis Sheirer
- * 
+ *
  *     This program is free software: you can redistribute it and/or modify
  *     it under the terms of the GNU General Public License as published by
  *     the Free Software Foundation, either version 3 of the License, or
  *     (at your option) any later version.
- * 
+ *
  *     This program is distributed in the hope that it will be useful,
  *     but WITHOUT ANY WARRANTY; without even the implied warranty of
  *     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  *     GNU General Public License for more details.
- * 
+ *
  *     You should have received a copy of the GNU General Public License
  *     along with this program.  If not, see <http://www.gnu.org/licenses/>
  ******************************************************************************/
 package io.github.dsheirer.alias.id.mobileID;
 
 
+import com.fasterxml.jackson.dataformat.xml.annotation.JacksonXmlProperty;
 import io.github.dsheirer.alias.id.AliasID;
 import io.github.dsheirer.alias.id.AliasIDType;
 
-import javax.xml.bind.annotation.XmlAttribute;
-
 /**
  * Mobile ID Number
  */
 public class Min extends AliasID
 {
-	private String mMin;
-	
-	public Min()
-	{
-	}
+    private String mMin;
 
-	@XmlAttribute
-	public String getMin()
-	{
-		return mMin;
-	}
-
-	public void setMin( String min )
-	{
-		mMin = min;
-	}
-
-	@Override
-	public boolean isValid()
-	{
-		return mMin != null;
-	}
-
-	public String toString()
-	{
-		return "MIN: " + mMin;
-	}
-
-	@Override
-    public boolean matches( AliasID id )
+    public Min()
     {
-		boolean retVal = false;
-		
-		if( mMin != null && id instanceof Min )
-		{
-			Min min = (Min)id;
-
-			//Create a pattern - replace * wildcards with regex single-char wildcard
-			String pattern = mMin.replace( "*", ".?" );
-			
-			retVal = min.getMin().matches( pattern );
-		}
-		
-	    return retVal;
     }
 
-	@Override
+    @JacksonXmlProperty(isAttribute = true, localName = "min")
+    public String getMin()
+    {
+        return mMin;
+    }
+
+    public void setMin(String min)
+    {
+        mMin = min;
+    }
+
+    @Override
+    public boolean isValid()
+    {
+        return mMin != null;
+    }
+
+    public String toString()
+    {
+        return "MIN: " + mMin;
+    }
+
+    @Override
+    public boolean matches(AliasID id)
+    {
+        boolean retVal = false;
+
+        if(mMin != null && id instanceof Min)
+        {
+            Min min = (Min)id;
+
+            //Create a pattern - replace * wildcards with regex single-char wildcard
+            String pattern = mMin.replace("*", ".?");
+
+            retVal = min.getMin().matches(pattern);
+        }
+
+        return retVal;
+    }
+
+    @JacksonXmlProperty(isAttribute = true, localName = "type", namespace = "http://www.w3.org/2001/XMLSchema-instance")
+    @Override
     public AliasIDType getType()
     {
-	    return AliasIDType.MIN;
+        return AliasIDType.MIN;
     }
 }

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

@@ -1,79 +1,79 @@
 /*******************************************************************************
  *     SDR Trunk 
  *     Copyright (C) 2014 Dennis Sheirer
- * 
+ *
  *     This program is free software: you can redistribute it and/or modify
  *     it under the terms of the GNU General Public License as published by
  *     the Free Software Foundation, either version 3 of the License, or
  *     (at your option) any later version.
- * 
+ *
  *     This program is distributed in the hope that it will be useful,
  *     but WITHOUT ANY WARRANTY; without even the implied warranty of
  *     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  *     GNU General Public License for more details.
- * 
+ *
  *     You should have received a copy of the GNU General Public License
  *     along with this program.  If not, see <http://www.gnu.org/licenses/>
  ******************************************************************************/
 package io.github.dsheirer.alias.id.mpt1327;
 
 
+import com.fasterxml.jackson.dataformat.xml.annotation.JacksonXmlProperty;
 import io.github.dsheirer.alias.id.AliasID;
 import io.github.dsheirer.alias.id.AliasIDType;
 
-import javax.xml.bind.annotation.XmlAttribute;
-
 public class MPT1327ID extends AliasID
 {
-	private String mID;
-	
-	public MPT1327ID()
-	{
-	}
+    private String mID;
 
-	@XmlAttribute
-	public String getIdent()
-	{
-		return mID;
-	}
-
-	public void setIdent( String ident )
-	{
-		mID = ident;
-	}
-
-	@Override
-	public boolean isValid()
-	{
-		return mID != null;
-	}
-
-	public String toString()
-	{
-		return "MPT-1327: " + mID;
-	}
-
-	@Override
-    public boolean matches( AliasID id )
+    public MPT1327ID()
     {
-		boolean retVal = false;
-		
-		if( mID != null && id instanceof MPT1327ID )
-		{
-			MPT1327ID tgid = (MPT1327ID)id;
-
-			//Create a pattern - replace * wildcards with regex single-char wildcard
-			String pattern = mID.replace( "*", ".?" );
-			
-			retVal = tgid.getIdent().matches( pattern );
-		}
-		
-	    return retVal;
     }
 
-	@Override
+    @JacksonXmlProperty(isAttribute = true, localName = "ident")
+    public String getIdent()
+    {
+        return mID;
+    }
+
+    public void setIdent(String ident)
+    {
+        mID = ident;
+    }
+
+    @Override
+    public boolean isValid()
+    {
+        return mID != null;
+    }
+
+    public String toString()
+    {
+        return "MPT-1327: " + mID;
+    }
+
+    @Override
+    public boolean matches(AliasID id)
+    {
+        boolean retVal = false;
+
+        if(mID != null && id instanceof MPT1327ID)
+        {
+            MPT1327ID tgid = (MPT1327ID)id;
+
+            //Create a pattern - replace * wildcards with regex single-char wildcard
+            String pattern = mID.replace("*", ".?");
+
+            retVal = tgid.getIdent().matches(pattern);
+        }
+
+        return retVal;
+    }
+
+    @JacksonXmlProperty(isAttribute = true, localName = "type", namespace = "http://www.w3.org/2001/XMLSchema-instance")
+    @Override
     public AliasIDType getType()
     {
-	    return AliasIDType.MPT1327;
+        return AliasIDType.MPT1327;
     }
 }

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

@@ -17,9 +17,9 @@
  ******************************************************************************/
 package io.github.dsheirer.alias.id.mpt1327;
 
+import io.github.dsheirer.alias.id.AliasID;
 import io.github.dsheirer.gui.editor.DocumentListenerEditor;
 import net.miginfocom.swing.MigLayout;
-import io.github.dsheirer.alias.id.AliasID;
 
 import javax.swing.*;
 import javax.swing.text.MaskFormatter;

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

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

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

@@ -17,9 +17,9 @@
  ******************************************************************************/
 package io.github.dsheirer.alias.id.nonrecordable;
 
+import io.github.dsheirer.alias.id.AliasID;
 import io.github.dsheirer.gui.editor.DocumentListenerEditor;
 import net.miginfocom.swing.MigLayout;
-import io.github.dsheirer.alias.id.AliasID;
 
 import javax.swing.*;
 import java.awt.*;

src/main/java/io/github/dsheirer/alias/id/priority/Priority.java

@@ -1,83 +1,85 @@
 /*******************************************************************************
  *     SDR Trunk 
  *     Copyright (C) 2014 Dennis Sheirer
- * 
+ *
  *     This program is free software: you can redistribute it and/or modify
  *     it under the terms of the GNU General Public License as published by
  *     the Free Software Foundation, either version 3 of the License, or
  *     (at your option) any later version.
- * 
+ *
  *     This program is distributed in the hope that it will be useful,
  *     but WITHOUT ANY WARRANTY; without even the implied warranty of
  *     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  *     GNU General Public License for more details.
- * 
+ *
  *     You should have received a copy of the GNU General Public License
  *     along with this program.  If not, see <http://www.gnu.org/licenses/>
  ******************************************************************************/
 package io.github.dsheirer.alias.id.priority;
 
+import com.fasterxml.jackson.annotation.JsonIgnore;
+import com.fasterxml.jackson.dataformat.xml.annotation.JacksonXmlProperty;
 import io.github.dsheirer.alias.id.AliasID;
 import io.github.dsheirer.alias.id.AliasIDType;
 
-import javax.xml.bind.annotation.XmlAttribute;
-
 /**
  * Specifies an (audio) priority level for this alias.
  */
 public class Priority extends AliasID
 {
-	public static final int DO_NOT_MONITOR = -1;
-	public static final int SELECTED_PRIORITY = 0;
-	public static final int MIN_PRIORITY = 1;
-	public static final int MAX_PRIORITY = 100;
-	public static final int DEFAULT_PRIORITY = 100;
-	
-	private int mPriority = DEFAULT_PRIORITY;
-	
-	public Priority()
-	{
-	}
+    public static final int DO_NOT_MONITOR = -1;
+    public static final int SELECTED_PRIORITY = 0;
+    public static final int MIN_PRIORITY = 1;
+    public static final int MAX_PRIORITY = 100;
+    public static final int DEFAULT_PRIORITY = 100;
 
-	@Override
-	public boolean isValid()
-	{
-		return true;
-	}
+    private int mPriority = DEFAULT_PRIORITY;
 
-	/**
-	 * Indicates the associated alias should not be monitored or tracked.
-	 */
-	public boolean isDoNotMonitor()
-	{
-		return mPriority == DO_NOT_MONITOR;
-	}
-
-	@XmlAttribute
-	public int getPriority()
-	{
-		return mPriority;
-	}
-
-	public void setPriority( int priority )
-	{
-		mPriority = priority;
-	}
-	
-	public String toString()
-	{
-		return "Audio Priority: " + ( isDoNotMonitor() ? "Do Not Monitor" : mPriority );
-	}
-
-	@Override
-    public boolean matches( AliasID id )
+    public Priority()
     {
-	    return false;
     }
 
-	@Override
+    @Override
+    public boolean isValid()
+    {
+        return true;
+    }
+
+    /**
+     * Indicates the associated alias should not be monitored or tracked.
+     */
+    @JsonIgnore
+    public boolean isDoNotMonitor()
+    {
+        return mPriority == DO_NOT_MONITOR;
+    }
+
+    @JacksonXmlProperty(isAttribute = true, localName = "priority")
+    public int getPriority()
+    {
+        return mPriority;
+    }
+
+    public void setPriority(int priority)
+    {
+        mPriority = priority;
+    }
+
+    public String toString()
+    {
+        return "Audio Priority: " + (isDoNotMonitor() ? "Do Not Monitor" : mPriority);
+    }
+
+    @Override
+    public boolean matches(AliasID id)
+    {
+        return false;
+    }
+
+    @JacksonXmlProperty(isAttribute = true, localName = "type", namespace = "http://www.w3.org/2001/XMLSchema-instance")
+    @Override
     public AliasIDType getType()
     {
-	    return AliasIDType.PRIORITY;
+        return AliasIDType.PRIORITY;
     }
 }

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

@@ -1,70 +1,68 @@
 /*******************************************************************************
  *     SDR Trunk 
  *     Copyright (C) 2014 Dennis Sheirer
- * 
+ *
  *     This program is free software: you can redistribute it and/or modify
  *     it under the terms of the GNU General Public License as published by
  *     the Free Software Foundation, either version 3 of the License, or
  *     (at your option) any later version.
- * 
+ *
  *     This program is distributed in the hope that it will be useful,
  *     but WITHOUT ANY WARRANTY; without even the implied warranty of
  *     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  *     GNU General Public License for more details.
- * 
+ *
  *     You should have received a copy of the GNU General Public License
  *     along with this program.  If not, see <http://www.gnu.org/licenses/>
  ******************************************************************************/
 package io.github.dsheirer.alias.id.siteID;
 
+import com.fasterxml.jackson.dataformat.xml.annotation.JacksonXmlProperty;
 import io.github.dsheirer.alias.id.AliasID;
 import io.github.dsheirer.alias.id.AliasIDType;
-import io.github.dsheirer.alias.id.AliasID;
-import io.github.dsheirer.alias.id.AliasIDType;
-
-import javax.xml.bind.annotation.XmlAttribute;
 
 public class SiteID extends AliasID
 {
-	private String mSite;
-	
-	public SiteID()
-	{
-	}
+    private String mSite;
 
-	@XmlAttribute
-	public String getSite()
-	{
-		return mSite;
-	}
-
-	public void setSite( String site )
-	{
-		mSite = site;
-	}
-
-	@Override
-	public boolean isValid()
-	{
-		return mSite != null;
-	}
-
-	public String toString()
-	{
-		return "Site: " + mSite;
-	}
-
-	@Override
-    public boolean matches( AliasID otherID )
+    public SiteID()
     {
-		return otherID != null && 
-			   otherID instanceof SiteID && 
-			   getSite().contentEquals( ( (SiteID)otherID).getSite() );
     }
 
-	@Override
+    @JacksonXmlProperty(isAttribute = true, localName = "site")
+    public String getSite()
+    {
+        return mSite;
+    }
+
+    public void setSite(String site)
+    {
+        mSite = site;
+    }
+
+    @Override
+    public boolean isValid()
+    {
+        return mSite != null;
+    }
+
+    public String toString()
+    {
+        return "Site: " + mSite;
+    }
+
+    @Override
+    public boolean matches(AliasID otherID)
+    {
+        return otherID != null &&
+            otherID instanceof SiteID &&
+            getSite().contentEquals(((SiteID)otherID).getSite());
+    }
+
+    @JacksonXmlProperty(isAttribute = true, localName = "type", namespace = "http://www.w3.org/2001/XMLSchema-instance")
+    @Override
     public AliasIDType getType()
     {
-	    return AliasIDType.SITE;
+        return AliasIDType.SITE;
     }
 }

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

@@ -17,9 +17,9 @@
  ******************************************************************************/
 package io.github.dsheirer.alias.id.siteID;
 
+import io.github.dsheirer.alias.id.AliasID;
 import io.github.dsheirer.gui.editor.DocumentListenerEditor;
 import net.miginfocom.swing.MigLayout;
-import io.github.dsheirer.alias.id.AliasID;
 
 import javax.swing.*;
 import java.awt.*;

src/main/java/io/github/dsheirer/alias/id/status/StatusID.java

@@ -1,75 +1,75 @@
 /*******************************************************************************
  *     SDR Trunk 
  *     Copyright (C) 2014 Dennis Sheirer
- * 
+ *
  *     This program is free software: you can redistribute it and/or modify
  *     it under the terms of the GNU General Public License as published by
  *     the Free Software Foundation, either version 3 of the License, or
  *     (at your option) any later version.
- * 
+ *
  *     This program is distributed in the hope that it will be useful,
  *     but WITHOUT ANY WARRANTY; without even the implied warranty of
  *     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  *     GNU General Public License for more details.
- * 
+ *
  *     You should have received a copy of the GNU General Public License
  *     along with this program.  If not, see <http://www.gnu.org/licenses/>
  ******************************************************************************/
 package io.github.dsheirer.alias.id.status;
 
+import com.fasterxml.jackson.dataformat.xml.annotation.JacksonXmlProperty;
 import io.github.dsheirer.alias.id.AliasID;
 import io.github.dsheirer.alias.id.AliasIDType;
 
-import javax.xml.bind.annotation.XmlAttribute;
-
 public class StatusID extends AliasID
 {
-	private int mStatus;
-	
-	public StatusID()
-	{
-	}
+    private int mStatus;
 
-	@XmlAttribute
-	public int getStatus()
-	{
-		return mStatus;
-	}
-
-	public void setStatus( int status )
-	{
-		this.mStatus = status;
-	}
-
-	@Override
-	public boolean isValid()
-	{
-		return true;
-	}
-
-	public String toString()
-	{
-		return "Status: " + String.format( "%03d", mStatus );
-	}
-
-	@Override
-    public boolean matches( AliasID id )
+    public StatusID()
     {
-		boolean retVal = false;
-		
-		if( id instanceof StatusID )
-		{
-			StatusID statusId = (StatusID)id;
-			
-			retVal = ( mStatus == statusId.getStatus() );
-		}
-		
-	    return retVal;
     }
 
-	@Override
+    @JacksonXmlProperty(isAttribute = true, localName = "status")
+    public int getStatus()
+    {
+        return mStatus;
+    }
+
+    public void setStatus(int status)
+    {
+        this.mStatus = status;
+    }
+
+    @Override
+    public boolean isValid()
+    {
+        return true;
+    }
+
+    public String toString()
+    {
+        return "Status: " + String.format("%03d", mStatus);
+    }
+
+    @Override
+    public boolean matches(AliasID id)
+    {
+        boolean retVal = false;
+
+        if(id instanceof StatusID)
+        {
+            StatusID statusId = (StatusID)id;
+
+            retVal = (mStatus == statusId.getStatus());
+        }
+
+        return retVal;
+    }
+
+    @JacksonXmlProperty(isAttribute = true, localName = "type", namespace = "http://www.w3.org/2001/XMLSchema-instance")
+    @Override
     public AliasIDType getType()
     {
-	    return AliasIDType.STATUS;
+        return AliasIDType.STATUS;
     }
 }

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

@@ -18,12 +18,10 @@
 package io.github.dsheirer.alias.id.talkgroup;
 
 
+import com.fasterxml.jackson.dataformat.xml.annotation.JacksonXmlProperty;
 import io.github.dsheirer.alias.id.AliasID;
 import io.github.dsheirer.alias.id.AliasIDType;
 
-import javax.xml.bind.annotation.XmlAttribute;
-
-
 public class TalkgroupID extends AliasID
 {
     private String mTalkgroup;
@@ -38,7 +36,7 @@ public class TalkgroupID extends AliasID
         mTalkgroup = talkgroup;
     }
 
-    @XmlAttribute
+    @JacksonXmlProperty(isAttribute = true, localName = "talkgroup")
     public String getTalkgroup()
     {
         return mTalkgroup;
@@ -71,7 +69,7 @@ public class TalkgroupID extends AliasID
 
         if(id instanceof TalkgroupID)
         {
-            TalkgroupID tgid = (TalkgroupID) id;
+            TalkgroupID tgid = (TalkgroupID)id;
 
             //Create a pattern - replace * wildcards with regex single-char wildcard
             String pattern = mTalkgroup.replace("*", ".?");
@@ -82,6 +80,7 @@ public class TalkgroupID extends AliasID
         return retVal;
     }
 
+    @JacksonXmlProperty(isAttribute = true, localName = "type", namespace = "http://www.w3.org/2001/XMLSchema-instance")
     @Override
     public AliasIDType getType()
     {

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

@@ -17,9 +17,9 @@
  ******************************************************************************/
 package io.github.dsheirer.alias.id.talkgroup;
 
+import io.github.dsheirer.alias.id.AliasID;
 import io.github.dsheirer.gui.editor.DocumentListenerEditor;
 import net.miginfocom.swing.MigLayout;
-import io.github.dsheirer.alias.id.AliasID;
 
 import javax.swing.*;
 import java.awt.*;

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

@@ -1,75 +1,75 @@
 /*******************************************************************************
  *     SDR Trunk 
  *     Copyright (C) 2014 Dennis Sheirer
- * 
+ *
  *     This program is free software: you can redistribute it and/or modify
  *     it under the terms of the GNU General Public License as published by
  *     the Free Software Foundation, either version 3 of the License, or
  *     (at your option) any later version.
- * 
+ *
  *     This program is distributed in the hope that it will be useful,
  *     but WITHOUT ANY WARRANTY; without even the implied warranty of
  *     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  *     GNU General Public License for more details.
- * 
+ *
  *     You should have received a copy of the GNU General Public License
  *     along with this program.  If not, see <http://www.gnu.org/licenses/>
  ******************************************************************************/
 package io.github.dsheirer.alias.id.uniqueID;
 
+import com.fasterxml.jackson.dataformat.xml.annotation.JacksonXmlProperty;
 import io.github.dsheirer.alias.id.AliasID;
 import io.github.dsheirer.alias.id.AliasIDType;
 
-import javax.xml.bind.annotation.XmlAttribute;
-
 public class UniqueID extends AliasID
 {
-	private int mUid;
-	
-	public UniqueID()
-	{
-	}
+    private int mUid;
 
-	@XmlAttribute
-	public int getUid()
-	{
-		return mUid;
-	}
-
-	public void setUid( int uid )
-	{
-		this.mUid = uid;
-	}
-
-	@Override
-	public boolean isValid()
-	{
-		return true;
-	}
-
-	public String toString()
-	{
-		return "UniqueID: " + mUid;
-	}
-
-	@Override
-    public boolean matches( AliasID id )
+    public UniqueID()
     {
-		boolean retVal = false;
-		
-		if( id instanceof UniqueID )
-		{
-			UniqueID uid = (UniqueID)id;
-			
-			retVal = mUid == uid.getUid();
-		}
-		
-	    return retVal;
     }
 
-	@Override
+    @JacksonXmlProperty(isAttribute = true, localName = "uid")
+    public int getUid()
+    {
+        return mUid;
+    }
+
+    public void setUid(int uid)
+    {
+        this.mUid = uid;
+    }
+
+    @Override
+    public boolean isValid()
+    {
+        return true;
+    }
+
+    public String toString()
+    {
+        return "UniqueID: " + mUid;
+    }
+
+    @Override
+    public boolean matches(AliasID id)
+    {
+        boolean retVal = false;
+
+        if(id instanceof UniqueID)
+        {
+            UniqueID uid = (UniqueID)id;
+
+            retVal = mUid == uid.getUid();
+        }
+
+        return retVal;
+    }
+
+    @JacksonXmlProperty(isAttribute = true, localName = "type", namespace = "http://www.w3.org/2001/XMLSchema-instance")
+    @Override
     public AliasIDType getType()
     {
-	    return AliasIDType.LTR_NET_UID;
+        return AliasIDType.LTR_NET_UID;
     }
 }

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

@@ -17,9 +17,9 @@
  ******************************************************************************/
 package io.github.dsheirer.alias.id.uniqueID;
 
+import io.github.dsheirer.alias.id.AliasID;
 import io.github.dsheirer.gui.editor.DocumentListenerEditor;
 import net.miginfocom.swing.MigLayout;
-import io.github.dsheirer.alias.id.AliasID;
 
 import javax.swing.*;
 import java.awt.*;