GitHub/sdrtrunk
1
0
Fork 0
mirror of https://github.com/DSheirer/sdrtrunk.git synced 2026-11-12 08:37:25 -05:00
Code Issues Packages Projects Releases 2 Wiki Activity

Merge branch 'master' into #90-channel_processing_list_and_gui_reformat

Browse Source 
# Conflicts:
#	src/alias/AliasList.java
This commit is contained in:
Denny
2017-01-18 19:07:39 -05:00
parent bc8873de01 929fbdb21e
commit acabab35ff
3 changed files with 100 additions and 85 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
src/alias/PatchGroupAlias.java
View File

@@ -144,19 +144,16 @@ public class PatchGroupAlias extends Alias
}
else
{
if(getId().size() > 0)
for(AliasID id: getId())
{
for(AliasID id: getId())
if(id.getType() == AliasIDType.TALKGROUP)
{
if(id.getType() == AliasIDType.TALKGROUP)
{
return "PATCH:" + ((TalkgroupID)id).getTalkgroup();
}
return "PATCH:" + ((TalkgroupID)id).getTalkgroup();
}
}
}
return "PATCH";
return "PATCH:****";
}
@Override
@@ -164,16 +161,22 @@ public class PatchGroupAlias extends Alias
{
List<AliasAction> aliasActions = new ArrayList<>();
for(Alias alias: mPatchedAliases)
{
aliasActions.addAll(alias.getAction());
}
if(hasPatchGroupAlias())
{
aliasActions.addAll(getPatchGroupAlias().getAction());
}
for(Alias alias: mPatchedAliases)
{
for(AliasAction action: alias.getAction())
{
if(!aliasActions.contains(action))
{
aliasActions.add(action);
}
}
}
return aliasActions;
}
@@ -198,7 +201,7 @@ public class PatchGroupAlias extends Alias
for(Alias alias: mPatchedAliases)
{
if(alias.getCallPriority() < highestPriority)
if(alias.hasCallPriority() && alias.getCallPriority() < highestPriority)
{
highestPriority = alias.getCallPriority();
}