aboutsummaryrefslogtreecommitdiff
path: root/src/org/traccar/protocol/Gt06ProtocolDecoder.java
diff options
context:
space:
mode:
authorjon-stumpf <jon.stumpf@gmail.com>2014-10-21 15:00:55 -0400
committerjon-stumpf <jon.stumpf@gmail.com>2014-10-21 16:02:45 -0400
commit0d59336ac1fbe9934260e56811c3bcafa0aeaeca (patch)
tree57aea8c58bbd8d197d61e6b7013937c44f950de7 /src/org/traccar/protocol/Gt06ProtocolDecoder.java
parentf0790eba6f3194daf4677c27e8259f783aae3207 (diff)
downloadtrackermap-server-0d59336ac1fbe9934260e56811c3bcafa0aeaeca.tar.gz
trackermap-server-0d59336ac1fbe9934260e56811c3bcafa0aeaeca.tar.bz2
trackermap-server-0d59336ac1fbe9934260e56811c3bcafa0aeaeca.zip
Updated BaseProtocolDecoder constructor to take three parameters (DataManager, String, Properties); Removed second constructor;
Diffstat (limited to 'src/org/traccar/protocol/Gt06ProtocolDecoder.java')
-rw-r--r--src/org/traccar/protocol/Gt06ProtocolDecoder.java19
1 files changed, 8 insertions, 11 deletions
diff --git a/src/org/traccar/protocol/Gt06ProtocolDecoder.java b/src/org/traccar/protocol/Gt06ProtocolDecoder.java
index 10fa20f65..0ef242b05 100644
--- a/src/org/traccar/protocol/Gt06ProtocolDecoder.java
+++ b/src/org/traccar/protocol/Gt06ProtocolDecoder.java
@@ -17,13 +17,15 @@ package org.traccar.protocol;
import java.util.Calendar;
import java.util.Properties;
+import java.util.Properties;
import java.util.TimeZone;
+
import org.jboss.netty.buffer.ChannelBuffer;
import org.jboss.netty.buffer.ChannelBuffers;
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;
@@ -35,18 +37,13 @@ public class Gt06ProtocolDecoder extends BaseProtocolDecoder {
private Long deviceId;
private final TimeZone timeZone = TimeZone.getTimeZone("UTC");
- public Gt06ProtocolDecoder(DataManager dataManager) {
- super(dataManager);
- }
-
- public Gt06ProtocolDecoder(ServerManager serverManager, String protocol) {
- super(serverManager, protocol);
+ public Gt06ProtocolDecoder(DataManager dataManager, String protocol, Properties properties) {
+ super(dataManager, protocol, properties);
- if (serverManager != null) {
- Properties p = getServerManager().getProperties();
- if (p.containsKey(protocol + ".timezone")) {
+ if (properties != null) {
+ if (properties.containsKey(protocol + ".timezone")) {
timeZone.setRawOffset(
- Integer.valueOf(p.getProperty(protocol + ".timezone")) * 1000);
+ Integer.valueOf(properties.getProperty(protocol + ".timezone")) * 1000);
}
}
}