diff options
| author | Anton Tananaev <anton.tananaev@gmail.com> | 2014-10-22 09:43:19 +1300 |
|---|---|---|
| committer | Anton Tananaev <anton.tananaev@gmail.com> | 2014-10-22 09:43:19 +1300 |
| commit | 91395e9ac0dd5de366b87bb5d082990b15a946e9 (patch) | |
| tree | 57aea8c58bbd8d197d61e6b7013937c44f950de7 /src/org/traccar/protocol/GatorProtocolDecoder.java | |
| parent | 8876e964cf26a090d11fd855642c95bc02a17c7f (diff) | |
| parent | 0d59336ac1fbe9934260e56811c3bcafa0aeaeca (diff) | |
| download | traccar-server-91395e9ac0dd5de366b87bb5d082990b15a946e9.tar.gz traccar-server-91395e9ac0dd5de366b87bb5d082990b15a946e9.tar.bz2 traccar-server-91395e9ac0dd5de366b87bb5d082990b15a946e9.zip | |
Merge pull request #918 from jon-stumpf/enhancement-eliminate-hardcoded-protocol-names
Eliminate hardcoded protocol names
Diffstat (limited to 'src/org/traccar/protocol/GatorProtocolDecoder.java')
| -rw-r--r-- | src/org/traccar/protocol/GatorProtocolDecoder.java | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/src/org/traccar/protocol/GatorProtocolDecoder.java b/src/org/traccar/protocol/GatorProtocolDecoder.java index 15a46d375..9fb74dacc 100644 --- a/src/org/traccar/protocol/GatorProtocolDecoder.java +++ b/src/org/traccar/protocol/GatorProtocolDecoder.java @@ -16,12 +16,15 @@ package org.traccar.protocol; import java.util.Calendar; +import java.util.Properties; import java.util.TimeZone; + import org.jboss.netty.buffer.ChannelBuffer; import org.jboss.netty.channel.Channel; import org.jboss.netty.channel.ChannelHandlerContext; + import org.traccar.BaseProtocolDecoder; -import org.traccar.ServerManager; +import org.traccar.database.DataManager; import org.traccar.helper.ChannelBufferTools; import org.traccar.helper.Log; import org.traccar.model.ExtendedInfoFormatter; @@ -29,8 +32,8 @@ import org.traccar.model.Position; public class GatorProtocolDecoder extends BaseProtocolDecoder { - public GatorProtocolDecoder(ServerManager serverManager) { - super(serverManager); + public GatorProtocolDecoder(DataManager dataManager, String protocol, Properties properties) { + super(dataManager, protocol, properties); } private static final int PACKET_HEARTBEAT = 0x21; @@ -66,7 +69,7 @@ public class GatorProtocolDecoder extends BaseProtocolDecoder { // Create new position Position position = new Position(); - ExtendedInfoFormatter extendedInfo = new ExtendedInfoFormatter("gator"); + ExtendedInfoFormatter extendedInfo = new ExtendedInfoFormatter(getProtocol()); // Identification try { |