From e2a855c53cad32d38a53ed65c0b899f59c99e646 Mon Sep 17 00:00:00 2001 From: Anton Tananaev Date: Wed, 31 Oct 2012 23:27:09 +1300 Subject: Properly handle connection closing (fix #62) --- src/org/traccar/protocol/Avl08ProtocolDecoder.java | 4 ++-- .../traccar/protocol/EnforaProtocolDecoder.java | 4 ++-- src/org/traccar/protocol/Ev603ProtocolDecoder.java | 4 ++-- src/org/traccar/protocol/Gl100ProtocolDecoder.java | 4 ++-- src/org/traccar/protocol/Gl200ProtocolDecoder.java | 4 ++-- .../traccar/protocol/Gps103ProtocolDecoder.java | 4 ++-- src/org/traccar/protocol/H02ProtocolDecoder.java | 4 ++-- src/org/traccar/protocol/Jt600ProtocolDecoder.java | 4 ++-- src/org/traccar/protocol/MaxonProtocolDecoder.java | 23 +++++++++++----------- .../traccar/protocol/MeiligaoProtocolDecoder.java | 6 +++--- .../traccar/protocol/ProgressProtocolDecoder.java | 4 ++-- src/org/traccar/protocol/ST210ProtocolDecoder.java | 6 ++---- src/org/traccar/protocol/T55ProtocolDecoder.java | 20 +++++++++---------- src/org/traccar/protocol/Tk103ProtocolDecoder.java | 12 +++++------ src/org/traccar/protocol/V680ProtocolDecoder.java | 4 ++-- .../traccar/protocol/Xexun2ProtocolDecoder.java | 18 ++++++++--------- src/org/traccar/protocol/XexunProtocolDecoder.java | 4 ++-- 17 files changed, 63 insertions(+), 66 deletions(-) (limited to 'src/org/traccar/protocol') diff --git a/src/org/traccar/protocol/Avl08ProtocolDecoder.java b/src/org/traccar/protocol/Avl08ProtocolDecoder.java index 2dc711cd7..c8766b642 100644 --- a/src/org/traccar/protocol/Avl08ProtocolDecoder.java +++ b/src/org/traccar/protocol/Avl08ProtocolDecoder.java @@ -33,8 +33,8 @@ public class Avl08ProtocolDecoder extends GenericProtocolDecoder { /** * Initialize */ - public Avl08ProtocolDecoder(DataManager dataManager, Integer resetDelay) { - super(dataManager, resetDelay); + public Avl08ProtocolDecoder(DataManager dataManager) { + super(dataManager); } /** diff --git a/src/org/traccar/protocol/EnforaProtocolDecoder.java b/src/org/traccar/protocol/EnforaProtocolDecoder.java index 3b41592ea..fc40dcbba 100644 --- a/src/org/traccar/protocol/EnforaProtocolDecoder.java +++ b/src/org/traccar/protocol/EnforaProtocolDecoder.java @@ -37,8 +37,8 @@ public class EnforaProtocolDecoder extends GenericProtocolDecoder { /** * Initialize */ - public EnforaProtocolDecoder(DataManager dataManager, Integer resetDelay) { - super(dataManager, resetDelay); + public EnforaProtocolDecoder(DataManager dataManager) { + super(dataManager); } /** diff --git a/src/org/traccar/protocol/Ev603ProtocolDecoder.java b/src/org/traccar/protocol/Ev603ProtocolDecoder.java index 7730642f4..83689f760 100644 --- a/src/org/traccar/protocol/Ev603ProtocolDecoder.java +++ b/src/org/traccar/protocol/Ev603ProtocolDecoder.java @@ -39,8 +39,8 @@ public class Ev603ProtocolDecoder extends GenericProtocolDecoder{ /** * Initialize */ - public Ev603ProtocolDecoder(DataManager dataManager, Integer resetDelay) { - super(dataManager, resetDelay); + public Ev603ProtocolDecoder(DataManager dataManager) { + super(dataManager); } /** diff --git a/src/org/traccar/protocol/Gl100ProtocolDecoder.java b/src/org/traccar/protocol/Gl100ProtocolDecoder.java index 8ac68f6f4..2e8b40a61 100644 --- a/src/org/traccar/protocol/Gl100ProtocolDecoder.java +++ b/src/org/traccar/protocol/Gl100ProtocolDecoder.java @@ -33,8 +33,8 @@ public class Gl100ProtocolDecoder extends GenericProtocolDecoder { /** * Initialize */ - public Gl100ProtocolDecoder(DataManager dataManager, Integer resetDelay) { - super(dataManager, resetDelay); + public Gl100ProtocolDecoder(DataManager dataManager) { + super(dataManager); } /** diff --git a/src/org/traccar/protocol/Gl200ProtocolDecoder.java b/src/org/traccar/protocol/Gl200ProtocolDecoder.java index 63def5ddf..c109ea4c7 100644 --- a/src/org/traccar/protocol/Gl200ProtocolDecoder.java +++ b/src/org/traccar/protocol/Gl200ProtocolDecoder.java @@ -33,8 +33,8 @@ public class Gl200ProtocolDecoder extends GenericProtocolDecoder { /** * Initialize */ - public Gl200ProtocolDecoder(DataManager dataManager, Integer resetDelay) { - super(dataManager, resetDelay); + public Gl200ProtocolDecoder(DataManager dataManager) { + super(dataManager); } /** diff --git a/src/org/traccar/protocol/Gps103ProtocolDecoder.java b/src/org/traccar/protocol/Gps103ProtocolDecoder.java index 6a666fc86..cc0fcb9cb 100644 --- a/src/org/traccar/protocol/Gps103ProtocolDecoder.java +++ b/src/org/traccar/protocol/Gps103ProtocolDecoder.java @@ -33,8 +33,8 @@ public class Gps103ProtocolDecoder extends GenericProtocolDecoder { /** * Initialize */ - public Gps103ProtocolDecoder(DataManager dataManager, Integer resetDelay) { - super(dataManager, resetDelay); + public Gps103ProtocolDecoder(DataManager dataManager) { + super(dataManager); } /** diff --git a/src/org/traccar/protocol/H02ProtocolDecoder.java b/src/org/traccar/protocol/H02ProtocolDecoder.java index 183311817..bfdfc3758 100644 --- a/src/org/traccar/protocol/H02ProtocolDecoder.java +++ b/src/org/traccar/protocol/H02ProtocolDecoder.java @@ -33,8 +33,8 @@ public class H02ProtocolDecoder extends GenericProtocolDecoder { /** * Initialize */ - public H02ProtocolDecoder(DataManager dataManager, Integer resetDelay) { - super(dataManager, resetDelay); + public H02ProtocolDecoder(DataManager dataManager) { + super(dataManager); } /** diff --git a/src/org/traccar/protocol/Jt600ProtocolDecoder.java b/src/org/traccar/protocol/Jt600ProtocolDecoder.java index 11932f8ce..907eabb4b 100644 --- a/src/org/traccar/protocol/Jt600ProtocolDecoder.java +++ b/src/org/traccar/protocol/Jt600ProtocolDecoder.java @@ -36,8 +36,8 @@ public class Jt600ProtocolDecoder extends GenericProtocolDecoder { /** * Initialize */ - public Jt600ProtocolDecoder(DataManager dataManager, Integer resetDelay) { - super(dataManager, resetDelay); + public Jt600ProtocolDecoder(DataManager dataManager) { + super(dataManager); } /** diff --git a/src/org/traccar/protocol/MaxonProtocolDecoder.java b/src/org/traccar/protocol/MaxonProtocolDecoder.java index 7e26c9c19..e05ef0e30 100644 --- a/src/org/traccar/protocol/MaxonProtocolDecoder.java +++ b/src/org/traccar/protocol/MaxonProtocolDecoder.java @@ -42,8 +42,8 @@ public class MaxonProtocolDecoder extends GenericProtocolDecoder { /** * Initialize */ - public MaxonProtocolDecoder(DataManager dataManager, Integer resetDelay) { - super(dataManager, resetDelay); + public MaxonProtocolDecoder(DataManager dataManager) { + super(dataManager); } /** @@ -51,20 +51,19 @@ public class MaxonProtocolDecoder extends GenericProtocolDecoder { */ static private Pattern pattern = Pattern.compile( "\\$GPRMC," + - "(\\d{2})(\\d{2})(\\d{2}).(\\d{2})," + // Time (HHMMSS.SSS) - "([AV])," + // Validity - "(\\d{2})(\\d{2}.\\d{5})," + // Latitude (DDMM.MMMMM) + "(\\d{2})(\\d{2})(\\d{2})\\.(\\d{2})," + // Time (HHMMSS.SSS) + "([AV])," + // Validity + "(\\d{2})(\\d{2}\\.\\d{5})," + // Latitude (DDMM.MMMMM) "([NS])," + - "(\\d{3})(\\d{2}.\\d{5})," + // Longitude (DDDMM.MMMMM) + "(\\d{3})(\\d{2}\\.\\d{5})," + // Longitude (DDDMM.MMMMM) "([EW])," + - "(\\d+.\\d{3})?," + // Speed - "(\\d+.\\d{2})?," + // Course - "(\\d{2})(\\d{2})(\\d{2})" + // Date (DDMMYY) - ".+"); // Other (Checksumm) + "(\\d+\\.\\d{3})?," + // Speed + "(\\d+\\.\\d{2})?," + // Course + "(\\d{2})(\\d{2})(\\d{2})" + // Date (DDMMYY) + ".+"); // Other (Checksumm) static private Pattern gpfidPattern = Pattern.compile( - "\\$GPFID,(\\d+)$" - ); + "\\$GPFID,(\\d+)$"); /** * Decode message" diff --git a/src/org/traccar/protocol/MeiligaoProtocolDecoder.java b/src/org/traccar/protocol/MeiligaoProtocolDecoder.java index 388565207..27defde78 100644 --- a/src/org/traccar/protocol/MeiligaoProtocolDecoder.java +++ b/src/org/traccar/protocol/MeiligaoProtocolDecoder.java @@ -38,8 +38,8 @@ public class MeiligaoProtocolDecoder extends GenericProtocolDecoder { /** * Initialize */ - public MeiligaoProtocolDecoder(DataManager dataManager, Integer resetDelay) { - super(dataManager, resetDelay); + public MeiligaoProtocolDecoder(DataManager dataManager) { + super(dataManager); } /** @@ -55,7 +55,7 @@ public class MeiligaoProtocolDecoder extends GenericProtocolDecoder { "(\\d+.\\d+)," + // Speed "(\\d+\\.?\\d+)?," + // Course "(\\d{2})(\\d{2})(\\d{2})," + // Date (DDMMYY) - "[^\\|]+\\|(\\d+.\\d)\\|" + // Dilution of precision + "[^\\|]+\\|(\\d+\\.\\d)\\|" + // Dilution of precision "(\\d+)\\|" + // Altitude "([0-9a-fA-F]+)\\|" + // State ".*"); // TODO: parse ADC diff --git a/src/org/traccar/protocol/ProgressProtocolDecoder.java b/src/org/traccar/protocol/ProgressProtocolDecoder.java index 173dd083a..865e190e2 100644 --- a/src/org/traccar/protocol/ProgressProtocolDecoder.java +++ b/src/org/traccar/protocol/ProgressProtocolDecoder.java @@ -39,8 +39,8 @@ public class ProgressProtocolDecoder extends GenericProtocolDecoder { /** * Initialize */ - public ProgressProtocolDecoder(DataManager dataManager, Integer resetDelay) { - super(dataManager, resetDelay); + public ProgressProtocolDecoder(DataManager dataManager) { + super(dataManager); } /* diff --git a/src/org/traccar/protocol/ST210ProtocolDecoder.java b/src/org/traccar/protocol/ST210ProtocolDecoder.java index 9418293fc..642079361 100644 --- a/src/org/traccar/protocol/ST210ProtocolDecoder.java +++ b/src/org/traccar/protocol/ST210ProtocolDecoder.java @@ -1,13 +1,11 @@ package org.traccar.protocol; import java.util.Calendar; -import java.util.GregorianCalendar; import java.util.LinkedList; import java.util.List; 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.GenericProtocolDecoder; @@ -18,8 +16,8 @@ import org.traccar.model.Position; public class ST210ProtocolDecoder extends GenericProtocolDecoder { - public ST210ProtocolDecoder(DataManager dataManager, Integer resetDelay) { - super(dataManager, resetDelay); + public ST210ProtocolDecoder(DataManager dataManager) { + super(dataManager); } private enum ST210FIELDS { diff --git a/src/org/traccar/protocol/T55ProtocolDecoder.java b/src/org/traccar/protocol/T55ProtocolDecoder.java index 9342433b7..d531f1adf 100644 --- a/src/org/traccar/protocol/T55ProtocolDecoder.java +++ b/src/org/traccar/protocol/T55ProtocolDecoder.java @@ -38,8 +38,8 @@ public class T55ProtocolDecoder extends GenericProtocolDecoder { /** * Initialize */ - public T55ProtocolDecoder(DataManager dataManager, Integer resetDelay) { - super(dataManager, resetDelay); + public T55ProtocolDecoder(DataManager dataManager) { + super(dataManager); } /** @@ -47,16 +47,16 @@ public class T55ProtocolDecoder extends GenericProtocolDecoder { */ static private Pattern pattern = Pattern.compile( "\\$GPRMC," + - "(\\d{2})(\\d{2})(\\d{2}).(\\d{3})," + // Time (HHMMSS.SSS) - "([AV])," + // Validity - "(\\d{2})(\\d{2}.\\d{4})," + // Latitude (DDMM.MMMM) + "(\\d{2})(\\d{2})(\\d{2})\\.(\\d{3})," + // Time (HHMMSS.SSS) + "([AV])," + // Validity + "(\\d{2})(\\d{2}\\.\\d{4})," + // Latitude (DDMM.MMMM) "([NS])," + - "(\\d{3})(\\d{2}.\\d{4})," + // Longitude (DDDMM.MMMM) + "(\\d{3})(\\d{2}\\.\\d{4})," + // Longitude (DDDMM.MMMM) "([EW])," + - "(\\d+.\\d{2})?," + // Speed - "(\\d+.\\d{2})?," + // Course - "(\\d{2})(\\d{2})(\\d{2})" + // Date (DDMMYY) - ".+"); // Other (Checksumm) + "(\\d+\\.\\d{2})?," + // Speed + "(\\d+\\.\\d{2})?," + // Course + "(\\d{2})(\\d{2})(\\d{2})" + // Date (DDMMYY) + ".+"); // Other (Checksumm) /** * Decode message diff --git a/src/org/traccar/protocol/Tk103ProtocolDecoder.java b/src/org/traccar/protocol/Tk103ProtocolDecoder.java index a0129dd5a..4c0fd0c03 100644 --- a/src/org/traccar/protocol/Tk103ProtocolDecoder.java +++ b/src/org/traccar/protocol/Tk103ProtocolDecoder.java @@ -33,8 +33,8 @@ public class Tk103ProtocolDecoder extends GenericProtocolDecoder { /** * Initialize */ - public Tk103ProtocolDecoder(DataManager dataManager, Integer resetDelay) { - super(dataManager, resetDelay); + public Tk103ProtocolDecoder(DataManager dataManager) { + super(dataManager); } /** @@ -47,13 +47,13 @@ public class Tk103ProtocolDecoder extends GenericProtocolDecoder { "(\\d{15})" + // IMEI (?) "(\\d{2})(\\d{2})(\\d{2})" + // Date (YYMMDD) "([AV])" + // Validity - "(\\d{2})(\\d{2}.\\d{4})" + // Latitude (DDMM.MMMM) + "(\\d{2})(\\d{2}\\.\\d{4})" + // Latitude (DDMM.MMMM) "([NS])" + - "(\\d{3})(\\d{2}.\\d{4})" + // Longitude (DDDMM.MMMM) + "(\\d{3})(\\d{2}\\.\\d{4})" + // Longitude (DDDMM.MMMM) "([EW])" + - "(\\d+.\\d)" + // Speed + "(\\d+\\.\\d)" + // Speed "(\\d{2})(\\d{2})(\\d{2})" + // Time (HHMMSS) - "(\\d+.\\d{2})" + // Course + "(\\d+\\.\\d{2})" + // Course "(\\d+)" + // State ".+"); // Mileage (?) diff --git a/src/org/traccar/protocol/V680ProtocolDecoder.java b/src/org/traccar/protocol/V680ProtocolDecoder.java index 5d2427ca4..10f17b184 100644 --- a/src/org/traccar/protocol/V680ProtocolDecoder.java +++ b/src/org/traccar/protocol/V680ProtocolDecoder.java @@ -33,8 +33,8 @@ public class V680ProtocolDecoder extends GenericProtocolDecoder { /** * Initialize */ - public V680ProtocolDecoder(DataManager dataManager, Integer resetDelay) { - super(dataManager, resetDelay); + public V680ProtocolDecoder(DataManager dataManager) { + super(dataManager); } /** diff --git a/src/org/traccar/protocol/Xexun2ProtocolDecoder.java b/src/org/traccar/protocol/Xexun2ProtocolDecoder.java index 1ee2737d1..e7b29b728 100644 --- a/src/org/traccar/protocol/Xexun2ProtocolDecoder.java +++ b/src/org/traccar/protocol/Xexun2ProtocolDecoder.java @@ -33,8 +33,8 @@ public class Xexun2ProtocolDecoder extends GenericProtocolDecoder { /** * Initialize */ - public Xexun2ProtocolDecoder(DataManager dataManager, Integer resetDelay) { - super(dataManager, resetDelay); + public Xexun2ProtocolDecoder(DataManager dataManager) { + super(dataManager); } /** @@ -45,14 +45,14 @@ public class Xexun2ProtocolDecoder extends GenericProtocolDecoder { "(\\d+)," + // Serial "(\\+\\d+)," + // Number "GPRMC," + - "(\\d{2})(\\d{2})(\\d{2}).(\\d{3})," + // Time (HHMMSS.SSS) + "(\\d{2})(\\d{2})(\\d{2})\\.(\\d{3})," + // Time (HHMMSS.SSS) "([AV])," + // Validity - "(\\d{2})(\\d{2}.\\d{4})," + // Latitude (DDMM.MMMM) + "(\\d{2})(\\d{2}\\.\\d{4})," + // Latitude (DDMM.MMMM) "([NS])," + - "(\\d{3})(\\d{2}.\\d{4})," + // Longitude (DDDMM.MMMM) + "(\\d{3})(\\d{2}\\.\\d{4})," + // Longitude (DDDMM.MMMM) "([EW])," + - "(\\d+.\\d+)," + // Speed - "(\\d+.\\d+)?," + // Course + "(\\d+\\.\\d+)," + // Speed + "(\\d+\\.\\d+)?," + // Course "(\\d{2})(\\d{2})(\\d{2})," + // Date (DDMMYY) ",,.\\*..," + // Checksum "([FL])," + // Signal @@ -60,8 +60,8 @@ public class Xexun2ProtocolDecoder extends GenericProtocolDecoder { ".*imei:" + "(\\d+)," + // IMEI "(\\d+)," + // Satellites - "(\\d+.\\d+)," + // Altitude - "F:(\\d+.\\d+)V," + // Power + "(\\d+\\.\\d+)," + // Altitude + "F:(\\d+\\.\\d+)V," + // Power ".*" + "[\r\n]*"); diff --git a/src/org/traccar/protocol/XexunProtocolDecoder.java b/src/org/traccar/protocol/XexunProtocolDecoder.java index f6b7bcb44..cbff2dee3 100644 --- a/src/org/traccar/protocol/XexunProtocolDecoder.java +++ b/src/org/traccar/protocol/XexunProtocolDecoder.java @@ -34,8 +34,8 @@ public class XexunProtocolDecoder extends GenericProtocolDecoder { /** * Initialize */ - public XexunProtocolDecoder(DataManager dataManager, Integer resetDelay) { - super(dataManager, resetDelay); + public XexunProtocolDecoder(DataManager dataManager) { + super(dataManager); } /** -- cgit v1.2.3