From 001ee6acf3052fd99970e75a7f55b11332b9442f Mon Sep 17 00:00:00 2001
From: jon-stumpf <jon.stumpf@gmail.com>
Date: Thu, 16 Mar 2017 23:35:43 -0400
Subject: Merged Y4 and Y2 DateTimeFormats, simplifying switch;

---
 src/org/traccar/protocol/CguardProtocolDecoder.java | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'src/org/traccar/protocol/CguardProtocolDecoder.java')

diff --git a/src/org/traccar/protocol/CguardProtocolDecoder.java b/src/org/traccar/protocol/CguardProtocolDecoder.java
index 59a10d804..19144017a 100644
--- a/src/org/traccar/protocol/CguardProtocolDecoder.java
+++ b/src/org/traccar/protocol/CguardProtocolDecoder.java
@@ -62,7 +62,7 @@ public class CguardProtocolDecoder extends BaseProtocolDecoder {
         position.setProtocol(getProtocolName());
         position.setDeviceId(deviceSession.getDeviceId());
 
-        position.setTime(parser.nextDateTime(Parser.DateTimeFormat.Y2MD_HMS));
+        position.setTime(parser.nextDateTime());
 
         position.setValid(true);
         position.setLatitude(parser.nextDouble());
@@ -88,7 +88,7 @@ public class CguardProtocolDecoder extends BaseProtocolDecoder {
         position.setProtocol(getProtocolName());
         position.setDeviceId(deviceSession.getDeviceId());
 
-        getLastLocation(position, parser.nextDateTime(Parser.DateTimeFormat.Y2MD_HMS));
+        getLastLocation(position, parser.nextDateTime());
 
         String[] data = parser.next().split(":");
         for (int i = 0; i < data.length / 2; i++) {
-- 
cgit v1.2.3