Closes #72 - updates alias list to maintain a map of alias id to alias and separate lists for wildcard alias id values. Alias lookup logic is changed to first look for in the alias map for a concrete match to the alias identifier. If an alias is not found, then the list of wildcard alias identifier values is iterated looking for a matching wildcard. If the wildcard is found, then the matching alias is returned from the map.

This commit is contained in:
Denny
2016-07-31 09:18:25 -04:00
parent b19bfb400e
commit 6af24ffa38
16 changed files with 496 additions and 423 deletions

10
.idea/dictionaries/denny.xml generated Normal file
View File

@@ -0,0 +1,10 @@
<component name="ProjectDictionaryState">
<dictionary name="denny">
<words>
<w>fleetsync</w>
<w>ident</w>
<w>talkgroup</w>
<w>tgid</w>
</words>
</dictionary>
</component>

View File

@@ -8,5 +8,14 @@
<orderEntry type="inheritedJdk" /> <orderEntry type="inheritedJdk" />
<orderEntry type="sourceFolder" forTests="false" /> <orderEntry type="sourceFolder" forTests="false" />
<orderEntry type="library" name="imports" level="project" /> <orderEntry type="library" name="imports" level="project" />
<orderEntry type="module-library">
<library>
<CLASSES>
<root url="jar://$MODULE_DIR$/../jmbe/jmbe/library/jmbe-0.3.2.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES />
</library>
</orderEntry>
</component> </component>
</module> </module>

View File

