From 2a3fad9496decd83f06ae5abf067f8d4337ec741 Mon Sep 17 00:00:00 2001 From: Anton Tananaev Date: Thu, 23 Apr 2015 15:49:56 +1200 Subject: Major code refacroting --- src/org/traccar/protocol/WialonProtocolDecoder.java | 15 +++++---------- 1 file changed, 5 insertions(+), 10 deletions(-) (limited to 'src/org/traccar/protocol/WialonProtocolDecoder.java') diff --git a/src/org/traccar/protocol/WialonProtocolDecoder.java b/src/org/traccar/protocol/WialonProtocolDecoder.java index 6c4c0e8db..76cf9b924 100644 --- a/src/org/traccar/protocol/WialonProtocolDecoder.java +++ b/src/org/traccar/protocol/WialonProtocolDecoder.java @@ -34,10 +34,8 @@ import org.traccar.model.Position; public class WialonProtocolDecoder extends BaseProtocolDecoder { - private Long deviceId; - - public WialonProtocolDecoder(DataManager dataManager, String protocol, Properties properties) { - super(dataManager, protocol, properties); + public WialonProtocolDecoder(String protocol) { + super(protocol); } private static final Pattern pattern = Pattern.compile( @@ -75,14 +73,14 @@ public class WialonProtocolDecoder extends BaseProtocolDecoder { // Parse message Matcher parser = pattern.matcher(substring); - if (deviceId == null || !parser.matches()) { + if (!hasDeviceId() || !parser.matches()) { return null; } // Create new position Position position = new Position(); ExtendedInfoFormatter extendedInfo = new ExtendedInfoFormatter(getProtocol()); - position.setDeviceId(deviceId); + position.setDeviceId(getDeviceId()); Integer index = 1; @@ -187,11 +185,8 @@ public class WialonProtocolDecoder extends BaseProtocolDecoder { // Detect device ID if (sentence.startsWith("#L#")) { String imei = sentence.substring(3, sentence.indexOf(';')); - try { - deviceId = getDataManager().getDeviceByImei(imei).getId(); + if (identify(imei)) { sendResponse(channel, "#AL#", 1); - } catch(Exception error) { - Log.warning("Unknown device - " + imei); } } -- cgit v1.2.3