Changeset 19538 in josm

Timestamp:

2026-02-20T12:50:19+01:00 (5 hours ago)

Author:

stoecker

Message:

fix one more PMD, see #24635, drop java.util.Date in SyncEditorLayerIndex

File:

• trunk/scripts/SyncEditorLayerIndex.java (modified) (5 diffs)

trunk/scripts/SyncEditorLayerIndex.java

@@ -16 +16 @@
 import java.text.DecimalFormat;
 import java.text.ParseException;
-import java.text.SimpleDateFormat;
+import java.time.LocalDate;
+import java.time.format.DateTimeFormatter;
+import java.time.format.ResolverStyle;
 import java.util.ArrayList;
 import java.util.Arrays;
-import java.util.Calendar;
 import java.util.Collection;
 import java.util.Collections;
-import java.util.Date;
 import java.util.HashMap;
 import java.util.LinkedList;
@@ -818 +818 @@
             Matcher m = pattern.matcher(ed);
             if (m.matches()) {
-                Calendar cal = Calendar.getInstance();
-                cal.set(Integer.parseInt(m.group(2)),
-                        m.group(4) == null ? 0 : Integer.parseInt(m.group(4))-1,
-                        m.group(6) == null ? 1 : Integer.parseInt(m.group(6)));
-                cal.add(Calendar.DAY_OF_MONTH, -1);
-                ed2 = m.group(1) + cal.get(Calendar.YEAR);
+                int year = Integer.parseInt(m.group(2));
+                int month = (m.group(4) == null) ? 1 : Integer.parseInt(m.group(4));
+                int day = (m.group(6) == null) ? 1 : Integer.parseInt(m.group(6));
+                LocalDate date = LocalDate.of(year, month, day).minusDays(1);
+                ed2 = m.group(1) + date.getYear();
                 if (m.group(4) != null)
-                    ed2 += "-" + String.format("%02d", cal.get(Calendar.MONTH)+1);
+                    ed2 += "-" + String.format("%02d", date.getMonthValue());
                 if (m.group(6) != null)
-                    ed2 += "-" + String.format("%02d", cal.get(Calendar.DAY_OF_MONTH));
+                    ed2 += "-" + String.format("%02d", date.getDayOfMonth());
             }
             String ef2 = ed2.replaceAll("\\A-;", "").replaceAll(";-\\z", "").replaceAll("\\A([0-9-]+);\\1\\z", "$1");
@@ -1306 +1305 @@
                 } else {
                     try {
-                        Date first = verifyDate(m.group(2), m.group(4), m.group(6));
-                        Date second = verifyDate(m.group(9), m.group(11), m.group(13));
+                        LocalDate first = verifyDate(m.group(2), m.group(4), m.group(6));
+                        LocalDate second = verifyDate(m.group(9), m.group(11), m.group(13));
                         if (second.compareTo(first) < 0) {
                             myprintln("~ JOSM-Date '"+d+"' is strange (second earlier than first): "+getDescription(j));
@@ -1393 +1392 @@
     }
 
-    static Date verifyDate(String year, String month, String day) throws ParseException {
+    static LocalDate verifyDate(String year, String month, String day) throws ParseException {
         String date;
         if (year == null) {
@@ -1400 +1399 @@
             date = year + "-" + (month == null ? "01" : month) + "-" + (day == null ? "01" : day);
         }
-        SimpleDateFormat df = new SimpleDateFormat("yyyy-MM-dd");
-        df.setLenient(false);
-        return df.parse(date);
+        DateTimeFormatter formatter = DateTimeFormatter.ofPattern("uuuu-MM-dd").withResolverStyle(ResolverStyle.STRICT);
+
+        return LocalDate.parse(date, formatter);
     }