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

#30 - WIP - adds Icecast TCP(v2.3) and HTTP(v2.4) server support. Adds streaming tab and ability to add/delete/change streaming configurations. Adds streaming channel alias id so that aliases can be tagged to stream to one or more stream channels. Adds initial support for broadcastify streaming.

Browse Source
This commit is contained in:
Denny
2016-11-06 09:33:49 -05:00
parent 893cbba277
commit 357979a5dd
85 changed files with 3418 additions and 2117 deletions
Download Patch File Download Diff File Expand all files Collapse all files

48
src/alias/Alias.java
View File

@@ -30,6 +30,7 @@ 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;
@@ -184,7 +185,7 @@ public class Alias
{
for( AliasID id: mAliasIDs )
{
if( id.getType() == AliasIDType.Priority )
if( id.getType() == AliasIDType.PRIORITY)
{
return ((Priority)id).getPriority();
}
@@ -197,7 +198,7 @@ public class Alias
{
for( AliasID id: mAliasIDs )
{
if( id.getType() == AliasIDType.Priority )
if( id.getType() == AliasIDType.PRIORITY)
{
return true;
}
@@ -216,7 +217,7 @@ public class Alias
{
for( AliasID id: mAliasIDs )
{
if( id.getType() == AliasIDType.Priority )
if( id.getType() == AliasIDType.PRIORITY)
{
((Priority)id).setPriority( priority );
return;
@@ -238,7 +239,7 @@ public class Alias
{
for( AliasID id: getId() )
{
if( id.getType() == AliasIDType.NonRecordable )
if( id.getType() == AliasIDType.NON_RECORDABLE)
{
return false;
}
@@ -258,7 +259,7 @@ public class Alias
for( AliasID id: getId() )
{
if( id.getType() == AliasIDType.NonRecordable )
if( id.getType() == AliasIDType.NON_RECORDABLE)
{
toRemove = id;
break;
@@ -274,7 +275,7 @@ public class Alias
{
for( AliasID id: getId() )
{
if( id.getType() == AliasIDType.NonRecordable )
if( id.getType() == AliasIDType.NON_RECORDABLE)
{
return;
}
@@ -283,4 +284,39 @@ public class Alias
addAliasID( new NonRecordable() );
}
}
/**
* Inspects the alias for any broadcast channels;
*/
public boolean hasBroadcastChannels()
{
for( AliasID id: getId() )
{
if( id.getType() == AliasIDType.BROADCAST_CHANNEL)
{
return true;
}
}
return false;
}
/**
* List of broadcast channels specified for this alias.
*/
@XmlTransient
public List<BroadcastChannel> getBroadcastChannels()
{
List<BroadcastChannel> broadcastChannels = new ArrayList<>();
for(AliasID id: getId())
{
if(id.getType() == AliasIDType.BROADCAST_CHANNEL)
{
broadcastChannels.add((BroadcastChannel)id);
}
}
return broadcastChannels;
}
}

5
src/alias/AliasController.java
View File

@@ -1,5 +1,6 @@
package alias;
import audio.broadcast.BroadcastModel;
import gui.editor.Editor;
import java.awt.Color;
@@ -52,11 +53,11 @@ public class AliasController extends JPanel
private IconCellRenderer mIconCellRenderer;
public AliasController( AliasModel aliasModel, SettingsManager settingsManager )
public AliasController(AliasModel aliasModel, BroadcastModel broadcastModel, SettingsManager settingsManager )
{
mAliasModel = aliasModel;
mAliasEditor = new AliasEditor( mAliasModel, settingsManager );
mAliasEditor = new AliasEditor( mAliasModel, broadcastModel, settingsManager );
mMultipleAliasEditor = new MultipleAliasEditor( mAliasModel, settingsManager );
mIconCellRenderer = new IconCellRenderer( settingsManager );

5
src/alias/AliasEditor.java
View File

@@ -17,6 +17,7 @@
******************************************************************************/
package alias;
import audio.broadcast.BroadcastModel;
import gui.editor.Editor;
import java.awt.Color;
@@ -49,11 +50,11 @@ public class AliasEditor extends Editor<Alias>
private AliasIdentifierEditor mAliasIdentifierEditor;
private AliasActionEditor mAliasActionEditor;
public AliasEditor( AliasModel aliasModel, SettingsManager settingsManager )
public AliasEditor(AliasModel aliasModel, BroadcastModel broadcastModel, SettingsManager settingsManager )
{
mAliasModel = aliasModel;
mAliasNameEditor = new AliasNameEditor( mAliasModel, settingsManager );
mAliasIdentifierEditor = new AliasIdentifierEditor( aliasModel );
mAliasIdentifierEditor = new AliasIdentifierEditor( aliasModel, broadcastModel );
mAliasActionEditor = new AliasActionEditor( aliasModel );
mAliasModel.addListener( this );

66
src/alias/AliasFactory.java
View File

@@ -17,8 +17,6 @@
******************************************************************************/
package alias;
import gui.editor.Editor;
import gui.editor.EmptyEditor;
import alias.action.AliasAction;
import alias.action.AliasActionType;
import alias.action.beep.BeepAction;
@@ -29,6 +27,8 @@ import alias.action.script.ScriptAction;
import alias.action.script.ScriptActionEditor;
import alias.id.AliasID;
import alias.id.AliasIDType;
import alias.id.broadcast.BroadcastChannel;
import alias.id.broadcast.BroadcastChannelEditor;
import alias.id.esn.ESNEditor;
import alias.id.esn.Esn;
import alias.id.fleetsync.FleetsyncID;
@@ -53,6 +53,9 @@ import alias.id.talkgroup.TalkgroupID;
import alias.id.talkgroup.TalkgroupIDEditor;
import alias.id.uniqueID.UniqueID;
import alias.id.uniqueID.UniqueIDEditor;
import audio.broadcast.BroadcastModel;
import gui.editor.Editor;
import gui.editor.EmptyEditor;
public class AliasFactory
{
@@ -60,22 +63,27 @@ public class AliasFactory
{
switch( id.getType() )
{
case BROADCAST_CHANNEL:
BroadcastChannel originalBroadcast = (BroadcastChannel)id;
BroadcastChannel copyBroadcast = new BroadcastChannel();
copyBroadcast.setChannelName(originalBroadcast.getChannelName());
return copyBroadcast;
case ESN:
Esn originalESN = (Esn)id;
Esn copyESN = new Esn();
copyESN.setEsn( originalESN.getEsn() );
return copyESN;
case Fleetsync:
case FLEETSYNC:
FleetsyncID originalFleetsyncID = (FleetsyncID)id;
FleetsyncID copyFleetsyncID = new FleetsyncID();
copyFleetsyncID.setIdent( originalFleetsyncID.getIdent() );
return copyFleetsyncID;
case LTRNetUID:
case LTR_NET_UID:
UniqueID originalUniqueID = (UniqueID)id;
UniqueID copyUniqueID = new UniqueID();
copyUniqueID.setUid( originalUniqueID.getUid() );
return copyUniqueID;
case LoJack:
case LOJACK:
LoJackFunctionAndID originalLoJackFunctionAndID = (LoJackFunctionAndID)id;
LoJackFunctionAndID copyLoJackFunctionAndID = new LoJackFunctionAndID();
copyLoJackFunctionAndID.setFunction( originalLoJackFunctionAndID.getFunction() );
@@ -96,24 +104,24 @@ public class AliasFactory
MPT1327ID copyMPT1327ID = new MPT1327ID();
copyMPT1327ID.setIdent( originalMPT1327ID.getIdent() );
return copyMPT1327ID;
case NonRecordable:
case NON_RECORDABLE:
return new NonRecordable();
case Priority:
case PRIORITY:
Priority originalPriority = (Priority)id;
Priority copyPriority = new Priority();
copyPriority.setPriority( originalPriority.getPriority() );
return copyPriority;
case Site:
case SITE:
SiteID originalSiteID = (SiteID)id;
SiteID copySiteID = new SiteID();
copySiteID.setSite( originalSiteID.getSite() );
return copySiteID;
case Talkgroup:
case TALKGROUP:
TalkgroupID originalTalkgroupID = (TalkgroupID)id;
TalkgroupID copyTalkgroupID = new TalkgroupID();
copyTalkgroupID.setTalkgroup( originalTalkgroupID.getTalkgroup() );
return copyTalkgroupID;
case Status:
case STATUS:
StatusID originalStatusID = (StatusID)id;
StatusID copyStatusID = new StatusID();
copyStatusID.setStatus( originalStatusID.getStatus() );
@@ -183,19 +191,21 @@ public class AliasFactory
return copy;
}
public static Editor<AliasID> getEditor( AliasID aliasID )
public static Editor<AliasID> getEditor( AliasID aliasID, BroadcastModel broadcastModel )
{
if( aliasID != null )
{
switch( aliasID.getType() )
{
case BROADCAST_CHANNEL:
return new BroadcastChannelEditor(aliasID, broadcastModel);
case ESN:
return new ESNEditor( aliasID );
case Fleetsync:
case FLEETSYNC:
return new FleetsyncIDEditor( aliasID );
case LTRNetUID:
case LTR_NET_UID:
return new UniqueIDEditor( aliasID );
case LoJack:
case LOJACK:
return new LoJackIDEditor( aliasID );
case MDC1200:
return new MDC1200IDEditor( aliasID );
@@ -203,15 +213,15 @@ public class AliasFactory
return new MINEditor( aliasID );
case MPT1327:
return new MPT1327IDEditor( aliasID );
case NonRecordable:
case NON_RECORDABLE:
return new NonRecordableEditor( aliasID );
case Priority:
case PRIORITY:
return new PriorityEditor( aliasID );
case Site:
case SITE:
return new SiteIDEditor( aliasID );
case Status:
case STATUS:
return new StatusIDEditor( aliasID );
case Talkgroup:
case TALKGROUP:
return new TalkgroupIDEditor( aliasID );
default:
break;
@@ -245,13 +255,15 @@ public class AliasFactory
{
switch( type )
{
case BROADCAST_CHANNEL:
return new BroadcastChannel();
case ESN:
return new Esn();
case Fleetsync:
case FLEETSYNC:
return new FleetsyncID();
case LTRNetUID:
case LTR_NET_UID:
return new UniqueID();
case LoJack:
case LOJACK:
return new LoJackFunctionAndID();
case MDC1200:
return new MDC1200ID();
@@ -259,15 +271,15 @@ public class AliasFactory
return new Min();
case MPT1327:
return new MPT1327ID();
case NonRecordable:
case NON_RECORDABLE:
return new NonRecordable();
case Priority:
case PRIORITY:
return new Priority();
case Site:
case SITE:
return new SiteID();
case Status:
case STATUS:
return new StatusID();
case Talkgroup:
case TALKGROUP:
return new TalkgroupID();
default:
throw new IllegalArgumentException( "Unrecognized Alias ID type: " + type );

33
src/alias/AliasList.java
View File

@@ -41,7 +41,6 @@ import java.util.Collections;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
import java.util.regex.Pattern;
public class AliasList implements Listener<AliasEvent>
{
@@ -120,7 +119,7 @@ public class AliasList implements Listener<AliasEvent>
mESN.put(esn, alias);
}
break;
case Fleetsync:
case FLEETSYNC:
String fleetsync = ((FleetsyncID)id).getIdent();
if(fleetsync != null)
@@ -134,7 +133,7 @@ public class AliasList implements Listener<AliasEvent>
mFleetsync.put(fleetsync, alias);
}
break;
case LoJack:
case LOJACK:
mLoJack.put((LoJackFunctionAndID) id, alias);
break;
case MDC1200:
@@ -179,10 +178,10 @@ public class AliasList implements Listener<AliasEvent>
mMobileID.put(min, alias);
}
break;
case LTRNetUID:
case LTR_NET_UID:
mUniqueID.put(((UniqueID)id).getUid(), alias);
break;
case Site:
case SITE:
String siteID = ((SiteID)id).getSite();
if(siteID != null)
@@ -196,10 +195,10 @@ public class AliasList implements Listener<AliasEvent>
mSiteID.put(siteID, alias);
}
break;
case Status:
case STATUS:
mStatus.put(((StatusID) id).getStatus(), alias);
break;
case Talkgroup:
case TALKGROUP:
String tgid = ((TalkgroupID)id).getTalkgroup();
if(tgid != null)
@@ -213,8 +212,8 @@ public class AliasList implements Listener<AliasEvent>
mTalkgroup.put(tgid, alias);
}
break;
case NonRecordable:
case Priority:
case NON_RECORDABLE:
case PRIORITY:
//We don't maintain lookups for these items
break;
default:
@@ -279,7 +278,7 @@ public class AliasList implements Listener<AliasEvent>
mESN.remove(esn);
break;
case Fleetsync:
case FLEETSYNC:
String fleetsync = ((FleetsyncID)id).getIdent();
if(fleetsync != null)
@@ -292,7 +291,7 @@ public class AliasList implements Listener<AliasEvent>
mFleetsync.remove(fleetsync);
}
break;
case LoJack:
case LOJACK:
mLoJack.remove((LoJackFunctionAndID) id);
break;
case MDC1200:
@@ -334,16 +333,16 @@ public class AliasList implements Listener<AliasEvent>
mMobileID.remove(min);
}
break;
case LTRNetUID:
case LTR_NET_UID:
mUniqueID.remove(((UniqueID) id).getUid());
break;
case Site:
case SITE:
mSiteID.remove(((SiteID) id).getSite());
break;
case Status:
case STATUS:
mStatus.remove(((StatusID) id).getStatus());
break;
case Talkgroup:
case TALKGROUP:
String tgid = ((TalkgroupID)id).getTalkgroup();
if(tgid != null)
@@ -356,8 +355,8 @@ public class AliasList implements Listener<AliasEvent>
mTalkgroup.remove(tgid);
}
break;
case NonRecordable:
case Priority:
case NON_RECORDABLE:
case PRIORITY:
//We don't maintain lookups for these items
break;
default:

3
src/alias/id/AliasID.java
View File

@@ -21,6 +21,7 @@ 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;
@@ -36,7 +37,7 @@ import alias.id.talkgroup.TalkgroupID;
import alias.id.uniqueID.UniqueID;
@SuppressWarnings( "deprecation" )
@XmlSeeAlso( { Esn.class, FleetsyncID.class, Group.class, LoJackFunctionAndID.class,
@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 } )

20
src/alias/id/AliasIDType.java
View File

@@ -20,20 +20,20 @@ package alias.id;
public enum AliasIDType
{
ESN( "ESN" ),
Fleetsync( "Fleetsync" ),
LoJack( "LoJack" ),
LTRNetUID( "LTR-Net UID" ),
FLEETSYNC( "Fleetsync" ),
LOJACK( "LoJack" ),
LTR_NET_UID( "LTR-Net UID" ),
MDC1200( "MDC-1200" ),
MIN( "Passport MIN" ),
MPT1327( "MPT-1327" ),
Site( "Site" ),
Status( "Status" ),
Talkgroup( "Talkgroup" ),
SITE( "Site" ),
STATUS( "Status" ),
TALKGROUP( "Talkgroup" ),
Invert( "Audio Inversion" ),
Priority( "Audio Priority" ),
NonRecordable( "Audio Non-Recordable" ),
Streaming( "Audio Streaming" );
INVERT( "Audio Inversion" ),
PRIORITY( "Audio Priority" ),
NON_RECORDABLE( "Audio Non-Recordable" ),
BROADCAST_CHANNEL( "Audio Broadcast Channel" );
private String mLabel;

56
src/alias/id/AliasIdentifierEditor.java
View File

@@ -17,6 +17,7 @@
******************************************************************************/
package alias.id;
import audio.broadcast.BroadcastModel;
import gui.editor.Editor;
import gui.editor.EmptyEditor;
@@ -61,10 +62,13 @@ public class AliasIdentifierEditor extends Editor<Alias>
private EditorContainer mEditorContainer = new EditorContainer();
private AliasModel mAliasModel;
private BroadcastModel mBroadcastModel;
public AliasIdentifierEditor( AliasModel model )
public AliasIdentifierEditor( AliasModel aliasModel, BroadcastModel broadcastModel )
{
mAliasModel = model;
mAliasModel = aliasModel;
mBroadcastModel = broadcastModel;
init();
}
@@ -120,45 +124,35 @@ public class AliasIdentifierEditor extends Editor<Alias>
JPopupMenu menu = new JPopupMenu();
menu.add( new AddAliasIdentifierItem( AliasIDType.ESN ) );
menu.add( new AddAliasIdentifierItem( AliasIDType.Fleetsync ) );
menu.add( new AddAliasIdentifierItem( AliasIDType.LoJack ) );
menu.add( new AddAliasIdentifierItem( AliasIDType.LTRNetUID ) );
menu.add( new AddAliasIdentifierItem( AliasIDType.FLEETSYNC) );
menu.add( new AddAliasIdentifierItem( AliasIDType.LOJACK) );
menu.add( new AddAliasIdentifierItem( AliasIDType.LTR_NET_UID) );
menu.add( new AddAliasIdentifierItem( AliasIDType.MDC1200 ) );
menu.add( new AddAliasIdentifierItem( AliasIDType.MPT1327 ) );
menu.add( new AddAliasIdentifierItem( AliasIDType.MIN ) );
menu.add( new AddAliasIdentifierItem( AliasIDType.Site ) );
menu.add( new AddAliasIdentifierItem( AliasIDType.Status ) );
menu.add( new AddAliasIdentifierItem( AliasIDType.Talkgroup ) );
menu.add( new AddAliasIdentifierItem( AliasIDType.SITE) );
menu.add( new AddAliasIdentifierItem( AliasIDType.STATUS) );
menu.add( new AddAliasIdentifierItem( AliasIDType.TALKGROUP) );
menu.addSeparator();
menu.add( new AddAliasIdentifierItem( AliasIDType.BROADCAST_CHANNEL) );
boolean separatorAdded = false;
if( hasItem() )
{
Alias alias = getItem();
if( !alias.hasCallPriority() )
{
if( !separatorAdded )
{
menu.addSeparator();
separatorAdded = true;
}
menu.add( new AddAliasIdentifierItem( AliasIDType.Priority ) );
}
if( alias.isRecordable() )
{
if( !separatorAdded )
{
menu.addSeparator();
separatorAdded = true;
}
menu.add( new AddAliasIdentifierItem( AliasIDType.NonRecordable ) );
menu.add( new AddAliasIdentifierItem( AliasIDType.NON_RECORDABLE) );
}
if( !alias.hasCallPriority() )
{
menu.add( new AddAliasIdentifierItem( AliasIDType.PRIORITY) );
}
}
menu.show( e.getComponent(), e.getX(), e.getY() );
}
} );
@@ -327,7 +321,7 @@ public class AliasIdentifierEditor extends Editor<Alias>
removeAll();
//This will always give us an editor
mEditor = AliasFactory.getEditor( aliasID );
mEditor = AliasFactory.getEditor( aliasID, mBroadcastModel );
add( mEditor );

81
src/alias/id/broadcast/BroadcastChannel.java Normal file
View File

@@ -0,0 +1,81 @@
/*******************************************************************************
* sdrtrunk
* 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.broadcast;
import alias.id.AliasID;
import alias.id.AliasIDType;
import javax.xml.bind.annotation.XmlAttribute;
public class BroadcastChannel extends AliasID
{
private String mChannelName;
public BroadcastChannel()
{
}
/**
* Name of the broadcast channel configuration
*/
@XmlAttribute(name="channel")
public String getChannelName()
{
return mChannelName;
}
/**
* Sets the name of the broadcast channel configuration
*/
public void setChannelName(String channel)
{
mChannelName = channel;
}
@Override
public AliasIDType getType()
{
return AliasIDType.BROADCAST_CHANNEL;
}
@Override
public boolean isValid()
{
return mChannelName != null;
}
@Override
public boolean matches( AliasID id )
{
return false;
}
@Override
public String toString()
{
if(isValid())
{
return "Broadcast Channel: " + mChannelName;
}
else
{
return "Broadcast Channel: None Selected";
}
}
}

91
src/alias/id/broadcast/BroadcastChannelEditor.java Normal file
View File

@@ -0,0 +1,91 @@
/*******************************************************************************
* sdrtrunk
* 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.broadcast;
import alias.id.AliasID;
import audio.broadcast.BroadcastModel;
import gui.editor.DocumentListenerEditor;
import net.miginfocom.swing.MigLayout;
import javax.swing.*;
import java.awt.*;
import java.awt.event.MouseAdapter;
import java.awt.event.MouseEvent;
import java.util.List;
public class BroadcastChannelEditor extends DocumentListenerEditor<AliasID>
{
private static final long serialVersionUID = 1L;
private static final String HELP_TEXT = "<html>"
+ "<h3>Audio Broadcast Channel</h3>"
+ "Name of a audio streaming broadcast configuration<br>"
+ "to be used for streaming audio to an external<br>"
+ "streaming server";
private JComboBox<String> mBroadcastConfigurations;
public BroadcastChannelEditor(AliasID aliasID, BroadcastModel broadcastModel)
{
List<String> channelNames = broadcastModel.getBroadcastConfigurationNames();
mBroadcastConfigurations = new JComboBox<String>(channelNames.toArray(new String[channelNames.size()]));
setItem( aliasID );
initGUI();
}
private void initGUI()
{
setLayout( new MigLayout( "fill,wrap 1", "[]", "[][]" ) );
add( new JLabel( "Broadcast Channel" ), "grow" );
add(mBroadcastConfigurations, "grow");
BroadcastChannel channel = (BroadcastChannel)getItem();
if(channel.isValid())
{
mBroadcastConfigurations.setSelectedItem(channel.getChannelName());
}
JLabel help = new JLabel( "Help ..." );
help.setForeground( Color.BLUE.brighter() );
help.setCursor( new Cursor( Cursor.HAND_CURSOR ) );
help.addMouseListener( new MouseAdapter()
{
@Override
public void mouseClicked( MouseEvent e )
{
JOptionPane.showMessageDialog( BroadcastChannelEditor.this,
HELP_TEXT, "Help", JOptionPane.INFORMATION_MESSAGE );
}
} );
add( help, "align left" );
}
@Override
public void save()
{
((BroadcastChannel)getItem()).setChannelName((String)mBroadcastConfigurations.getSelectedItem());
}
}

2
src/alias/id/fleetsync/FleetsyncID.java
View File

@@ -74,6 +74,6 @@ public class FleetsyncID extends AliasID
@Override
public AliasIDType getType()
{
return AliasIDType.Fleetsync;
return AliasIDType.FLEETSYNC;
}
}

2
src/alias/id/lojack/LoJackFunctionAndID.java
View File

@@ -101,7 +101,7 @@ public class LoJackFunctionAndID extends AliasID
@Override
public AliasIDType getType()
{
return AliasIDType.LoJack;
return AliasIDType.LOJACK;
}
@Override

2
src/alias/id/nonrecordable/NonRecordable.java
View File

@@ -8,7 +8,7 @@ public class NonRecordable extends AliasID
@Override
public AliasIDType getType()
{
return AliasIDType.NonRecordable;
return AliasIDType.NON_RECORDABLE;
}
@Override

2
src/alias/id/priority/Priority.java
View File

@@ -78,6 +78,6 @@ public class Priority extends AliasID
@Override
public AliasIDType getType()
{
return AliasIDType.Priority;
return AliasIDType.PRIORITY;
}
}

2
src/alias/id/siteID/SiteID.java
View File

@@ -63,6 +63,6 @@ public class SiteID extends AliasID
@Override
public AliasIDType getType()
{
return AliasIDType.Site;
return AliasIDType.SITE;
}
}

2
src/alias/id/status/StatusID.java
View File

@@ -70,6 +70,6 @@ public class StatusID extends AliasID
@Override
public AliasIDType getType()
{
return AliasIDType.Status;
return AliasIDType.STATUS;
}
}

2
src/alias/id/talkgroup/TalkgroupID.java
View File

@@ -78,6 +78,6 @@ public class TalkgroupID extends AliasID
@Override
public AliasIDType getType()
{
return AliasIDType.Talkgroup;
return AliasIDType.TALKGROUP;
}
}

2
src/alias/id/uniqueID/UniqueID.java
View File

@@ -70,6 +70,6 @@ public class UniqueID extends AliasID
@Override
public AliasIDType getType()
{
return AliasIDType.LTRNetUID;
return AliasIDType.LTR_NET_UID;
}
}