mirror of
https://github.com/DSheirer/sdrtrunk.git
synced 2026-11-16 18:47:33 -05:00
Alias updates to allow JAXB persistence
This commit is contained in:
@@ -1,6 +1,6 @@
|
|||||||
/*******************************************************************************
|
/*******************************************************************************
|
||||||
* SDR Trunk
|
* SDR Trunk
|
||||||
* Copyright (C) 2014 Dennis Sheirer
|
* Copyright (C) 2014-2016 Dennis Sheirer
|
||||||
*
|
*
|
||||||
* This program is free software: you can redistribute it and/or modify
|
* 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
|
* it under the terms of the GNU General Public License as published by
|
||||||
@@ -22,11 +22,15 @@ import java.util.ArrayList;
|
|||||||
import java.util.List;
|
import java.util.List;
|
||||||
|
|
||||||
import javax.xml.bind.annotation.XmlAttribute;
|
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 alias.action.AliasAction;
|
import alias.action.AliasAction;
|
||||||
import alias.priority.Priority;
|
import alias.priority.Priority;
|
||||||
import audio.inverted.AudioType;
|
|
||||||
|
|
||||||
|
@XmlSeeAlso( { AliasID.class, AliasAction.class } )
|
||||||
|
@XmlRootElement( name = "alias" )
|
||||||
public class Alias
|
public class Alias
|
||||||
{
|
{
|
||||||
private String mList;
|
private String mList;
|
||||||
@@ -121,6 +125,7 @@ public class Alias
|
|||||||
mIconName = iconName;
|
mIconName = iconName;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@XmlElement( name="id" )
|
||||||
public List<AliasID> getId()
|
public List<AliasID> getId()
|
||||||
{
|
{
|
||||||
return mAliasIDs;
|
return mAliasIDs;
|
||||||
@@ -141,6 +146,7 @@ public class Alias
|
|||||||
mAliasIDs.remove( id );
|
mAliasIDs.remove( id );
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@XmlElement( name="action" )
|
||||||
public List<AliasAction> getAction()
|
public List<AliasAction> getAction()
|
||||||
{
|
{
|
||||||
return mAliasActions;
|
return mAliasActions;
|
||||||
|
|||||||
@@ -1,6 +1,6 @@
|
|||||||
/*******************************************************************************
|
/*******************************************************************************
|
||||||
* SDR Trunk
|
* SDR Trunk
|
||||||
* Copyright (C) 2014 Dennis Sheirer
|
* Copyright (C) 2014-2016 Dennis Sheirer
|
||||||
*
|
*
|
||||||
* This program is free software: you can redistribute it and/or modify
|
* 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
|
* it under the terms of the GNU General Public License as published by
|
||||||
@@ -17,6 +17,27 @@
|
|||||||
******************************************************************************/
|
******************************************************************************/
|
||||||
package alias;
|
package alias;
|
||||||
|
|
||||||
|
import javax.xml.bind.annotation.XmlRootElement;
|
||||||
|
import javax.xml.bind.annotation.XmlSeeAlso;
|
||||||
|
|
||||||
|
import alias.id.esn.Esn;
|
||||||
|
import alias.id.fleetsync.FleetsyncID;
|
||||||
|
import alias.id.fleetsync.StatusID;
|
||||||
|
import alias.id.lojack.LoJackFunctionAndID;
|
||||||
|
import alias.id.mdc.MDC1200ID;
|
||||||
|
import alias.id.mobileID.Min;
|
||||||
|
import alias.id.mpt1327.MPT1327ID;
|
||||||
|
import alias.id.siteID.SiteID;
|
||||||
|
import alias.id.talkgroup.TalkgroupID;
|
||||||
|
import alias.id.uniqueID.UniqueID;
|
||||||
|
import alias.priority.Priority;
|
||||||
|
import alias.record.NonRecordable;
|
||||||
|
|
||||||
|
@XmlSeeAlso( { 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 abstract class AliasID
|
||||||
{
|
{
|
||||||
public AliasID()
|
public AliasID()
|
||||||
|
|||||||
@@ -1,12 +1,37 @@
|
|||||||
|
/*******************************************************************************
|
||||||
|
* 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.action;
|
package alias.action;
|
||||||
|
|
||||||
|
import javax.xml.bind.annotation.XmlRootElement;
|
||||||
|
import javax.xml.bind.annotation.XmlSeeAlso;
|
||||||
|
|
||||||
import message.Message;
|
import message.Message;
|
||||||
import alias.Alias;
|
import alias.Alias;
|
||||||
|
import alias.action.beep.BeepAction;
|
||||||
|
import alias.action.clip.ClipAction;
|
||||||
|
import alias.action.script.ScriptAction;
|
||||||
import controller.ThreadPoolManager;
|
import controller.ThreadPoolManager;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Alias action defines an action to execute when an alias is detected active.
|
* 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 abstract class AliasAction
|
||||||
{
|
{
|
||||||
public AliasAction()
|
public AliasAction()
|
||||||
|
|||||||
Reference in New Issue
Block a user