Merge pull request #2104 from Windchild292/dev_Windchild_MHQ1894

MekHQ 1894: Adding additional legacy date format
MegaMek · Aug 3, 2020 · a57db2a · a57db2a
2 parents 9712cdf + d241de1
commit a57db2a
Showing 1 changed file with 7 additions and 3 deletions.
diff --git a/megamek/src/megamek/utils/MegaMekXmlUtil.java b/megamek/src/megamek/utils/MegaMekXmlUtil.java
@@ -21,6 +21,7 @@
 import java.io.InputStream;
 import java.io.PrintWriter;
 import java.time.LocalDate;
+import java.time.format.DateTimeFormatter;
 import java.time.format.DateTimeParseException;
 
 import javax.xml.parsers.DocumentBuilder;
@@ -176,12 +177,15 @@ public static String indentStr(int level) {
      */
     public static LocalDate parseDate(String value) throws DateTimeParseException {
         // Accept (truncates): yyyy-MM-dd HH:mm:ss
+        // Accept (legacy): YYYYMMDD
         // Accept: yyyy-MM-dd
         int firstSpace = value.indexOf(' ');
-        if (firstSpace < 0) {
-            return LocalDate.parse(value);
-        } else {
+        if (firstSpace >= 0) {
             return LocalDate.parse(value.substring(0, firstSpace));
+        } else if (value.indexOf('-') < 0) {
+            return LocalDate.parse(value, DateTimeFormatter.ofPattern("yyyyMMdd"));
+        } else { // default parsing
+            return LocalDate.parse(value);
         }
     }