aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAnton Tananaev <anton.tananaev@gmail.com>2015-09-12 21:38:17 +1200
committerAnton Tananaev <anton.tananaev@gmail.com>2015-09-12 21:38:17 +1200
commit1a43a20487bf187c6c759eedce273b38159ea140 (patch)
tree6e2fa693ba29fc047c0964bc15b9e5221eebad25
parenta7d9e52831ff5f6f360a7e5a264ae7021c9882c7 (diff)
downloadtraccar-server-1a43a20487bf187c6c759eedce273b38159ea140.tar.gz
traccar-server-1a43a20487bf187c6c759eedce273b38159ea140.tar.bz2
traccar-server-1a43a20487bf187c6c759eedce273b38159ea140.zip
Use protocol name for config keys
-rw-r--r--src/org/traccar/protocol/GlobalSatProtocolDecoder.java4
-rw-r--r--src/org/traccar/protocol/Gt06ProtocolDecoder.java4
2 files changed, 4 insertions, 4 deletions
diff --git a/src/org/traccar/protocol/GlobalSatProtocolDecoder.java b/src/org/traccar/protocol/GlobalSatProtocolDecoder.java
index 04b88114f..2b36d7a9e 100644
--- a/src/org/traccar/protocol/GlobalSatProtocolDecoder.java
+++ b/src/org/traccar/protocol/GlobalSatProtocolDecoder.java
@@ -35,8 +35,8 @@ public class GlobalSatProtocolDecoder extends BaseProtocolDecoder {
public GlobalSatProtocolDecoder(GlobalSatProtocol protocol) {
super(protocol);
- format0 = Context.getConfig().getString(protocol + ".format0", "TSPRXAB27GHKLMnaicz*U!");
- format1 = Context.getConfig().getString(protocol + ".format1", "SARY*U!");
+ format0 = Context.getConfig().getString(getProtocolName() + ".format0", "TSPRXAB27GHKLMnaicz*U!");
+ format1 = Context.getConfig().getString(getProtocolName() + ".format1", "SARY*U!");
}
public void setFormat0(String format) {
diff --git a/src/org/traccar/protocol/Gt06ProtocolDecoder.java b/src/org/traccar/protocol/Gt06ProtocolDecoder.java
index 018b42dc9..e16432275 100644
--- a/src/org/traccar/protocol/Gt06ProtocolDecoder.java
+++ b/src/org/traccar/protocol/Gt06ProtocolDecoder.java
@@ -36,9 +36,9 @@ public class Gt06ProtocolDecoder extends BaseProtocolDecoder {
public Gt06ProtocolDecoder(Gt06Protocol protocol) {
super(protocol);
- if (Context.getConfig().hasKey(protocol + ".timezone")) {
+ if (Context.getConfig().hasKey(getProtocolName() + ".timezone")) {
forceTimeZone = true;
- timeZone.setRawOffset(Context.getConfig().getInteger(protocol + ".timezone") * 1000);
+ timeZone.setRawOffset(Context.getConfig().getInteger(getProtocolName() + ".timezone") * 1000);
}
}