From 804c75dd39f1141ae9ffc176c0e8e5fdf32aa2f9 Mon Sep 17 00:00:00 2001 From: Anton Tananaev Date: Wed, 17 Oct 2018 16:23:49 +1300 Subject: Decoders to accept generic protocol --- src/org/traccar/BaseProtocolDecoder.java | 2 +- src/org/traccar/protocol/AdmProtocolDecoder.java | 3 ++- src/org/traccar/protocol/AisProtocolDecoder.java | 3 ++- src/org/traccar/protocol/AlematicsProtocolDecoder.java | 3 ++- src/org/traccar/protocol/AnytrekProtocolDecoder.java | 3 ++- src/org/traccar/protocol/ApelProtocolDecoder.java | 3 ++- src/org/traccar/protocol/AplicomProtocolDecoder.java | 3 ++- src/org/traccar/protocol/AppelloProtocolDecoder.java | 3 ++- src/org/traccar/protocol/AppletProtocolDecoder.java | 3 ++- src/org/traccar/protocol/AquilaProtocolDecoder.java | 3 ++- src/org/traccar/protocol/Ardi01ProtocolDecoder.java | 3 ++- src/org/traccar/protocol/ArknavProtocolDecoder.java | 3 ++- src/org/traccar/protocol/ArknavX8ProtocolDecoder.java | 3 ++- src/org/traccar/protocol/ArnaviProtocolDecoder.java | 3 ++- src/org/traccar/protocol/AstraProtocolDecoder.java | 3 ++- src/org/traccar/protocol/At2000ProtocolDecoder.java | 3 ++- src/org/traccar/protocol/AtrackProtocolDecoder.java | 3 ++- src/org/traccar/protocol/AuroProtocolDecoder.java | 3 ++- src/org/traccar/protocol/AustinNbProtocolDecoder.java | 3 ++- src/org/traccar/protocol/AutoFonProtocolDecoder.java | 3 ++- src/org/traccar/protocol/AutoGradeProtocolDecoder.java | 3 ++- src/org/traccar/protocol/AutoTrackProtocolDecoder.java | 3 ++- src/org/traccar/protocol/AvemaProtocolDecoder.java | 3 ++- src/org/traccar/protocol/Avl301ProtocolDecoder.java | 3 ++- src/org/traccar/protocol/BceProtocolDecoder.java | 3 ++- src/org/traccar/protocol/BlackKiteProtocolDecoder.java | 3 ++- src/org/traccar/protocol/BoxProtocolDecoder.java | 3 ++- src/org/traccar/protocol/CalAmpProtocolDecoder.java | 3 ++- src/org/traccar/protocol/CarTrackProtocolDecoder.java | 3 ++- src/org/traccar/protocol/CarcellProtocolDecoder.java | 3 ++- src/org/traccar/protocol/CarscopProtocolDecoder.java | 3 ++- src/org/traccar/protocol/CastelProtocolDecoder.java | 3 ++- src/org/traccar/protocol/CautelaProtocolDecoder.java | 3 ++- src/org/traccar/protocol/CellocatorProtocolDecoder.java | 3 ++- src/org/traccar/protocol/CguardProtocolDecoder.java | 3 ++- src/org/traccar/protocol/CityeasyProtocolDecoder.java | 3 ++- src/org/traccar/protocol/ContinentalProtocolDecoder.java | 3 ++- src/org/traccar/protocol/CradlepointProtocolDecoder.java | 3 ++- src/org/traccar/protocol/DishaProtocolDecoder.java | 3 ++- src/org/traccar/protocol/DmtHttpProtocolDecoder.java | 3 ++- src/org/traccar/protocol/DmtProtocolDecoder.java | 3 ++- src/org/traccar/protocol/DwayProtocolDecoder.java | 3 ++- src/org/traccar/protocol/EasyTrackProtocolDecoder.java | 3 ++- src/org/traccar/protocol/EelinkProtocolDecoder.java | 3 ++- src/org/traccar/protocol/EgtsProtocolDecoder.java | 3 ++- src/org/traccar/protocol/EnforaProtocolDecoder.java | 3 ++- src/org/traccar/protocol/EsealProtocolDecoder.java | 3 ++- src/org/traccar/protocol/EskyProtocolDecoder.java | 3 ++- src/org/traccar/protocol/ExtremTracProtocolDecoder.java | 3 ++- src/org/traccar/protocol/FifotrackProtocolDecoder.java | 3 ++- src/org/traccar/protocol/FlespiProtocolDecoder.java | 3 ++- src/org/traccar/protocol/FlexCommProtocolDecoder.java | 3 ++- src/org/traccar/protocol/FlextrackProtocolDecoder.java | 3 ++- src/org/traccar/protocol/FoxProtocolDecoder.java | 3 ++- src/org/traccar/protocol/FreedomProtocolDecoder.java | 3 ++- src/org/traccar/protocol/FreematicsProtocolDecoder.java | 3 ++- src/org/traccar/protocol/GalileoProtocolDecoder.java | 3 ++- src/org/traccar/protocol/GatorProtocolDecoder.java | 3 ++- src/org/traccar/protocol/GenxProtocolDecoder.java | 3 ++- src/org/traccar/protocol/Gl100ProtocolDecoder.java | 3 ++- src/org/traccar/protocol/Gl200BinaryProtocolDecoder.java | 3 ++- src/org/traccar/protocol/Gl200ProtocolDecoder.java | 3 ++- src/org/traccar/protocol/Gl200TextProtocolDecoder.java | 3 ++- src/org/traccar/protocol/GlobalSatProtocolDecoder.java | 3 ++- src/org/traccar/protocol/GnxProtocolDecoder.java | 3 ++- src/org/traccar/protocol/GoSafeProtocolDecoder.java | 3 ++- src/org/traccar/protocol/GotopProtocolDecoder.java | 3 ++- src/org/traccar/protocol/Gps056ProtocolDecoder.java | 3 ++- src/org/traccar/protocol/Gps103ProtocolDecoder.java | 3 ++- src/org/traccar/protocol/GpsGateProtocolDecoder.java | 3 ++- src/org/traccar/protocol/GpsMarkerProtocolDecoder.java | 3 ++- src/org/traccar/protocol/GpsmtaProtocolDecoder.java | 3 ++- src/org/traccar/protocol/GranitProtocolDecoder.java | 3 ++- src/org/traccar/protocol/Gt02ProtocolDecoder.java | 3 ++- src/org/traccar/protocol/Gt06ProtocolDecoder.java | 3 ++- src/org/traccar/protocol/Gt30ProtocolDecoder.java | 3 ++- src/org/traccar/protocol/H02ProtocolDecoder.java | 3 ++- src/org/traccar/protocol/HaicomProtocolDecoder.java | 3 ++- src/org/traccar/protocol/HomtecsProtocolDecoder.java | 3 ++- src/org/traccar/protocol/HuaShengProtocolDecoder.java | 3 ++- src/org/traccar/protocol/HuabaoProtocolDecoder.java | 3 ++- src/org/traccar/protocol/HunterProProtocolDecoder.java | 3 ++- src/org/traccar/protocol/IntellitracProtocolDecoder.java | 3 ++- src/org/traccar/protocol/ItsProtocolDecoder.java | 3 ++- src/org/traccar/protocol/Ivt401ProtocolDecoder.java | 3 ++- src/org/traccar/protocol/JpKorjarProtocolDecoder.java | 3 ++- src/org/traccar/protocol/Jt600ProtocolDecoder.java | 3 ++- src/org/traccar/protocol/KenjiProtocolDecoder.java | 3 ++- src/org/traccar/protocol/KhdProtocolDecoder.java | 3 ++- src/org/traccar/protocol/L100ProtocolDecoder.java | 3 ++- src/org/traccar/protocol/LaipacProtocolDecoder.java | 3 ++- src/org/traccar/protocol/M2cProtocolDecoder.java | 3 ++- src/org/traccar/protocol/M2mProtocolDecoder.java | 3 ++- src/org/traccar/protocol/MaestroProtocolDecoder.java | 3 ++- src/org/traccar/protocol/ManPowerProtocolDecoder.java | 3 ++- src/org/traccar/protocol/MegastekProtocolDecoder.java | 3 ++- src/org/traccar/protocol/MeiligaoProtocolDecoder.java | 3 ++- src/org/traccar/protocol/MeitrackProtocolDecoder.java | 3 ++- src/org/traccar/protocol/MilesmateProtocolDecoder.java | 3 ++- src/org/traccar/protocol/MiniFinderProtocolDecoder.java | 3 ++- src/org/traccar/protocol/MtxProtocolDecoder.java | 3 ++- src/org/traccar/protocol/MxtProtocolDecoder.java | 3 ++- src/org/traccar/protocol/NavigilProtocolDecoder.java | 3 ++- src/org/traccar/protocol/NavisProtocolDecoder.java | 3 ++- src/org/traccar/protocol/NoranProtocolDecoder.java | 3 ++- src/org/traccar/protocol/NvsProtocolDecoder.java | 3 ++- src/org/traccar/protocol/ObdDongleProtocolDecoder.java | 3 ++- src/org/traccar/protocol/OigoProtocolDecoder.java | 3 ++- src/org/traccar/protocol/OkoProtocolDecoder.java | 3 ++- src/org/traccar/protocol/OpenGtsProtocolDecoder.java | 3 ++- src/org/traccar/protocol/OrionProtocolDecoder.java | 3 ++- src/org/traccar/protocol/OsmAndProtocolDecoder.java | 3 ++- src/org/traccar/protocol/OwnTracksProtocolDecoder.java | 3 ++- src/org/traccar/protocol/PathAwayProtocolDecoder.java | 3 ++- src/org/traccar/protocol/PiligrimProtocolDecoder.java | 3 ++- src/org/traccar/protocol/PretraceProtocolDecoder.java | 3 ++- src/org/traccar/protocol/PricolProtocolDecoder.java | 3 ++- src/org/traccar/protocol/ProgressProtocolDecoder.java | 3 ++- src/org/traccar/protocol/Pt3000ProtocolDecoder.java | 3 ++- src/org/traccar/protocol/Pt502ProtocolDecoder.java | 3 ++- src/org/traccar/protocol/Pt60ProtocolDecoder.java | 3 ++- src/org/traccar/protocol/RaveonProtocolDecoder.java | 3 ++- src/org/traccar/protocol/RecodaProtocolDecoder.java | 3 ++- src/org/traccar/protocol/RetranslatorProtocolDecoder.java | 3 ++- src/org/traccar/protocol/RitiProtocolDecoder.java | 3 ++- src/org/traccar/protocol/RoboTrackProtocolDecoder.java | 3 ++- src/org/traccar/protocol/RuptelaProtocolDecoder.java | 3 ++- src/org/traccar/protocol/SabertekProtocolDecoder.java | 3 ++- src/org/traccar/protocol/SanavProtocolDecoder.java | 3 ++- src/org/traccar/protocol/SigfoxProtocolDecoder.java | 3 ++- src/org/traccar/protocol/SiwiProtocolDecoder.java | 3 ++- src/org/traccar/protocol/SkypatrolProtocolDecoder.java | 3 ++- src/org/traccar/protocol/SmartSoleProtocolDecoder.java | 3 ++- src/org/traccar/protocol/SmokeyProtocolDecoder.java | 3 ++- src/org/traccar/protocol/SpotProtocolDecoder.java | 3 ++- src/org/traccar/protocol/StarLinkProtocolDecoder.java | 3 ++- src/org/traccar/protocol/Stl060ProtocolDecoder.java | 3 ++- src/org/traccar/protocol/SuntechProtocolDecoder.java | 3 ++- src/org/traccar/protocol/SupermateProtocolDecoder.java | 3 ++- src/org/traccar/protocol/SviasProtocolDecoder.java | 3 ++- src/org/traccar/protocol/T55ProtocolDecoder.java | 3 ++- src/org/traccar/protocol/T57ProtocolDecoder.java | 3 ++- src/org/traccar/protocol/T800xProtocolDecoder.java | 3 ++- src/org/traccar/protocol/TaipProtocolDecoder.java | 3 ++- src/org/traccar/protocol/TekProtocolDecoder.java | 3 ++- src/org/traccar/protocol/TelemaxProtocolDecoder.java | 3 ++- src/org/traccar/protocol/TelicProtocolDecoder.java | 3 ++- src/org/traccar/protocol/ThinkRaceProtocolDecoder.java | 3 ++- src/org/traccar/protocol/Tk102ProtocolDecoder.java | 3 ++- src/org/traccar/protocol/Tk103ProtocolDecoder.java | 3 ++- src/org/traccar/protocol/Tlt2hProtocolDecoder.java | 3 ++- src/org/traccar/protocol/TlvProtocolDecoder.java | 3 ++- src/org/traccar/protocol/TmgProtocolDecoder.java | 3 ++- src/org/traccar/protocol/TopflytechProtocolDecoder.java | 3 ++- src/org/traccar/protocol/TotemProtocolDecoder.java | 3 ++- src/org/traccar/protocol/Tr20ProtocolDecoder.java | 3 ++- src/org/traccar/protocol/Tr900ProtocolDecoder.java | 3 ++- src/org/traccar/protocol/TrackboxProtocolDecoder.java | 3 ++- src/org/traccar/protocol/TrakMateProtocolDecoder.java | 3 ++- src/org/traccar/protocol/TramigoProtocolDecoder.java | 3 ++- src/org/traccar/protocol/TrvProtocolDecoder.java | 3 ++- src/org/traccar/protocol/Tt8850ProtocolDecoder.java | 3 ++- src/org/traccar/protocol/TytanProtocolDecoder.java | 3 ++- src/org/traccar/protocol/TzoneProtocolDecoder.java | 3 ++- src/org/traccar/protocol/UlbotechProtocolDecoder.java | 3 ++- src/org/traccar/protocol/UproProtocolDecoder.java | 3 ++- src/org/traccar/protocol/V680ProtocolDecoder.java | 3 ++- src/org/traccar/protocol/VisiontekProtocolDecoder.java | 3 ++- src/org/traccar/protocol/Vt200ProtocolDecoder.java | 3 ++- src/org/traccar/protocol/VtfmsProtocolDecoder.java | 3 ++- src/org/traccar/protocol/WatchProtocolDecoder.java | 3 ++- src/org/traccar/protocol/WialonProtocolDecoder.java | 3 ++- src/org/traccar/protocol/WondexProtocolDecoder.java | 3 ++- src/org/traccar/protocol/WristbandProtocolDecoder.java | 3 ++- src/org/traccar/protocol/XirgoProtocolDecoder.java | 3 ++- src/org/traccar/protocol/Xt013ProtocolDecoder.java | 3 ++- src/org/traccar/protocol/Xt2400ProtocolDecoder.java | 3 ++- src/org/traccar/protocol/YwtProtocolDecoder.java | 3 ++- 178 files changed, 355 insertions(+), 178 deletions(-) diff --git a/src/org/traccar/BaseProtocolDecoder.java b/src/org/traccar/BaseProtocolDecoder.java index b5cdfbf30..e18b7df58 100644 --- a/src/org/traccar/BaseProtocolDecoder.java +++ b/src/org/traccar/BaseProtocolDecoder.java @@ -50,7 +50,7 @@ public abstract class BaseProtocolDecoder extends ExtendedObjectDecoder { } public String getProtocolName() { - return protocol.getName(); + return protocol != null ? protocol.getName() : null; } public String getServer(Channel channel) { diff --git a/src/org/traccar/protocol/AdmProtocolDecoder.java b/src/org/traccar/protocol/AdmProtocolDecoder.java index 4c41d29cd..1dd2b64f1 100644 --- a/src/org/traccar/protocol/AdmProtocolDecoder.java +++ b/src/org/traccar/protocol/AdmProtocolDecoder.java @@ -19,6 +19,7 @@ import io.netty.buffer.ByteBuf; import io.netty.channel.Channel; import org.traccar.BaseProtocolDecoder; import org.traccar.DeviceSession; +import org.traccar.Protocol; import org.traccar.helper.BitUtil; import org.traccar.helper.UnitsConverter; import org.traccar.model.Position; @@ -29,7 +30,7 @@ import java.util.Date; public class AdmProtocolDecoder extends BaseProtocolDecoder { - public AdmProtocolDecoder(AdmProtocol protocol) { + public AdmProtocolDecoder(Protocol protocol) { super(protocol); } diff --git a/src/org/traccar/protocol/AisProtocolDecoder.java b/src/org/traccar/protocol/AisProtocolDecoder.java index 7954ef5f9..8970f3d4a 100644 --- a/src/org/traccar/protocol/AisProtocolDecoder.java +++ b/src/org/traccar/protocol/AisProtocolDecoder.java @@ -18,6 +18,7 @@ package org.traccar.protocol; import io.netty.channel.Channel; import org.traccar.BaseProtocolDecoder; import org.traccar.DeviceSession; +import org.traccar.Protocol; import org.traccar.helper.BitBuffer; import org.traccar.helper.Parser; import org.traccar.helper.PatternBuilder; @@ -34,7 +35,7 @@ import java.util.regex.Pattern; public class AisProtocolDecoder extends BaseProtocolDecoder { - public AisProtocolDecoder(AisProtocol protocol) { + public AisProtocolDecoder(Protocol protocol) { super(protocol); } diff --git a/src/org/traccar/protocol/AlematicsProtocolDecoder.java b/src/org/traccar/protocol/AlematicsProtocolDecoder.java index 8909b8d5b..25ccf6856 100644 --- a/src/org/traccar/protocol/AlematicsProtocolDecoder.java +++ b/src/org/traccar/protocol/AlematicsProtocolDecoder.java @@ -18,6 +18,7 @@ package org.traccar.protocol; import io.netty.channel.Channel; import org.traccar.BaseProtocolDecoder; import org.traccar.DeviceSession; +import org.traccar.Protocol; import org.traccar.helper.BitUtil; import org.traccar.helper.Parser; import org.traccar.helper.PatternBuilder; @@ -29,7 +30,7 @@ import java.util.regex.Pattern; public class AlematicsProtocolDecoder extends BaseProtocolDecoder { - public AlematicsProtocolDecoder(AlematicsProtocol protocol) { + public AlematicsProtocolDecoder(Protocol protocol) { super(protocol); } diff --git a/src/org/traccar/protocol/AnytrekProtocolDecoder.java b/src/org/traccar/protocol/AnytrekProtocolDecoder.java index defb6949f..7665e6cfd 100644 --- a/src/org/traccar/protocol/AnytrekProtocolDecoder.java +++ b/src/org/traccar/protocol/AnytrekProtocolDecoder.java @@ -22,6 +22,7 @@ import io.netty.channel.Channel; import org.traccar.BaseProtocolDecoder; import org.traccar.DeviceSession; import org.traccar.NetworkMessage; +import org.traccar.Protocol; import org.traccar.helper.BitUtil; import org.traccar.helper.DateBuilder; import org.traccar.helper.UnitsConverter; @@ -31,7 +32,7 @@ import java.net.SocketAddress; public class AnytrekProtocolDecoder extends BaseProtocolDecoder { - public AnytrekProtocolDecoder(AnytrekProtocol protocol) { + public AnytrekProtocolDecoder(Protocol protocol) { super(protocol); } diff --git a/src/org/traccar/protocol/ApelProtocolDecoder.java b/src/org/traccar/protocol/ApelProtocolDecoder.java index affbdedaf..c95a0366a 100644 --- a/src/org/traccar/protocol/ApelProtocolDecoder.java +++ b/src/org/traccar/protocol/ApelProtocolDecoder.java @@ -21,6 +21,7 @@ import io.netty.channel.Channel; import org.traccar.BaseProtocolDecoder; import org.traccar.DeviceSession; import org.traccar.NetworkMessage; +import org.traccar.Protocol; import org.traccar.helper.Checksum; import org.traccar.helper.UnitsConverter; import org.traccar.model.Position; @@ -36,7 +37,7 @@ public class ApelProtocolDecoder extends BaseProtocolDecoder { private long lastIndex; private long newIndex; - public ApelProtocolDecoder(ApelProtocol protocol) { + public ApelProtocolDecoder(Protocol protocol) { super(protocol); } diff --git a/src/org/traccar/protocol/AplicomProtocolDecoder.java b/src/org/traccar/protocol/AplicomProtocolDecoder.java index e2ac3c736..215aa0211 100644 --- a/src/org/traccar/protocol/AplicomProtocolDecoder.java +++ b/src/org/traccar/protocol/AplicomProtocolDecoder.java @@ -23,6 +23,7 @@ import org.slf4j.LoggerFactory; import org.traccar.BaseProtocolDecoder; import org.traccar.Context; import org.traccar.DeviceSession; +import org.traccar.Protocol; import org.traccar.helper.Checksum; import org.traccar.helper.UnitsConverter; import org.traccar.model.Position; @@ -36,7 +37,7 @@ public class AplicomProtocolDecoder extends BaseProtocolDecoder { private static final Logger LOGGER = LoggerFactory.getLogger(AplicomProtocolDecoder.class); - public AplicomProtocolDecoder(AplicomProtocol protocol) { + public AplicomProtocolDecoder(Protocol protocol) { super(protocol); } diff --git a/src/org/traccar/protocol/AppelloProtocolDecoder.java b/src/org/traccar/protocol/AppelloProtocolDecoder.java index ea0a2e243..47e329234 100644 --- a/src/org/traccar/protocol/AppelloProtocolDecoder.java +++ b/src/org/traccar/protocol/AppelloProtocolDecoder.java @@ -18,6 +18,7 @@ package org.traccar.protocol; import io.netty.channel.Channel; import org.traccar.BaseProtocolDecoder; import org.traccar.DeviceSession; +import org.traccar.Protocol; import org.traccar.helper.Parser; import org.traccar.helper.PatternBuilder; import org.traccar.model.Position; @@ -27,7 +28,7 @@ import java.util.regex.Pattern; public class AppelloProtocolDecoder extends BaseProtocolDecoder { - public AppelloProtocolDecoder(AppelloProtocol protocol) { + public AppelloProtocolDecoder(Protocol protocol) { super(protocol); } diff --git a/src/org/traccar/protocol/AppletProtocolDecoder.java b/src/org/traccar/protocol/AppletProtocolDecoder.java index ee859d4d0..7a995cc24 100644 --- a/src/org/traccar/protocol/AppletProtocolDecoder.java +++ b/src/org/traccar/protocol/AppletProtocolDecoder.java @@ -20,12 +20,13 @@ import io.netty.handler.codec.http.FullHttpRequest; import io.netty.handler.codec.http.HttpResponseStatus; import org.traccar.BaseHttpProtocolDecoder; import org.traccar.DeviceSession; +import org.traccar.Protocol; import java.net.SocketAddress; public class AppletProtocolDecoder extends BaseHttpProtocolDecoder { - public AppletProtocolDecoder(AppletProtocol protocol) { + public AppletProtocolDecoder(Protocol protocol) { super(protocol); } diff --git a/src/org/traccar/protocol/AquilaProtocolDecoder.java b/src/org/traccar/protocol/AquilaProtocolDecoder.java index 8c6dbf121..57af5e366 100644 --- a/src/org/traccar/protocol/AquilaProtocolDecoder.java +++ b/src/org/traccar/protocol/AquilaProtocolDecoder.java @@ -20,6 +20,7 @@ import org.traccar.BaseProtocolDecoder; import org.traccar.Context; import org.traccar.DeviceSession; import org.traccar.NetworkMessage; +import org.traccar.Protocol; import org.traccar.helper.Parser; import org.traccar.helper.PatternBuilder; import org.traccar.helper.UnitsConverter; @@ -32,7 +33,7 @@ import java.util.regex.Pattern; public class AquilaProtocolDecoder extends BaseProtocolDecoder { - public AquilaProtocolDecoder(AquilaProtocol protocol) { + public AquilaProtocolDecoder(Protocol protocol) { super(protocol); } diff --git a/src/org/traccar/protocol/Ardi01ProtocolDecoder.java b/src/org/traccar/protocol/Ardi01ProtocolDecoder.java index 7e25159b1..85e9ecfde 100644 --- a/src/org/traccar/protocol/Ardi01ProtocolDecoder.java +++ b/src/org/traccar/protocol/Ardi01ProtocolDecoder.java @@ -18,6 +18,7 @@ package org.traccar.protocol; import io.netty.channel.Channel; import org.traccar.BaseProtocolDecoder; import org.traccar.DeviceSession; +import org.traccar.Protocol; import org.traccar.helper.Parser; import org.traccar.helper.PatternBuilder; import org.traccar.helper.UnitsConverter; @@ -28,7 +29,7 @@ import java.util.regex.Pattern; public class Ardi01ProtocolDecoder extends BaseProtocolDecoder { - public Ardi01ProtocolDecoder(Ardi01Protocol protocol) { + public Ardi01ProtocolDecoder(Protocol protocol) { super(protocol); } diff --git a/src/org/traccar/protocol/ArknavProtocolDecoder.java b/src/org/traccar/protocol/ArknavProtocolDecoder.java index c1a297e97..4982e02fc 100644 --- a/src/org/traccar/protocol/ArknavProtocolDecoder.java +++ b/src/org/traccar/protocol/ArknavProtocolDecoder.java @@ -18,6 +18,7 @@ package org.traccar.protocol; import io.netty.channel.Channel; import org.traccar.BaseProtocolDecoder; import org.traccar.DeviceSession; +import org.traccar.Protocol; import org.traccar.helper.Parser; import org.traccar.helper.PatternBuilder; import org.traccar.model.Position; @@ -27,7 +28,7 @@ import java.util.regex.Pattern; public class ArknavProtocolDecoder extends BaseProtocolDecoder { - public ArknavProtocolDecoder(ArknavProtocol protocol) { + public ArknavProtocolDecoder(Protocol protocol) { super(protocol); } diff --git a/src/org/traccar/protocol/ArknavX8ProtocolDecoder.java b/src/org/traccar/protocol/ArknavX8ProtocolDecoder.java index 60d7fe0db..62ad09a52 100644 --- a/src/org/traccar/protocol/ArknavX8ProtocolDecoder.java +++ b/src/org/traccar/protocol/ArknavX8ProtocolDecoder.java @@ -18,6 +18,7 @@ package org.traccar.protocol; import io.netty.channel.Channel; import org.traccar.BaseProtocolDecoder; import org.traccar.DeviceSession; +import org.traccar.Protocol; import org.traccar.helper.Parser; import org.traccar.helper.PatternBuilder; import org.traccar.model.Position; @@ -27,7 +28,7 @@ import java.util.regex.Pattern; public class ArknavX8ProtocolDecoder extends BaseProtocolDecoder { - public ArknavX8ProtocolDecoder(ArknavX8Protocol protocol) { + public ArknavX8ProtocolDecoder(Protocol protocol) { super(protocol); } diff --git a/src/org/traccar/protocol/ArnaviProtocolDecoder.java b/src/org/traccar/protocol/ArnaviProtocolDecoder.java index 7649dddf6..eaa8133e0 100644 --- a/src/org/traccar/protocol/ArnaviProtocolDecoder.java +++ b/src/org/traccar/protocol/ArnaviProtocolDecoder.java @@ -18,6 +18,7 @@ package org.traccar.protocol; import io.netty.channel.Channel; import org.traccar.BaseProtocolDecoder; import org.traccar.DeviceSession; +import org.traccar.Protocol; import org.traccar.helper.DateBuilder; import org.traccar.helper.Parser; import org.traccar.helper.PatternBuilder; @@ -28,7 +29,7 @@ import java.util.regex.Pattern; public class ArnaviProtocolDecoder extends BaseProtocolDecoder { - public ArnaviProtocolDecoder(ArnaviProtocol protocol) { + public ArnaviProtocolDecoder(Protocol protocol) { super(protocol); } diff --git a/src/org/traccar/protocol/AstraProtocolDecoder.java b/src/org/traccar/protocol/AstraProtocolDecoder.java index 7c6a8fc1e..e6f546b9f 100644 --- a/src/org/traccar/protocol/AstraProtocolDecoder.java +++ b/src/org/traccar/protocol/AstraProtocolDecoder.java @@ -23,6 +23,7 @@ import org.slf4j.LoggerFactory; import org.traccar.BaseProtocolDecoder; import org.traccar.DeviceSession; import org.traccar.NetworkMessage; +import org.traccar.Protocol; import org.traccar.helper.BitUtil; import org.traccar.helper.DateBuilder; import org.traccar.helper.UnitsConverter; @@ -37,7 +38,7 @@ public class AstraProtocolDecoder extends BaseProtocolDecoder { private static final Logger LOGGER = LoggerFactory.getLogger(AstraProtocolDecoder.class); - public AstraProtocolDecoder(AstraProtocol protocol) { + public AstraProtocolDecoder(Protocol protocol) { super(protocol); } diff --git a/src/org/traccar/protocol/At2000ProtocolDecoder.java b/src/org/traccar/protocol/At2000ProtocolDecoder.java index 4457854e3..43798eb67 100644 --- a/src/org/traccar/protocol/At2000ProtocolDecoder.java +++ b/src/org/traccar/protocol/At2000ProtocolDecoder.java @@ -21,6 +21,7 @@ import io.netty.channel.Channel; import org.traccar.BaseProtocolDecoder; import org.traccar.DeviceSession; import org.traccar.NetworkMessage; +import org.traccar.Protocol; import org.traccar.helper.DataConverter; import org.traccar.helper.UnitsConverter; import org.traccar.model.Position; @@ -38,7 +39,7 @@ public class At2000ProtocolDecoder extends BaseProtocolDecoder { private static final int BLOCK_LENGTH = 16; - public At2000ProtocolDecoder(At2000Protocol protocol) { + public At2000ProtocolDecoder(Protocol protocol) { super(protocol); } diff --git a/src/org/traccar/protocol/AtrackProtocolDecoder.java b/src/org/traccar/protocol/AtrackProtocolDecoder.java index 49f44a4f0..1963763ed 100644 --- a/src/org/traccar/protocol/AtrackProtocolDecoder.java +++ b/src/org/traccar/protocol/AtrackProtocolDecoder.java @@ -22,6 +22,7 @@ import org.traccar.BaseProtocolDecoder; import org.traccar.Context; import org.traccar.DeviceSession; import org.traccar.NetworkMessage; +import org.traccar.Protocol; import org.traccar.helper.DateBuilder; import org.traccar.helper.Parser; import org.traccar.helper.PatternBuilder; @@ -55,7 +56,7 @@ public class AtrackProtocolDecoder extends BaseProtocolDecoder { private final Map alarmMap = new HashMap<>(); - public AtrackProtocolDecoder(AtrackProtocol protocol) { + public AtrackProtocolDecoder(Protocol protocol) { super(protocol); longDate = Context.getConfig().getBoolean(getProtocolName() + ".longDate"); diff --git a/src/org/traccar/protocol/AuroProtocolDecoder.java b/src/org/traccar/protocol/AuroProtocolDecoder.java index e84b65bf3..d7916147b 100644 --- a/src/org/traccar/protocol/AuroProtocolDecoder.java +++ b/src/org/traccar/protocol/AuroProtocolDecoder.java @@ -18,6 +18,7 @@ package org.traccar.protocol; import io.netty.channel.Channel; import org.traccar.BaseProtocolDecoder; import org.traccar.DeviceSession; +import org.traccar.Protocol; import org.traccar.helper.Parser; import org.traccar.helper.PatternBuilder; import org.traccar.helper.UnitsConverter; @@ -28,7 +29,7 @@ import java.util.regex.Pattern; public class AuroProtocolDecoder extends BaseProtocolDecoder { - public AuroProtocolDecoder(AuroProtocol protocol) { + public AuroProtocolDecoder(Protocol protocol) { super(protocol); } diff --git a/src/org/traccar/protocol/AustinNbProtocolDecoder.java b/src/org/traccar/protocol/AustinNbProtocolDecoder.java index 5e2ee6178..dc6f3d280 100644 --- a/src/org/traccar/protocol/AustinNbProtocolDecoder.java +++ b/src/org/traccar/protocol/AustinNbProtocolDecoder.java @@ -18,6 +18,7 @@ package org.traccar.protocol; import io.netty.channel.Channel; import org.traccar.BaseProtocolDecoder; import org.traccar.DeviceSession; +import org.traccar.Protocol; import org.traccar.helper.Parser; import org.traccar.helper.PatternBuilder; import org.traccar.model.Position; @@ -28,7 +29,7 @@ import java.util.regex.Pattern; public class AustinNbProtocolDecoder extends BaseProtocolDecoder { - public AustinNbProtocolDecoder(AustinNbProtocol protocol) { + public AustinNbProtocolDecoder(Protocol protocol) { super(protocol); } diff --git a/src/org/traccar/protocol/AutoFonProtocolDecoder.java b/src/org/traccar/protocol/AutoFonProtocolDecoder.java index c5a3692f2..aa05ca2d7 100644 --- a/src/org/traccar/protocol/AutoFonProtocolDecoder.java +++ b/src/org/traccar/protocol/AutoFonProtocolDecoder.java @@ -23,6 +23,7 @@ import io.netty.channel.Channel; import org.traccar.BaseProtocolDecoder; import org.traccar.DeviceSession; import org.traccar.NetworkMessage; +import org.traccar.Protocol; import org.traccar.helper.BitUtil; import org.traccar.helper.DateBuilder; import org.traccar.model.CellTower; @@ -36,7 +37,7 @@ import java.util.List; public class AutoFonProtocolDecoder extends BaseProtocolDecoder { - public AutoFonProtocolDecoder(AutoFonProtocol protocol) { + public AutoFonProtocolDecoder(Protocol protocol) { super(protocol); } diff --git a/src/org/traccar/protocol/AutoGradeProtocolDecoder.java b/src/org/traccar/protocol/AutoGradeProtocolDecoder.java index 9b9ef7d46..5052450b5 100644 --- a/src/org/traccar/protocol/AutoGradeProtocolDecoder.java +++ b/src/org/traccar/protocol/AutoGradeProtocolDecoder.java @@ -18,6 +18,7 @@ package org.traccar.protocol; import io.netty.channel.Channel; import org.traccar.BaseProtocolDecoder; import org.traccar.DeviceSession; +import org.traccar.Protocol; import org.traccar.helper.BitUtil; import org.traccar.helper.DateBuilder; import org.traccar.helper.Parser; @@ -29,7 +30,7 @@ import java.util.regex.Pattern; public class AutoGradeProtocolDecoder extends BaseProtocolDecoder { - public AutoGradeProtocolDecoder(AutoGradeProtocol protocol) { + public AutoGradeProtocolDecoder(Protocol protocol) { super(protocol); } diff --git a/src/org/traccar/protocol/AutoTrackProtocolDecoder.java b/src/org/traccar/protocol/AutoTrackProtocolDecoder.java index 93bba4678..43b273be5 100644 --- a/src/org/traccar/protocol/AutoTrackProtocolDecoder.java +++ b/src/org/traccar/protocol/AutoTrackProtocolDecoder.java @@ -22,6 +22,7 @@ import io.netty.channel.Channel; import org.traccar.BaseProtocolDecoder; import org.traccar.DeviceSession; import org.traccar.NetworkMessage; +import org.traccar.Protocol; import org.traccar.helper.Checksum; import org.traccar.helper.UnitsConverter; import org.traccar.model.Position; @@ -31,7 +32,7 @@ import java.util.Date; public class AutoTrackProtocolDecoder extends BaseProtocolDecoder { - public AutoTrackProtocolDecoder(AutoTrackProtocol protocol) { + public AutoTrackProtocolDecoder(Protocol protocol) { super(protocol); } diff --git a/src/org/traccar/protocol/AvemaProtocolDecoder.java b/src/org/traccar/protocol/AvemaProtocolDecoder.java index 483c7e2c8..16a31162a 100644 --- a/src/org/traccar/protocol/AvemaProtocolDecoder.java +++ b/src/org/traccar/protocol/AvemaProtocolDecoder.java @@ -18,6 +18,7 @@ package org.traccar.protocol; import io.netty.channel.Channel; import org.traccar.BaseProtocolDecoder; import org.traccar.DeviceSession; +import org.traccar.Protocol; import org.traccar.helper.Parser; import org.traccar.helper.PatternBuilder; import org.traccar.helper.UnitsConverter; @@ -30,7 +31,7 @@ import java.util.regex.Pattern; public class AvemaProtocolDecoder extends BaseProtocolDecoder { - public AvemaProtocolDecoder(AvemaProtocol protocol) { + public AvemaProtocolDecoder(Protocol protocol) { super(protocol); } diff --git a/src/org/traccar/protocol/Avl301ProtocolDecoder.java b/src/org/traccar/protocol/Avl301ProtocolDecoder.java index a3697117b..f6b7db2d6 100644 --- a/src/org/traccar/protocol/Avl301ProtocolDecoder.java +++ b/src/org/traccar/protocol/Avl301ProtocolDecoder.java @@ -21,6 +21,7 @@ import io.netty.channel.Channel; import org.traccar.BaseProtocolDecoder; import org.traccar.DeviceSession; import org.traccar.NetworkMessage; +import org.traccar.Protocol; import org.traccar.helper.DateBuilder; import org.traccar.model.CellTower; import org.traccar.model.Network; @@ -30,7 +31,7 @@ import java.net.SocketAddress; public class Avl301ProtocolDecoder extends BaseProtocolDecoder { - public Avl301ProtocolDecoder(Avl301Protocol protocol) { + public Avl301ProtocolDecoder(Protocol protocol) { super(protocol); } diff --git a/src/org/traccar/protocol/BceProtocolDecoder.java b/src/org/traccar/protocol/BceProtocolDecoder.java index 301be7847..22877a29b 100644 --- a/src/org/traccar/protocol/BceProtocolDecoder.java +++ b/src/org/traccar/protocol/BceProtocolDecoder.java @@ -21,6 +21,7 @@ import io.netty.channel.Channel; import org.traccar.BaseProtocolDecoder; import org.traccar.DeviceSession; import org.traccar.NetworkMessage; +import org.traccar.Protocol; import org.traccar.helper.BitUtil; import org.traccar.helper.UnitsConverter; import org.traccar.model.CellTower; @@ -34,7 +35,7 @@ import java.util.List; public class BceProtocolDecoder extends BaseProtocolDecoder { - public BceProtocolDecoder(BceProtocol protocol) { + public BceProtocolDecoder(Protocol protocol) { super(protocol); } diff --git a/src/org/traccar/protocol/BlackKiteProtocolDecoder.java b/src/org/traccar/protocol/BlackKiteProtocolDecoder.java index aebf970d0..dca4b908a 100644 --- a/src/org/traccar/protocol/BlackKiteProtocolDecoder.java +++ b/src/org/traccar/protocol/BlackKiteProtocolDecoder.java @@ -22,6 +22,7 @@ import io.netty.channel.Channel; import org.traccar.BaseProtocolDecoder; import org.traccar.DeviceSession; import org.traccar.NetworkMessage; +import org.traccar.Protocol; import org.traccar.helper.BitUtil; import org.traccar.model.Position; @@ -35,7 +36,7 @@ import java.util.Set; public class BlackKiteProtocolDecoder extends BaseProtocolDecoder { - public BlackKiteProtocolDecoder(BlackKiteProtocol protocol) { + public BlackKiteProtocolDecoder(Protocol protocol) { super(protocol); } diff --git a/src/org/traccar/protocol/BoxProtocolDecoder.java b/src/org/traccar/protocol/BoxProtocolDecoder.java index 231fd9b36..9f3ce29b2 100644 --- a/src/org/traccar/protocol/BoxProtocolDecoder.java +++ b/src/org/traccar/protocol/BoxProtocolDecoder.java @@ -19,6 +19,7 @@ import io.netty.channel.Channel; import org.traccar.BaseProtocolDecoder; import org.traccar.DeviceSession; import org.traccar.NetworkMessage; +import org.traccar.Protocol; import org.traccar.helper.Parser; import org.traccar.helper.PatternBuilder; import org.traccar.helper.UnitsConverter; @@ -29,7 +30,7 @@ import java.util.regex.Pattern; public class BoxProtocolDecoder extends BaseProtocolDecoder { - public BoxProtocolDecoder(BoxProtocol protocol) { + public BoxProtocolDecoder(Protocol protocol) { super(protocol); } diff --git a/src/org/traccar/protocol/CalAmpProtocolDecoder.java b/src/org/traccar/protocol/CalAmpProtocolDecoder.java index d495e7400..31416d7f1 100644 --- a/src/org/traccar/protocol/CalAmpProtocolDecoder.java +++ b/src/org/traccar/protocol/CalAmpProtocolDecoder.java @@ -22,6 +22,7 @@ import io.netty.channel.Channel; import org.traccar.BaseProtocolDecoder; import org.traccar.DeviceSession; import org.traccar.NetworkMessage; +import org.traccar.Protocol; import org.traccar.helper.BitUtil; import org.traccar.helper.UnitsConverter; import org.traccar.model.Position; @@ -31,7 +32,7 @@ import java.util.Date; public class CalAmpProtocolDecoder extends BaseProtocolDecoder { - public CalAmpProtocolDecoder(CalAmpProtocol protocol) { + public CalAmpProtocolDecoder(Protocol protocol) { super(protocol); } diff --git a/src/org/traccar/protocol/CarTrackProtocolDecoder.java b/src/org/traccar/protocol/CarTrackProtocolDecoder.java index 87c4ae345..ce3345826 100644 --- a/src/org/traccar/protocol/CarTrackProtocolDecoder.java +++ b/src/org/traccar/protocol/CarTrackProtocolDecoder.java @@ -19,6 +19,7 @@ package org.traccar.protocol; import io.netty.channel.Channel; import org.traccar.BaseProtocolDecoder; import org.traccar.DeviceSession; +import org.traccar.Protocol; import org.traccar.helper.DateBuilder; import org.traccar.helper.Parser; import org.traccar.helper.PatternBuilder; @@ -29,7 +30,7 @@ import java.util.regex.Pattern; public class CarTrackProtocolDecoder extends BaseProtocolDecoder { - public CarTrackProtocolDecoder(CarTrackProtocol protocol) { + public CarTrackProtocolDecoder(Protocol protocol) { super(protocol); } diff --git a/src/org/traccar/protocol/CarcellProtocolDecoder.java b/src/org/traccar/protocol/CarcellProtocolDecoder.java index a4da7982e..344b2f1ea 100644 --- a/src/org/traccar/protocol/CarcellProtocolDecoder.java +++ b/src/org/traccar/protocol/CarcellProtocolDecoder.java @@ -21,6 +21,7 @@ import java.util.regex.Pattern; import io.netty.channel.Channel; import org.traccar.BaseProtocolDecoder; import org.traccar.DeviceSession; +import org.traccar.Protocol; import org.traccar.helper.Parser; import org.traccar.helper.Parser.CoordinateFormat; import org.traccar.helper.PatternBuilder; @@ -29,7 +30,7 @@ import org.traccar.model.Position; public class CarcellProtocolDecoder extends BaseProtocolDecoder { - public CarcellProtocolDecoder(CarcellProtocol protocol) { + public CarcellProtocolDecoder(Protocol protocol) { super(protocol); } diff --git a/src/org/traccar/protocol/CarscopProtocolDecoder.java b/src/org/traccar/protocol/CarscopProtocolDecoder.java index d8634b512..161666adc 100644 --- a/src/org/traccar/protocol/CarscopProtocolDecoder.java +++ b/src/org/traccar/protocol/CarscopProtocolDecoder.java @@ -18,6 +18,7 @@ package org.traccar.protocol; import io.netty.channel.Channel; import org.traccar.BaseProtocolDecoder; import org.traccar.DeviceSession; +import org.traccar.Protocol; import org.traccar.helper.DateBuilder; import org.traccar.helper.Parser; import org.traccar.helper.PatternBuilder; @@ -28,7 +29,7 @@ import java.util.regex.Pattern; public class CarscopProtocolDecoder extends BaseProtocolDecoder { - public CarscopProtocolDecoder(CarscopProtocol protocol) { + public CarscopProtocolDecoder(Protocol protocol) { super(protocol); } diff --git a/src/org/traccar/protocol/CastelProtocolDecoder.java b/src/org/traccar/protocol/CastelProtocolDecoder.java index 344ca2df4..0541adf6f 100644 --- a/src/org/traccar/protocol/CastelProtocolDecoder.java +++ b/src/org/traccar/protocol/CastelProtocolDecoder.java @@ -22,6 +22,7 @@ import io.netty.channel.Channel; import org.traccar.BaseProtocolDecoder; import org.traccar.DeviceSession; import org.traccar.NetworkMessage; +import org.traccar.Protocol; import org.traccar.helper.Checksum; import org.traccar.helper.DateBuilder; import org.traccar.helper.ObdDecoder; @@ -72,7 +73,7 @@ public class CastelProtocolDecoder extends BaseProtocolDecoder { } } - public CastelProtocolDecoder(CastelProtocol protocol) { + public CastelProtocolDecoder(Protocol protocol) { super(protocol); } diff --git a/src/org/traccar/protocol/CautelaProtocolDecoder.java b/src/org/traccar/protocol/CautelaProtocolDecoder.java index ce231591e..bddf19b41 100644 --- a/src/org/traccar/protocol/CautelaProtocolDecoder.java +++ b/src/org/traccar/protocol/CautelaProtocolDecoder.java @@ -18,6 +18,7 @@ package org.traccar.protocol; import io.netty.channel.Channel; import org.traccar.BaseProtocolDecoder; import org.traccar.DeviceSession; +import org.traccar.Protocol; import org.traccar.helper.DateBuilder; import org.traccar.helper.Parser; import org.traccar.helper.PatternBuilder; @@ -28,7 +29,7 @@ import java.util.regex.Pattern; public class CautelaProtocolDecoder extends BaseProtocolDecoder { - public CautelaProtocolDecoder(CautelaProtocol protocol) { + public CautelaProtocolDecoder(Protocol protocol) { super(protocol); } diff --git a/src/org/traccar/protocol/CellocatorProtocolDecoder.java b/src/org/traccar/protocol/CellocatorProtocolDecoder.java index 30319eaee..fb805658a 100644 --- a/src/org/traccar/protocol/CellocatorProtocolDecoder.java +++ b/src/org/traccar/protocol/CellocatorProtocolDecoder.java @@ -21,6 +21,7 @@ import io.netty.channel.Channel; import org.traccar.BaseProtocolDecoder; import org.traccar.DeviceSession; import org.traccar.NetworkMessage; +import org.traccar.Protocol; import org.traccar.helper.DateBuilder; import org.traccar.helper.UnitsConverter; import org.traccar.model.Position; @@ -29,7 +30,7 @@ import java.net.SocketAddress; public class CellocatorProtocolDecoder extends BaseProtocolDecoder { - public CellocatorProtocolDecoder(CellocatorProtocol protocol) { + public CellocatorProtocolDecoder(Protocol protocol) { super(protocol); } diff --git a/src/org/traccar/protocol/CguardProtocolDecoder.java b/src/org/traccar/protocol/CguardProtocolDecoder.java index 806f500ab..9786afd6a 100644 --- a/src/org/traccar/protocol/CguardProtocolDecoder.java +++ b/src/org/traccar/protocol/CguardProtocolDecoder.java @@ -18,6 +18,7 @@ package org.traccar.protocol; import io.netty.channel.Channel; import org.traccar.BaseProtocolDecoder; import org.traccar.DeviceSession; +import org.traccar.Protocol; import org.traccar.helper.Parser; import org.traccar.helper.PatternBuilder; import org.traccar.helper.UnitsConverter; @@ -28,7 +29,7 @@ import java.util.regex.Pattern; public class CguardProtocolDecoder extends BaseProtocolDecoder { - public CguardProtocolDecoder(CguardProtocol protocol) { + public CguardProtocolDecoder(Protocol protocol) { super(protocol); } diff --git a/src/org/traccar/protocol/CityeasyProtocolDecoder.java b/src/org/traccar/protocol/CityeasyProtocolDecoder.java index a66b9adb3..9c4c7e11d 100644 --- a/src/org/traccar/protocol/CityeasyProtocolDecoder.java +++ b/src/org/traccar/protocol/CityeasyProtocolDecoder.java @@ -20,6 +20,7 @@ import io.netty.buffer.ByteBufUtil; import io.netty.channel.Channel; import org.traccar.BaseProtocolDecoder; import org.traccar.DeviceSession; +import org.traccar.Protocol; import org.traccar.helper.Checksum; import org.traccar.helper.Parser; import org.traccar.helper.PatternBuilder; @@ -33,7 +34,7 @@ import java.util.regex.Pattern; public class CityeasyProtocolDecoder extends BaseProtocolDecoder { - public CityeasyProtocolDecoder(CityeasyProtocol protocol) { + public CityeasyProtocolDecoder(Protocol protocol) { super(protocol); } diff --git a/src/org/traccar/protocol/ContinentalProtocolDecoder.java b/src/org/traccar/protocol/ContinentalProtocolDecoder.java index b8f322dc6..471afa0d6 100644 --- a/src/org/traccar/protocol/ContinentalProtocolDecoder.java +++ b/src/org/traccar/protocol/ContinentalProtocolDecoder.java @@ -19,6 +19,7 @@ import io.netty.buffer.ByteBuf; import io.netty.channel.Channel; import org.traccar.BaseProtocolDecoder; import org.traccar.DeviceSession; +import org.traccar.Protocol; import org.traccar.helper.BitUtil; import org.traccar.helper.UnitsConverter; import org.traccar.model.Position; @@ -28,7 +29,7 @@ import java.util.Date; public class ContinentalProtocolDecoder extends BaseProtocolDecoder { - public ContinentalProtocolDecoder(ContinentalProtocol protocol) { + public ContinentalProtocolDecoder(Protocol protocol) { super(protocol); } diff --git a/src/org/traccar/protocol/CradlepointProtocolDecoder.java b/src/org/traccar/protocol/CradlepointProtocolDecoder.java index 222f73ec3..a282131ce 100644 --- a/src/org/traccar/protocol/CradlepointProtocolDecoder.java +++ b/src/org/traccar/protocol/CradlepointProtocolDecoder.java @@ -18,6 +18,7 @@ package org.traccar.protocol; import io.netty.channel.Channel; import org.traccar.BaseProtocolDecoder; import org.traccar.DeviceSession; +import org.traccar.Protocol; import org.traccar.helper.DateBuilder; import org.traccar.helper.Parser; import org.traccar.helper.PatternBuilder; @@ -29,7 +30,7 @@ import java.util.regex.Pattern; public class CradlepointProtocolDecoder extends BaseProtocolDecoder { - public CradlepointProtocolDecoder(CradlepointProtocol protocol) { + public CradlepointProtocolDecoder(Protocol protocol) { super(protocol); } diff --git a/src/org/traccar/protocol/DishaProtocolDecoder.java b/src/org/traccar/protocol/DishaProtocolDecoder.java index 994bf6828..3223988ab 100644 --- a/src/org/traccar/protocol/DishaProtocolDecoder.java +++ b/src/org/traccar/protocol/DishaProtocolDecoder.java @@ -18,6 +18,7 @@ package org.traccar.protocol; import io.netty.channel.Channel; import org.traccar.BaseProtocolDecoder; import org.traccar.DeviceSession; +import org.traccar.Protocol; import org.traccar.helper.Parser; import org.traccar.helper.PatternBuilder; import org.traccar.model.Position; @@ -27,7 +28,7 @@ import java.util.regex.Pattern; public class DishaProtocolDecoder extends BaseProtocolDecoder { - public DishaProtocolDecoder(DishaProtocol protocol) { + public DishaProtocolDecoder(Protocol protocol) { super(protocol); } diff --git a/src/org/traccar/protocol/DmtHttpProtocolDecoder.java b/src/org/traccar/protocol/DmtHttpProtocolDecoder.java index bfe7d26a7..987361baf 100644 --- a/src/org/traccar/protocol/DmtHttpProtocolDecoder.java +++ b/src/org/traccar/protocol/DmtHttpProtocolDecoder.java @@ -20,6 +20,7 @@ import io.netty.handler.codec.http.FullHttpRequest; import io.netty.handler.codec.http.HttpResponseStatus; import org.traccar.BaseHttpProtocolDecoder; import org.traccar.DeviceSession; +import org.traccar.Protocol; import org.traccar.helper.BitUtil; import org.traccar.helper.UnitsConverter; import org.traccar.model.Position; @@ -38,7 +39,7 @@ import java.util.TimeZone; public class DmtHttpProtocolDecoder extends BaseHttpProtocolDecoder { - public DmtHttpProtocolDecoder(DmtHttpProtocol protocol) { + public DmtHttpProtocolDecoder(Protocol protocol) { super(protocol); } diff --git a/src/org/traccar/protocol/DmtProtocolDecoder.java b/src/org/traccar/protocol/DmtProtocolDecoder.java index 613b8cddd..c04e90f1d 100644 --- a/src/org/traccar/protocol/DmtProtocolDecoder.java +++ b/src/org/traccar/protocol/DmtProtocolDecoder.java @@ -21,6 +21,7 @@ import io.netty.channel.Channel; import org.traccar.BaseProtocolDecoder; import org.traccar.DeviceSession; import org.traccar.NetworkMessage; +import org.traccar.Protocol; import org.traccar.helper.BitUtil; import org.traccar.helper.DateBuilder; import org.traccar.helper.UnitsConverter; @@ -34,7 +35,7 @@ import java.util.List; public class DmtProtocolDecoder extends BaseProtocolDecoder { - public DmtProtocolDecoder(DmtProtocol protocol) { + public DmtProtocolDecoder(Protocol protocol) { super(protocol); } diff --git a/src/org/traccar/protocol/DwayProtocolDecoder.java b/src/org/traccar/protocol/DwayProtocolDecoder.java index f2e1ad710..9b02c898e 100644 --- a/src/org/traccar/protocol/DwayProtocolDecoder.java +++ b/src/org/traccar/protocol/DwayProtocolDecoder.java @@ -19,6 +19,7 @@ import io.netty.channel.Channel; import org.traccar.BaseProtocolDecoder; import org.traccar.DeviceSession; import org.traccar.NetworkMessage; +import org.traccar.Protocol; import org.traccar.helper.Parser; import org.traccar.helper.PatternBuilder; import org.traccar.helper.UnitsConverter; @@ -29,7 +30,7 @@ import java.util.regex.Pattern; public class DwayProtocolDecoder extends BaseProtocolDecoder { - public DwayProtocolDecoder(DwayProtocol protocol) { + public DwayProtocolDecoder(Protocol protocol) { super(protocol); } diff --git a/src/org/traccar/protocol/EasyTrackProtocolDecoder.java b/src/org/traccar/protocol/EasyTrackProtocolDecoder.java index 243b5f55d..2ddb24f5c 100644 --- a/src/org/traccar/protocol/EasyTrackProtocolDecoder.java +++ b/src/org/traccar/protocol/EasyTrackProtocolDecoder.java @@ -18,6 +18,7 @@ package org.traccar.protocol; import io.netty.channel.Channel; import org.traccar.BaseProtocolDecoder; import org.traccar.DeviceSession; +import org.traccar.Protocol; import org.traccar.helper.BitUtil; import org.traccar.helper.DateBuilder; import org.traccar.helper.Parser; @@ -30,7 +31,7 @@ import java.util.regex.Pattern; public class EasyTrackProtocolDecoder extends BaseProtocolDecoder { - public EasyTrackProtocolDecoder(EasyTrackProtocol protocol) { + public EasyTrackProtocolDecoder(Protocol protocol) { super(protocol); } diff --git a/src/org/traccar/protocol/EelinkProtocolDecoder.java b/src/org/traccar/protocol/EelinkProtocolDecoder.java index 67e7f5127..bffefbddf 100644 --- a/src/org/traccar/protocol/EelinkProtocolDecoder.java +++ b/src/org/traccar/protocol/EelinkProtocolDecoder.java @@ -22,6 +22,7 @@ import io.netty.channel.socket.DatagramChannel; import org.traccar.BaseProtocolDecoder; import org.traccar.DeviceSession; import org.traccar.NetworkMessage; +import org.traccar.Protocol; import org.traccar.helper.BitUtil; import org.traccar.helper.Parser; import org.traccar.helper.PatternBuilder; @@ -37,7 +38,7 @@ import java.util.regex.Pattern; public class EelinkProtocolDecoder extends BaseProtocolDecoder { - public EelinkProtocolDecoder(EelinkProtocol protocol) { + public EelinkProtocolDecoder(Protocol protocol) { super(protocol); } diff --git a/src/org/traccar/protocol/EgtsProtocolDecoder.java b/src/org/traccar/protocol/EgtsProtocolDecoder.java index 45e191d1e..b9fcb2f44 100644 --- a/src/org/traccar/protocol/EgtsProtocolDecoder.java +++ b/src/org/traccar/protocol/EgtsProtocolDecoder.java @@ -21,6 +21,7 @@ import io.netty.channel.Channel; import org.traccar.BaseProtocolDecoder; import org.traccar.DeviceSession; import org.traccar.NetworkMessage; +import org.traccar.Protocol; import org.traccar.helper.BitUtil; import org.traccar.helper.Checksum; import org.traccar.helper.UnitsConverter; @@ -34,7 +35,7 @@ import java.util.List; public class EgtsProtocolDecoder extends BaseProtocolDecoder { - public EgtsProtocolDecoder(EgtsProtocol protocol) { + public EgtsProtocolDecoder(Protocol protocol) { super(protocol); } diff --git a/src/org/traccar/protocol/EnforaProtocolDecoder.java b/src/org/traccar/protocol/EnforaProtocolDecoder.java index d78be685f..bfa7a116b 100644 --- a/src/org/traccar/protocol/EnforaProtocolDecoder.java +++ b/src/org/traccar/protocol/EnforaProtocolDecoder.java @@ -19,6 +19,7 @@ import io.netty.buffer.ByteBuf; import io.netty.channel.Channel; import org.traccar.BaseProtocolDecoder; import org.traccar.DeviceSession; +import org.traccar.Protocol; import org.traccar.helper.BufferUtil; import org.traccar.helper.DateBuilder; import org.traccar.helper.Parser; @@ -31,7 +32,7 @@ import java.util.regex.Pattern; public class EnforaProtocolDecoder extends BaseProtocolDecoder { - public EnforaProtocolDecoder(EnforaProtocol protocol) { + public EnforaProtocolDecoder(Protocol protocol) { super(protocol); } diff --git a/src/org/traccar/protocol/EsealProtocolDecoder.java b/src/org/traccar/protocol/EsealProtocolDecoder.java index 39c0d94c2..7a1fd7022 100644 --- a/src/org/traccar/protocol/EsealProtocolDecoder.java +++ b/src/org/traccar/protocol/EsealProtocolDecoder.java @@ -20,6 +20,7 @@ import org.traccar.BaseProtocolDecoder; import org.traccar.Context; import org.traccar.DeviceSession; import org.traccar.NetworkMessage; +import org.traccar.Protocol; import org.traccar.helper.Parser; import org.traccar.helper.PatternBuilder; import org.traccar.helper.UnitsConverter; @@ -32,7 +33,7 @@ public class EsealProtocolDecoder extends BaseProtocolDecoder { private String config; - public EsealProtocolDecoder(EsealProtocol protocol) { + public EsealProtocolDecoder(Protocol protocol) { super(protocol); config = Context.getConfig().getString(getProtocolName() + ".config"); } diff --git a/src/org/traccar/protocol/EskyProtocolDecoder.java b/src/org/traccar/protocol/EskyProtocolDecoder.java index 712632ac3..641b2e28f 100644 --- a/src/org/traccar/protocol/EskyProtocolDecoder.java +++ b/src/org/traccar/protocol/EskyProtocolDecoder.java @@ -18,6 +18,7 @@ package org.traccar.protocol; import io.netty.channel.Channel; import org.traccar.BaseProtocolDecoder; import org.traccar.DeviceSession; +import org.traccar.Protocol; import org.traccar.helper.Parser; import org.traccar.helper.PatternBuilder; import org.traccar.helper.UnitsConverter; @@ -28,7 +29,7 @@ import java.util.regex.Pattern; public class EskyProtocolDecoder extends BaseProtocolDecoder { - public EskyProtocolDecoder(EskyProtocol protocol) { + public EskyProtocolDecoder(Protocol protocol) { super(protocol); } diff --git a/src/org/traccar/protocol/ExtremTracProtocolDecoder.java b/src/org/traccar/protocol/ExtremTracProtocolDecoder.java index c214b4f5d..9fde6f0a0 100644 --- a/src/org/traccar/protocol/ExtremTracProtocolDecoder.java +++ b/src/org/traccar/protocol/ExtremTracProtocolDecoder.java @@ -18,6 +18,7 @@ package org.traccar.protocol; import io.netty.channel.Channel; import org.traccar.BaseProtocolDecoder; import org.traccar.DeviceSession; +import org.traccar.Protocol; import org.traccar.helper.DateBuilder; import org.traccar.helper.Parser; import org.traccar.helper.PatternBuilder; @@ -28,7 +29,7 @@ import java.util.regex.Pattern; public class ExtremTracProtocolDecoder extends BaseProtocolDecoder { - public ExtremTracProtocolDecoder(ExtremTracProtocol protocol) { + public ExtremTracProtocolDecoder(Protocol protocol) { super(protocol); } diff --git a/src/org/traccar/protocol/FifotrackProtocolDecoder.java b/src/org/traccar/protocol/FifotrackProtocolDecoder.java index b27368e3a..4412df86b 100644 --- a/src/org/traccar/protocol/FifotrackProtocolDecoder.java +++ b/src/org/traccar/protocol/FifotrackProtocolDecoder.java @@ -18,6 +18,7 @@ package org.traccar.protocol; import io.netty.channel.Channel; import org.traccar.BaseProtocolDecoder; import org.traccar.DeviceSession; +import org.traccar.Protocol; import org.traccar.helper.Parser; import org.traccar.helper.PatternBuilder; import org.traccar.helper.UnitsConverter; @@ -30,7 +31,7 @@ import java.util.regex.Pattern; public class FifotrackProtocolDecoder extends BaseProtocolDecoder { - public FifotrackProtocolDecoder(FifotrackProtocol protocol) { + public FifotrackProtocolDecoder(Protocol protocol) { super(protocol); } diff --git a/src/org/traccar/protocol/FlespiProtocolDecoder.java b/src/org/traccar/protocol/FlespiProtocolDecoder.java index da5ba13e9..86da3943e 100644 --- a/src/org/traccar/protocol/FlespiProtocolDecoder.java +++ b/src/org/traccar/protocol/FlespiProtocolDecoder.java @@ -20,6 +20,7 @@ import io.netty.handler.codec.http.FullHttpRequest; import io.netty.handler.codec.http.HttpResponseStatus; import org.traccar.BaseHttpProtocolDecoder; import org.traccar.DeviceSession; +import org.traccar.Protocol; import org.traccar.model.Position; import javax.json.Json; @@ -38,7 +39,7 @@ import java.util.Map; public class FlespiProtocolDecoder extends BaseHttpProtocolDecoder { - public FlespiProtocolDecoder(FlespiProtocol protocol) { + public FlespiProtocolDecoder(Protocol protocol) { super(protocol); } diff --git a/src/org/traccar/protocol/FlexCommProtocolDecoder.java b/src/org/traccar/protocol/FlexCommProtocolDecoder.java index 3a1e23d20..068c0a05c 100644 --- a/src/org/traccar/protocol/FlexCommProtocolDecoder.java +++ b/src/org/traccar/protocol/FlexCommProtocolDecoder.java @@ -19,6 +19,7 @@ import io.netty.channel.Channel; import org.traccar.BaseProtocolDecoder; import org.traccar.DeviceSession; import org.traccar.NetworkMessage; +import org.traccar.Protocol; import org.traccar.helper.Parser; import org.traccar.helper.PatternBuilder; import org.traccar.helper.UnitsConverter; @@ -31,7 +32,7 @@ import java.util.regex.Pattern; public class FlexCommProtocolDecoder extends BaseProtocolDecoder { - public FlexCommProtocolDecoder(FlexCommProtocol protocol) { + public FlexCommProtocolDecoder(Protocol protocol) { super(protocol); } diff --git a/src/org/traccar/protocol/FlextrackProtocolDecoder.java b/src/org/traccar/protocol/FlextrackProtocolDecoder.java index a6970ba86..9dce22ede 100644 --- a/src/org/traccar/protocol/FlextrackProtocolDecoder.java +++ b/src/org/traccar/protocol/FlextrackProtocolDecoder.java @@ -19,6 +19,7 @@ import io.netty.channel.Channel; import org.traccar.BaseProtocolDecoder; import org.traccar.DeviceSession; import org.traccar.NetworkMessage; +import org.traccar.Protocol; import org.traccar.helper.Parser; import org.traccar.helper.PatternBuilder; import org.traccar.helper.UnitsConverter; @@ -31,7 +32,7 @@ import java.util.regex.Pattern; public class FlextrackProtocolDecoder extends BaseProtocolDecoder { - public FlextrackProtocolDecoder(FlextrackProtocol protocol) { + public FlextrackProtocolDecoder(Protocol protocol) { super(protocol); } diff --git a/src/org/traccar/protocol/FoxProtocolDecoder.java b/src/org/traccar/protocol/FoxProtocolDecoder.java index 7ce57109d..449f00022 100644 --- a/src/org/traccar/protocol/FoxProtocolDecoder.java +++ b/src/org/traccar/protocol/FoxProtocolDecoder.java @@ -18,6 +18,7 @@ package org.traccar.protocol; import io.netty.channel.Channel; import org.traccar.BaseProtocolDecoder; import org.traccar.DeviceSession; +import org.traccar.Protocol; import org.traccar.helper.Parser; import org.traccar.helper.PatternBuilder; import org.traccar.helper.UnitsConverter; @@ -28,7 +29,7 @@ import java.util.regex.Pattern; public class FoxProtocolDecoder extends BaseProtocolDecoder { - public FoxProtocolDecoder(FoxProtocol protocol) { + public FoxProtocolDecoder(Protocol protocol) { super(protocol); } diff --git a/src/org/traccar/protocol/FreedomProtocolDecoder.java b/src/org/traccar/protocol/FreedomProtocolDecoder.java index 95348ba11..1d2dd3133 100644 --- a/src/org/traccar/protocol/FreedomProtocolDecoder.java +++ b/src/org/traccar/protocol/FreedomProtocolDecoder.java @@ -18,6 +18,7 @@ package org.traccar.protocol; import io.netty.channel.Channel; import org.traccar.BaseProtocolDecoder; import org.traccar.DeviceSession; +import org.traccar.Protocol; import org.traccar.helper.Parser; import org.traccar.helper.PatternBuilder; import org.traccar.model.Position; @@ -27,7 +28,7 @@ import java.util.regex.Pattern; public class FreedomProtocolDecoder extends BaseProtocolDecoder { - public FreedomProtocolDecoder(FreedomProtocol protocol) { + public FreedomProtocolDecoder(Protocol protocol) { super(protocol); } diff --git a/src/org/traccar/protocol/FreematicsProtocolDecoder.java b/src/org/traccar/protocol/FreematicsProtocolDecoder.java index 8dce49195..b91690d71 100644 --- a/src/org/traccar/protocol/FreematicsProtocolDecoder.java +++ b/src/org/traccar/protocol/FreematicsProtocolDecoder.java @@ -19,6 +19,7 @@ import io.netty.channel.Channel; import org.traccar.BaseProtocolDecoder; import org.traccar.DeviceSession; import org.traccar.NetworkMessage; +import org.traccar.Protocol; import org.traccar.helper.Checksum; import org.traccar.helper.DateBuilder; import org.traccar.helper.UnitsConverter; @@ -31,7 +32,7 @@ import java.util.List; public class FreematicsProtocolDecoder extends BaseProtocolDecoder { - public FreematicsProtocolDecoder(FreematicsProtocol protocol) { + public FreematicsProtocolDecoder(Protocol protocol) { super(protocol); } diff --git a/src/org/traccar/protocol/GalileoProtocolDecoder.java b/src/org/traccar/protocol/GalileoProtocolDecoder.java index 26f8f4686..64a4a6ea8 100644 --- a/src/org/traccar/protocol/GalileoProtocolDecoder.java +++ b/src/org/traccar/protocol/GalileoProtocolDecoder.java @@ -23,6 +23,7 @@ import org.traccar.BaseProtocolDecoder; import org.traccar.Context; import org.traccar.DeviceSession; import org.traccar.NetworkMessage; +import org.traccar.Protocol; import org.traccar.helper.UnitsConverter; import org.traccar.model.Position; @@ -38,7 +39,7 @@ import java.util.Set; public class GalileoProtocolDecoder extends BaseProtocolDecoder { - public GalileoProtocolDecoder(GalileoProtocol protocol) { + public GalileoProtocolDecoder(Protocol protocol) { super(protocol); } diff --git a/src/org/traccar/protocol/GatorProtocolDecoder.java b/src/org/traccar/protocol/GatorProtocolDecoder.java index f77723691..31500bae6 100644 --- a/src/org/traccar/protocol/GatorProtocolDecoder.java +++ b/src/org/traccar/protocol/GatorProtocolDecoder.java @@ -21,6 +21,7 @@ import io.netty.channel.Channel; import org.traccar.BaseProtocolDecoder; import org.traccar.DeviceSession; import org.traccar.NetworkMessage; +import org.traccar.Protocol; import org.traccar.helper.BcdUtil; import org.traccar.helper.DateBuilder; import org.traccar.helper.UnitsConverter; @@ -30,7 +31,7 @@ import java.net.SocketAddress; public class GatorProtocolDecoder extends BaseProtocolDecoder { - public GatorProtocolDecoder(GatorProtocol protocol) { + public GatorProtocolDecoder(Protocol protocol) { super(protocol); } diff --git a/src/org/traccar/protocol/GenxProtocolDecoder.java b/src/org/traccar/protocol/GenxProtocolDecoder.java index 399a42109..2ae9de7a0 100644 --- a/src/org/traccar/protocol/GenxProtocolDecoder.java +++ b/src/org/traccar/protocol/GenxProtocolDecoder.java @@ -19,6 +19,7 @@ import io.netty.channel.Channel; import org.traccar.BaseProtocolDecoder; import org.traccar.Context; import org.traccar.DeviceSession; +import org.traccar.Protocol; import org.traccar.helper.UnitsConverter; import org.traccar.model.Position; @@ -29,7 +30,7 @@ public class GenxProtocolDecoder extends BaseProtocolDecoder { private int[] reportColumns; - public GenxProtocolDecoder(GenxProtocol protocol) { + public GenxProtocolDecoder(Protocol protocol) { super(protocol); setReportColumns(Context.getConfig().getString(getProtocolName() + ".reportColumns", "1,2,3,4")); } diff --git a/src/org/traccar/protocol/Gl100ProtocolDecoder.java b/src/org/traccar/protocol/Gl100ProtocolDecoder.java index a1654d062..ae0383e5c 100644 --- a/src/org/traccar/protocol/Gl100ProtocolDecoder.java +++ b/src/org/traccar/protocol/Gl100ProtocolDecoder.java @@ -19,6 +19,7 @@ import io.netty.channel.Channel; import org.traccar.BaseProtocolDecoder; import org.traccar.DeviceSession; import org.traccar.NetworkMessage; +import org.traccar.Protocol; import org.traccar.helper.Parser; import org.traccar.helper.PatternBuilder; import org.traccar.model.Position; @@ -28,7 +29,7 @@ import java.util.regex.Pattern; public class Gl100ProtocolDecoder extends BaseProtocolDecoder { - public Gl100ProtocolDecoder(Gl100Protocol protocol) { + public Gl100ProtocolDecoder(Protocol protocol) { super(protocol); } diff --git a/src/org/traccar/protocol/Gl200BinaryProtocolDecoder.java b/src/org/traccar/protocol/Gl200BinaryProtocolDecoder.java index 62caaf13d..c3339bea5 100644 --- a/src/org/traccar/protocol/Gl200BinaryProtocolDecoder.java +++ b/src/org/traccar/protocol/Gl200BinaryProtocolDecoder.java @@ -19,6 +19,7 @@ import io.netty.buffer.ByteBuf; import io.netty.channel.Channel; import org.traccar.BaseProtocolDecoder; import org.traccar.DeviceSession; +import org.traccar.Protocol; import org.traccar.helper.BitBuffer; import org.traccar.helper.BitUtil; import org.traccar.helper.DateBuilder; @@ -35,7 +36,7 @@ import java.util.List; public class Gl200BinaryProtocolDecoder extends BaseProtocolDecoder { - public Gl200BinaryProtocolDecoder(Gl200Protocol protocol) { + public Gl200BinaryProtocolDecoder(Protocol protocol) { super(protocol); } diff --git a/src/org/traccar/protocol/Gl200ProtocolDecoder.java b/src/org/traccar/protocol/Gl200ProtocolDecoder.java index 8abaa1e37..ca1df7a13 100644 --- a/src/org/traccar/protocol/Gl200ProtocolDecoder.java +++ b/src/org/traccar/protocol/Gl200ProtocolDecoder.java @@ -19,6 +19,7 @@ import org.traccar.BaseProtocolDecoder; import io.netty.buffer.ByteBuf; import io.netty.channel.Channel; +import org.traccar.Protocol; import java.net.SocketAddress; @@ -27,7 +28,7 @@ public class Gl200ProtocolDecoder extends BaseProtocolDecoder { private final Gl200TextProtocolDecoder textProtocolDecoder; private final Gl200BinaryProtocolDecoder binaryProtocolDecoder; - public Gl200ProtocolDecoder(Gl200Protocol protocol) { + public Gl200ProtocolDecoder(Protocol protocol) { super(protocol); textProtocolDecoder = new Gl200TextProtocolDecoder(protocol); binaryProtocolDecoder = new Gl200BinaryProtocolDecoder(protocol); diff --git a/src/org/traccar/protocol/Gl200TextProtocolDecoder.java b/src/org/traccar/protocol/Gl200TextProtocolDecoder.java index 164f20135..21020ee6d 100644 --- a/src/org/traccar/protocol/Gl200TextProtocolDecoder.java +++ b/src/org/traccar/protocol/Gl200TextProtocolDecoder.java @@ -19,6 +19,7 @@ import org.traccar.BaseProtocolDecoder; import org.traccar.Context; import org.traccar.DeviceSession; import org.traccar.NetworkMessage; +import org.traccar.Protocol; import org.traccar.helper.BitUtil; import org.traccar.helper.Parser; import org.traccar.helper.PatternBuilder; @@ -46,7 +47,7 @@ public class Gl200TextProtocolDecoder extends BaseProtocolDecoder { private boolean ignoreFixTime; - public Gl200TextProtocolDecoder(Gl200Protocol protocol) { + public Gl200TextProtocolDecoder(Protocol protocol) { super(protocol); ignoreFixTime = Context.getConfig().getBoolean(getProtocolName() + ".ignoreFixTime"); diff --git a/src/org/traccar/protocol/GlobalSatProtocolDecoder.java b/src/org/traccar/protocol/GlobalSatProtocolDecoder.java index 4b67c1eff..3d4ab5760 100644 --- a/src/org/traccar/protocol/GlobalSatProtocolDecoder.java +++ b/src/org/traccar/protocol/GlobalSatProtocolDecoder.java @@ -20,6 +20,7 @@ import org.traccar.BaseProtocolDecoder; import org.traccar.Context; import org.traccar.DeviceSession; import org.traccar.NetworkMessage; +import org.traccar.Protocol; import org.traccar.helper.DateBuilder; import org.traccar.helper.Parser; import org.traccar.helper.PatternBuilder; @@ -34,7 +35,7 @@ public class GlobalSatProtocolDecoder extends BaseProtocolDecoder { private String format0; private String format1; - public GlobalSatProtocolDecoder(GlobalSatProtocol protocol) { + public GlobalSatProtocolDecoder(Protocol protocol) { super(protocol); format0 = Context.getConfig().getString(getProtocolName() + ".format0", "TSPRXAB27GHKLMnaicz*U!"); diff --git a/src/org/traccar/protocol/GnxProtocolDecoder.java b/src/org/traccar/protocol/GnxProtocolDecoder.java index 36bcba2dc..c9c221a69 100644 --- a/src/org/traccar/protocol/GnxProtocolDecoder.java +++ b/src/org/traccar/protocol/GnxProtocolDecoder.java @@ -18,6 +18,7 @@ package org.traccar.protocol; import io.netty.channel.Channel; import org.traccar.BaseProtocolDecoder; import org.traccar.DeviceSession; +import org.traccar.Protocol; import org.traccar.helper.Parser; import org.traccar.helper.PatternBuilder; import org.traccar.model.Position; @@ -27,7 +28,7 @@ import java.util.regex.Pattern; public class GnxProtocolDecoder extends BaseProtocolDecoder { - public GnxProtocolDecoder(GnxProtocol protocol) { + public GnxProtocolDecoder(Protocol protocol) { super(protocol); } diff --git a/src/org/traccar/protocol/GoSafeProtocolDecoder.java b/src/org/traccar/protocol/GoSafeProtocolDecoder.java index 9d6a61d52..760fcb2fd 100644 --- a/src/org/traccar/protocol/GoSafeProtocolDecoder.java +++ b/src/org/traccar/protocol/GoSafeProtocolDecoder.java @@ -19,6 +19,7 @@ import io.netty.channel.Channel; import org.traccar.BaseProtocolDecoder; import org.traccar.DeviceSession; import org.traccar.NetworkMessage; +import org.traccar.Protocol; import org.traccar.helper.BitUtil; import org.traccar.helper.DateBuilder; import org.traccar.helper.Parser; @@ -36,7 +37,7 @@ import java.util.regex.Pattern; public class GoSafeProtocolDecoder extends BaseProtocolDecoder { - public GoSafeProtocolDecoder(GoSafeProtocol protocol) { + public GoSafeProtocolDecoder(Protocol protocol) { super(protocol); } diff --git a/src/org/traccar/protocol/GotopProtocolDecoder.java b/src/org/traccar/protocol/GotopProtocolDecoder.java index 728c2a8d6..2ef975fe5 100644 --- a/src/org/traccar/protocol/GotopProtocolDecoder.java +++ b/src/org/traccar/protocol/GotopProtocolDecoder.java @@ -18,6 +18,7 @@ package org.traccar.protocol; import io.netty.channel.Channel; import org.traccar.BaseProtocolDecoder; import org.traccar.DeviceSession; +import org.traccar.Protocol; import org.traccar.helper.Parser; import org.traccar.helper.PatternBuilder; import org.traccar.helper.UnitsConverter; @@ -28,7 +29,7 @@ import java.util.regex.Pattern; public class GotopProtocolDecoder extends BaseProtocolDecoder { - public GotopProtocolDecoder(GotopProtocol protocol) { + public GotopProtocolDecoder(Protocol protocol) { super(protocol); } diff --git a/src/org/traccar/protocol/Gps056ProtocolDecoder.java b/src/org/traccar/protocol/Gps056ProtocolDecoder.java index 13027142f..0ba79bb51 100644 --- a/src/org/traccar/protocol/Gps056ProtocolDecoder.java +++ b/src/org/traccar/protocol/Gps056ProtocolDecoder.java @@ -21,6 +21,7 @@ import io.netty.channel.Channel; import org.traccar.BaseProtocolDecoder; import org.traccar.DeviceSession; import org.traccar.NetworkMessage; +import org.traccar.Protocol; import org.traccar.helper.DateBuilder; import org.traccar.helper.UnitsConverter; import org.traccar.model.Position; @@ -30,7 +31,7 @@ import java.nio.charset.StandardCharsets; public class Gps056ProtocolDecoder extends BaseProtocolDecoder { - public Gps056ProtocolDecoder(Gps056Protocol protocol) { + public Gps056ProtocolDecoder(Protocol protocol) { super(protocol); } diff --git a/src/org/traccar/protocol/Gps103ProtocolDecoder.java b/src/org/traccar/protocol/Gps103ProtocolDecoder.java index 3c8cbbe87..36060f841 100644 --- a/src/org/traccar/protocol/Gps103ProtocolDecoder.java +++ b/src/org/traccar/protocol/Gps103ProtocolDecoder.java @@ -19,6 +19,7 @@ import io.netty.channel.Channel; import org.traccar.BaseProtocolDecoder; import org.traccar.DeviceSession; import org.traccar.NetworkMessage; +import org.traccar.Protocol; import org.traccar.helper.DateBuilder; import org.traccar.helper.Parser; import org.traccar.helper.PatternBuilder; @@ -33,7 +34,7 @@ import java.util.regex.Pattern; public class Gps103ProtocolDecoder extends BaseProtocolDecoder { - public Gps103ProtocolDecoder(Gps103Protocol protocol) { + public Gps103ProtocolDecoder(Protocol protocol) { super(protocol); } diff --git a/src/org/traccar/protocol/GpsGateProtocolDecoder.java b/src/org/traccar/protocol/GpsGateProtocolDecoder.java index 6eff3eb76..cc187225b 100644 --- a/src/org/traccar/protocol/GpsGateProtocolDecoder.java +++ b/src/org/traccar/protocol/GpsGateProtocolDecoder.java @@ -19,6 +19,7 @@ import io.netty.channel.Channel; import org.traccar.BaseProtocolDecoder; import org.traccar.DeviceSession; import org.traccar.NetworkMessage; +import org.traccar.Protocol; import org.traccar.helper.Checksum; import org.traccar.helper.DateBuilder; import org.traccar.helper.Parser; @@ -30,7 +31,7 @@ import java.util.regex.Pattern; public class GpsGateProtocolDecoder extends BaseProtocolDecoder { - public GpsGateProtocolDecoder(GpsGateProtocol protocol) { + public GpsGateProtocolDecoder(Protocol protocol) { super(protocol); } diff --git a/src/org/traccar/protocol/GpsMarkerProtocolDecoder.java b/src/org/traccar/protocol/GpsMarkerProtocolDecoder.java index a6e39e353..bbb2c31e2 100644 --- a/src/org/traccar/protocol/GpsMarkerProtocolDecoder.java +++ b/src/org/traccar/protocol/GpsMarkerProtocolDecoder.java @@ -18,6 +18,7 @@ package org.traccar.protocol; import io.netty.channel.Channel; import org.traccar.BaseProtocolDecoder; import org.traccar.DeviceSession; +import org.traccar.Protocol; import org.traccar.helper.Parser; import org.traccar.helper.PatternBuilder; import org.traccar.model.Position; @@ -27,7 +28,7 @@ import java.util.regex.Pattern; public class GpsMarkerProtocolDecoder extends BaseProtocolDecoder { - public GpsMarkerProtocolDecoder(GpsMarkerProtocol protocol) { + public GpsMarkerProtocolDecoder(Protocol protocol) { super(protocol); } diff --git a/src/org/traccar/protocol/GpsmtaProtocolDecoder.java b/src/org/traccar/protocol/GpsmtaProtocolDecoder.java index 332811263..31f9401b4 100644 --- a/src/org/traccar/protocol/GpsmtaProtocolDecoder.java +++ b/src/org/traccar/protocol/GpsmtaProtocolDecoder.java @@ -19,6 +19,7 @@ import io.netty.channel.Channel; import org.traccar.BaseProtocolDecoder; import org.traccar.DeviceSession; import org.traccar.NetworkMessage; +import org.traccar.Protocol; import org.traccar.helper.Parser; import org.traccar.helper.PatternBuilder; import org.traccar.model.Position; @@ -29,7 +30,7 @@ import java.util.regex.Pattern; public class GpsmtaProtocolDecoder extends BaseProtocolDecoder { - public GpsmtaProtocolDecoder(GpsmtaProtocol protocol) { + public GpsmtaProtocolDecoder(Protocol protocol) { super(protocol); } diff --git a/src/org/traccar/protocol/GranitProtocolDecoder.java b/src/org/traccar/protocol/GranitProtocolDecoder.java index d4aa7e6e8..8900e5b39 100644 --- a/src/org/traccar/protocol/GranitProtocolDecoder.java +++ b/src/org/traccar/protocol/GranitProtocolDecoder.java @@ -22,6 +22,7 @@ import org.traccar.BaseProtocolDecoder; import org.traccar.Context; import org.traccar.DeviceSession; import org.traccar.NetworkMessage; +import org.traccar.Protocol; import org.traccar.helper.BitUtil; import org.traccar.helper.Checksum; import org.traccar.model.Position; @@ -41,7 +42,7 @@ public class GranitProtocolDecoder extends BaseProtocolDecoder { private double adc3Ratio; private double adc4Ratio; - public GranitProtocolDecoder(GranitProtocol protocol) { + public GranitProtocolDecoder(Protocol protocol) { super(protocol); adc1Ratio = Context.getConfig().getDouble("granit.adc1Ratio", 1); adc2Ratio = Context.getConfig().getDouble("granit.adc2Ratio", 1); diff --git a/src/org/traccar/protocol/Gt02ProtocolDecoder.java b/src/org/traccar/protocol/Gt02ProtocolDecoder.java index ab4c7022e..78a3fd3ee 100644 --- a/src/org/traccar/protocol/Gt02ProtocolDecoder.java +++ b/src/org/traccar/protocol/Gt02ProtocolDecoder.java @@ -22,6 +22,7 @@ import io.netty.channel.Channel; import org.traccar.BaseProtocolDecoder; import org.traccar.DeviceSession; import org.traccar.NetworkMessage; +import org.traccar.Protocol; import org.traccar.helper.BitUtil; import org.traccar.helper.DateBuilder; import org.traccar.helper.UnitsConverter; @@ -32,7 +33,7 @@ import java.nio.charset.StandardCharsets; public class Gt02ProtocolDecoder extends BaseProtocolDecoder { - public Gt02ProtocolDecoder(Gt02Protocol protocol) { + public Gt02ProtocolDecoder(Protocol protocol) { super(protocol); } diff --git a/src/org/traccar/protocol/Gt06ProtocolDecoder.java b/src/org/traccar/protocol/Gt06ProtocolDecoder.java index 16114f420..3bbc09e2a 100644 --- a/src/org/traccar/protocol/Gt06ProtocolDecoder.java +++ b/src/org/traccar/protocol/Gt06ProtocolDecoder.java @@ -23,6 +23,7 @@ import org.traccar.BaseProtocolDecoder; import org.traccar.Context; import org.traccar.DeviceSession; import org.traccar.NetworkMessage; +import org.traccar.Protocol; import org.traccar.helper.BcdUtil; import org.traccar.helper.BitUtil; import org.traccar.helper.Checksum; @@ -48,7 +49,7 @@ public class Gt06ProtocolDecoder extends BaseProtocolDecoder { private final Map photos = new HashMap<>(); - public Gt06ProtocolDecoder(Gt06Protocol protocol) { + public Gt06ProtocolDecoder(Protocol protocol) { super(protocol); } diff --git a/src/org/traccar/protocol/Gt30ProtocolDecoder.java b/src/org/traccar/protocol/Gt30ProtocolDecoder.java index ac1557994..abf208a46 100644 --- a/src/org/traccar/protocol/Gt30ProtocolDecoder.java +++ b/src/org/traccar/protocol/Gt30ProtocolDecoder.java @@ -18,6 +18,7 @@ package org.traccar.protocol; import io.netty.channel.Channel; import org.traccar.BaseProtocolDecoder; import org.traccar.DeviceSession; +import org.traccar.Protocol; import org.traccar.helper.DateBuilder; import org.traccar.helper.Parser; import org.traccar.helper.PatternBuilder; @@ -28,7 +29,7 @@ import java.util.regex.Pattern; public class Gt30ProtocolDecoder extends BaseProtocolDecoder { - public Gt30ProtocolDecoder(Gt30Protocol protocol) { + public Gt30ProtocolDecoder(Protocol protocol) { super(protocol); } diff --git a/src/org/traccar/protocol/H02ProtocolDecoder.java b/src/org/traccar/protocol/H02ProtocolDecoder.java index 9603200ab..eece99ebb 100644 --- a/src/org/traccar/protocol/H02ProtocolDecoder.java +++ b/src/org/traccar/protocol/H02ProtocolDecoder.java @@ -21,6 +21,7 @@ import io.netty.channel.Channel; import org.traccar.BaseProtocolDecoder; import org.traccar.DeviceSession; import org.traccar.NetworkMessage; +import org.traccar.Protocol; import org.traccar.helper.BcdUtil; import org.traccar.helper.BitUtil; import org.traccar.helper.DateBuilder; @@ -40,7 +41,7 @@ import java.util.regex.Pattern; public class H02ProtocolDecoder extends BaseProtocolDecoder { - public H02ProtocolDecoder(H02Protocol protocol) { + public H02ProtocolDecoder(Protocol protocol) { super(protocol); } diff --git a/src/org/traccar/protocol/HaicomProtocolDecoder.java b/src/org/traccar/protocol/HaicomProtocolDecoder.java index b828b5a16..dd20f2aeb 100644 --- a/src/org/traccar/protocol/HaicomProtocolDecoder.java +++ b/src/org/traccar/protocol/HaicomProtocolDecoder.java @@ -18,6 +18,7 @@ package org.traccar.protocol; import io.netty.channel.Channel; import org.traccar.BaseProtocolDecoder; import org.traccar.DeviceSession; +import org.traccar.Protocol; import org.traccar.helper.BitUtil; import org.traccar.helper.Parser; import org.traccar.helper.PatternBuilder; @@ -28,7 +29,7 @@ import java.util.regex.Pattern; public class HaicomProtocolDecoder extends BaseProtocolDecoder { - public HaicomProtocolDecoder(HaicomProtocol protocol) { + public HaicomProtocolDecoder(Protocol protocol) { super(protocol); } diff --git a/src/org/traccar/protocol/HomtecsProtocolDecoder.java b/src/org/traccar/protocol/HomtecsProtocolDecoder.java index 80294795e..a93572b5c 100644 --- a/src/org/traccar/protocol/HomtecsProtocolDecoder.java +++ b/src/org/traccar/protocol/HomtecsProtocolDecoder.java @@ -18,6 +18,7 @@ package org.traccar.protocol; import io.netty.channel.Channel; import org.traccar.BaseProtocolDecoder; import org.traccar.DeviceSession; +import org.traccar.Protocol; import org.traccar.helper.Parser; import org.traccar.helper.PatternBuilder; import org.traccar.model.Position; @@ -27,7 +28,7 @@ import java.util.regex.Pattern; public class HomtecsProtocolDecoder extends BaseProtocolDecoder { - public HomtecsProtocolDecoder(HomtecsProtocol protocol) { + public HomtecsProtocolDecoder(Protocol protocol) { super(protocol); } diff --git a/src/org/traccar/protocol/HuaShengProtocolDecoder.java b/src/org/traccar/protocol/HuaShengProtocolDecoder.java index ae57ef296..8a937a194 100644 --- a/src/org/traccar/protocol/HuaShengProtocolDecoder.java +++ b/src/org/traccar/protocol/HuaShengProtocolDecoder.java @@ -21,6 +21,7 @@ import io.netty.channel.Channel; import org.traccar.BaseProtocolDecoder; import org.traccar.DeviceSession; import org.traccar.NetworkMessage; +import org.traccar.Protocol; import org.traccar.helper.BitUtil; import org.traccar.helper.DateBuilder; import org.traccar.helper.UnitsConverter; @@ -31,7 +32,7 @@ import java.nio.charset.StandardCharsets; public class HuaShengProtocolDecoder extends BaseProtocolDecoder { - public HuaShengProtocolDecoder(HuaShengProtocol protocol) { + public HuaShengProtocolDecoder(Protocol protocol) { super(protocol); } diff --git a/src/org/traccar/protocol/HuabaoProtocolDecoder.java b/src/org/traccar/protocol/HuabaoProtocolDecoder.java index cda37650c..2eb75a710 100644 --- a/src/org/traccar/protocol/HuabaoProtocolDecoder.java +++ b/src/org/traccar/protocol/HuabaoProtocolDecoder.java @@ -22,6 +22,7 @@ import io.netty.channel.Channel; import org.traccar.BaseProtocolDecoder; import org.traccar.DeviceSession; import org.traccar.NetworkMessage; +import org.traccar.Protocol; import org.traccar.helper.BcdUtil; import org.traccar.helper.BitUtil; import org.traccar.helper.Checksum; @@ -36,7 +37,7 @@ import java.util.List; public class HuabaoProtocolDecoder extends BaseProtocolDecoder { - public HuabaoProtocolDecoder(HuabaoProtocol protocol) { + public HuabaoProtocolDecoder(Protocol protocol) { super(protocol); } diff --git a/src/org/traccar/protocol/HunterProProtocolDecoder.java b/src/org/traccar/protocol/HunterProProtocolDecoder.java index c166d151d..06bc12d59 100644 --- a/src/org/traccar/protocol/HunterProProtocolDecoder.java +++ b/src/org/traccar/protocol/HunterProProtocolDecoder.java @@ -18,6 +18,7 @@ package org.traccar.protocol; import io.netty.channel.Channel; import org.traccar.BaseProtocolDecoder; import org.traccar.DeviceSession; +import org.traccar.Protocol; import org.traccar.helper.DateBuilder; import org.traccar.helper.Parser; import org.traccar.helper.PatternBuilder; @@ -28,7 +29,7 @@ import java.util.regex.Pattern; public class HunterProProtocolDecoder extends BaseProtocolDecoder { - public HunterProProtocolDecoder(HunterProProtocol protocol) { + public HunterProProtocolDecoder(Protocol protocol) { super(protocol); } diff --git a/src/org/traccar/protocol/IntellitracProtocolDecoder.java b/src/org/traccar/protocol/IntellitracProtocolDecoder.java index fc9f749dd..897606270 100644 --- a/src/org/traccar/protocol/IntellitracProtocolDecoder.java +++ b/src/org/traccar/protocol/IntellitracProtocolDecoder.java @@ -18,6 +18,7 @@ package org.traccar.protocol; import io.netty.channel.Channel; import org.traccar.BaseProtocolDecoder; import org.traccar.DeviceSession; +import org.traccar.Protocol; import org.traccar.helper.Parser; import org.traccar.helper.PatternBuilder; import org.traccar.helper.UnitsConverter; @@ -28,7 +29,7 @@ import java.util.regex.Pattern; public class IntellitracProtocolDecoder extends BaseProtocolDecoder { - public IntellitracProtocolDecoder(IntellitracProtocol protocol) { + public IntellitracProtocolDecoder(Protocol protocol) { super(protocol); } diff --git a/src/org/traccar/protocol/ItsProtocolDecoder.java b/src/org/traccar/protocol/ItsProtocolDecoder.java index 79eca21ce..f6112d122 100644 --- a/src/org/traccar/protocol/ItsProtocolDecoder.java +++ b/src/org/traccar/protocol/ItsProtocolDecoder.java @@ -18,6 +18,7 @@ package org.traccar.protocol; import io.netty.channel.Channel; import org.traccar.BaseProtocolDecoder; import org.traccar.DeviceSession; +import org.traccar.Protocol; import org.traccar.helper.Parser; import org.traccar.helper.PatternBuilder; import org.traccar.helper.UnitsConverter; @@ -28,7 +29,7 @@ import java.util.regex.Pattern; public class ItsProtocolDecoder extends BaseProtocolDecoder { - public ItsProtocolDecoder(ItsProtocol protocol) { + public ItsProtocolDecoder(Protocol protocol) { super(protocol); } diff --git a/src/org/traccar/protocol/Ivt401ProtocolDecoder.java b/src/org/traccar/protocol/Ivt401ProtocolDecoder.java index 38dacb02b..63556e7a9 100644 --- a/src/org/traccar/protocol/Ivt401ProtocolDecoder.java +++ b/src/org/traccar/protocol/Ivt401ProtocolDecoder.java @@ -18,6 +18,7 @@ package org.traccar.protocol; import io.netty.channel.Channel; import org.traccar.BaseProtocolDecoder; import org.traccar.DeviceSession; +import org.traccar.Protocol; import org.traccar.helper.Parser; import org.traccar.helper.PatternBuilder; import org.traccar.helper.UnitsConverter; @@ -28,7 +29,7 @@ import java.util.regex.Pattern; public class Ivt401ProtocolDecoder extends BaseProtocolDecoder { - public Ivt401ProtocolDecoder(Ivt401Protocol protocol) { + public Ivt401ProtocolDecoder(Protocol protocol) { super(protocol); } diff --git a/src/org/traccar/protocol/JpKorjarProtocolDecoder.java b/src/org/traccar/protocol/JpKorjarProtocolDecoder.java index 860e3ea23..a8389d1b1 100644 --- a/src/org/traccar/protocol/JpKorjarProtocolDecoder.java +++ b/src/org/traccar/protocol/JpKorjarProtocolDecoder.java @@ -19,6 +19,7 @@ package org.traccar.protocol; import io.netty.channel.Channel; import org.traccar.BaseProtocolDecoder; import org.traccar.DeviceSession; +import org.traccar.Protocol; import org.traccar.helper.Parser; import org.traccar.helper.PatternBuilder; import org.traccar.model.CellTower; @@ -30,7 +31,7 @@ import java.util.regex.Pattern; public class JpKorjarProtocolDecoder extends BaseProtocolDecoder { - public JpKorjarProtocolDecoder(JpKorjarProtocol protocol) { + public JpKorjarProtocolDecoder(Protocol protocol) { super(protocol); } diff --git a/src/org/traccar/protocol/Jt600ProtocolDecoder.java b/src/org/traccar/protocol/Jt600ProtocolDecoder.java index 109f8a68a..1351706e2 100644 --- a/src/org/traccar/protocol/Jt600ProtocolDecoder.java +++ b/src/org/traccar/protocol/Jt600ProtocolDecoder.java @@ -21,6 +21,7 @@ import io.netty.channel.Channel; import org.traccar.BaseProtocolDecoder; import org.traccar.DeviceSession; import org.traccar.NetworkMessage; +import org.traccar.Protocol; import org.traccar.helper.BcdUtil; import org.traccar.helper.BitBuffer; import org.traccar.helper.BitUtil; @@ -40,7 +41,7 @@ import java.util.regex.Pattern; public class Jt600ProtocolDecoder extends BaseProtocolDecoder { - public Jt600ProtocolDecoder(Jt600Protocol protocol) { + public Jt600ProtocolDecoder(Protocol protocol) { super(protocol); } diff --git a/src/org/traccar/protocol/KenjiProtocolDecoder.java b/src/org/traccar/protocol/KenjiProtocolDecoder.java index 1fe1b6b9f..63812242a 100644 --- a/src/org/traccar/protocol/KenjiProtocolDecoder.java +++ b/src/org/traccar/protocol/KenjiProtocolDecoder.java @@ -18,6 +18,7 @@ package org.traccar.protocol; import io.netty.channel.Channel; import org.traccar.BaseProtocolDecoder; import org.traccar.DeviceSession; +import org.traccar.Protocol; import org.traccar.helper.BitUtil; import org.traccar.helper.DateBuilder; import org.traccar.helper.Parser; @@ -29,7 +30,7 @@ import java.util.regex.Pattern; public class KenjiProtocolDecoder extends BaseProtocolDecoder { - public KenjiProtocolDecoder(KenjiProtocol protocol) { + public KenjiProtocolDecoder(Protocol protocol) { super(protocol); } diff --git a/src/org/traccar/protocol/KhdProtocolDecoder.java b/src/org/traccar/protocol/KhdProtocolDecoder.java index 6aa4add9e..f186fc0d5 100644 --- a/src/org/traccar/protocol/KhdProtocolDecoder.java +++ b/src/org/traccar/protocol/KhdProtocolDecoder.java @@ -21,6 +21,7 @@ import io.netty.channel.Channel; import org.traccar.BaseProtocolDecoder; import org.traccar.DeviceSession; import org.traccar.NetworkMessage; +import org.traccar.Protocol; import org.traccar.helper.BcdUtil; import org.traccar.helper.Checksum; import org.traccar.helper.DateBuilder; @@ -31,7 +32,7 @@ import java.net.SocketAddress; public class KhdProtocolDecoder extends BaseProtocolDecoder { - public KhdProtocolDecoder(KhdProtocol protocol) { + public KhdProtocolDecoder(Protocol protocol) { super(protocol); } diff --git a/src/org/traccar/protocol/L100ProtocolDecoder.java b/src/org/traccar/protocol/L100ProtocolDecoder.java index 9bc2e21c1..07c5622cb 100644 --- a/src/org/traccar/protocol/L100ProtocolDecoder.java +++ b/src/org/traccar/protocol/L100ProtocolDecoder.java @@ -19,6 +19,7 @@ import io.netty.channel.Channel; import org.traccar.BaseProtocolDecoder; import org.traccar.DeviceSession; import org.traccar.NetworkMessage; +import org.traccar.Protocol; import org.traccar.helper.Checksum; import org.traccar.helper.DateBuilder; import org.traccar.helper.ObdDecoder; @@ -33,7 +34,7 @@ import java.util.regex.Pattern; public class L100ProtocolDecoder extends BaseProtocolDecoder { - public L100ProtocolDecoder(L100Protocol protocol) { + public L100ProtocolDecoder(Protocol protocol) { super(protocol); } diff --git a/src/org/traccar/protocol/LaipacProtocolDecoder.java b/src/org/traccar/protocol/LaipacProtocolDecoder.java index 9232cd6f0..2f3cbb1b9 100644 --- a/src/org/traccar/protocol/LaipacProtocolDecoder.java +++ b/src/org/traccar/protocol/LaipacProtocolDecoder.java @@ -19,6 +19,7 @@ import io.netty.channel.Channel; import org.traccar.BaseProtocolDecoder; import org.traccar.DeviceSession; import org.traccar.NetworkMessage; +import org.traccar.Protocol; import org.traccar.helper.Checksum; import org.traccar.helper.DateBuilder; import org.traccar.helper.Parser; @@ -32,7 +33,7 @@ import java.util.regex.Pattern; public class LaipacProtocolDecoder extends BaseProtocolDecoder { - public LaipacProtocolDecoder(LaipacProtocol protocol) { + public LaipacProtocolDecoder(Protocol protocol) { super(protocol); } diff --git a/src/org/traccar/protocol/M2cProtocolDecoder.java b/src/org/traccar/protocol/M2cProtocolDecoder.java index 67b2accb9..1460bb176 100644 --- a/src/org/traccar/protocol/M2cProtocolDecoder.java +++ b/src/org/traccar/protocol/M2cProtocolDecoder.java @@ -18,6 +18,7 @@ package org.traccar.protocol; import io.netty.channel.Channel; import org.traccar.BaseProtocolDecoder; import org.traccar.DeviceSession; +import org.traccar.Protocol; import org.traccar.helper.Parser; import org.traccar.helper.PatternBuilder; import org.traccar.helper.UnitsConverter; @@ -30,7 +31,7 @@ import java.util.regex.Pattern; public class M2cProtocolDecoder extends BaseProtocolDecoder { - public M2cProtocolDecoder(M2cProtocol protocol) { + public M2cProtocolDecoder(Protocol protocol) { super(protocol); } diff --git a/src/org/traccar/protocol/M2mProtocolDecoder.java b/src/org/traccar/protocol/M2mProtocolDecoder.java index 7bb704904..21e4a2fd0 100644 --- a/src/org/traccar/protocol/M2mProtocolDecoder.java +++ b/src/org/traccar/protocol/M2mProtocolDecoder.java @@ -19,6 +19,7 @@ import io.netty.buffer.ByteBuf; import io.netty.channel.Channel; import org.traccar.BaseProtocolDecoder; import org.traccar.DeviceSession; +import org.traccar.Protocol; import org.traccar.helper.DateBuilder; import org.traccar.model.Position; @@ -26,7 +27,7 @@ import java.net.SocketAddress; public class M2mProtocolDecoder extends BaseProtocolDecoder { - public M2mProtocolDecoder(M2mProtocol protocol) { + public M2mProtocolDecoder(Protocol protocol) { super(protocol); } diff --git a/src/org/traccar/protocol/MaestroProtocolDecoder.java b/src/org/traccar/protocol/MaestroProtocolDecoder.java index 32072007e..37b097414 100644 --- a/src/org/traccar/protocol/MaestroProtocolDecoder.java +++ b/src/org/traccar/protocol/MaestroProtocolDecoder.java @@ -18,6 +18,7 @@ package org.traccar.protocol; import io.netty.channel.Channel; import org.traccar.BaseProtocolDecoder; import org.traccar.DeviceSession; +import org.traccar.Protocol; import org.traccar.helper.Parser; import org.traccar.helper.PatternBuilder; import org.traccar.helper.UnitsConverter; @@ -28,7 +29,7 @@ import java.util.regex.Pattern; public class MaestroProtocolDecoder extends BaseProtocolDecoder { - public MaestroProtocolDecoder(MaestroProtocol protocol) { + public MaestroProtocolDecoder(Protocol protocol) { super(protocol); } diff --git a/src/org/traccar/protocol/ManPowerProtocolDecoder.java b/src/org/traccar/protocol/ManPowerProtocolDecoder.java index d1b6bdc72..2c7b7eb40 100644 --- a/src/org/traccar/protocol/ManPowerProtocolDecoder.java +++ b/src/org/traccar/protocol/ManPowerProtocolDecoder.java @@ -18,6 +18,7 @@ package org.traccar.protocol; import io.netty.channel.Channel; import org.traccar.BaseProtocolDecoder; import org.traccar.DeviceSession; +import org.traccar.Protocol; import org.traccar.helper.Parser; import org.traccar.helper.PatternBuilder; import org.traccar.model.Position; @@ -27,7 +28,7 @@ import java.util.regex.Pattern; public class ManPowerProtocolDecoder extends BaseProtocolDecoder { - public ManPowerProtocolDecoder(ManPowerProtocol protocol) { + public ManPowerProtocolDecoder(Protocol protocol) { super(protocol); } diff --git a/src/org/traccar/protocol/MegastekProtocolDecoder.java b/src/org/traccar/protocol/MegastekProtocolDecoder.java index c57d755c7..d81cc0eda 100644 --- a/src/org/traccar/protocol/MegastekProtocolDecoder.java +++ b/src/org/traccar/protocol/MegastekProtocolDecoder.java @@ -18,6 +18,7 @@ package org.traccar.protocol; import io.netty.channel.Channel; import org.traccar.BaseProtocolDecoder; import org.traccar.DeviceSession; +import org.traccar.Protocol; import org.traccar.helper.DateBuilder; import org.traccar.helper.Parser; import org.traccar.helper.PatternBuilder; @@ -30,7 +31,7 @@ import java.util.regex.Pattern; public class MegastekProtocolDecoder extends BaseProtocolDecoder { - public MegastekProtocolDecoder(MegastekProtocol protocol) { + public MegastekProtocolDecoder(Protocol protocol) { super(protocol); } diff --git a/src/org/traccar/protocol/MeiligaoProtocolDecoder.java b/src/org/traccar/protocol/MeiligaoProtocolDecoder.java index 9fbd053eb..06ecba357 100644 --- a/src/org/traccar/protocol/MeiligaoProtocolDecoder.java +++ b/src/org/traccar/protocol/MeiligaoProtocolDecoder.java @@ -22,6 +22,7 @@ import org.traccar.BaseProtocolDecoder; import org.traccar.Context; import org.traccar.DeviceSession; import org.traccar.NetworkMessage; +import org.traccar.Protocol; import org.traccar.helper.BitUtil; import org.traccar.helper.Checksum; import org.traccar.helper.DateBuilder; @@ -41,7 +42,7 @@ public class MeiligaoProtocolDecoder extends BaseProtocolDecoder { private Map photos = new HashMap<>(); - public MeiligaoProtocolDecoder(MeiligaoProtocol protocol) { + public MeiligaoProtocolDecoder(Protocol protocol) { super(protocol); } diff --git a/src/org/traccar/protocol/MeitrackProtocolDecoder.java b/src/org/traccar/protocol/MeitrackProtocolDecoder.java index 9c4bcdd09..55260ef0c 100644 --- a/src/org/traccar/protocol/MeitrackProtocolDecoder.java +++ b/src/org/traccar/protocol/MeitrackProtocolDecoder.java @@ -22,6 +22,7 @@ import org.traccar.BaseProtocolDecoder; import org.traccar.Context; import org.traccar.DeviceSession; import org.traccar.NetworkMessage; +import org.traccar.Protocol; import org.traccar.helper.Checksum; import org.traccar.helper.Parser; import org.traccar.helper.PatternBuilder; @@ -41,7 +42,7 @@ public class MeitrackProtocolDecoder extends BaseProtocolDecoder { private ByteBuf photo; - public MeitrackProtocolDecoder(MeitrackProtocol protocol) { + public MeitrackProtocolDecoder(Protocol protocol) { super(protocol); } diff --git a/src/org/traccar/protocol/MilesmateProtocolDecoder.java b/src/org/traccar/protocol/MilesmateProtocolDecoder.java index 62d81e5a1..901ceb8f7 100644 --- a/src/org/traccar/protocol/MilesmateProtocolDecoder.java +++ b/src/org/traccar/protocol/MilesmateProtocolDecoder.java @@ -19,6 +19,7 @@ import io.netty.channel.Channel; import org.traccar.BaseProtocolDecoder; import org.traccar.DeviceSession; import org.traccar.NetworkMessage; +import org.traccar.Protocol; import org.traccar.helper.DateBuilder; import org.traccar.helper.Parser; import org.traccar.helper.PatternBuilder; @@ -30,7 +31,7 @@ import java.util.regex.Pattern; public class MilesmateProtocolDecoder extends BaseProtocolDecoder { - public MilesmateProtocolDecoder(MilesmateProtocol protocol) { + public MilesmateProtocolDecoder(Protocol protocol) { super(protocol); } diff --git a/src/org/traccar/protocol/MiniFinderProtocolDecoder.java b/src/org/traccar/protocol/MiniFinderProtocolDecoder.java index d7af66ba7..9ea8de0bf 100644 --- a/src/org/traccar/protocol/MiniFinderProtocolDecoder.java +++ b/src/org/traccar/protocol/MiniFinderProtocolDecoder.java @@ -18,6 +18,7 @@ package org.traccar.protocol; import io.netty.channel.Channel; import org.traccar.BaseProtocolDecoder; import org.traccar.DeviceSession; +import org.traccar.Protocol; import org.traccar.helper.BitUtil; import org.traccar.helper.Parser; import org.traccar.helper.PatternBuilder; @@ -29,7 +30,7 @@ import java.util.regex.Pattern; public class MiniFinderProtocolDecoder extends BaseProtocolDecoder { - public MiniFinderProtocolDecoder(MiniFinderProtocol protocol) { + public MiniFinderProtocolDecoder(Protocol protocol) { super(protocol); } diff --git a/src/org/traccar/protocol/MtxProtocolDecoder.java b/src/org/traccar/protocol/MtxProtocolDecoder.java index 18bce399f..d1207bedf 100644 --- a/src/org/traccar/protocol/MtxProtocolDecoder.java +++ b/src/org/traccar/protocol/MtxProtocolDecoder.java @@ -19,6 +19,7 @@ import io.netty.channel.Channel; import org.traccar.BaseProtocolDecoder; import org.traccar.DeviceSession; import org.traccar.NetworkMessage; +import org.traccar.Protocol; import org.traccar.helper.Parser; import org.traccar.helper.PatternBuilder; import org.traccar.model.Position; @@ -28,7 +29,7 @@ import java.util.regex.Pattern; public class MtxProtocolDecoder extends BaseProtocolDecoder { - public MtxProtocolDecoder(MtxProtocol protocol) { + public MtxProtocolDecoder(Protocol protocol) { super(protocol); } diff --git a/src/org/traccar/protocol/MxtProtocolDecoder.java b/src/org/traccar/protocol/MxtProtocolDecoder.java index d6029c6d0..7bde85f87 100644 --- a/src/org/traccar/protocol/MxtProtocolDecoder.java +++ b/src/org/traccar/protocol/MxtProtocolDecoder.java @@ -21,6 +21,7 @@ import io.netty.channel.Channel; import org.traccar.BaseProtocolDecoder; import org.traccar.DeviceSession; import org.traccar.NetworkMessage; +import org.traccar.Protocol; import org.traccar.helper.BitUtil; import org.traccar.helper.Checksum; import org.traccar.helper.DateBuilder; @@ -31,7 +32,7 @@ import java.net.SocketAddress; public class MxtProtocolDecoder extends BaseProtocolDecoder { - public MxtProtocolDecoder(MxtProtocol protocol) { + public MxtProtocolDecoder(Protocol protocol) { super(protocol); } diff --git a/src/org/traccar/protocol/NavigilProtocolDecoder.java b/src/org/traccar/protocol/NavigilProtocolDecoder.java index c330907f7..db5521201 100644 --- a/src/org/traccar/protocol/NavigilProtocolDecoder.java +++ b/src/org/traccar/protocol/NavigilProtocolDecoder.java @@ -21,6 +21,7 @@ import io.netty.channel.Channel; import org.traccar.BaseProtocolDecoder; import org.traccar.DeviceSession; import org.traccar.NetworkMessage; +import org.traccar.Protocol; import org.traccar.helper.Checksum; import org.traccar.helper.UnitsConverter; import org.traccar.model.Position; @@ -30,7 +31,7 @@ import java.util.Date; public class NavigilProtocolDecoder extends BaseProtocolDecoder { - public NavigilProtocolDecoder(NavigilProtocol protocol) { + public NavigilProtocolDecoder(Protocol protocol) { super(protocol); } diff --git a/src/org/traccar/protocol/NavisProtocolDecoder.java b/src/org/traccar/protocol/NavisProtocolDecoder.java index 8da94b9aa..33404c41f 100644 --- a/src/org/traccar/protocol/NavisProtocolDecoder.java +++ b/src/org/traccar/protocol/NavisProtocolDecoder.java @@ -21,6 +21,7 @@ import io.netty.channel.Channel; import org.traccar.BaseProtocolDecoder; import org.traccar.DeviceSession; import org.traccar.NetworkMessage; +import org.traccar.Protocol; import org.traccar.helper.BitUtil; import org.traccar.helper.DateBuilder; import org.traccar.helper.UnitsConverter; @@ -36,7 +37,7 @@ public class NavisProtocolDecoder extends BaseProtocolDecoder { private String prefix; private long deviceUniqueId, serverId; - public NavisProtocolDecoder(NavisProtocol protocol) { + public NavisProtocolDecoder(Protocol protocol) { super(protocol); } diff --git a/src/org/traccar/protocol/NoranProtocolDecoder.java b/src/org/traccar/protocol/NoranProtocolDecoder.java index 65bd64384..53dae7fd6 100644 --- a/src/org/traccar/protocol/NoranProtocolDecoder.java +++ b/src/org/traccar/protocol/NoranProtocolDecoder.java @@ -21,6 +21,7 @@ import io.netty.channel.Channel; import org.traccar.BaseProtocolDecoder; import org.traccar.DeviceSession; import org.traccar.NetworkMessage; +import org.traccar.Protocol; import org.traccar.helper.BitUtil; import org.traccar.helper.DateBuilder; import org.traccar.helper.UnitsConverter; @@ -33,7 +34,7 @@ import java.text.SimpleDateFormat; public class NoranProtocolDecoder extends BaseProtocolDecoder { - public NoranProtocolDecoder(NoranProtocol protocol) { + public NoranProtocolDecoder(Protocol protocol) { super(protocol); } diff --git a/src/org/traccar/protocol/NvsProtocolDecoder.java b/src/org/traccar/protocol/NvsProtocolDecoder.java index 46909ff0c..5d1159f7d 100644 --- a/src/org/traccar/protocol/NvsProtocolDecoder.java +++ b/src/org/traccar/protocol/NvsProtocolDecoder.java @@ -21,6 +21,7 @@ import io.netty.channel.Channel; import org.traccar.BaseProtocolDecoder; import org.traccar.DeviceSession; import org.traccar.NetworkMessage; +import org.traccar.Protocol; import org.traccar.helper.UnitsConverter; import org.traccar.model.Position; @@ -32,7 +33,7 @@ import java.util.List; public class NvsProtocolDecoder extends BaseProtocolDecoder { - public NvsProtocolDecoder(NvsProtocol protocol) { + public NvsProtocolDecoder(Protocol protocol) { super(protocol); } diff --git a/src/org/traccar/protocol/ObdDongleProtocolDecoder.java b/src/org/traccar/protocol/ObdDongleProtocolDecoder.java index 2f96bbac5..1c9771ce9 100644 --- a/src/org/traccar/protocol/ObdDongleProtocolDecoder.java +++ b/src/org/traccar/protocol/ObdDongleProtocolDecoder.java @@ -21,6 +21,7 @@ import io.netty.channel.Channel; import org.traccar.BaseProtocolDecoder; import org.traccar.DeviceSession; import org.traccar.NetworkMessage; +import org.traccar.Protocol; import org.traccar.helper.BitUtil; import org.traccar.helper.UnitsConverter; import org.traccar.model.Position; @@ -31,7 +32,7 @@ import java.util.Date; public class ObdDongleProtocolDecoder extends BaseProtocolDecoder { - public ObdDongleProtocolDecoder(ObdDongleProtocol protocol) { + public ObdDongleProtocolDecoder(Protocol protocol) { super(protocol); } diff --git a/src/org/traccar/protocol/OigoProtocolDecoder.java b/src/org/traccar/protocol/OigoProtocolDecoder.java index fe356f7cf..b9cc71e8c 100644 --- a/src/org/traccar/protocol/OigoProtocolDecoder.java +++ b/src/org/traccar/protocol/OigoProtocolDecoder.java @@ -22,6 +22,7 @@ import io.netty.channel.Channel; import org.traccar.BaseProtocolDecoder; import org.traccar.DeviceSession; import org.traccar.NetworkMessage; +import org.traccar.Protocol; import org.traccar.helper.BitUtil; import org.traccar.helper.DateBuilder; import org.traccar.helper.UnitsConverter; @@ -32,7 +33,7 @@ import java.nio.charset.StandardCharsets; public class OigoProtocolDecoder extends BaseProtocolDecoder { - public OigoProtocolDecoder(OigoProtocol protocol) { + public OigoProtocolDecoder(Protocol protocol) { super(protocol); } diff --git a/src/org/traccar/protocol/OkoProtocolDecoder.java b/src/org/traccar/protocol/OkoProtocolDecoder.java index 0318c30c7..5adf61494 100644 --- a/src/org/traccar/protocol/OkoProtocolDecoder.java +++ b/src/org/traccar/protocol/OkoProtocolDecoder.java @@ -18,6 +18,7 @@ package org.traccar.protocol; import io.netty.channel.Channel; import org.traccar.BaseProtocolDecoder; import org.traccar.DeviceSession; +import org.traccar.Protocol; import org.traccar.helper.DateBuilder; import org.traccar.helper.Parser; import org.traccar.helper.PatternBuilder; @@ -28,7 +29,7 @@ import java.util.regex.Pattern; public class OkoProtocolDecoder extends BaseProtocolDecoder { - public OkoProtocolDecoder(OkoProtocol protocol) { + public OkoProtocolDecoder(Protocol protocol) { super(protocol); } diff --git a/src/org/traccar/protocol/OpenGtsProtocolDecoder.java b/src/org/traccar/protocol/OpenGtsProtocolDecoder.java index c854ad491..b76cbfa85 100644 --- a/src/org/traccar/protocol/OpenGtsProtocolDecoder.java +++ b/src/org/traccar/protocol/OpenGtsProtocolDecoder.java @@ -21,6 +21,7 @@ import io.netty.handler.codec.http.HttpResponseStatus; import io.netty.handler.codec.http.QueryStringDecoder; import org.traccar.BaseHttpProtocolDecoder; import org.traccar.DeviceSession; +import org.traccar.Protocol; import org.traccar.helper.DateBuilder; import org.traccar.helper.Parser; import org.traccar.helper.PatternBuilder; @@ -47,7 +48,7 @@ public class OpenGtsProtocolDecoder extends BaseHttpProtocolDecoder { .any() .compile(); - public OpenGtsProtocolDecoder(OpenGtsProtocol protocol) { + public OpenGtsProtocolDecoder(Protocol protocol) { super(protocol); } diff --git a/src/org/traccar/protocol/OrionProtocolDecoder.java b/src/org/traccar/protocol/OrionProtocolDecoder.java index bbc509bec..af819989e 100644 --- a/src/org/traccar/protocol/OrionProtocolDecoder.java +++ b/src/org/traccar/protocol/OrionProtocolDecoder.java @@ -21,6 +21,7 @@ import io.netty.channel.Channel; import org.traccar.BaseProtocolDecoder; import org.traccar.DeviceSession; import org.traccar.NetworkMessage; +import org.traccar.Protocol; import org.traccar.helper.DateBuilder; import org.traccar.model.Position; @@ -30,7 +31,7 @@ import java.util.List; public class OrionProtocolDecoder extends BaseProtocolDecoder { - public OrionProtocolDecoder(OrionProtocol protocol) { + public OrionProtocolDecoder(Protocol protocol) { super(protocol); } diff --git a/src/org/traccar/protocol/OsmAndProtocolDecoder.java b/src/org/traccar/protocol/OsmAndProtocolDecoder.java index ab2bc7c7d..e2aaeb7b6 100644 --- a/src/org/traccar/protocol/OsmAndProtocolDecoder.java +++ b/src/org/traccar/protocol/OsmAndProtocolDecoder.java @@ -22,6 +22,7 @@ import io.netty.handler.codec.http.QueryStringDecoder; import org.traccar.BaseHttpProtocolDecoder; import org.traccar.Context; import org.traccar.DeviceSession; +import org.traccar.Protocol; import org.traccar.model.CellTower; import org.traccar.model.Network; import org.traccar.model.Position; @@ -38,7 +39,7 @@ import java.util.Map; public class OsmAndProtocolDecoder extends BaseHttpProtocolDecoder { - public OsmAndProtocolDecoder(OsmAndProtocol protocol) { + public OsmAndProtocolDecoder(Protocol protocol) { super(protocol); } diff --git a/src/org/traccar/protocol/OwnTracksProtocolDecoder.java b/src/org/traccar/protocol/OwnTracksProtocolDecoder.java index 00a63d712..f38c8ef25 100644 --- a/src/org/traccar/protocol/OwnTracksProtocolDecoder.java +++ b/src/org/traccar/protocol/OwnTracksProtocolDecoder.java @@ -21,6 +21,7 @@ import io.netty.handler.codec.http.FullHttpRequest; import io.netty.handler.codec.http.HttpResponseStatus; import org.traccar.BaseHttpProtocolDecoder; import org.traccar.DeviceSession; +import org.traccar.Protocol; import org.traccar.helper.UnitsConverter; import org.traccar.model.Position; @@ -33,7 +34,7 @@ import java.util.Date; public class OwnTracksProtocolDecoder extends BaseHttpProtocolDecoder { - public OwnTracksProtocolDecoder(OwnTracksProtocol protocol) { + public OwnTracksProtocolDecoder(Protocol protocol) { super(protocol); } diff --git a/src/org/traccar/protocol/PathAwayProtocolDecoder.java b/src/org/traccar/protocol/PathAwayProtocolDecoder.java index 40e68a5d2..02a15e34a 100644 --- a/src/org/traccar/protocol/PathAwayProtocolDecoder.java +++ b/src/org/traccar/protocol/PathAwayProtocolDecoder.java @@ -26,6 +26,7 @@ import io.netty.handler.codec.http.QueryStringDecoder; import org.traccar.BaseProtocolDecoder; import org.traccar.DeviceSession; import org.traccar.NetworkMessage; +import org.traccar.Protocol; import org.traccar.helper.Parser; import org.traccar.helper.PatternBuilder; import org.traccar.model.Position; @@ -35,7 +36,7 @@ import java.util.regex.Pattern; public class PathAwayProtocolDecoder extends BaseProtocolDecoder { - public PathAwayProtocolDecoder(PathAwayProtocol protocol) { + public PathAwayProtocolDecoder(Protocol protocol) { super(protocol); } diff --git a/src/org/traccar/protocol/PiligrimProtocolDecoder.java b/src/org/traccar/protocol/PiligrimProtocolDecoder.java index a1850df54..47aa86da7 100644 --- a/src/org/traccar/protocol/PiligrimProtocolDecoder.java +++ b/src/org/traccar/protocol/PiligrimProtocolDecoder.java @@ -27,6 +27,7 @@ import io.netty.handler.codec.http.QueryStringDecoder; import org.traccar.BaseProtocolDecoder; import org.traccar.DeviceSession; import org.traccar.NetworkMessage; +import org.traccar.Protocol; import org.traccar.helper.BitUtil; import org.traccar.helper.DateBuilder; import org.traccar.model.Position; @@ -38,7 +39,7 @@ import java.util.List; public class PiligrimProtocolDecoder extends BaseProtocolDecoder { - public PiligrimProtocolDecoder(PiligrimProtocol protocol) { + public PiligrimProtocolDecoder(Protocol protocol) { super(protocol); } diff --git a/src/org/traccar/protocol/PretraceProtocolDecoder.java b/src/org/traccar/protocol/PretraceProtocolDecoder.java index fc0245c0e..a19384e62 100644 --- a/src/org/traccar/protocol/PretraceProtocolDecoder.java +++ b/src/org/traccar/protocol/PretraceProtocolDecoder.java @@ -18,6 +18,7 @@ package org.traccar.protocol; import io.netty.channel.Channel; import org.traccar.BaseProtocolDecoder; import org.traccar.DeviceSession; +import org.traccar.Protocol; import org.traccar.helper.Parser; import org.traccar.helper.PatternBuilder; import org.traccar.helper.UnitsConverter; @@ -28,7 +29,7 @@ import java.util.regex.Pattern; public class PretraceProtocolDecoder extends BaseProtocolDecoder { - public PretraceProtocolDecoder(PretraceProtocol protocol) { + public PretraceProtocolDecoder(Protocol protocol) { super(protocol); } diff --git a/src/org/traccar/protocol/PricolProtocolDecoder.java b/src/org/traccar/protocol/PricolProtocolDecoder.java index b76e5f27f..190c68258 100644 --- a/src/org/traccar/protocol/PricolProtocolDecoder.java +++ b/src/org/traccar/protocol/PricolProtocolDecoder.java @@ -21,6 +21,7 @@ import io.netty.channel.Channel; import org.traccar.BaseProtocolDecoder; import org.traccar.DeviceSession; import org.traccar.NetworkMessage; +import org.traccar.Protocol; import org.traccar.helper.DateBuilder; import org.traccar.helper.UnitsConverter; import org.traccar.model.Position; @@ -30,7 +31,7 @@ import java.nio.charset.StandardCharsets; public class PricolProtocolDecoder extends BaseProtocolDecoder { - public PricolProtocolDecoder(PricolProtocol protocol) { + public PricolProtocolDecoder(Protocol protocol) { super(protocol); } diff --git a/src/org/traccar/protocol/ProgressProtocolDecoder.java b/src/org/traccar/protocol/ProgressProtocolDecoder.java index dca0e649e..0025cd9e7 100644 --- a/src/org/traccar/protocol/ProgressProtocolDecoder.java +++ b/src/org/traccar/protocol/ProgressProtocolDecoder.java @@ -22,6 +22,7 @@ import io.netty.channel.Channel; import org.traccar.BaseProtocolDecoder; import org.traccar.DeviceSession; import org.traccar.NetworkMessage; +import org.traccar.Protocol; import org.traccar.helper.BitUtil; import org.traccar.model.Position; @@ -36,7 +37,7 @@ public class ProgressProtocolDecoder extends BaseProtocolDecoder { private long lastIndex; private long newIndex; - public ProgressProtocolDecoder(ProgressProtocol protocol) { + public ProgressProtocolDecoder(Protocol protocol) { super(protocol); } diff --git a/src/org/traccar/protocol/Pt3000ProtocolDecoder.java b/src/org/traccar/protocol/Pt3000ProtocolDecoder.java index 8e9d99d14..e7f9e062a 100644 --- a/src/org/traccar/protocol/Pt3000ProtocolDecoder.java +++ b/src/org/traccar/protocol/Pt3000ProtocolDecoder.java @@ -18,6 +18,7 @@ package org.traccar.protocol; import io.netty.channel.Channel; import org.traccar.BaseProtocolDecoder; import org.traccar.DeviceSession; +import org.traccar.Protocol; import org.traccar.helper.DateBuilder; import org.traccar.helper.Parser; import org.traccar.helper.PatternBuilder; @@ -28,7 +29,7 @@ import java.util.regex.Pattern; public class Pt3000ProtocolDecoder extends BaseProtocolDecoder { - public Pt3000ProtocolDecoder(Pt3000Protocol protocol) { + public Pt3000ProtocolDecoder(Protocol protocol) { super(protocol); } diff --git a/src/org/traccar/protocol/Pt502ProtocolDecoder.java b/src/org/traccar/protocol/Pt502ProtocolDecoder.java index e0aea693a..12210652b 100644 --- a/src/org/traccar/protocol/Pt502ProtocolDecoder.java +++ b/src/org/traccar/protocol/Pt502ProtocolDecoder.java @@ -23,6 +23,7 @@ import org.traccar.BaseProtocolDecoder; import org.traccar.Context; import org.traccar.DeviceSession; import org.traccar.NetworkMessage; +import org.traccar.Protocol; import org.traccar.helper.DateBuilder; import org.traccar.helper.Parser; import org.traccar.helper.PatternBuilder; @@ -38,7 +39,7 @@ public class Pt502ProtocolDecoder extends BaseProtocolDecoder { private ByteBuf photo; - public Pt502ProtocolDecoder(Pt502Protocol protocol) { + public Pt502ProtocolDecoder(Protocol protocol) { super(protocol); } diff --git a/src/org/traccar/protocol/Pt60ProtocolDecoder.java b/src/org/traccar/protocol/Pt60ProtocolDecoder.java index 63dd3c90b..7027115f7 100644 --- a/src/org/traccar/protocol/Pt60ProtocolDecoder.java +++ b/src/org/traccar/protocol/Pt60ProtocolDecoder.java @@ -19,6 +19,7 @@ import io.netty.channel.Channel; import org.traccar.BaseProtocolDecoder; import org.traccar.DeviceSession; import org.traccar.NetworkMessage; +import org.traccar.Protocol; import org.traccar.helper.Parser; import org.traccar.helper.PatternBuilder; import org.traccar.model.Position; @@ -31,7 +32,7 @@ import java.util.regex.Pattern; public class Pt60ProtocolDecoder extends BaseProtocolDecoder { - public Pt60ProtocolDecoder(Pt60Protocol protocol) { + public Pt60ProtocolDecoder(Protocol protocol) { super(protocol); } diff --git a/src/org/traccar/protocol/RaveonProtocolDecoder.java b/src/org/traccar/protocol/RaveonProtocolDecoder.java index 099c188ac..50acd20a1 100644 --- a/src/org/traccar/protocol/RaveonProtocolDecoder.java +++ b/src/org/traccar/protocol/RaveonProtocolDecoder.java @@ -18,6 +18,7 @@ package org.traccar.protocol; import io.netty.channel.Channel; import org.traccar.BaseProtocolDecoder; import org.traccar.DeviceSession; +import org.traccar.Protocol; import org.traccar.helper.Parser; import org.traccar.helper.PatternBuilder; import org.traccar.helper.UnitsConverter; @@ -28,7 +29,7 @@ import java.util.regex.Pattern; public class RaveonProtocolDecoder extends BaseProtocolDecoder { - public RaveonProtocolDecoder(RaveonProtocol protocol) { + public RaveonProtocolDecoder(Protocol protocol) { super(protocol); } diff --git a/src/org/traccar/protocol/RecodaProtocolDecoder.java b/src/org/traccar/protocol/RecodaProtocolDecoder.java index eef1cb5af..04098225f 100644 --- a/src/org/traccar/protocol/RecodaProtocolDecoder.java +++ b/src/org/traccar/protocol/RecodaProtocolDecoder.java @@ -19,6 +19,7 @@ import io.netty.buffer.ByteBuf; import io.netty.channel.Channel; import org.traccar.BaseProtocolDecoder; import org.traccar.DeviceSession; +import org.traccar.Protocol; import org.traccar.helper.BitUtil; import org.traccar.helper.UnitsConverter; import org.traccar.model.Position; @@ -29,7 +30,7 @@ import java.util.Date; public class RecodaProtocolDecoder extends BaseProtocolDecoder { - public RecodaProtocolDecoder(RecodaProtocol protocol) { + public RecodaProtocolDecoder(Protocol protocol) { super(protocol); } diff --git a/src/org/traccar/protocol/RetranslatorProtocolDecoder.java b/src/org/traccar/protocol/RetranslatorProtocolDecoder.java index b31dce5d7..0688c9b0e 100644 --- a/src/org/traccar/protocol/RetranslatorProtocolDecoder.java +++ b/src/org/traccar/protocol/RetranslatorProtocolDecoder.java @@ -21,6 +21,7 @@ import io.netty.channel.Channel; import org.traccar.BaseProtocolDecoder; import org.traccar.DeviceSession; import org.traccar.NetworkMessage; +import org.traccar.Protocol; import org.traccar.model.Position; import java.net.SocketAddress; @@ -29,7 +30,7 @@ import java.util.Date; public class RetranslatorProtocolDecoder extends BaseProtocolDecoder { - public RetranslatorProtocolDecoder(RetranslatorProtocol protocol) { + public RetranslatorProtocolDecoder(Protocol protocol) { super(protocol); } diff --git a/src/org/traccar/protocol/RitiProtocolDecoder.java b/src/org/traccar/protocol/RitiProtocolDecoder.java index 4488db006..46267ca90 100644 --- a/src/org/traccar/protocol/RitiProtocolDecoder.java +++ b/src/org/traccar/protocol/RitiProtocolDecoder.java @@ -19,6 +19,7 @@ import io.netty.buffer.ByteBuf; import io.netty.channel.Channel; import org.traccar.BaseProtocolDecoder; import org.traccar.DeviceSession; +import org.traccar.Protocol; import org.traccar.helper.DateBuilder; import org.traccar.helper.Parser; import org.traccar.helper.PatternBuilder; @@ -30,7 +31,7 @@ import java.util.regex.Pattern; public class RitiProtocolDecoder extends BaseProtocolDecoder { - public RitiProtocolDecoder(RitiProtocol protocol) { + public RitiProtocolDecoder(Protocol protocol) { super(protocol); } diff --git a/src/org/traccar/protocol/RoboTrackProtocolDecoder.java b/src/org/traccar/protocol/RoboTrackProtocolDecoder.java index 587f9b8f7..b613f31d7 100644 --- a/src/org/traccar/protocol/RoboTrackProtocolDecoder.java +++ b/src/org/traccar/protocol/RoboTrackProtocolDecoder.java @@ -21,6 +21,7 @@ import io.netty.channel.Channel; import org.traccar.BaseProtocolDecoder; import org.traccar.DeviceSession; import org.traccar.NetworkMessage; +import org.traccar.Protocol; import org.traccar.helper.BitUtil; import org.traccar.helper.UnitsConverter; import org.traccar.model.CellTower; @@ -33,7 +34,7 @@ import java.util.Date; public class RoboTrackProtocolDecoder extends BaseProtocolDecoder { - public RoboTrackProtocolDecoder(RoboTrackProtocol protocol) { + public RoboTrackProtocolDecoder(Protocol protocol) { super(protocol); } diff --git a/src/org/traccar/protocol/RuptelaProtocolDecoder.java b/src/org/traccar/protocol/RuptelaProtocolDecoder.java index e5d196fed..b043b6201 100644 --- a/src/org/traccar/protocol/RuptelaProtocolDecoder.java +++ b/src/org/traccar/protocol/RuptelaProtocolDecoder.java @@ -21,6 +21,7 @@ import io.netty.channel.Channel; import org.traccar.BaseProtocolDecoder; import org.traccar.DeviceSession; import org.traccar.NetworkMessage; +import org.traccar.Protocol; import org.traccar.helper.DataConverter; import org.traccar.helper.UnitsConverter; import org.traccar.model.Position; @@ -33,7 +34,7 @@ import java.util.List; public class RuptelaProtocolDecoder extends BaseProtocolDecoder { - public RuptelaProtocolDecoder(RuptelaProtocol protocol) { + public RuptelaProtocolDecoder(Protocol protocol) { super(protocol); } diff --git a/src/org/traccar/protocol/SabertekProtocolDecoder.java b/src/org/traccar/protocol/SabertekProtocolDecoder.java index 8b7f2fb44..3033aa2cc 100644 --- a/src/org/traccar/protocol/SabertekProtocolDecoder.java +++ b/src/org/traccar/protocol/SabertekProtocolDecoder.java @@ -20,6 +20,7 @@ import io.netty.channel.Channel; import org.traccar.BaseProtocolDecoder; import org.traccar.DeviceSession; import org.traccar.NetworkMessage; +import org.traccar.Protocol; import org.traccar.helper.BitUtil; import org.traccar.helper.Parser; import org.traccar.helper.PatternBuilder; @@ -32,7 +33,7 @@ import java.util.regex.Pattern; public class SabertekProtocolDecoder extends BaseProtocolDecoder { - public SabertekProtocolDecoder(SabertekProtocol protocol) { + public SabertekProtocolDecoder(Protocol protocol) { super(protocol); } diff --git a/src/org/traccar/protocol/SanavProtocolDecoder.java b/src/org/traccar/protocol/SanavProtocolDecoder.java index 763b51d04..7e1c158e6 100644 --- a/src/org/traccar/protocol/SanavProtocolDecoder.java +++ b/src/org/traccar/protocol/SanavProtocolDecoder.java @@ -18,6 +18,7 @@ package org.traccar.protocol; import io.netty.channel.Channel; import org.traccar.BaseProtocolDecoder; import org.traccar.DeviceSession; +import org.traccar.Protocol; import org.traccar.helper.BitUtil; import org.traccar.helper.DateBuilder; import org.traccar.helper.Parser; @@ -29,7 +30,7 @@ import java.util.regex.Pattern; public class SanavProtocolDecoder extends BaseProtocolDecoder { - public SanavProtocolDecoder(SanavProtocol protocol) { + public SanavProtocolDecoder(Protocol protocol) { super(protocol); } diff --git a/src/org/traccar/protocol/SigfoxProtocolDecoder.java b/src/org/traccar/protocol/SigfoxProtocolDecoder.java index f18eb015b..d7836b35d 100644 --- a/src/org/traccar/protocol/SigfoxProtocolDecoder.java +++ b/src/org/traccar/protocol/SigfoxProtocolDecoder.java @@ -22,6 +22,7 @@ import io.netty.handler.codec.http.FullHttpRequest; import io.netty.handler.codec.http.HttpResponseStatus; import org.traccar.BaseHttpProtocolDecoder; import org.traccar.DeviceSession; +import org.traccar.Protocol; import org.traccar.helper.DataConverter; import org.traccar.helper.UnitsConverter; import org.traccar.model.Position; @@ -36,7 +37,7 @@ import java.util.Date; public class SigfoxProtocolDecoder extends BaseHttpProtocolDecoder { - public SigfoxProtocolDecoder(SigfoxProtocol protocol) { + public SigfoxProtocolDecoder(Protocol protocol) { super(protocol); } diff --git a/src/org/traccar/protocol/SiwiProtocolDecoder.java b/src/org/traccar/protocol/SiwiProtocolDecoder.java index fc1296c64..6b97f5fe0 100644 --- a/src/org/traccar/protocol/SiwiProtocolDecoder.java +++ b/src/org/traccar/protocol/SiwiProtocolDecoder.java @@ -18,6 +18,7 @@ package org.traccar.protocol; import io.netty.channel.Channel; import org.traccar.BaseProtocolDecoder; import org.traccar.DeviceSession; +import org.traccar.Protocol; import org.traccar.helper.Parser; import org.traccar.helper.PatternBuilder; import org.traccar.helper.UnitsConverter; @@ -28,7 +29,7 @@ import java.util.regex.Pattern; public class SiwiProtocolDecoder extends BaseProtocolDecoder { - public SiwiProtocolDecoder(SiwiProtocol protocol) { + public SiwiProtocolDecoder(Protocol protocol) { super(protocol); } diff --git a/src/org/traccar/protocol/SkypatrolProtocolDecoder.java b/src/org/traccar/protocol/SkypatrolProtocolDecoder.java index 826311052..3c7ca6dc5 100644 --- a/src/org/traccar/protocol/SkypatrolProtocolDecoder.java +++ b/src/org/traccar/protocol/SkypatrolProtocolDecoder.java @@ -22,6 +22,7 @@ import org.slf4j.LoggerFactory; import org.traccar.BaseProtocolDecoder; import org.traccar.Context; import org.traccar.DeviceSession; +import org.traccar.Protocol; import org.traccar.helper.BitUtil; import org.traccar.helper.DateBuilder; import org.traccar.model.Position; @@ -35,7 +36,7 @@ public class SkypatrolProtocolDecoder extends BaseProtocolDecoder { private final long defaultMask; - public SkypatrolProtocolDecoder(SkypatrolProtocol protocol) { + public SkypatrolProtocolDecoder(Protocol protocol) { super(protocol); defaultMask = Context.getConfig().getInteger(getProtocolName() + ".mask"); } diff --git a/src/org/traccar/protocol/SmartSoleProtocolDecoder.java b/src/org/traccar/protocol/SmartSoleProtocolDecoder.java index c135f3a22..04920c969 100644 --- a/src/org/traccar/protocol/SmartSoleProtocolDecoder.java +++ b/src/org/traccar/protocol/SmartSoleProtocolDecoder.java @@ -18,6 +18,7 @@ package org.traccar.protocol; import io.netty.channel.Channel; import org.traccar.BaseProtocolDecoder; import org.traccar.DeviceSession; +import org.traccar.Protocol; import org.traccar.helper.Parser; import org.traccar.helper.PatternBuilder; import org.traccar.helper.UnitsConverter; @@ -28,7 +29,7 @@ import java.util.regex.Pattern; public class SmartSoleProtocolDecoder extends BaseProtocolDecoder { - public SmartSoleProtocolDecoder(SmartSoleProtocol protocol) { + public SmartSoleProtocolDecoder(Protocol protocol) { super(protocol); } diff --git a/src/org/traccar/protocol/SmokeyProtocolDecoder.java b/src/org/traccar/protocol/SmokeyProtocolDecoder.java index b9cef5ad4..9da52e97a 100644 --- a/src/org/traccar/protocol/SmokeyProtocolDecoder.java +++ b/src/org/traccar/protocol/SmokeyProtocolDecoder.java @@ -22,6 +22,7 @@ import io.netty.channel.Channel; import org.traccar.BaseProtocolDecoder; import org.traccar.DeviceSession; import org.traccar.NetworkMessage; +import org.traccar.Protocol; import org.traccar.helper.DateBuilder; import org.traccar.model.CellTower; import org.traccar.model.Network; @@ -35,7 +36,7 @@ import java.time.temporal.ChronoUnit; public class SmokeyProtocolDecoder extends BaseProtocolDecoder { - public SmokeyProtocolDecoder(SmokeyProtocol protocol) { + public SmokeyProtocolDecoder(Protocol protocol) { super(protocol); } diff --git a/src/org/traccar/protocol/SpotProtocolDecoder.java b/src/org/traccar/protocol/SpotProtocolDecoder.java index 16e287b6c..78b2b0487 100644 --- a/src/org/traccar/protocol/SpotProtocolDecoder.java +++ b/src/org/traccar/protocol/SpotProtocolDecoder.java @@ -21,6 +21,7 @@ import io.netty.handler.codec.http.FullHttpRequest; import io.netty.handler.codec.http.HttpResponseStatus; import org.traccar.BaseHttpProtocolDecoder; import org.traccar.DeviceSession; +import org.traccar.Protocol; import org.traccar.helper.DateUtil; import org.traccar.model.Position; import org.w3c.dom.Document; @@ -45,7 +46,7 @@ public class SpotProtocolDecoder extends BaseHttpProtocolDecoder { private XPath xPath; private XPathExpression messageExpression; - public SpotProtocolDecoder(SpotProtocol protocol) { + public SpotProtocolDecoder(Protocol protocol) { super(protocol); try { documentBuilder = DocumentBuilderFactory.newInstance().newDocumentBuilder(); diff --git a/src/org/traccar/protocol/StarLinkProtocolDecoder.java b/src/org/traccar/protocol/StarLinkProtocolDecoder.java index 16c467e69..ed5f81c1c 100644 --- a/src/org/traccar/protocol/StarLinkProtocolDecoder.java +++ b/src/org/traccar/protocol/StarLinkProtocolDecoder.java @@ -19,6 +19,7 @@ import io.netty.channel.Channel; import org.traccar.BaseProtocolDecoder; import org.traccar.Context; import org.traccar.DeviceSession; +import org.traccar.Protocol; import org.traccar.helper.Parser; import org.traccar.helper.PatternBuilder; import org.traccar.model.CellTower; @@ -36,7 +37,7 @@ public class StarLinkProtocolDecoder extends BaseProtocolDecoder { private String[] dataTags; private DateFormat dateFormat; - public StarLinkProtocolDecoder(StarLinkProtocol protocol) { + public StarLinkProtocolDecoder(Protocol protocol) { super(protocol); String format = Context.getConfig().getString( diff --git a/src/org/traccar/protocol/Stl060ProtocolDecoder.java b/src/org/traccar/protocol/Stl060ProtocolDecoder.java index d997d2379..7b0055aa1 100644 --- a/src/org/traccar/protocol/Stl060ProtocolDecoder.java +++ b/src/org/traccar/protocol/Stl060ProtocolDecoder.java @@ -18,6 +18,7 @@ package org.traccar.protocol; import io.netty.channel.Channel; import org.traccar.BaseProtocolDecoder; import org.traccar.DeviceSession; +import org.traccar.Protocol; import org.traccar.helper.Parser; import org.traccar.helper.PatternBuilder; import org.traccar.model.Position; @@ -27,7 +28,7 @@ import java.util.regex.Pattern; public class Stl060ProtocolDecoder extends BaseProtocolDecoder { - public Stl060ProtocolDecoder(Stl060Protocol protocol) { + public Stl060ProtocolDecoder(Protocol protocol) { super(protocol); } diff --git a/src/org/traccar/protocol/SuntechProtocolDecoder.java b/src/org/traccar/protocol/SuntechProtocolDecoder.java index eed269270..48eb3a71d 100644 --- a/src/org/traccar/protocol/SuntechProtocolDecoder.java +++ b/src/org/traccar/protocol/SuntechProtocolDecoder.java @@ -19,6 +19,7 @@ import io.netty.channel.Channel; import org.traccar.BaseProtocolDecoder; import org.traccar.Context; import org.traccar.DeviceSession; +import org.traccar.Protocol; import org.traccar.helper.BitUtil; import org.traccar.helper.UnitsConverter; import org.traccar.model.CellTower; @@ -38,7 +39,7 @@ public class SuntechProtocolDecoder extends BaseProtocolDecoder { private boolean includeAdc; private boolean includeTemp; - public SuntechProtocolDecoder(SuntechProtocol protocol) { + public SuntechProtocolDecoder(Protocol protocol) { super(protocol); protocolType = Context.getConfig().getInteger(getProtocolName() + ".protocolType"); diff --git a/src/org/traccar/protocol/SupermateProtocolDecoder.java b/src/org/traccar/protocol/SupermateProtocolDecoder.java index a5e93a673..40a25bb91 100644 --- a/src/org/traccar/protocol/SupermateProtocolDecoder.java +++ b/src/org/traccar/protocol/SupermateProtocolDecoder.java @@ -20,6 +20,7 @@ import io.netty.channel.Channel; import org.traccar.BaseProtocolDecoder; import org.traccar.DeviceSession; import org.traccar.NetworkMessage; +import org.traccar.Protocol; import org.traccar.helper.DateBuilder; import org.traccar.helper.Parser; import org.traccar.helper.PatternBuilder; @@ -32,7 +33,7 @@ import java.util.regex.Pattern; public class SupermateProtocolDecoder extends BaseProtocolDecoder { - public SupermateProtocolDecoder(SupermateProtocol protocol) { + public SupermateProtocolDecoder(Protocol protocol) { super(protocol); } diff --git a/src/org/traccar/protocol/SviasProtocolDecoder.java b/src/org/traccar/protocol/SviasProtocolDecoder.java index d6d755e19..978483175 100644 --- a/src/org/traccar/protocol/SviasProtocolDecoder.java +++ b/src/org/traccar/protocol/SviasProtocolDecoder.java @@ -18,6 +18,7 @@ package org.traccar.protocol; import io.netty.channel.Channel; import org.traccar.BaseProtocolDecoder; import org.traccar.NetworkMessage; +import org.traccar.Protocol; import org.traccar.helper.BitUtil; import org.traccar.helper.PatternBuilder; @@ -30,7 +31,7 @@ import org.traccar.model.Position; public class SviasProtocolDecoder extends BaseProtocolDecoder { - public SviasProtocolDecoder(SviasProtocol protocol) { + public SviasProtocolDecoder(Protocol protocol) { super(protocol); } diff --git a/src/org/traccar/protocol/T55ProtocolDecoder.java b/src/org/traccar/protocol/T55ProtocolDecoder.java index 8aa7fae8f..214a40a49 100644 --- a/src/org/traccar/protocol/T55ProtocolDecoder.java +++ b/src/org/traccar/protocol/T55ProtocolDecoder.java @@ -20,6 +20,7 @@ import org.traccar.BaseProtocolDecoder; import org.traccar.Context; import org.traccar.DeviceSession; import org.traccar.NetworkMessage; +import org.traccar.Protocol; import org.traccar.helper.DateBuilder; import org.traccar.helper.Parser; import org.traccar.helper.PatternBuilder; @@ -32,7 +33,7 @@ import java.util.regex.Pattern; public class T55ProtocolDecoder extends BaseProtocolDecoder { - public T55ProtocolDecoder(T55Protocol protocol) { + public T55ProtocolDecoder(Protocol protocol) { super(protocol); } diff --git a/src/org/traccar/protocol/T57ProtocolDecoder.java b/src/org/traccar/protocol/T57ProtocolDecoder.java index 441f8cf8a..2a3cca3e4 100644 --- a/src/org/traccar/protocol/T57ProtocolDecoder.java +++ b/src/org/traccar/protocol/T57ProtocolDecoder.java @@ -18,6 +18,7 @@ package org.traccar.protocol; import io.netty.channel.Channel; import org.traccar.BaseProtocolDecoder; import org.traccar.DeviceSession; +import org.traccar.Protocol; import org.traccar.helper.Parser; import org.traccar.helper.PatternBuilder; import org.traccar.model.Position; @@ -27,7 +28,7 @@ import java.util.regex.Pattern; public class T57ProtocolDecoder extends BaseProtocolDecoder { - public T57ProtocolDecoder(T57Protocol protocol) { + public T57ProtocolDecoder(Protocol protocol) { super(protocol); } diff --git a/src/org/traccar/protocol/T800xProtocolDecoder.java b/src/org/traccar/protocol/T800xProtocolDecoder.java index d5504c190..866971090 100644 --- a/src/org/traccar/protocol/T800xProtocolDecoder.java +++ b/src/org/traccar/protocol/T800xProtocolDecoder.java @@ -22,6 +22,7 @@ import io.netty.channel.Channel; import org.traccar.BaseProtocolDecoder; import org.traccar.DeviceSession; import org.traccar.NetworkMessage; +import org.traccar.Protocol; import org.traccar.helper.BcdUtil; import org.traccar.helper.BitUtil; import org.traccar.helper.DateBuilder; @@ -34,7 +35,7 @@ import java.net.SocketAddress; public class T800xProtocolDecoder extends BaseProtocolDecoder { - public T800xProtocolDecoder(T800xProtocol protocol) { + public T800xProtocolDecoder(Protocol protocol) { super(protocol); } diff --git a/src/org/traccar/protocol/TaipProtocolDecoder.java b/src/org/traccar/protocol/TaipProtocolDecoder.java index 31b435bce..8a0cb870b 100644 --- a/src/org/traccar/protocol/TaipProtocolDecoder.java +++ b/src/org/traccar/protocol/TaipProtocolDecoder.java @@ -19,6 +19,7 @@ import io.netty.channel.Channel; import org.traccar.BaseProtocolDecoder; import org.traccar.DeviceSession; import org.traccar.NetworkMessage; +import org.traccar.Protocol; import org.traccar.helper.BitUtil; import org.traccar.helper.Checksum; import org.traccar.helper.DateBuilder; @@ -34,7 +35,7 @@ import java.util.regex.Pattern; public class TaipProtocolDecoder extends BaseProtocolDecoder { - public TaipProtocolDecoder(TaipProtocol protocol) { + public TaipProtocolDecoder(Protocol protocol) { super(protocol); } diff --git a/src/org/traccar/protocol/TekProtocolDecoder.java b/src/org/traccar/protocol/TekProtocolDecoder.java index 497981832..a9101e65f 100644 --- a/src/org/traccar/protocol/TekProtocolDecoder.java +++ b/src/org/traccar/protocol/TekProtocolDecoder.java @@ -20,6 +20,7 @@ import io.netty.buffer.ByteBufUtil; import io.netty.channel.Channel; import org.traccar.BaseProtocolDecoder; import org.traccar.DeviceSession; +import org.traccar.Protocol; import org.traccar.helper.BitUtil; import org.traccar.helper.DateBuilder; import org.traccar.helper.Parser; @@ -32,7 +33,7 @@ import java.util.regex.Pattern; public class TekProtocolDecoder extends BaseProtocolDecoder { - public TekProtocolDecoder(TekProtocol protocol) { + public TekProtocolDecoder(Protocol protocol) { super(protocol); } diff --git a/src/org/traccar/protocol/TelemaxProtocolDecoder.java b/src/org/traccar/protocol/TelemaxProtocolDecoder.java index 5eb5ca0b5..9369ab101 100644 --- a/src/org/traccar/protocol/TelemaxProtocolDecoder.java +++ b/src/org/traccar/protocol/TelemaxProtocolDecoder.java @@ -18,6 +18,7 @@ package org.traccar.protocol; import io.netty.channel.Channel; import org.traccar.BaseProtocolDecoder; import org.traccar.DeviceSession; +import org.traccar.Protocol; import org.traccar.helper.BitUtil; import org.traccar.model.Position; @@ -29,7 +30,7 @@ import java.util.List; public class TelemaxProtocolDecoder extends BaseProtocolDecoder { - public TelemaxProtocolDecoder(TelemaxProtocol protocol) { + public TelemaxProtocolDecoder(Protocol protocol) { super(protocol); } diff --git a/src/org/traccar/protocol/TelicProtocolDecoder.java b/src/org/traccar/protocol/TelicProtocolDecoder.java index 3a9962361..6d5e8f21e 100644 --- a/src/org/traccar/protocol/TelicProtocolDecoder.java +++ b/src/org/traccar/protocol/TelicProtocolDecoder.java @@ -18,6 +18,7 @@ package org.traccar.protocol; import io.netty.channel.Channel; import org.traccar.BaseProtocolDecoder; import org.traccar.DeviceSession; +import org.traccar.Protocol; import org.traccar.helper.Parser; import org.traccar.helper.PatternBuilder; import org.traccar.helper.UnitsConverter; @@ -28,7 +29,7 @@ import java.util.regex.Pattern; public class TelicProtocolDecoder extends BaseProtocolDecoder { - public TelicProtocolDecoder(TelicProtocol protocol) { + public TelicProtocolDecoder(Protocol protocol) { super(protocol); } diff --git a/src/org/traccar/protocol/ThinkRaceProtocolDecoder.java b/src/org/traccar/protocol/ThinkRaceProtocolDecoder.java index 451f1c448..0928b25e0 100644 --- a/src/org/traccar/protocol/ThinkRaceProtocolDecoder.java +++ b/src/org/traccar/protocol/ThinkRaceProtocolDecoder.java @@ -21,6 +21,7 @@ import io.netty.channel.Channel; import org.traccar.BaseProtocolDecoder; import org.traccar.DeviceSession; import org.traccar.NetworkMessage; +import org.traccar.Protocol; import org.traccar.helper.BitUtil; import org.traccar.model.CellTower; import org.traccar.model.Network; @@ -32,7 +33,7 @@ import java.util.Date; public class ThinkRaceProtocolDecoder extends BaseProtocolDecoder { - public ThinkRaceProtocolDecoder(ThinkRaceProtocol protocol) { + public ThinkRaceProtocolDecoder(Protocol protocol) { super(protocol); } diff --git a/src/org/traccar/protocol/Tk102ProtocolDecoder.java b/src/org/traccar/protocol/Tk102ProtocolDecoder.java index c3ba6d303..da0c6928b 100644 --- a/src/org/traccar/protocol/Tk102ProtocolDecoder.java +++ b/src/org/traccar/protocol/Tk102ProtocolDecoder.java @@ -21,6 +21,7 @@ import io.netty.channel.Channel; import org.traccar.BaseProtocolDecoder; import org.traccar.DeviceSession; import org.traccar.NetworkMessage; +import org.traccar.Protocol; import org.traccar.helper.DateBuilder; import org.traccar.helper.Parser; import org.traccar.helper.PatternBuilder; @@ -32,7 +33,7 @@ import java.util.regex.Pattern; public class Tk102ProtocolDecoder extends BaseProtocolDecoder { - public Tk102ProtocolDecoder(Tk102Protocol protocol) { + public Tk102ProtocolDecoder(Protocol protocol) { super(protocol); } diff --git a/src/org/traccar/protocol/Tk103ProtocolDecoder.java b/src/org/traccar/protocol/Tk103ProtocolDecoder.java index 3b1ab9655..9e28b5051 100644 --- a/src/org/traccar/protocol/Tk103ProtocolDecoder.java +++ b/src/org/traccar/protocol/Tk103ProtocolDecoder.java @@ -20,6 +20,7 @@ import org.traccar.BaseProtocolDecoder; import org.traccar.Context; import org.traccar.DeviceSession; import org.traccar.NetworkMessage; +import org.traccar.Protocol; import org.traccar.helper.BitUtil; import org.traccar.helper.DateBuilder; import org.traccar.helper.Parser; @@ -36,7 +37,7 @@ public class Tk103ProtocolDecoder extends BaseProtocolDecoder { private boolean decodeLow; - public Tk103ProtocolDecoder(Tk103Protocol protocol) { + public Tk103ProtocolDecoder(Protocol protocol) { super(protocol); decodeLow = Context.getConfig().getBoolean(getProtocolName() + ".decodeLow"); } diff --git a/src/org/traccar/protocol/Tlt2hProtocolDecoder.java b/src/org/traccar/protocol/Tlt2hProtocolDecoder.java index 780785247..73e28e17b 100644 --- a/src/org/traccar/protocol/Tlt2hProtocolDecoder.java +++ b/src/org/traccar/protocol/Tlt2hProtocolDecoder.java @@ -18,6 +18,7 @@ package org.traccar.protocol; import io.netty.channel.Channel; import org.traccar.BaseProtocolDecoder; import org.traccar.DeviceSession; +import org.traccar.Protocol; import org.traccar.helper.DateBuilder; import org.traccar.helper.Parser; import org.traccar.helper.PatternBuilder; @@ -30,7 +31,7 @@ import java.util.regex.Pattern; public class Tlt2hProtocolDecoder extends BaseProtocolDecoder { - public Tlt2hProtocolDecoder(Tlt2hProtocol protocol) { + public Tlt2hProtocolDecoder(Protocol protocol) { super(protocol); } diff --git a/src/org/traccar/protocol/TlvProtocolDecoder.java b/src/org/traccar/protocol/TlvProtocolDecoder.java index d3ce4e072..36cf7859f 100644 --- a/src/org/traccar/protocol/TlvProtocolDecoder.java +++ b/src/org/traccar/protocol/TlvProtocolDecoder.java @@ -21,6 +21,7 @@ import io.netty.channel.Channel; import org.traccar.BaseProtocolDecoder; import org.traccar.DeviceSession; import org.traccar.NetworkMessage; +import org.traccar.Protocol; import org.traccar.helper.UnitsConverter; import org.traccar.model.Position; @@ -30,7 +31,7 @@ import java.util.Date; public class TlvProtocolDecoder extends BaseProtocolDecoder { - public TlvProtocolDecoder(TlvProtocol protocol) { + public TlvProtocolDecoder(Protocol protocol) { super(protocol); } diff --git a/src/org/traccar/protocol/TmgProtocolDecoder.java b/src/org/traccar/protocol/TmgProtocolDecoder.java index 7ac443d5c..d27849f8c 100644 --- a/src/org/traccar/protocol/TmgProtocolDecoder.java +++ b/src/org/traccar/protocol/TmgProtocolDecoder.java @@ -18,6 +18,7 @@ package org.traccar.protocol; import io.netty.channel.Channel; import org.traccar.BaseProtocolDecoder; import org.traccar.DeviceSession; +import org.traccar.Protocol; import org.traccar.helper.BitUtil; import org.traccar.helper.Parser; import org.traccar.helper.PatternBuilder; @@ -29,7 +30,7 @@ import java.util.regex.Pattern; public class TmgProtocolDecoder extends BaseProtocolDecoder { - public TmgProtocolDecoder(TmgProtocol protocol) { + public TmgProtocolDecoder(Protocol protocol) { super(protocol); } diff --git a/src/org/traccar/protocol/TopflytechProtocolDecoder.java b/src/org/traccar/protocol/TopflytechProtocolDecoder.java index 4ce161b1c..6de053c32 100644 --- a/src/org/traccar/protocol/TopflytechProtocolDecoder.java +++ b/src/org/traccar/protocol/TopflytechProtocolDecoder.java @@ -18,6 +18,7 @@ package org.traccar.protocol; import io.netty.channel.Channel; import org.traccar.BaseProtocolDecoder; import org.traccar.DeviceSession; +import org.traccar.Protocol; import org.traccar.helper.Parser; import org.traccar.helper.PatternBuilder; import org.traccar.model.Position; @@ -27,7 +28,7 @@ import java.util.regex.Pattern; public class TopflytechProtocolDecoder extends BaseProtocolDecoder { - public TopflytechProtocolDecoder(TopflytechProtocol protocol) { + public TopflytechProtocolDecoder(Protocol protocol) { super(protocol); } diff --git a/src/org/traccar/protocol/TotemProtocolDecoder.java b/src/org/traccar/protocol/TotemProtocolDecoder.java index d8caa9766..ed4c1409a 100644 --- a/src/org/traccar/protocol/TotemProtocolDecoder.java +++ b/src/org/traccar/protocol/TotemProtocolDecoder.java @@ -19,6 +19,7 @@ import io.netty.channel.Channel; import org.traccar.BaseProtocolDecoder; import org.traccar.DeviceSession; import org.traccar.NetworkMessage; +import org.traccar.Protocol; import org.traccar.helper.BitUtil; import org.traccar.helper.Checksum; import org.traccar.helper.DateBuilder; @@ -34,7 +35,7 @@ import java.util.regex.Pattern; public class TotemProtocolDecoder extends BaseProtocolDecoder { - public TotemProtocolDecoder(TotemProtocol protocol) { + public TotemProtocolDecoder(Protocol protocol) { super(protocol); } diff --git a/src/org/traccar/protocol/Tr20ProtocolDecoder.java b/src/org/traccar/protocol/Tr20ProtocolDecoder.java index 0c4c12f60..e7ae0185f 100644 --- a/src/org/traccar/protocol/Tr20ProtocolDecoder.java +++ b/src/org/traccar/protocol/Tr20ProtocolDecoder.java @@ -19,6 +19,7 @@ import io.netty.channel.Channel; import org.traccar.BaseProtocolDecoder; import org.traccar.DeviceSession; import org.traccar.NetworkMessage; +import org.traccar.Protocol; import org.traccar.helper.Parser; import org.traccar.helper.PatternBuilder; import org.traccar.helper.UnitsConverter; @@ -29,7 +30,7 @@ import java.util.regex.Pattern; public class Tr20ProtocolDecoder extends BaseProtocolDecoder { - public Tr20ProtocolDecoder(Tr20Protocol protocol) { + public Tr20ProtocolDecoder(Protocol protocol) { super(protocol); } diff --git a/src/org/traccar/protocol/Tr900ProtocolDecoder.java b/src/org/traccar/protocol/Tr900ProtocolDecoder.java index 8200884ac..319194c21 100644 --- a/src/org/traccar/protocol/Tr900ProtocolDecoder.java +++ b/src/org/traccar/protocol/Tr900ProtocolDecoder.java @@ -18,6 +18,7 @@ package org.traccar.protocol; import io.netty.channel.Channel; import org.traccar.BaseProtocolDecoder; import org.traccar.DeviceSession; +import org.traccar.Protocol; import org.traccar.helper.Parser; import org.traccar.helper.PatternBuilder; import org.traccar.model.Position; @@ -27,7 +28,7 @@ import java.util.regex.Pattern; public class Tr900ProtocolDecoder extends BaseProtocolDecoder { - public Tr900ProtocolDecoder(Tr900Protocol protocol) { + public Tr900ProtocolDecoder(Protocol protocol) { super(protocol); } diff --git a/src/org/traccar/protocol/TrackboxProtocolDecoder.java b/src/org/traccar/protocol/TrackboxProtocolDecoder.java index fff60ae70..db8022738 100644 --- a/src/org/traccar/protocol/TrackboxProtocolDecoder.java +++ b/src/org/traccar/protocol/TrackboxProtocolDecoder.java @@ -19,6 +19,7 @@ import io.netty.channel.Channel; import org.traccar.BaseProtocolDecoder; import org.traccar.DeviceSession; import org.traccar.NetworkMessage; +import org.traccar.Protocol; import org.traccar.helper.DateBuilder; import org.traccar.helper.Parser; import org.traccar.helper.PatternBuilder; @@ -29,7 +30,7 @@ import java.util.regex.Pattern; public class TrackboxProtocolDecoder extends BaseProtocolDecoder { - public TrackboxProtocolDecoder(TrackboxProtocol protocol) { + public TrackboxProtocolDecoder(Protocol protocol) { super(protocol); } diff --git a/src/org/traccar/protocol/TrakMateProtocolDecoder.java b/src/org/traccar/protocol/TrakMateProtocolDecoder.java index 9fd7af542..f677ab36e 100644 --- a/src/org/traccar/protocol/TrakMateProtocolDecoder.java +++ b/src/org/traccar/protocol/TrakMateProtocolDecoder.java @@ -18,6 +18,7 @@ package org.traccar.protocol; import io.netty.channel.Channel; import org.traccar.BaseProtocolDecoder; import org.traccar.DeviceSession; +import org.traccar.Protocol; import org.traccar.helper.Parser; import org.traccar.helper.PatternBuilder; import org.traccar.model.Position; @@ -27,7 +28,7 @@ import java.util.regex.Pattern; public class TrakMateProtocolDecoder extends BaseProtocolDecoder { - public TrakMateProtocolDecoder(TrakMateProtocol protocol) { + public TrakMateProtocolDecoder(Protocol protocol) { super(protocol); } diff --git a/src/org/traccar/protocol/TramigoProtocolDecoder.java b/src/org/traccar/protocol/TramigoProtocolDecoder.java index a54a4de68..e42e2f670 100644 --- a/src/org/traccar/protocol/TramigoProtocolDecoder.java +++ b/src/org/traccar/protocol/TramigoProtocolDecoder.java @@ -21,6 +21,7 @@ import io.netty.channel.Channel; import org.traccar.BaseProtocolDecoder; import org.traccar.DeviceSession; import org.traccar.NetworkMessage; +import org.traccar.Protocol; import org.traccar.helper.DateUtil; import org.traccar.helper.UnitsConverter; import org.traccar.model.Position; @@ -37,7 +38,7 @@ import java.util.regex.Pattern; public class TramigoProtocolDecoder extends BaseProtocolDecoder { - public TramigoProtocolDecoder(TramigoProtocol protocol) { + public TramigoProtocolDecoder(Protocol protocol) { super(protocol); } diff --git a/src/org/traccar/protocol/TrvProtocolDecoder.java b/src/org/traccar/protocol/TrvProtocolDecoder.java index 9c4968974..3d27be9d4 100644 --- a/src/org/traccar/protocol/TrvProtocolDecoder.java +++ b/src/org/traccar/protocol/TrvProtocolDecoder.java @@ -19,6 +19,7 @@ import io.netty.channel.Channel; import org.traccar.BaseProtocolDecoder; import org.traccar.DeviceSession; import org.traccar.NetworkMessage; +import org.traccar.Protocol; import org.traccar.helper.DateBuilder; import org.traccar.helper.Parser; import org.traccar.helper.PatternBuilder; @@ -34,7 +35,7 @@ import java.util.regex.Pattern; public class TrvProtocolDecoder extends BaseProtocolDecoder { - public TrvProtocolDecoder(TrvProtocol protocol) { + public TrvProtocolDecoder(Protocol protocol) { super(protocol); } diff --git a/src/org/traccar/protocol/Tt8850ProtocolDecoder.java b/src/org/traccar/protocol/Tt8850ProtocolDecoder.java index 46220e143..1010528c4 100644 --- a/src/org/traccar/protocol/Tt8850ProtocolDecoder.java +++ b/src/org/traccar/protocol/Tt8850ProtocolDecoder.java @@ -18,6 +18,7 @@ package org.traccar.protocol; import io.netty.channel.Channel; import org.traccar.BaseProtocolDecoder; import org.traccar.DeviceSession; +import org.traccar.Protocol; import org.traccar.helper.Parser; import org.traccar.helper.PatternBuilder; import org.traccar.helper.UnitsConverter; @@ -30,7 +31,7 @@ import java.util.regex.Pattern; public class Tt8850ProtocolDecoder extends BaseProtocolDecoder { - public Tt8850ProtocolDecoder(Tt8850Protocol protocol) { + public Tt8850ProtocolDecoder(Protocol protocol) { super(protocol); } diff --git a/src/org/traccar/protocol/TytanProtocolDecoder.java b/src/org/traccar/protocol/TytanProtocolDecoder.java index 6788fd7b9..93d3a63d2 100644 --- a/src/org/traccar/protocol/TytanProtocolDecoder.java +++ b/src/org/traccar/protocol/TytanProtocolDecoder.java @@ -22,6 +22,7 @@ import io.netty.channel.Channel; import org.traccar.BaseProtocolDecoder; import org.traccar.DeviceSession; import org.traccar.NetworkMessage; +import org.traccar.Protocol; import org.traccar.helper.BitUtil; import org.traccar.helper.UnitsConverter; import org.traccar.model.Position; @@ -34,7 +35,7 @@ import java.util.List; public class TytanProtocolDecoder extends BaseProtocolDecoder { - public TytanProtocolDecoder(TytanProtocol protocol) { + public TytanProtocolDecoder(Protocol protocol) { super(protocol); } diff --git a/src/org/traccar/protocol/TzoneProtocolDecoder.java b/src/org/traccar/protocol/TzoneProtocolDecoder.java index 1537c0107..87b44a4b2 100644 --- a/src/org/traccar/protocol/TzoneProtocolDecoder.java +++ b/src/org/traccar/protocol/TzoneProtocolDecoder.java @@ -20,6 +20,7 @@ import io.netty.buffer.ByteBufUtil; import io.netty.channel.Channel; import org.traccar.BaseProtocolDecoder; import org.traccar.DeviceSession; +import org.traccar.Protocol; import org.traccar.helper.BitUtil; import org.traccar.helper.DateBuilder; import org.traccar.model.CellTower; @@ -30,7 +31,7 @@ import java.net.SocketAddress; public class TzoneProtocolDecoder extends BaseProtocolDecoder { - public TzoneProtocolDecoder(TzoneProtocol protocol) { + public TzoneProtocolDecoder(Protocol protocol) { super(protocol); } diff --git a/src/org/traccar/protocol/UlbotechProtocolDecoder.java b/src/org/traccar/protocol/UlbotechProtocolDecoder.java index ed4695a44..0a2a59e23 100644 --- a/src/org/traccar/protocol/UlbotechProtocolDecoder.java +++ b/src/org/traccar/protocol/UlbotechProtocolDecoder.java @@ -22,6 +22,7 @@ import io.netty.channel.Channel; import org.traccar.BaseProtocolDecoder; import org.traccar.DeviceSession; import org.traccar.NetworkMessage; +import org.traccar.Protocol; import org.traccar.helper.BitUtil; import org.traccar.helper.Checksum; import org.traccar.helper.DateBuilder; @@ -40,7 +41,7 @@ import java.util.regex.Pattern; public class UlbotechProtocolDecoder extends BaseProtocolDecoder { - public UlbotechProtocolDecoder(UlbotechProtocol protocol) { + public UlbotechProtocolDecoder(Protocol protocol) { super(protocol); } diff --git a/src/org/traccar/protocol/UproProtocolDecoder.java b/src/org/traccar/protocol/UproProtocolDecoder.java index 7efe3b94f..c5b72ea0a 100644 --- a/src/org/traccar/protocol/UproProtocolDecoder.java +++ b/src/org/traccar/protocol/UproProtocolDecoder.java @@ -21,6 +21,7 @@ import io.netty.channel.Channel; import org.traccar.BaseProtocolDecoder; import org.traccar.DeviceSession; import org.traccar.NetworkMessage; +import org.traccar.Protocol; import org.traccar.helper.BitUtil; import org.traccar.helper.DateBuilder; import org.traccar.helper.Parser; @@ -35,7 +36,7 @@ import java.util.regex.Pattern; public class UproProtocolDecoder extends BaseProtocolDecoder { - public UproProtocolDecoder(UproProtocol protocol) { + public UproProtocolDecoder(Protocol protocol) { super(protocol); } diff --git a/src/org/traccar/protocol/V680ProtocolDecoder.java b/src/org/traccar/protocol/V680ProtocolDecoder.java index 05095e8ba..0342404a6 100644 --- a/src/org/traccar/protocol/V680ProtocolDecoder.java +++ b/src/org/traccar/protocol/V680ProtocolDecoder.java @@ -18,6 +18,7 @@ package org.traccar.protocol; import io.netty.channel.Channel; import org.traccar.BaseProtocolDecoder; import org.traccar.DeviceSession; +import org.traccar.Protocol; import org.traccar.helper.DateBuilder; import org.traccar.helper.Parser; import org.traccar.helper.PatternBuilder; @@ -28,7 +29,7 @@ import java.util.regex.Pattern; public class V680ProtocolDecoder extends BaseProtocolDecoder { - public V680ProtocolDecoder(V680Protocol protocol) { + public V680ProtocolDecoder(Protocol protocol) { super(protocol); } diff --git a/src/org/traccar/protocol/VisiontekProtocolDecoder.java b/src/org/traccar/protocol/VisiontekProtocolDecoder.java index 57ccb5100..c4787bda2 100644 --- a/src/org/traccar/protocol/VisiontekProtocolDecoder.java +++ b/src/org/traccar/protocol/VisiontekProtocolDecoder.java @@ -18,6 +18,7 @@ package org.traccar.protocol; import io.netty.channel.Channel; import org.traccar.BaseProtocolDecoder; import org.traccar.DeviceSession; +import org.traccar.Protocol; import org.traccar.helper.Parser; import org.traccar.helper.PatternBuilder; import org.traccar.helper.UnitsConverter; @@ -28,7 +29,7 @@ import java.util.regex.Pattern; public class VisiontekProtocolDecoder extends BaseProtocolDecoder { - public VisiontekProtocolDecoder(VisiontekProtocol protocol) { + public VisiontekProtocolDecoder(Protocol protocol) { super(protocol); } diff --git a/src/org/traccar/protocol/Vt200ProtocolDecoder.java b/src/org/traccar/protocol/Vt200ProtocolDecoder.java index d5035bd5c..b1564abd9 100644 --- a/src/org/traccar/protocol/Vt200ProtocolDecoder.java +++ b/src/org/traccar/protocol/Vt200ProtocolDecoder.java @@ -20,6 +20,7 @@ import io.netty.buffer.ByteBufUtil; import io.netty.channel.Channel; import org.traccar.BaseProtocolDecoder; import org.traccar.DeviceSession; +import org.traccar.Protocol; import org.traccar.helper.BcdUtil; import org.traccar.helper.BitUtil; import org.traccar.helper.DateBuilder; @@ -32,7 +33,7 @@ import java.util.Date; public class Vt200ProtocolDecoder extends BaseProtocolDecoder { - public Vt200ProtocolDecoder(Vt200Protocol protocol) { + public Vt200ProtocolDecoder(Protocol protocol) { super(protocol); } diff --git a/src/org/traccar/protocol/VtfmsProtocolDecoder.java b/src/org/traccar/protocol/VtfmsProtocolDecoder.java index 5e5e5c9b5..c08261a59 100644 --- a/src/org/traccar/protocol/VtfmsProtocolDecoder.java +++ b/src/org/traccar/protocol/VtfmsProtocolDecoder.java @@ -18,6 +18,7 @@ package org.traccar.protocol; import io.netty.channel.Channel; import org.traccar.BaseProtocolDecoder; import org.traccar.DeviceSession; +import org.traccar.Protocol; import org.traccar.helper.Parser; import org.traccar.helper.PatternBuilder; import org.traccar.helper.UnitsConverter; @@ -30,7 +31,7 @@ public class VtfmsProtocolDecoder extends BaseProtocolDecoder { private static final String[] DIRECTIONS = new String[] {"N", "NE", "E", "SE", "S", "SW", "W", "NW"}; - public VtfmsProtocolDecoder(VtfmsProtocol protocol) { + public VtfmsProtocolDecoder(Protocol protocol) { super(protocol); } diff --git a/src/org/traccar/protocol/WatchProtocolDecoder.java b/src/org/traccar/protocol/WatchProtocolDecoder.java index 4e5d8c377..78b190030 100644 --- a/src/org/traccar/protocol/WatchProtocolDecoder.java +++ b/src/org/traccar/protocol/WatchProtocolDecoder.java @@ -21,6 +21,7 @@ import org.traccar.BaseProtocolDecoder; import org.traccar.Context; import org.traccar.DeviceSession; import org.traccar.NetworkMessage; +import org.traccar.Protocol; import org.traccar.helper.BitUtil; import org.traccar.helper.Parser; import org.traccar.helper.PatternBuilder; @@ -37,7 +38,7 @@ import java.util.regex.Pattern; public class WatchProtocolDecoder extends BaseProtocolDecoder { - public WatchProtocolDecoder(WatchProtocol protocol) { + public WatchProtocolDecoder(Protocol protocol) { super(protocol); } diff --git a/src/org/traccar/protocol/WialonProtocolDecoder.java b/src/org/traccar/protocol/WialonProtocolDecoder.java index 805c12cf9..7939c7b67 100644 --- a/src/org/traccar/protocol/WialonProtocolDecoder.java +++ b/src/org/traccar/protocol/WialonProtocolDecoder.java @@ -19,6 +19,7 @@ import io.netty.channel.Channel; import org.traccar.BaseProtocolDecoder; import org.traccar.DeviceSession; import org.traccar.NetworkMessage; +import org.traccar.Protocol; import org.traccar.helper.Parser; import org.traccar.helper.PatternBuilder; import org.traccar.helper.UnitsConverter; @@ -33,7 +34,7 @@ import java.util.regex.Pattern; public class WialonProtocolDecoder extends BaseProtocolDecoder { - public WialonProtocolDecoder(WialonProtocol protocol) { + public WialonProtocolDecoder(Protocol protocol) { super(protocol); } diff --git a/src/org/traccar/protocol/WondexProtocolDecoder.java b/src/org/traccar/protocol/WondexProtocolDecoder.java index 7845cb26a..b85ae2656 100644 --- a/src/org/traccar/protocol/WondexProtocolDecoder.java +++ b/src/org/traccar/protocol/WondexProtocolDecoder.java @@ -19,6 +19,7 @@ import io.netty.buffer.ByteBuf; import io.netty.channel.Channel; import org.traccar.BaseProtocolDecoder; import org.traccar.DeviceSession; +import org.traccar.Protocol; import org.traccar.helper.Parser; import org.traccar.helper.PatternBuilder; import org.traccar.helper.UnitsConverter; @@ -31,7 +32,7 @@ import java.util.regex.Pattern; public class WondexProtocolDecoder extends BaseProtocolDecoder { - public WondexProtocolDecoder(WondexProtocol protocol) { + public WondexProtocolDecoder(Protocol protocol) { super(protocol); } diff --git a/src/org/traccar/protocol/WristbandProtocolDecoder.java b/src/org/traccar/protocol/WristbandProtocolDecoder.java index f62836765..4e044c915 100644 --- a/src/org/traccar/protocol/WristbandProtocolDecoder.java +++ b/src/org/traccar/protocol/WristbandProtocolDecoder.java @@ -21,6 +21,7 @@ import io.netty.channel.Channel; import org.traccar.BaseProtocolDecoder; import org.traccar.DeviceSession; import org.traccar.NetworkMessage; +import org.traccar.Protocol; import org.traccar.helper.Parser; import org.traccar.helper.PatternBuilder; import org.traccar.helper.UnitsConverter; @@ -37,7 +38,7 @@ import java.util.regex.Pattern; public class WristbandProtocolDecoder extends BaseProtocolDecoder { - public WristbandProtocolDecoder(WristbandProtocol protocol) { + public WristbandProtocolDecoder(Protocol protocol) { super(protocol); } diff --git a/src/org/traccar/protocol/XirgoProtocolDecoder.java b/src/org/traccar/protocol/XirgoProtocolDecoder.java index 878715e40..d572b0366 100644 --- a/src/org/traccar/protocol/XirgoProtocolDecoder.java +++ b/src/org/traccar/protocol/XirgoProtocolDecoder.java @@ -18,6 +18,7 @@ package org.traccar.protocol; import io.netty.channel.Channel; import org.traccar.BaseProtocolDecoder; import org.traccar.DeviceSession; +import org.traccar.Protocol; import org.traccar.helper.Parser; import org.traccar.helper.PatternBuilder; import org.traccar.helper.UnitsConverter; @@ -28,7 +29,7 @@ import java.util.regex.Pattern; public class XirgoProtocolDecoder extends BaseProtocolDecoder { - public XirgoProtocolDecoder(XirgoProtocol protocol) { + public XirgoProtocolDecoder(Protocol protocol) { super(protocol); } diff --git a/src/org/traccar/protocol/Xt013ProtocolDecoder.java b/src/org/traccar/protocol/Xt013ProtocolDecoder.java index fda7c59ea..f49fb9563 100644 --- a/src/org/traccar/protocol/Xt013ProtocolDecoder.java +++ b/src/org/traccar/protocol/Xt013ProtocolDecoder.java @@ -18,6 +18,7 @@ package org.traccar.protocol; import io.netty.channel.Channel; import org.traccar.BaseProtocolDecoder; import org.traccar.DeviceSession; +import org.traccar.Protocol; import org.traccar.helper.Parser; import org.traccar.helper.PatternBuilder; import org.traccar.helper.UnitsConverter; @@ -28,7 +29,7 @@ import java.util.regex.Pattern; public class Xt013ProtocolDecoder extends BaseProtocolDecoder { - public Xt013ProtocolDecoder(Xt013Protocol protocol) { + public Xt013ProtocolDecoder(Protocol protocol) { super(protocol); } diff --git a/src/org/traccar/protocol/Xt2400ProtocolDecoder.java b/src/org/traccar/protocol/Xt2400ProtocolDecoder.java index a01a64b5b..819011a50 100644 --- a/src/org/traccar/protocol/Xt2400ProtocolDecoder.java +++ b/src/org/traccar/protocol/Xt2400ProtocolDecoder.java @@ -20,6 +20,7 @@ import io.netty.channel.Channel; import org.traccar.BaseProtocolDecoder; import org.traccar.Context; import org.traccar.DeviceSession; +import org.traccar.Protocol; import org.traccar.helper.DataConverter; import org.traccar.helper.UnitsConverter; import org.traccar.model.Position; @@ -34,7 +35,7 @@ import java.util.regex.Pattern; public class Xt2400ProtocolDecoder extends BaseProtocolDecoder { - public Xt2400ProtocolDecoder(Xt2400Protocol protocol) { + public Xt2400ProtocolDecoder(Protocol protocol) { super(protocol); String config = Context.getConfig().getString(getProtocolName() + ".config"); diff --git a/src/org/traccar/protocol/YwtProtocolDecoder.java b/src/org/traccar/protocol/YwtProtocolDecoder.java index 4e86f14c9..bf5a23fa7 100644 --- a/src/org/traccar/protocol/YwtProtocolDecoder.java +++ b/src/org/traccar/protocol/YwtProtocolDecoder.java @@ -19,6 +19,7 @@ import io.netty.channel.Channel; import org.traccar.BaseProtocolDecoder; import org.traccar.DeviceSession; import org.traccar.NetworkMessage; +import org.traccar.Protocol; import org.traccar.helper.Parser; import org.traccar.helper.PatternBuilder; import org.traccar.helper.UnitsConverter; @@ -29,7 +30,7 @@ import java.util.regex.Pattern; public class YwtProtocolDecoder extends BaseProtocolDecoder { - public YwtProtocolDecoder(YwtProtocol protocol) { + public YwtProtocolDecoder(Protocol protocol) { super(protocol); } -- cgit v1.2.3