From 876169d832846e4ee1a5eea769771e0e1abcfea2 Mon Sep 17 00:00:00 2001
From: jon-stumpf <jon.stumpf@gmail.com>
Date: Fri, 17 Mar 2017 08:39:26 -0400
Subject: Renamed millisecond DateTimeFormats as requested;

---
 src/org/traccar/helper/Parser.java                   | 12 ++++++------
 src/org/traccar/protocol/HomtecsProtocolDecoder.java |  2 +-
 2 files changed, 7 insertions(+), 7 deletions(-)

(limited to 'src/org/traccar')

diff --git a/src/org/traccar/helper/Parser.java b/src/org/traccar/helper/Parser.java
index aa2f457d3..1b77390b3 100644
--- a/src/org/traccar/helper/Parser.java
+++ b/src/org/traccar/helper/Parser.java
@@ -177,9 +177,9 @@ public class Parser {
         SMH_DMY,     // SSMMHHDDMMYYYY or SSMMHHDDMMYY
 
         DMY_HMS,     // DDMMYYYYHHMMSS or DDMMYYHHMMSS
-        DMY_HMSms,   // DDMMYYYYHHMMSS.sss or DDMMYYHHMMSS.sss
+        DMY_HMSS,    // DDMMYYYYHHMMSS.sss or DDMMYYHHMMSS.sss
         YMD_HMS,     // YYYYMMDDHHMMSS or YYMMDDHHMMSS
-        YMD_HMSms,   // YYYYMMDDHHMMSS.sss or YYMMDDHHMMSS.sss
+        YMD_HMSS,    // YYYYMMDDHHMMSS.sss or YYMMDDHHMMSS.sss
 
         ISO8601      // YYYY-MM-DDTHH:MM:SS+HH:MM
     }
@@ -217,12 +217,12 @@ public class Parser {
                 day = nextInt(radix); month = nextInt(radix); year = nextInt(radix); // (d{2})(d{2})(d{2}|d{4})
                 break;
             case DMY_HMS:
-            case DMY_HMSms:
+            case DMY_HMSS:
                 day = nextInt(radix); month = nextInt(radix); year = nextInt(radix); // (d{2})(d{2})(d{2}|d{4})
                 hour = nextInt(radix); minute = nextInt(radix); second = nextInt(radix); // (d{2})(d{2})(d{2})
                 break;
             case YMD_HMS:
-            case YMD_HMSms:
+            case YMD_HMSS:
             case ISO8601:
             default:
                 year = nextInt(radix); month = nextInt(radix); day = nextInt(radix); // (d{2}|d{4})(d{2})(d{2})
@@ -231,8 +231,8 @@ public class Parser {
         }
 
         switch (format) {
-            case YMD_HMSms:
-            case DMY_HMSms:
+            case YMD_HMSS:
+            case DMY_HMSS:
                 millisecond = nextInt(radix); // (ddd)
                 break;
             case ISO8601:
diff --git a/src/org/traccar/protocol/HomtecsProtocolDecoder.java b/src/org/traccar/protocol/HomtecsProtocolDecoder.java
index c0dbf0b1b..846df0b66 100644
--- a/src/org/traccar/protocol/HomtecsProtocolDecoder.java
+++ b/src/org/traccar/protocol/HomtecsProtocolDecoder.java
@@ -63,7 +63,7 @@ public class HomtecsProtocolDecoder extends BaseProtocolDecoder {
         }
         position.setDeviceId(deviceSession.getDeviceId());
 
-        position.setTime(parser.nextDateTime(Parser.DateTimeFormat.YMD_HMSms));
+        position.setTime(parser.nextDateTime(Parser.DateTimeFormat.YMD_HMSS));
 
         position.setValid(true);
         position.set(Position.KEY_SATELLITES, parser.nextInt());
-- 
cgit v1.2.3