From a2dac324574dde8fe8e57bd46dd7f94d0fb60231 Mon Sep 17 00:00:00 2001 From: Anton Tananaev Date: Sun, 12 Jul 2015 17:54:00 +1200 Subject: Re-factor configuration access --- .../traccar/protocol/GlobalSatProtocolDecoder.java | 22 +++++----------------- 1 file changed, 5 insertions(+), 17 deletions(-) (limited to 'src/org/traccar/protocol/GlobalSatProtocolDecoder.java') diff --git a/src/org/traccar/protocol/GlobalSatProtocolDecoder.java b/src/org/traccar/protocol/GlobalSatProtocolDecoder.java index c411b4c25..04b88114f 100644 --- a/src/org/traccar/protocol/GlobalSatProtocolDecoder.java +++ b/src/org/traccar/protocol/GlobalSatProtocolDecoder.java @@ -17,14 +17,10 @@ package org.traccar.protocol; import java.net.SocketAddress; 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.Context; import org.traccar.helper.UnitsConverter; @@ -33,22 +29,14 @@ import org.traccar.model.Position; public class GlobalSatProtocolDecoder extends BaseProtocolDecoder { - // Default values - private String format0 = "TSPRXAB27GHKLMnaicz*U!"; - private String format1 = "SARY*U!"; + private String format0; + private String format1; public GlobalSatProtocolDecoder(GlobalSatProtocol protocol) { super(protocol); - - Properties properties = Context.getProps(); - if (properties != null) { - if (properties.containsKey(protocol + ".format0")) { - format0 = properties.getProperty(protocol + ".format0"); - } - if (properties.containsKey(protocol + ".format1")) { - format1 = properties.getProperty(protocol + ".format1"); - } - } + + format0 = Context.getConfig().getString(protocol + ".format0", "TSPRXAB27GHKLMnaicz*U!"); + format1 = Context.getConfig().getString(protocol + ".format1", "SARY*U!"); } public void setFormat0(String format) { -- cgit v1.2.3