diff options
author | Anton Tananaev <anton.tananaev@gmail.com> | 2015-06-29 10:49:13 +1200 |
---|---|---|
committer | Anton Tananaev <anton.tananaev@gmail.com> | 2015-06-29 10:49:13 +1200 |
commit | 55448d82b2971bc16c67bfa2b2e996d81c4c702e (patch) | |
tree | 565ee245ea0e98b88674b775147fbc6d3e1933cb /src/org/traccar/protocol/Pt3000ProtocolDecoder.java | |
parent | 88b3f00f3855aa408c7859051efdcb5b37fe559f (diff) | |
parent | d1c4cd526845aad56c5b0a3e20454638bbc7fecc (diff) | |
download | trackermap-server-55448d82b2971bc16c67bfa2b2e996d81c4c702e.tar.gz trackermap-server-55448d82b2971bc16c67bfa2b2e996d81c4c702e.tar.bz2 trackermap-server-55448d82b2971bc16c67bfa2b2e996d81c4c702e.zip |
Merge branch implement commands (fix #1271)
Diffstat (limited to 'src/org/traccar/protocol/Pt3000ProtocolDecoder.java')
-rw-r--r-- | src/org/traccar/protocol/Pt3000ProtocolDecoder.java | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/src/org/traccar/protocol/Pt3000ProtocolDecoder.java b/src/org/traccar/protocol/Pt3000ProtocolDecoder.java index 01b7b284c..ebfded3d5 100644 --- a/src/org/traccar/protocol/Pt3000ProtocolDecoder.java +++ b/src/org/traccar/protocol/Pt3000ProtocolDecoder.java @@ -24,12 +24,11 @@ import org.jboss.netty.channel.Channel; import org.jboss.netty.channel.ChannelHandlerContext; import org.traccar.BaseProtocolDecoder; -import org.traccar.model.Event; import org.traccar.model.Position; public class Pt3000ProtocolDecoder extends BaseProtocolDecoder { - public Pt3000ProtocolDecoder(String protocol) { + public Pt3000ProtocolDecoder(Pt3000Protocol protocol) { super(protocol); } @@ -62,12 +61,12 @@ public class Pt3000ProtocolDecoder extends BaseProtocolDecoder { // Create new position Position position = new Position(); - position.setProtocol(getProtocol()); + position.setProtocol(getProtocolName()); Integer index = 1; // Identifier - if (!identify(parser.group(index++))) { + if (!identify(parser.group(index++), channel)) { return null; } position.setDeviceId(getDeviceId()); |