@@ -17,19 +17,6 @@
******************************************************************************/ ******************************************************************************/
package alias; package alias;
import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
import javax.xml.bind.annotation.XmlAttribute;
import module.decode.lj1200.LJ1200Message.Function;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import sample.Listener;
import alias.id.AliasID; import alias.id.AliasID;
import alias.id.esn.Esn; import alias.id.esn.Esn;
import alias.id.fleetsync.FleetsyncID; import alias.id.fleetsync.FleetsyncID;
@@ -42,12 +29,22 @@ import alias.id.status.StatusID;
import alias.id.talkgroup.TalkgroupID; import alias.id.talkgroup.TalkgroupID;
import alias.id.uniqueID.UniqueID; import alias.id.uniqueID.UniqueID;
import audio.metadata.MetadataType; import audio.metadata.MetadataType;
import module.decode.lj1200.LJ1200Message.Function;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import sample.Listener;
import javax.xml.bind.annotation.XmlAttribute;
import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
public class AliasList implements Listener<AliasEvent> public class AliasList implements Listener<AliasEvent>
{ {
private final static Logger mLog = LoggerFactory.getLogger( AliasList.class ); private final static Logger mLog = LoggerFactory.getLogger( AliasList.class );
public static final String WILDCARD = "*";
private List<Alias> mAliases = new ArrayList<>();
private Map<String,Alias> mESN = new HashMap<>(); private Map<String,Alias> mESN = new HashMap<>();
private Map<String,Alias> mFleetsync = new HashMap<>(); private Map<String,Alias> mFleetsync = new HashMap<>();
private Map<LoJackFunctionAndID,Alias> mLoJack = new HashMap<>(); private Map<LoJackFunctionAndID,Alias> mLoJack = new HashMap<>();
@@ -58,15 +55,15 @@ public class AliasList implements Listener<AliasEvent>
private Map<Integer, Alias> mStatus = new HashMap<>(); private Map<Integer, Alias> mStatus = new HashMap<>();
private Map<String,Alias> mTalkgroup = new HashMap<>(); private Map<String,Alias> mTalkgroup = new HashMap<>();
private Map<Integer,Alias> mUniqueID = new HashMap<>(); private Map<Integer,Alias> mUniqueID = new HashMap<>();
private boolean mESNWildcard = false; private List<String> mESNWildcards = new ArrayList<>();
private boolean mMobileIDWildcard = false; private List<String> mMobileIDWildcards = new ArrayList<>();
private boolean mFleetsyncWildcard = false; private List<String> mFleetsyncWildcards = new ArrayList<>();
private boolean mMDC1200Wildcard = false; private List<String> mMDC1200Wildcards = new ArrayList<>();
private boolean mMPT1327Wildcard = false; private List<String> mMPT1327Wildcards = new ArrayList<>();
private boolean mSiteWildcard = false; private List<String> mSiteWildcards = new ArrayList<>();
private boolean mTalkgroupWildcard = false; private List<String> mTalkgroupWildcards = new ArrayList<>();
private String mName; private String mName;
/** /**
@@ -87,8 +84,6 @@ public class AliasList implements Listener<AliasEvent>
{ {
if( alias != null ) if( alias != null )
{ {
mAliases.add( alias );
for( AliasID aliasID: alias.getId() ) for( AliasID aliasID: alias.getId() )
{ {
addAliasID( aliasID, alias ); addAliasID( aliasID, alias );
@@ -101,131 +96,140 @@ public class AliasList implements Listener<AliasEvent>
*/ */
private void addAliasID( AliasID id, Alias alias ) private void addAliasID( AliasID id, Alias alias )
{ {
switch( id.getType() ) if(id.isValid())
{ {
case ESN: switch( id.getType() )
Esn esn = (Esn)id; {
if( esn.getEsn().contains( "*" ) ) case ESN:
{ Esn esn = (Esn)id;
mESNWildcard = true; if( esn.getEsn().contains(WILDCARD) )
{
String regexESN = convertToRegex(esn.getEsn());
mESN.put( fixWildcard( esn.getEsn() ), alias ); mESNWildcards.add(regexESN);
} mESN.put( regexESN, alias );
else }
{ else
mESN.put( esn.getEsn(), alias ); {
} mESN.put( esn.getEsn(), alias );
break; }
case Fleetsync: break;
FleetsyncID fs = (FleetsyncID)id; case Fleetsync:
FleetsyncID fs = (FleetsyncID)id;
if( fs.getIdent().contains( "*" ) )
{
mFleetsyncWildcard = true;
mFleetsync.put( fixWildcard( fs.getIdent() ), alias );
}
else
{
mFleetsync.put( fs.getIdent(), alias );
}
break;
case LoJack:
mLoJack.put( (LoJackFunctionAndID)id, alias );
break;
case MDC1200:
MDC1200ID mdc = (MDC1200ID)id;
if( mdc.getIdent().contains( "*" ) )
{
mMDC1200Wildcard = true;
//Replace (*) wildcard with regex wildcard (.)
mMDC1200.put( fixWildcard( mdc.getIdent() ), alias );
}
else
{
mMDC1200.put( mdc.getIdent(), alias );
}
break;
case MPT1327:
MPT1327ID mpt = (MPT1327ID)id;
String ident = mpt.getIdent();
if( ident != null )
{
if( ident.contains( "*" ) )
{
mMPT1327Wildcard = true;
//Replace (*) wildcard with regex wildcard (.)
mMPT1327.put( fixWildcard( ident ), alias );
}
else
{
mMPT1327.put( ident, alias );
}
}
break;
case MIN:
Min min = (Min)id;
if( min.getMin().contains( "*" ) )
{
mMobileIDWildcard = true;
mMobileID.put( fixWildcard( min.getMin() ), alias );
}
else
{
mMobileID.put( min.getMin(), alias );
}
break;
case LTRNetUID:
UniqueID uid = (UniqueID)id;
mUniqueID.put( uid.getUid(), alias );
break;
case Site:
SiteID siteID = (SiteID)id;
if( siteID.getSite().contains( "*" ) ) if( fs.getIdent().contains(WILDCARD) )
{ {
mSiteWildcard = true; String regexFleetsync = convertToRegex( fs.getIdent() );
mSiteID.put( fixWildcard( siteID.getSite() ), alias );
} mFleetsyncWildcards.add(regexFleetsync);
else mFleetsync.put( regexFleetsync, alias );
{ }
mSiteID.put( siteID.getSite(), alias ); else
} {
mFleetsync.put( fs.getIdent(), alias );
break; }
case Status: break;
mStatus.put( ((StatusID)id).getStatus(), alias ); case LoJack:
break; mLoJack.put( (LoJackFunctionAndID)id, alias );
case Talkgroup: break;
TalkgroupID tgid = (TalkgroupID)id; case MDC1200:
MDC1200ID mdc = (MDC1200ID)id;
if( tgid.getTalkgroup().contains( "*" ) )
{ if( mdc.getIdent().contains(WILDCARD) )
mTalkgroupWildcard = true; {
String regexMDC = convertToRegex(mdc.getIdent());
//Replace (*) wildcard with regex wildcard (.)
mTalkgroup.put( fixWildcard( tgid.getTalkgroup() ), alias ); mMDC1200Wildcards.add(regexMDC);
} mMDC1200.put(regexMDC, alias);
else }
{ else
mTalkgroup.put( tgid.getTalkgroup(), alias ); {
} mMDC1200.put( mdc.getIdent(), alias );
break; }
case NonRecordable: break;
case Priority: case MPT1327:
//We don't maintain lookups for these items MPT1327ID mpt = (MPT1327ID)id;
break;
default: String ident = mpt.getIdent();
mLog.warn( "Unrecognized Alias ID Type:" + id.getType().name() );
break; if( ident != null )
} {
if( ident.contains(WILDCARD) )
{
String regexMPT1327 = convertToRegex(ident);
mMPT1327Wildcards.add(regexMPT1327);
mMPT1327.put(regexMPT1327, alias);
}
else
{
mMPT1327.put( ident, alias );
}
}
break;
case MIN:
Min min = (Min)id;
if( min.getMin().contains(WILDCARD) )
{
String regexMIN = convertToRegex(min.getMin());
mMobileIDWildcards.add(regexMIN);
mMobileID.put( regexMIN, alias );
}
else
{
mMobileID.put( min.getMin(), alias );
}
break;
case LTRNetUID:
UniqueID uid = (UniqueID)id;
mUniqueID.put( uid.getUid(), alias );
break;
case Site:
SiteID siteID = (SiteID)id;
if( siteID.getSite().contains(WILDCARD) )
{
String regexSiteID = convertToRegex(siteID.getSite());
mSiteWildcards.add(regexSiteID);
mSiteID.put( regexSiteID, alias );
}
else
{
mSiteID.put( siteID.getSite(), alias );
}
break;
case Status:
mStatus.put( ((StatusID)id).getStatus(), alias );
break;
case Talkgroup:
TalkgroupID tgid = (TalkgroupID)id;
if( tgid.getTalkgroup().contains(WILDCARD) )
{
String regexTalkgroup = convertToRegex(tgid.getTalkgroup());
mTalkgroupWildcards.add(regexTalkgroup);
mTalkgroup.put( regexTalkgroup, alias );
}
else
{
mTalkgroup.put( tgid.getTalkgroup(), alias );
}
break;
case NonRecordable:
case Priority:
//We don't maintain lookups for these items
break;
default:
mLog.warn( "Unrecognized Alias ID Type:" + id.getType().name() );
break;
}
}
} }
/** /**
@@ -239,8 +243,6 @@ public class AliasList implements Listener<AliasEvent>
{ {
removeAliasID( aliasID, alias ); removeAliasID( aliasID, alias );
} }
mAliases.remove( alias );
} }
} }
@@ -249,185 +251,178 @@ public class AliasList implements Listener<AliasEvent>
*/ */
private void removeAliasID( AliasID id, Alias alias ) private void removeAliasID( AliasID id, Alias alias )
{ {
switch( id.getType() ) if(id.isValid())
{ {
case ESN: switch( id.getType() )
Esn esn = (Esn)id; {
if( mESN.containsKey( esn.getEsn() ) ) case ESN:
{ Esn esn = (Esn)id;
Alias esnAlias = mESN.get( esn.getEsn() );
if( esnAlias != null && esnAlias == alias )
{
mESN.remove( esn.getEsn() );
}
}
break;
case Fleetsync:
FleetsyncID fs = (FleetsyncID)id;
if( mFleetsync.containsKey( fs.getIdent() ) ) if( esn.getEsn().contains(WILDCARD))
{ {
Alias fsAlias = mFleetsync.get( fs.getIdent() ); String regexESN = convertToRegex(esn.getEsn());
mESN.remove(regexESN);
if( fsAlias != null && fsAlias == alias ) mESNWildcards.remove(regexESN);
{ }
mFleetsync.remove( fs.getIdent() ); else if( mESN.containsKey( esn.getEsn() ) )
} {
} mESN.remove(esn.getEsn());
break; }
case LoJack: break;
LoJackFunctionAndID lj = (LoJackFunctionAndID)id; case Fleetsync:
FleetsyncID fs = (FleetsyncID)id;
if( mLoJack.containsKey( lj ) )
{
Alias ljAlias = mLoJack.get( lj );
if( ljAlias != null && ljAlias == alias )
{
mLoJack.remove( lj );
}
}
break;
case MDC1200:
MDC1200ID mdc = (MDC1200ID)id;
if( mMDC1200.containsKey( mdc.getIdent() ) ) if(fs.getIdent().contains(WILDCARD))
{ {
Alias mdcAlias = mMDC1200.get( mdc.getIdent() ); String regexFleetsync = convertToRegex(fs.getIdent());
mFleetsync.remove(regexFleetsync);
if( mdcAlias != null && mdcAlias == alias ) mFleetsyncWildcards.remove(regexFleetsync);
{ }
mMDC1200.remove( mdc.getIdent() ); else
} {
} mFleetsync.remove( fs.getIdent() );
break; }
case MPT1327: break;
MPT1327ID mpt = (MPT1327ID)id; case LoJack:
mLoJack.remove((LoJackFunctionAndID)id);
if( mMPT1327.containsKey( mpt.getIdent() ) ) break;
{ case MDC1200:
Alias mptAlias = mMDC1200.get( mpt.getIdent() ); MDC1200ID mdc = (MDC1200ID)id;
if( mptAlias != null && mptAlias == alias )
{
mMPT1327.remove( mpt.getIdent() );
}
}
break;
case MIN:
Min min = (Min)id;
if( mMobileID.containsKey( min.getMin() ) )
{
Alias minAlias = mMobileID.get( min.getMin() );
if( minAlias != null && minAlias == alias )
{
mMobileID.remove( min.getMin() );
}
}
break;
case LTRNetUID:
UniqueID uid = (UniqueID)id;
if( mUniqueID.containsKey( uid.getUid() ) )
{
Alias uidAlias = mUniqueID.get( uid.getUid() );
if( uidAlias != null && uidAlias == alias )
{
mUniqueID.remove( uid.getUid() );
}
}
break;
case Site:
SiteID sid = (SiteID)id;
if( mSiteID.containsKey( sid.getSite() ) ) if(mdc.getIdent().contains(WILDCARD))
{ {
Alias sidAlias = mSiteID.get( sid.getSite() ); String regexMDC1200 = convertToRegex(mdc.getIdent());
mMDC1200.remove(regexMDC1200);
if( sidAlias != null && sidAlias == alias ) mMDC1200Wildcards.remove(regexMDC1200);
{ }
mSiteID.remove( sid.getSite() ); else
} {
} mMDC1200.remove( mdc.getIdent() );
break; }
case Status: break;
StatusID stat = (StatusID)id; case MPT1327:
MPT1327ID mpt = (MPT1327ID)id;
if( mStatus.containsKey( stat.getStatus() ) )
{ if(mpt.getIdent().contains(WILDCARD))
Alias statAlias = mStatus.get( stat.getStatus() ); {
String regexMPT1327 = convertToRegex(mpt.getIdent());
if( statAlias != null && statAlias == alias ) mMPT1327.remove(regexMPT1327);
{ mMPT1327Wildcards.remove(regexMPT1327);
mStatus.remove( stat.getStatus() ); }
} else
} {
break; mMPT1327.remove( mpt.getIdent() );
case Talkgroup: }
TalkgroupID tg = (TalkgroupID)id; break;
case MIN:
if( mTalkgroup.containsKey( tg.getTalkgroup() ) ) Min min = (Min)id;
{
Alias tgAlias = mTalkgroup.get( tg.getTalkgroup() ); if(min.getMin().contains(WILDCARD))
{
if( tgAlias != null && tgAlias == alias ) String regexMIN = convertToRegex(min.getMin());
{ mMobileID.remove(regexMIN);
mTalkgroup.remove( tg.getTalkgroup() ); mMobileIDWildcards.remove(regexMIN);
} }
} else
break; {
case NonRecordable: mMobileID.remove( min.getMin() );
case Priority: }
//We don't maintain lookups for these items break;
break; case LTRNetUID:
default: mUniqueID.remove( ((UniqueID)id).getUid() );
mLog.warn( "Unrecognized Alias ID Type:" + id.getType().name() ); break;
break; case Site:
} mSiteID.remove( ((SiteID)id).getSite() );
break;
case Status:
mStatus.remove( ((StatusID)id).getStatus() );
break;
case Talkgroup:
TalkgroupID tg = (TalkgroupID)id;
if(tg.getTalkgroup().contains(WILDCARD))
{
String regexTalkgroup = convertToRegex(tg.getTalkgroup());
mTalkgroup.remove(regexTalkgroup);
mTalkgroupWildcards.remove(regexTalkgroup);
}
else
{
mTalkgroup.remove( tg.getTalkgroup() );
}
break;
case NonRecordable:
case Priority:
//We don't maintain lookups for these items
break;
default:
mLog.warn( "Unrecognized Alias ID Type:" + id.getType().name() );
break;
}
}
} }
/** /**
* Converts user wildcard character (*) to regex single character wildcard (.) * Converts user wildcard character (*) to regex single character wildcard (.)
* but ignores a regex multi-character wildcard (.*) * but ignores a regex multi-character wildcard (.*)
*/ */
private String fixWildcard( String value ) private String convertToRegex(String value )
{ {
if( value.contains( "*" ) && !value.contains( ".*" ) ) if( value.contains(WILDCARD) && !value.contains( ".*" ) )
{ {
return value.replace( "*", "." ); return value.replace(WILDCARD, "." );
} }
return value; return value;
} }
/**
* Returns the first matching regex wildcard from the list of wildcards that matches the
* identifier.
*
* @param id to match
* @param wildcards to match against
* @return matching wildcard ID or null
*/
private String getWildcardMatch( String id, List<String> wildcards )
{
if(id != null)
{
for(String wildcard: wildcards)
{
if(wildcard.matches(id))
{
return wildcard;
}
}
}
return null;
}
/** /**
* Lookup alias by site ID * Lookup alias by site ID
*/ */
public Alias getSiteID( String siteID ) public Alias getSiteID( String siteID )
{ {
if( siteID != null ) Alias alias = null;
{
if( mSiteWildcard ) if(siteID != null)
{ {
for( String regex: mSiteID.keySet() ) alias = mSiteID.get(siteID);
{
if( siteID.matches( regex ) ) if(alias == null)
{ {
return mSiteID.get( regex ); String wildcard = getWildcardMatch(siteID, mSiteWildcards);
}
} if(wildcard != null)
} {
else alias = mSiteID.get(wildcard);
{ }
return mSiteID.get( siteID ); }
} }
}
return alias;
return null;
} }
/** /**
@@ -445,31 +440,30 @@ public class AliasList implements Listener<AliasEvent>
{ {
return mUniqueID.get( uniqueID ); return mUniqueID.get( uniqueID );
} }
/** /**
* Lookup alias by ESN * Lookup alias by ESN
*/ */
public Alias getESNAlias( String esn ) public Alias getESNAlias( String esn )
{ {
if( esn != null ) Alias alias = null;
{
if( mESNWildcard ) if(esn != null)
{ {
for( String regex: mESN.keySet() ) alias = mESN.get(esn);
{
if( esn.matches( regex ) ) if(alias == null)
{ {
return mESN.get( regex ); String wildcard = getWildcardMatch(esn, mESNWildcards);
}
} if(wildcard != null)
} {
else alias = mESN.get(wildcard);
{ }
return mESN.get( esn ); }
} }
}
return alias;
return null;
} }
/** /**
@@ -477,25 +471,24 @@ public class AliasList implements Listener<AliasEvent>
*/ */
public Alias getFleetsyncAlias( String ident ) public Alias getFleetsyncAlias( String ident )
{ {
Alias alias = null;
if( ident != null ) if( ident != null )
{ {
if( mFleetsyncWildcard ) alias = mFleetsync.get(ident);
{
for( String regex: mFleetsync.keySet() ) if(alias == null)
{ {
if( ident.matches( regex ) ) String wildcard = getWildcardMatch(ident, mFleetsyncWildcards);
{
return mFleetsync.get( regex ); if(wildcard != null)
} {
} alias = mFleetsync.get(wildcard);
} }
else }
{
return mFleetsync.get( ident );
}
} }
return null; return alias;
} }
/** /**
@@ -522,25 +515,24 @@ public class AliasList implements Listener<AliasEvent>
*/ */
public Alias getMDC1200Alias( String ident ) public Alias getMDC1200Alias( String ident )
{ {
Alias alias = null;
if( ident != null ) if( ident != null )
{ {
if( mMDC1200Wildcard ) alias = mMDC1200.get(ident);
{
for( String regex: mMDC1200.keySet() ) if(alias == null)
{ {
if( ident.matches( regex ) ) String wildcard = getWildcardMatch(ident, mMDC1200Wildcards);
{
return mMDC1200.get( regex ); if(wildcard != null)
} {
} alias = mMDC1200.get(wildcard);
} }
else }
{
return mMDC1200.get( ident );
}
} }
return null; return alias;
} }
/** /**
@@ -548,25 +540,24 @@ public class AliasList implements Listener<AliasEvent>
*/ */
public Alias getMPT1327Alias( String ident ) public Alias getMPT1327Alias( String ident )
{ {
Alias alias = null;
if( ident != null ) if( ident != null )
{ {
if( mMPT1327Wildcard ) alias = mMPT1327.get(ident);
{
for( String regex: mMPT1327.keySet() ) if(alias == null)
{ {
if( ident.matches( regex ) ) String wildcard = getWildcardMatch(ident, mMPT1327Wildcards);
{
return mMPT1327.get( regex ); if(wildcard != null)
} {
} alias = mMPT1327.get(wildcard);
} }
else }
{
return mMPT1327.get( ident );
}
} }
return null; return alias;
} }
/** /**
@@ -574,25 +565,24 @@ public class AliasList implements Listener<AliasEvent>
*/ */
public Alias getMobileIDNumberAlias( String ident ) public Alias getMobileIDNumberAlias( String ident )
{ {
Alias alias = null;
if( ident != null ) if( ident != null )
{ {
if( mMobileIDWildcard ) alias = mMobileID.get(ident);
{
for( String regex: mMobileID.keySet() ) if(alias == null)
{ {
if( ident.matches( regex ) ) String wildcard = getWildcardMatch(ident, mMobileIDWildcards);
{
return mMobileID.get( regex ); if(wildcard != null)
} {
} alias = mMobileID.get(wildcard);
} }
else }
{
return mMobileID.get( ident );
}
} }
return null; return alias;
} }
/** /**
@@ -600,25 +590,24 @@ public class AliasList implements Listener<AliasEvent>
*/ */
public Alias getTalkgroupAlias( String tgid ) public Alias getTalkgroupAlias( String tgid )
{ {
Alias alias = null;
if( tgid != null ) if( tgid != null )
{ {
if( mTalkgroupWildcard ) alias = mTalkgroup.get(tgid);
{
for( String regex: mTalkgroup.keySet() ) if(alias == null)
{ {
if( tgid.matches( regex ) ) String wildcard = getWildcardMatch(tgid, mTalkgroupWildcards);
{
return mTalkgroup.get( regex ); if(wildcard != null)
} {
} alias = mTalkgroup.get(wildcard);
} }
else }
{
return mTalkgroup.get( tgid );
}
} }
return null; return alias;
} }
/** /**
@@ -704,30 +693,19 @@ public class AliasList implements Listener<AliasEvent>
switch( event.getEvent() ) switch( event.getEvent() )
{ {
case ADD: case ADD:
if( alias.getList() != null && if( alias.getList() != null && getName().equalsIgnoreCase( alias.getList() ) )
getName().equalsIgnoreCase( alias.getList() ) )
{ {
addAlias( alias ); addAlias( alias );
} }
break; break;
case CHANGE: case CHANGE:
if( alias.getList() != null && if( alias.getList() != null && getName().equalsIgnoreCase( alias.getList() ) )
getName().equalsIgnoreCase( alias.getList() ) )
{ {
if( !mAliases.contains( alias ) ) addAlias( alias );
{
//Alias was moved to this list - add it
addAlias( alias );
}
}
else if( mAliases.contains( alias ) )
{
//An alias in this list was moved to another list
removeAlias( alias );
} }
break; break;
case DELETE: case DELETE:
if( mAliases.contains( alias ) ) if( alias.getList() != null && getName().equalsIgnoreCase( alias.getList() ) )
{ {
removeAlias( alias ); removeAlias( alias );
} }

View File

@@ -19,6 +19,7 @@ package alias.id;
import javax.xml.bind.annotation.XmlRootElement; import javax.xml.bind.annotation.XmlRootElement;
import javax.xml.bind.annotation.XmlSeeAlso; import javax.xml.bind.annotation.XmlSeeAlso;
import javax.xml.bind.annotation.XmlTransient;
import playlist.version1.Group; import playlist.version1.Group;
import alias.id.esn.Esn; import alias.id.esn.Esn;
@@ -49,4 +50,7 @@ public abstract class AliasID
public abstract AliasIDType getType(); public abstract AliasIDType getType();
public abstract boolean matches( AliasID id ); public abstract boolean matches( AliasID id );
@XmlTransient
public abstract boolean isValid();
} }

View File

@@ -36,7 +36,13 @@ public class Esn extends AliasID
return mEsn; return mEsn;
} }
public void setEsn( String esn ) @Override
public boolean isValid()
{
return mEsn != null;
}
public void setEsn(String esn )
{ {
mEsn = esn; mEsn = esn;
} }

View File

@@ -42,6 +42,12 @@ public class FleetsyncID extends AliasID
mID = ident; mID = ident;
} }
@Override
public boolean isValid()
{
return mID != null;
}
public String toString() public String toString()
{ {
return "Fleetsync: " + mID; return "Fleetsync: " + mID;

View File

@@ -55,6 +55,12 @@ public class LoJackFunctionAndID extends AliasID
mFunction = function; mFunction = function;
} }
@Override
public boolean isValid()
{
return mFunction != null && mID != null;
}
public String toString() public String toString()
{ {
return "LoJack FUNC: " + mFunction.getLabel() + " ID:" + ( mID == null ? "" : mID ); return "LoJack FUNC: " + mFunction.getLabel() + " ID:" + ( mID == null ? "" : mID );

View File

@@ -42,6 +42,12 @@ public class MDC1200ID extends AliasID
mID = ident; mID = ident;
} }
@Override
public boolean isValid()
{
return mID != null;
}
public String toString() public String toString()
{ {
return "MDC-1200: " + mID; return "MDC-1200: " + mID;

View File

@@ -43,7 +43,13 @@ public class Min extends AliasID
{ {
mMin = min; mMin = min;
} }
@Override
public boolean isValid()
{
return mMin != null;
}
public String toString() public String toString()
{ {
return "MIN: " + mMin; return "MIN: " + mMin;

View File

@@ -41,6 +41,12 @@ public class MPT1327ID extends AliasID
mID = ident; mID = ident;
} }
@Override
public boolean isValid()
{
return mID != null;
}
public String toString() public String toString()
{ {
return "MPT-1327: " + mID; return "MPT-1327: " + mID;

View File

@@ -11,6 +11,12 @@ public class NonRecordable extends AliasID
return AliasIDType.NonRecordable; return AliasIDType.NonRecordable;
} }
@Override
public boolean isValid()
{
return true;
}
@Override @Override
public boolean matches( AliasID id ) public boolean matches( AliasID id )
{ {

View File

@@ -39,6 +39,12 @@ public class Priority extends AliasID
{ {
} }
@Override
public boolean isValid()
{
return true;
}
/** /**
* Indicates the associated alias should not be monitored or tracked. * Indicates the associated alias should not be monitored or tracked.
*/ */

View File

@@ -40,7 +40,13 @@ public class SiteID extends AliasID
{ {
mSite = site; mSite = site;
} }
@Override
public boolean isValid()
{
return mSite != null;
}
public String toString() public String toString()
{ {
return "Site: " + mSite; return "Site: " + mSite;

View File

@@ -40,7 +40,13 @@ public class StatusID extends AliasID
{ {
this.mStatus = status; this.mStatus = status;
} }
@Override
public boolean isValid()
{
return true;
}
public String toString() public String toString()
{ {
return "Status: " + String.format( "%03d", mStatus ); return "Status: " + String.format( "%03d", mStatus );

View File

@@ -42,6 +42,12 @@ public class TalkgroupID extends AliasID
mTalkgroup = talkgroup; mTalkgroup = talkgroup;
} }
@Override
public boolean isValid()
{
return mTalkgroup != null;
}
public String toString() public String toString()
{ {
StringBuilder sb = new StringBuilder(); StringBuilder sb = new StringBuilder();

View File

@@ -41,6 +41,12 @@ public class UniqueID extends AliasID
this.mUid = uid; this.mUid = uid;
} }
@Override
public boolean isValid()
{
return true;
}
public String toString() public String toString()
{ {
return "UniqueID: " + mUid; return "UniqueID: " + mUid;