diff options
Diffstat (limited to 'src/org/traccar/protocol')
17 files changed, 19 insertions, 19 deletions
diff --git a/src/org/traccar/protocol/ApelProtocolDecoder.java b/src/org/traccar/protocol/ApelProtocolDecoder.java index 9a25a4fff..6ce823a29 100644 --- a/src/org/traccar/protocol/ApelProtocolDecoder.java +++ b/src/org/traccar/protocol/ApelProtocolDecoder.java @@ -131,7 +131,7 @@ public class ApelProtocolDecoder extends BaseProtocolDecoder { // Position else if (hasDeviceId() && (type == MSG_TYPE_CURRENT_GPS_DATA || type == MSG_TYPE_STATE_FULL_INFO_T104 || type == MSG_TYPE_LOG_RECORDS)) { - List<Position> positions = new LinkedList<Position>(); + List<Position> positions = new LinkedList<>(); int recordCount = 1; if (type == MSG_TYPE_LOG_RECORDS) { diff --git a/src/org/traccar/protocol/AtrackProtocolDecoder.java b/src/org/traccar/protocol/AtrackProtocolDecoder.java index 1f8ec9a1f..1f777b12a 100644 --- a/src/org/traccar/protocol/AtrackProtocolDecoder.java +++ b/src/org/traccar/protocol/AtrackProtocolDecoder.java @@ -91,7 +91,7 @@ public class AtrackProtocolDecoder extends BaseProtocolDecoder { // Send acknowledgement sendResponse(channel, remoteAddress, id, index); - List<Position> positions = new LinkedList<Position>(); + List<Position> positions = new LinkedList<>(); while (buf.readableBytes() >= MIN_DATA_LENGTH) { diff --git a/src/org/traccar/protocol/AutoFonProtocolDecoder.java b/src/org/traccar/protocol/AutoFonProtocolDecoder.java index 810d666dd..afc9a2d79 100644 --- a/src/org/traccar/protocol/AutoFonProtocolDecoder.java +++ b/src/org/traccar/protocol/AutoFonProtocolDecoder.java @@ -140,7 +140,7 @@ public class AutoFonProtocolDecoder extends BaseProtocolDecoder { int count = buf.readUnsignedByte() & 0x0f; buf.readUnsignedShort(); // total count - List<Position> positions = new LinkedList<Position>(); + List<Position> positions = new LinkedList<>(); for (int i = 0; i < count; i++) { positions.add(decodePosition(buf, true)); diff --git a/src/org/traccar/protocol/BceProtocolDecoder.java b/src/org/traccar/protocol/BceProtocolDecoder.java index 4255ebde2..4d4f262e8 100644 --- a/src/org/traccar/protocol/BceProtocolDecoder.java +++ b/src/org/traccar/protocol/BceProtocolDecoder.java @@ -54,7 +54,7 @@ public class BceProtocolDecoder extends BaseProtocolDecoder { return null; } - List<Position> positions = new LinkedList<Position>(); + List<Position> positions = new LinkedList<>(); while (buf.readableBytes() > 1) { @@ -79,7 +79,7 @@ public class BceProtocolDecoder extends BaseProtocolDecoder { // Read masks int mask; - List<Integer> masks = new LinkedList<Integer>(); + List<Integer> masks = new LinkedList<>(); do { mask = buf.readUnsignedShort(); masks.add(mask); diff --git a/src/org/traccar/protocol/CastelProtocolDecoder.java b/src/org/traccar/protocol/CastelProtocolDecoder.java index 3a09822b3..358f6bb1d 100644 --- a/src/org/traccar/protocol/CastelProtocolDecoder.java +++ b/src/org/traccar/protocol/CastelProtocolDecoder.java @@ -150,7 +150,7 @@ public class CastelProtocolDecoder extends BaseProtocolDecoder { int count = buf.readUnsignedByte(); - List<Position> positions = new LinkedList<Position>(); + List<Position> positions = new LinkedList<>(); for (int i = 0; i < count; i++) { diff --git a/src/org/traccar/protocol/GalileoProtocolDecoder.java b/src/org/traccar/protocol/GalileoProtocolDecoder.java index 66eb1f2cc..b9a4eef44 100644 --- a/src/org/traccar/protocol/GalileoProtocolDecoder.java +++ b/src/org/traccar/protocol/GalileoProtocolDecoder.java @@ -51,7 +51,7 @@ public class GalileoProtocolDecoder extends BaseProtocolDecoder { private static final int TAG_REFRIGERATOR = 0x5b; private static final int TAG_PRESSURE = 0x5c; - private static final Map<Integer, Integer> tagLengthMap = new HashMap<Integer, Integer>(); + private static final Map<Integer, Integer> tagLengthMap = new HashMap<>(); static { int[] l1 = {0x01,0x02,0x35,0x43,0xc4,0xc5,0xc6,0xc7,0xc8,0xc9,0xca,0xcb,0xcc,0xcd,0xce,0xcf,0xd0,0xd1,0xd2,0xd5,0x88,0x8a,0x8b,0x8c,0xa0,0xaf,0xa1,0xa2,0xa3,0xa4,0xa5,0xa6,0xa7,0xa8,0xa9,0xaa,0xab,0xac,0xad,0xae}; diff --git a/src/org/traccar/protocol/MeitrackProtocolDecoder.java b/src/org/traccar/protocol/MeitrackProtocolDecoder.java index adbaa6e58..2cdf75106 100644 --- a/src/org/traccar/protocol/MeitrackProtocolDecoder.java +++ b/src/org/traccar/protocol/MeitrackProtocolDecoder.java @@ -178,7 +178,7 @@ public class MeitrackProtocolDecoder extends BaseProtocolDecoder { } private List<Position> decodeBinaryMessage(Channel channel, ChannelBuffer buf) { - List<Position> positions = new LinkedList<Position>(); + List<Position> positions = new LinkedList<>(); String flag = buf.toString(2, 1, Charset.defaultCharset()); int index = ChannelBufferTools.find(buf, 0, buf.readableBytes(), ","); diff --git a/src/org/traccar/protocol/Mta6ProtocolDecoder.java b/src/org/traccar/protocol/Mta6ProtocolDecoder.java index e83c84583..e751c8b7a 100644 --- a/src/org/traccar/protocol/Mta6ProtocolDecoder.java +++ b/src/org/traccar/protocol/Mta6ProtocolDecoder.java @@ -115,7 +115,7 @@ public class Mta6ProtocolDecoder extends BaseProtocolDecoder { } private List<Position> parseFormatA(ChannelBuffer buf) { - List<Position> positions = new LinkedList<Position>(); + List<Position> positions = new LinkedList<>(); FloatReader latitudeReader = new FloatReader(); FloatReader longitudeReader = new FloatReader(); diff --git a/src/org/traccar/protocol/NavisProtocolDecoder.java b/src/org/traccar/protocol/NavisProtocolDecoder.java index 46d249fe7..4f3e6a1a4 100644 --- a/src/org/traccar/protocol/NavisProtocolDecoder.java +++ b/src/org/traccar/protocol/NavisProtocolDecoder.java @@ -225,7 +225,7 @@ public class NavisProtocolDecoder extends BaseProtocolDecoder { } private Object processArray(Channel channel, ChannelBuffer buf) { - List<Position> positions = new LinkedList<Position>(); + List<Position> positions = new LinkedList<>(); int count = buf.readUnsignedByte(); for (int i = 0; i < count; i++) { diff --git a/src/org/traccar/protocol/OrionProtocolDecoder.java b/src/org/traccar/protocol/OrionProtocolDecoder.java index daf52750b..388178dad 100644 --- a/src/org/traccar/protocol/OrionProtocolDecoder.java +++ b/src/org/traccar/protocol/OrionProtocolDecoder.java @@ -77,7 +77,7 @@ public class OrionProtocolDecoder extends BaseProtocolDecoder { return null; } - List<Position> positions = new LinkedList<Position>(); + List<Position> positions = new LinkedList<>(); for (int i = 0; i < (header & 0x0f); i++) { diff --git a/src/org/traccar/protocol/PiligrimProtocolDecoder.java b/src/org/traccar/protocol/PiligrimProtocolDecoder.java index 7f6d9463e..fad9bc703 100644 --- a/src/org/traccar/protocol/PiligrimProtocolDecoder.java +++ b/src/org/traccar/protocol/PiligrimProtocolDecoder.java @@ -88,7 +88,7 @@ public class PiligrimProtocolDecoder extends BaseProtocolDecoder { return null; } - List<Position> positions = new LinkedList<Position>(); + List<Position> positions = new LinkedList<>(); ChannelBuffer buf = request.getContent(); while (buf.readableBytes() > 2) { diff --git a/src/org/traccar/protocol/ProgressProtocolDecoder.java b/src/org/traccar/protocol/ProgressProtocolDecoder.java index bb29532bf..8b57f52d0 100644 --- a/src/org/traccar/protocol/ProgressProtocolDecoder.java +++ b/src/org/traccar/protocol/ProgressProtocolDecoder.java @@ -87,7 +87,7 @@ public class ProgressProtocolDecoder extends BaseProtocolDecoder { // Position else if (hasDeviceId() && (type == MSG_POINT || type == MSG_ALARM || type == MSG_LOGMSG)) { - List<Position> positions = new LinkedList<Position>(); + List<Position> positions = new LinkedList<>(); int recordCount = 1; if (type == MSG_LOGMSG) { diff --git a/src/org/traccar/protocol/RuptelaProtocolDecoder.java b/src/org/traccar/protocol/RuptelaProtocolDecoder.java index b81b5b248..0064798f3 100644 --- a/src/org/traccar/protocol/RuptelaProtocolDecoder.java +++ b/src/org/traccar/protocol/RuptelaProtocolDecoder.java @@ -53,7 +53,7 @@ public class RuptelaProtocolDecoder extends BaseProtocolDecoder { int type = buf.readUnsignedByte(); if (type == COMMAND_RECORDS) { - List<Position> positions = new LinkedList<Position>(); + List<Position> positions = new LinkedList<>(); buf.readUnsignedByte(); // records left int count = buf.readUnsignedByte(); diff --git a/src/org/traccar/protocol/TeltonikaProtocolDecoder.java b/src/org/traccar/protocol/TeltonikaProtocolDecoder.java index eff04f7cf..e57723ddb 100644 --- a/src/org/traccar/protocol/TeltonikaProtocolDecoder.java +++ b/src/org/traccar/protocol/TeltonikaProtocolDecoder.java @@ -53,7 +53,7 @@ public class TeltonikaProtocolDecoder extends BaseProtocolDecoder { private static final int CODEC_12 = 0x0C; private List<Position> parseLocation(Channel channel, ChannelBuffer buf) { - List<Position> positions = new LinkedList<Position>(); + List<Position> positions = new LinkedList<>(); buf.skipBytes(4); // marker buf.readUnsignedInt(); // data length diff --git a/src/org/traccar/protocol/Tlt2hProtocolDecoder.java b/src/org/traccar/protocol/Tlt2hProtocolDecoder.java index b242a2232..3cdb9199a 100644 --- a/src/org/traccar/protocol/Tlt2hProtocolDecoder.java +++ b/src/org/traccar/protocol/Tlt2hProtocolDecoder.java @@ -81,7 +81,7 @@ public class Tlt2hProtocolDecoder extends BaseProtocolDecoder { String status = parser.group(2); String[] messages = sentence.substring(sentence.indexOf('\n') + 1).split("\r\n"); - List<Position> positions = new LinkedList<Position>(); + List<Position> positions = new LinkedList<>(); for (String message : messages) { parser = patternPosition.matcher(message); diff --git a/src/org/traccar/protocol/TytanProtocolDecoder.java b/src/org/traccar/protocol/TytanProtocolDecoder.java index 432fa213e..558664e2d 100644 --- a/src/org/traccar/protocol/TytanProtocolDecoder.java +++ b/src/org/traccar/protocol/TytanProtocolDecoder.java @@ -58,7 +58,7 @@ public class TytanProtocolDecoder extends BaseProtocolDecoder { return null; } - List<Position> positions = new LinkedList<Position>(); + List<Position> positions = new LinkedList<>(); while (buf.readable()) { @@ -137,7 +137,7 @@ public class TytanProtocolDecoder extends BaseProtocolDecoder { break; case 24: { - Set<Integer> temps = new LinkedHashSet<Integer>(); + Set<Integer> temps = new LinkedHashSet<>(); int temp = buf.readUnsignedByte(); for (int i = 3; i >= 0; i--) { int n = (temp >> (2 * i)) & 0x03; diff --git a/src/org/traccar/protocol/WialonProtocolDecoder.java b/src/org/traccar/protocol/WialonProtocolDecoder.java index 5cf6cdab5..e79a7e9ee 100644 --- a/src/org/traccar/protocol/WialonProtocolDecoder.java +++ b/src/org/traccar/protocol/WialonProtocolDecoder.java @@ -200,7 +200,7 @@ public class WialonProtocolDecoder extends BaseProtocolDecoder { else if (sentence.startsWith("#B#")) { String[] messages = sentence.substring(sentence.indexOf('#', 1) + 1).split("\\|"); - List<Position> positions = new LinkedList<Position>(); + List<Position> positions = new LinkedList<>(); for (String message : messages) { Position position = decodePosition(message); |