Global rename of BitSetBuffer to BinaryMessage.

Corrected issue in P25 NID error correction.
This commit is contained in:
dennis.sheirer
2015-01-24 13:37:42 +00:00
parent 871705ece8
commit 9310fb0daf
148 changed files with 513 additions and 443 deletions

View File

@@ -1,7 +1,7 @@
package decode.p25.message.tsbk.osp.control;
import alias.AliasList;
import bits.BitSetBuffer;
import bits.BinaryMessage;
import decode.p25.message.tsbk.TSBKMessage;
import decode.p25.reference.DataUnitID;
import decode.p25.reference.Opcode;
@@ -20,7 +20,7 @@ public class AcknowledgeResponse extends TSBKMessage
public static final int[] TARGET_ADDRESS = { 120,121,122,123,124,125,126,
127,128,129,130,131,132,133,134,135,136,137,138,139,140,141,142,143 };
public AcknowledgeResponse( BitSetBuffer message,
public AcknowledgeResponse( BinaryMessage message,
DataUnitID duid,
AliasList aliasList )
{

View File

@@ -1,7 +1,7 @@
package decode.p25.message.tsbk.osp.control;
import alias.AliasList;
import bits.BitSetBuffer;
import bits.BinaryMessage;
import decode.p25.message.IdentifierProvider;
import decode.p25.message.IdentifierReceiver;
import decode.p25.message.tsbk.TSBKMessage;
@@ -28,7 +28,7 @@ public class AdjacentStatusBroadcast extends TSBKMessage implements IdentifierRe
private IdentifierProvider mIdentifierUpdate;
public AdjacentStatusBroadcast( BitSetBuffer message,
public AdjacentStatusBroadcast( BinaryMessage message,
DataUnitID duid,
AliasList aliasList )
{

View File

@@ -1,7 +1,7 @@
package decode.p25.message.tsbk.osp.control;
import alias.AliasList;
import bits.BitSetBuffer;
import bits.BinaryMessage;
import decode.p25.message.tsbk.TSBKMessage;
import decode.p25.reference.DataUnitID;
import decode.p25.reference.Opcode;
@@ -15,7 +15,7 @@ public class AuthenticationCommand extends TSBKMessage
public static final int[] TARGET_ID = { 120,121,122,123,124,125,126,
127,128,129,130,131,132,133,134,135,136,137,138,139,140,141,142,143 };
public AuthenticationCommand( BitSetBuffer message,
public AuthenticationCommand( BinaryMessage message,
DataUnitID duid,
AliasList aliasList )
{

View File

@@ -1,7 +1,7 @@
package decode.p25.message.tsbk.osp.control;
import alias.AliasList;
import bits.BitSetBuffer;
import bits.BinaryMessage;
import decode.p25.message.tsbk.TSBKMessage;
import decode.p25.reference.DataUnitID;
import decode.p25.reference.Opcode;
@@ -13,7 +13,7 @@ public class CallAlert extends TSBKMessage
public static final int[] SOURCE_ID = { 120,121,122,123,124,125,126,
127,128,129,130,131,132,133,134,135,136,137,138,139,140,141,142,143 };
public CallAlert( BitSetBuffer message,
public CallAlert( BinaryMessage message,
DataUnitID duid,
AliasList aliasList )
{

View File

@@ -1,7 +1,7 @@
package decode.p25.message.tsbk.osp.control;
import alias.AliasList;
import bits.BitSetBuffer;
import bits.BinaryMessage;
import decode.p25.message.tsbk.TSBKMessage;
import decode.p25.reference.DataUnitID;
import decode.p25.reference.DenyReason;
@@ -21,7 +21,7 @@ public class DenyResponse extends TSBKMessage
public static final int[] TARGET_ADDRESS = { 120,121,122,123,124,125,126,
127,128,129,130,131,132,133,134,135,136,137,138,139,140,141,142,143 };
public DenyResponse( BitSetBuffer message,
public DenyResponse( BinaryMessage message,
DataUnitID duid,
AliasList aliasList )
{

View File

@@ -1,7 +1,7 @@
package decode.p25.message.tsbk.osp.control;
import alias.AliasList;
import bits.BitSetBuffer;
import bits.BinaryMessage;
import decode.p25.message.tsbk.TSBKMessage;
import decode.p25.reference.DataUnitID;
import decode.p25.reference.ExtendedFunction;
@@ -16,7 +16,7 @@ public class ExtendedFunctionCommand extends TSBKMessage
public static final int[] TARGET_ADDRESS = { 120,121,122,123,124,125,126,
127,128,129,130,131,132,133,134,135,136,137,138,139,140,141,142,143 };
public ExtendedFunctionCommand( BitSetBuffer message,
public ExtendedFunctionCommand( BinaryMessage message,
DataUnitID duid,
AliasList aliasList )
{

View File

@@ -1,7 +1,7 @@
package decode.p25.message.tsbk.osp.control;
import alias.AliasList;
import bits.BitSetBuffer;
import bits.BinaryMessage;
import decode.p25.message.tsbk.TSBKMessage;
import decode.p25.reference.DataUnitID;
import decode.p25.reference.Opcode;
@@ -13,7 +13,7 @@ public class GroupAffiliationQuery extends TSBKMessage
public static final int[] SOURCE_ADDRESS = { 120,121,122,123,124,125,126,
127,128,129,130,131,132,133,134,135,136,137,138,139,140,141,142,143 };
public GroupAffiliationQuery( BitSetBuffer message,
public GroupAffiliationQuery( BinaryMessage message,
DataUnitID duid,
AliasList aliasList )
{

View File

@@ -1,7 +1,7 @@
package decode.p25.message.tsbk.osp.control;
import alias.AliasList;
import bits.BitSetBuffer;
import bits.BinaryMessage;
import decode.p25.message.tsbk.TSBKMessage;
import decode.p25.reference.DataUnitID;
import decode.p25.reference.Opcode;
@@ -18,7 +18,7 @@ public class GroupAffiliationResponse extends TSBKMessage
public static final int[] TARGET_ADDRESS = { 120,121,122,123,124,125,126,
127,128,129,130,131,132,133,134,135,136,137,138,139,140,141,142,143 };
public GroupAffiliationResponse( BitSetBuffer message,
public GroupAffiliationResponse( BinaryMessage message,
DataUnitID duid,
AliasList aliasList )
{

View File

@@ -1,7 +1,7 @@
package decode.p25.message.tsbk.osp.control;
import alias.AliasList;
import bits.BitSetBuffer;
import bits.BinaryMessage;
import decode.p25.message.IdentifierProvider;
import decode.p25.message.tsbk.TSBKMessage;
import decode.p25.reference.DataUnitID;
@@ -18,7 +18,7 @@ public abstract class IdentifierUpdate extends TSBKMessage
119,120,121,122,123,124,125,126,127,128,129,130,131,132,133,134,135,136,
137,138,139,140,141,142,143 };
public IdentifierUpdate( BitSetBuffer message,
public IdentifierUpdate( BinaryMessage message,
DataUnitID duid,
AliasList aliasList )
{

View File

@@ -1,7 +1,7 @@
package decode.p25.message.tsbk.osp.control;
import alias.AliasList;
import bits.BitSetBuffer;
import bits.BinaryMessage;
import decode.p25.reference.DataUnitID;
import decode.p25.reference.Opcode;
@@ -13,7 +13,7 @@ public class IdentifierUpdateNonVUHF extends IdentifierUpdate
public static final int[] TRANSMIT_OFFSET = { 94,95,96,97,98,99,100,101 };
public IdentifierUpdateNonVUHF( BitSetBuffer message,
public IdentifierUpdateNonVUHF( BinaryMessage message,
DataUnitID duid,
AliasList aliasList )
{

View File

@@ -1,7 +1,7 @@
package decode.p25.message.tsbk.osp.control;
import alias.AliasList;
import bits.BitSetBuffer;
import bits.BinaryMessage;
import decode.p25.reference.DataUnitID;
import decode.p25.reference.Opcode;
@@ -14,7 +14,7 @@ public class IdentifierUpdateVUHF extends IdentifierUpdate
public static final int[] TRANSMIT_OFFSET = { 89,90,91,92,93,94,95,96,97,98,
99,100,101 };
public IdentifierUpdateVUHF( BitSetBuffer message,
public IdentifierUpdateVUHF( BinaryMessage message,
DataUnitID duid,
AliasList aliasList )
{

View File

@@ -1,7 +1,7 @@
package decode.p25.message.tsbk.osp.control;
import alias.AliasList;
import bits.BitSetBuffer;
import bits.BinaryMessage;
import decode.p25.message.tsbk.TSBKMessage;
import decode.p25.reference.DataUnitID;
import decode.p25.reference.Opcode;
@@ -17,7 +17,7 @@ public class LocationRegistrationResponse extends TSBKMessage
public static final int[] TARGET_ADDRESS = { 120,121,122,123,124,125,126,
127,128,129,130,131,132,133,134,135,136,137,138,139,140,141,142,143 };
public LocationRegistrationResponse( BitSetBuffer message,
public LocationRegistrationResponse( BinaryMessage message,
DataUnitID duid,
AliasList aliasList )
{

View File

@@ -1,7 +1,7 @@
package decode.p25.message.tsbk.osp.control;
import alias.AliasList;
import bits.BitSetBuffer;
import bits.BinaryMessage;
import decode.p25.message.tsbk.TSBKMessage;
import decode.p25.reference.DataUnitID;
import decode.p25.reference.Opcode;
@@ -15,7 +15,7 @@ public class MessageUpdate extends TSBKMessage
public static final int[] SOURCE_ADDRESS = { 120,121,122,123,124,125,126,
127,128,129,130,131,132,133,134,135,136,137,138,139,140,141,142,143 };
public MessageUpdate( BitSetBuffer message,
public MessageUpdate( BinaryMessage message,
DataUnitID duid,
AliasList aliasList )
{

View File

@@ -1,7 +1,7 @@
package decode.p25.message.tsbk.osp.control;
import alias.AliasList;
import bits.BitSetBuffer;
import bits.BinaryMessage;
import decode.p25.message.IdentifierProvider;
import decode.p25.message.IdentifierReceiver;
import decode.p25.message.tsbk.TSBKMessage;
@@ -25,7 +25,7 @@ public class NetworkStatusBroadcast extends TSBKMessage implements IdentifierRec
private IdentifierProvider mIdentifierUpdate;
public NetworkStatusBroadcast( BitSetBuffer message,
public NetworkStatusBroadcast( BinaryMessage message,
DataUnitID duid,
AliasList aliasList )
{

View File

@@ -1,7 +1,7 @@
package decode.p25.message.tsbk.osp.control;
import alias.AliasList;
import bits.BitSetBuffer;
import bits.BinaryMessage;
import decode.p25.message.tsbk.TSBKMessage;
import decode.p25.reference.DataUnitID;
import decode.p25.reference.Encryption;
@@ -15,7 +15,7 @@ public class ProtectionParameterUpdate extends TSBKMessage
public static final int[] TARGET_ADDRESS = { 120,121,122,123,124,125,126,
127,128,129,130,131,132,133,134,135,136,137,138,139,140,141,142,143 };
public ProtectionParameterUpdate( BitSetBuffer message,
public ProtectionParameterUpdate( BinaryMessage message,
DataUnitID duid,
AliasList aliasList )
{

View File

@@ -1,7 +1,7 @@
package decode.p25.message.tsbk.osp.control;
import alias.AliasList;
import bits.BitSetBuffer;
import bits.BinaryMessage;
import decode.p25.message.tsbk.TSBKMessage;
import decode.p25.reference.DataUnitID;
import decode.p25.reference.Opcode;
@@ -21,7 +21,7 @@ public class QueuedResponse extends TSBKMessage
public static final int[] TARGET_ADDRESS = { 120,121,122,123,124,125,126,
127,128,129,130,131,132,133,134,135,136,137,138,139,140,141,142,143 };
public QueuedResponse( BitSetBuffer message,
public QueuedResponse( BinaryMessage message,
DataUnitID duid,
AliasList aliasList )
{

View File

@@ -1,7 +1,7 @@
package decode.p25.message.tsbk.osp.control;
import alias.AliasList;
import bits.BitSetBuffer;
import bits.BinaryMessage;
import decode.p25.message.IdentifierProvider;
import decode.p25.message.IdentifierReceiver;
import decode.p25.message.tsbk.TSBKMessage;
@@ -25,7 +25,7 @@ public class RFSSStatusBroadcast extends TSBKMessage implements IdentifierReceiv
private IdentifierProvider mIdentifierUpdate;
public RFSSStatusBroadcast( BitSetBuffer message,
public RFSSStatusBroadcast( BinaryMessage message,
DataUnitID duid,
AliasList aliasList )
{

View File

@@ -1,7 +1,7 @@
package decode.p25.message.tsbk.osp.control;
import alias.AliasList;
import bits.BitSetBuffer;
import bits.BinaryMessage;
import decode.p25.message.tsbk.TSBKMessage;
import decode.p25.reference.DataUnitID;
import decode.p25.reference.Opcode;
@@ -14,7 +14,7 @@ public class RadioUnitMonitorCommand extends TSBKMessage
public static final int[] TARGET_ADDRESS = { 120,121,122,123,124,125,126,
127,128,129,130,131,132,133,134,135,136,137,138,139,140,141,142,143 };
public RadioUnitMonitorCommand( BitSetBuffer message,
public RadioUnitMonitorCommand( BinaryMessage message,
DataUnitID duid,
AliasList aliasList )
{

View File

@@ -1,7 +1,7 @@
package decode.p25.message.tsbk.osp.control;
import alias.AliasList;
import bits.BitSetBuffer;
import bits.BinaryMessage;
import decode.p25.message.tsbk.TSBKMessage;
import decode.p25.reference.DataUnitID;
import decode.p25.reference.Opcode;
@@ -18,7 +18,7 @@ public class RoamingAddressCommand extends TSBKMessage
public static final int[] TARGET_ID = { 120,121,122,123,124,125,126,127,128,
129,130,131,132,133,134,135,136,137,138,139,140,141,142,143 };
public RoamingAddressCommand( BitSetBuffer message,
public RoamingAddressCommand( BinaryMessage message,
DataUnitID duid,
AliasList aliasList )
{

View File

@@ -4,7 +4,7 @@ import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import alias.AliasList;
import bits.BitSetBuffer;
import bits.BinaryMessage;
import decode.p25.message.IdentifierProvider;
import decode.p25.message.IdentifierReceiver;
import decode.p25.message.tsbk.TSBKMessage;
@@ -33,7 +33,7 @@ public class SecondaryControlChannelBroadcast extends TSBKMessage
private IdentifierProvider mIdentifierUpdate1;
private IdentifierProvider mIdentifierUpdate2;
public SecondaryControlChannelBroadcast( BitSetBuffer message,
public SecondaryControlChannelBroadcast( BinaryMessage message,
DataUnitID duid,
AliasList aliasList )
{

View File

@@ -4,7 +4,7 @@ import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import alias.AliasList;
import bits.BitSetBuffer;
import bits.BinaryMessage;
import decode.p25.reference.DataUnitID;
import decode.p25.reference.Opcode;
@@ -14,7 +14,7 @@ public class SecondaryControlChannelBroadcastExplicit
private final static Logger mLog = LoggerFactory.getLogger(
SecondaryControlChannelBroadcastExplicit.class );
public SecondaryControlChannelBroadcastExplicit( BitSetBuffer message,
public SecondaryControlChannelBroadcastExplicit( BinaryMessage message,
DataUnitID duid, AliasList aliasList )
{
super( message, duid, aliasList );

View File

@@ -1,7 +1,7 @@
package decode.p25.message.tsbk.osp.control;
import alias.AliasList;
import bits.BitSetBuffer;
import bits.BinaryMessage;
import decode.p25.message.tsbk.TSBKMessage;
import decode.p25.reference.DataUnitID;
import decode.p25.reference.Opcode;
@@ -13,7 +13,7 @@ public class StatusQuery extends TSBKMessage
public static final int[] SOURCE_ADDRESS = { 120,121,122,123,124,125,126,
127,128,129,130,131,132,133,134,135,136,137,138,139,140,141,142,143 };
public StatusQuery( BitSetBuffer message,
public StatusQuery( BinaryMessage message,
DataUnitID duid,
AliasList aliasList )
{

View File

@@ -1,7 +1,7 @@
package decode.p25.message.tsbk.osp.control;
import alias.AliasList;
import bits.BitSetBuffer;
import bits.BinaryMessage;
import decode.p25.message.tsbk.TSBKMessage;
import decode.p25.reference.DataUnitID;
import decode.p25.reference.Opcode;
@@ -15,7 +15,7 @@ public class StatusUpdate extends TSBKMessage
public static final int[] SOURCE_ADDRESS = { 160,161,162,163,164,165,166,
167,168,169,170,171,184,185,186,187,188,189,190,190,192,193,194,195 };
public StatusUpdate( BitSetBuffer message,
public StatusUpdate( BinaryMessage message,
DataUnitID duid,
AliasList aliasList )
{

View File

@@ -3,7 +3,7 @@ package decode.p25.message.tsbk.osp.control;
import java.util.List;
import alias.AliasList;
import bits.BitSetBuffer;
import bits.BinaryMessage;
import decode.p25.message.tsbk.TSBKMessage;
import decode.p25.reference.DataUnitID;
import decode.p25.reference.Opcode;
@@ -18,7 +18,7 @@ public class SystemServiceBroadcast extends TSBKMessage
public static final int[] REQUEST_PRIORITY_LEVEL = { 136,137,138,139,140,
141,142,143 };
public SystemServiceBroadcast( BitSetBuffer message,
public SystemServiceBroadcast( BinaryMessage message,
DataUnitID duid,
AliasList aliasList )
{

View File

@@ -7,7 +7,7 @@ import java.util.GregorianCalendar;
import java.util.TimeZone;
import alias.AliasList;
import bits.BitSetBuffer;
import bits.BinaryMessage;
import decode.p25.message.tsbk.TSBKMessage;
import decode.p25.reference.DataUnitID;
import decode.p25.reference.Opcode;
@@ -32,7 +32,7 @@ public class TimeAndDateAnnouncement extends TSBKMessage
private SimpleDateFormat mTimeFormatter =
new SimpleDateFormat( "EEE, d MMM yyyy HH:mm:ss Z" );
public TimeAndDateAnnouncement( BitSetBuffer message, DataUnitID duid,
public TimeAndDateAnnouncement( BinaryMessage message, DataUnitID duid,
AliasList aliasList )
{
super( message, duid, aliasList );

View File

@@ -1,7 +1,7 @@
package decode.p25.message.tsbk.osp.control;
import alias.AliasList;
import bits.BitSetBuffer;
import bits.BinaryMessage;
import decode.p25.message.tsbk.TSBKMessage;
import decode.p25.reference.DataUnitID;
import decode.p25.reference.Opcode;
@@ -16,7 +16,7 @@ public class UnitDeregistrationAcknowledge extends TSBKMessage
public static final int[] SOURCE_ID = { 120,121,122,123,124,125,126,
127,128,129,130,131,132,133,134,135,136,137,138,139,140,141,142,143 };
public UnitDeregistrationAcknowledge( BitSetBuffer message,
public UnitDeregistrationAcknowledge( BinaryMessage message,
DataUnitID duid,
AliasList aliasList )
{

View File

@@ -1,7 +1,7 @@
package decode.p25.message.tsbk.osp.control;
import alias.AliasList;
import bits.BitSetBuffer;
import bits.BinaryMessage;
import decode.p25.message.tsbk.TSBKMessage;
import decode.p25.reference.DataUnitID;
import decode.p25.reference.Opcode;
@@ -13,7 +13,7 @@ public class UnitRegistrationCommand extends TSBKMessage
public static final int[] SOURCE_ADDRESS = { 120,121,122,123,124,125,126,
127,128,129,130,131,132,133,134,135,136,137,138,139,140,141,142,143 };
public UnitRegistrationCommand( BitSetBuffer message,
public UnitRegistrationCommand( BinaryMessage message,
DataUnitID duid,
AliasList aliasList )
{

View File

@@ -1,7 +1,7 @@
package decode.p25.message.tsbk.osp.control;
import alias.AliasList;
import bits.BitSetBuffer;
import bits.BinaryMessage;
import decode.p25.message.tsbk.TSBKMessage;
import decode.p25.reference.DataUnitID;
import decode.p25.reference.Opcode;
@@ -16,7 +16,7 @@ public class UnitRegistrationResponse extends TSBKMessage
public static final int[] SOURCE_ADDRESS = { 120,121,122,123,124,125,126,
127,128,129,130,131,132,133,134,135,136,137,138,139,140,141,142,143 };
public UnitRegistrationResponse( BitSetBuffer message,
public UnitRegistrationResponse( BinaryMessage message,
DataUnitID duid,
AliasList aliasList )
{