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/LaipacProtocolDecoder.java | |
parent | 8876e964cf26a090d11fd855642c95bc02a17c7f (diff) | |
parent | 0d59336ac1fbe9934260e56811c3bcafa0aeaeca (diff) | |
download | trackermap-server-91395e9ac0dd5de366b87bb5d082990b15a946e9.tar.gz trackermap-server-91395e9ac0dd5de366b87bb5d082990b15a946e9.tar.bz2 trackermap-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/LaipacProtocolDecoder.java')
-rw-r--r-- | src/org/traccar/protocol/LaipacProtocolDecoder.java | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/src/org/traccar/protocol/LaipacProtocolDecoder.java b/src/org/traccar/protocol/LaipacProtocolDecoder.java index a62a50e51..f95109b80 100644 --- a/src/org/traccar/protocol/LaipacProtocolDecoder.java +++ b/src/org/traccar/protocol/LaipacProtocolDecoder.java @@ -16,13 +16,16 @@ package org.traccar.protocol; import java.util.Calendar; +import java.util.Properties; import java.util.TimeZone; import java.util.regex.Matcher; import java.util.regex.Pattern; + 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.Crc; import org.traccar.helper.Log; import org.traccar.model.ExtendedInfoFormatter; @@ -30,8 +33,8 @@ import org.traccar.model.Position; public class LaipacProtocolDecoder extends BaseProtocolDecoder { - public LaipacProtocolDecoder(ServerManager serverManager) { - super(serverManager); + public LaipacProtocolDecoder(DataManager dataManager, String protocol, Properties properties) { + super(dataManager, protocol, properties); } private static final Pattern pattern = Pattern.compile( @@ -71,7 +74,7 @@ public class LaipacProtocolDecoder extends BaseProtocolDecoder { // Create new position Position position = new Position(); - ExtendedInfoFormatter extendedInfo = new ExtendedInfoFormatter("laipac"); + ExtendedInfoFormatter extendedInfo = new ExtendedInfoFormatter(getProtocol()); Integer index = 1; // Identification |