Changeset 19539 in josm for trunk/src

Timestamp:

2026-02-20T22:21:27+01:00 (3 days ago)

Author:

stoecker

Message:

see #24635 - remove usage of Date

Location:

trunk/src/org/openstreetmap/josm

Files:

• gui/widgets/DateEditorWithSlider.java (modified) (1 diff)
• io/nmea/NmeaParser.java (modified) (7 diffs)
• io/remotecontrol/RequestProcessor.java (modified) (2 diffs)
• tools/ColorScale.java (modified) (2 diffs)

trunk/src/org/openstreetmap/josm/gui/widgets/DateEditorWithSlider.java

@@ -27 +27 @@
  * @since 5815
  */
+@SuppressWarnings("PMD.ReplaceJavaUtilDate") // JSpinner needs Date anyway, so not using Date makes no sense
 public class DateEditorWithSlider extends JPanel {
     private final JSpinner spinner;

trunk/src/org/openstreetmap/josm/io/nmea/NmeaParser.java

@@ -3 +3 @@
 
 import java.nio.charset.StandardCharsets;
-import java.text.ParsePosition;
-import java.text.SimpleDateFormat;
 import java.time.Instant;
+import java.time.ZoneOffset;
+import java.time.format.DateTimeFormatter;
+import java.time.format.DateTimeFormatterBuilder;
+import java.time.format.DateTimeParseException;
+import java.time.format.ResolverStyle;
+import java.time.temporal.ChronoField;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.Collection;
 import java.util.Collections;
-import java.util.Date;
 import java.util.Locale;
-import java.util.regex.Matcher;
-import java.util.regex.Pattern;
 
 import org.openstreetmap.josm.data.coor.LatLon;
@@ -20 +21 @@
 import org.openstreetmap.josm.io.IllegalDataException;
 import org.openstreetmap.josm.tools.Logging;
-import org.openstreetmap.josm.tools.date.DateUtils;
 
 /**
@@ -180 +180 @@
     }
 
-    private static final Pattern DATE_TIME_PATTERN = Pattern.compile("(\\d{12})(\\.\\d+)?");
-
-    private final SimpleDateFormat rmcTimeFmt = new SimpleDateFormat("ddMMyyHHmmss.SSS", Locale.ENGLISH);
-
-    private Instant readTime(String p) throws IllegalDataException {
-        // NMEA defines time with "a variable number of digits for decimal-fraction of seconds"
-        // This variable decimal fraction cannot be parsed by SimpleDateFormat
-        Matcher m = DATE_TIME_PATTERN.matcher(p);
-        if (m.matches()) {
-            String date = m.group(1);
-            double milliseconds = 0d;
-            if (m.groupCount() > 1 && m.group(2) != null) {
-                milliseconds = 1000d * Double.parseDouble("0" + m.group(2));
-            }
-            // Add milliseconds on three digits to match SimpleDateFormat pattern
-            date += String.format(".%03d", (int) milliseconds);
-            Date d = rmcTimeFmt.parse(date, new ParsePosition(0));
-            if (d != null)
-                return d.toInstant();
-        }
-        throw new IllegalDataException("Date is malformed: '" + p + "'");
-    }
+    /**
+     * NMEA defines time with "a variable number of digits for decimal-fraction of seconds"
+     */
+    private static final DateTimeFormatter RMC_TIME_FMT =
+        new DateTimeFormatterBuilder()
+                .appendPattern("ddMMyyHHmmss")
+                .optionalStart()
+                .appendFraction(ChronoField.NANO_OF_SECOND, 1, 9, true)
+                .optionalEnd()
+                .toFormatter(Locale.ENGLISH)
+                .withZone(ZoneOffset.UTC)
+                /* allow bad date information, we're mainly interested in the positions */
+                .withResolverStyle(ResolverStyle.LENIENT);
 
     protected Collection<WayPoint> waypoints = new ArrayList<>();
@@ -291 +282 @@
      */
     public NmeaParser() {
-        rmcTimeFmt.setTimeZone(DateUtils.UTC);
         pDate = "010100"; // TODO date problem
     }
@@ -366 +356 @@
                 // time
                 accu = e[GGA.TIME.position];
-                Instant instant = readTime(currentDate+accu);
+                Instant instant = Instant.from(RMC_TIME_FMT.parse(currentDate+accu));
 
                 if ((pTime == null) || (currentwp == null) || !pTime.equals(accu)) {
@@ -523 +513 @@
                 String time = e[RMC.TIME.position];
 
-                Instant instant = readTime(currentDate+time);
+                Instant instant = Instant.from(RMC_TIME_FMT.parse(currentDate+time));
 
                 if (pTime == null || currentwp == null || !pTime.equals(time)) {
@@ -590 +580 @@
             return true;
 
-        } catch (IllegalArgumentException | IndexOutOfBoundsException | IllegalDataException ex) {
+        } catch (IllegalArgumentException | IndexOutOfBoundsException | IllegalDataException | DateTimeParseException ex) {
             if (malformed < 5) {
                 Logging.warn(ex);

trunk/src/org/openstreetmap/josm/io/remotecontrol/RequestProcessor.java

@@ -11 +11 @@
 import java.nio.charset.Charset;
 import java.nio.charset.StandardCharsets;
+import java.time.ZoneOffset;
+import java.time.ZonedDateTime;
+import java.time.format.DateTimeFormatter;
 import java.util.Collection;
-import java.util.Date;
 import java.util.HashMap;
 import java.util.Locale;
@@ -453 +455 @@
             boolean endHeaders) throws IOException {
         out.write("HTTP/1.1 " + status + "\r\n");
-        out.write("Date: " + new Date() + "\r\n");
+        out.write("Date: " + DateTimeFormatter.RFC_1123_DATE_TIME.format(ZonedDateTime.now(ZoneOffset.UTC)) + "\r\n");
         out.write("Server: " + JOSM_REMOTE_CONTROL + "\r\n");
         out.write("Content-type: " + contentType + "; charset=" + RESPONSE_CHARSET.name().toLowerCase(Locale.ENGLISH) + "\r\n");

trunk/src/org/openstreetmap/josm/tools/ColorScale.java

@@ -9 +9 @@
 import java.awt.Font;
 import java.util.Arrays;
-import java.util.Date;
 import java.time.ZoneId;
 import java.time.Instant;
@@ -489 +488 @@
             } else {
                 final double val = minVal + i * (maxVal - minVal) / intervalCount;
-                final long longval = (long) val;
-
-                final Date date = new Date(longval * 1000L);
-                final Instant dateInst = date.toInstant();
+                final Instant dateInst = Instant.ofEpochSecond((long) val);
 
                 final ZoneId gmt = ZoneId.of("GMT");