Changeset 16629 in josm for trunk/src

Timestamp:

2020-06-14T17:17:02+02:00 (4 years ago)

Author:

simon04

Message:

see #19334 - ​https://errorprone.info/bugpattern/JavaTimeDefaultTimeZone

Location:

trunk/src/org/openstreetmap/josm

Files:

• actions/AddImageryLayerAction.java (modified) (1 diff)
• gui/dialogs/changeset/query/DateValidator.java (modified) (2 diffs)
• gui/dialogs/changeset/query/TimeValidator.java (modified) (2 diffs)
• gui/download/UserQueryList.java (modified) (4 diffs)
• gui/io/importexport/GpxExporter.java (modified) (2 diffs)
• io/OverpassDownloadReader.java (modified) (2 diffs)

trunk/src/org/openstreetmap/josm/actions/AddImageryLayerAction.java

@@ -98 +98 @@
         try {
             if (info.getUrl() != null && info.getUrl().contains("{time}")) {
-                final String instant = Year.now().atDay(1).atStartOfDay(ZoneOffset.UTC).toInstant().toString();
+                final String instant = Year.now(ZoneOffset.UTC).atDay(1).atStartOfDay(ZoneOffset.UTC).toInstant().toString();
                 final String example = String.join("/", instant, instant);
                 final String initialSelectionValue = info.getDate() != null ? info.getDate() : example;

trunk/src/org/openstreetmap/josm/gui/dialogs/changeset/query/DateValidator.java

@@ -5 +5 @@
 
 import java.time.LocalDate;
+import java.time.ZoneId;
 import java.time.ZonedDateTime;
 import java.time.format.DateTimeFormatter;
@@ -59 +60 @@
      */
     public String getStandardTooltipText() {
-        final ZonedDateTime now = ZonedDateTime.now();
+        final ZonedDateTime now = ZonedDateTime.now(ZoneId.systemDefault());
         return tr(
                 "Please enter a date in the usual format for your locale.<br>"

trunk/src/org/openstreetmap/josm/gui/dialogs/changeset/query/TimeValidator.java

@@ -5 +5 @@
 
 import java.time.LocalTime;
+import java.time.ZoneId;
 import java.time.ZonedDateTime;
 import java.time.format.DateTimeFormatter;
@@ -61 +62 @@
      */
     public String getStandardTooltipText() {
-        final ZonedDateTime now = ZonedDateTime.now();
+        final ZonedDateTime now = ZonedDateTime.now(ZoneId.systemDefault());
         return tr(
                 "Please enter a valid time in the usual format for your locale.<br>"

trunk/src/org/openstreetmap/josm/gui/download/UserQueryList.java

@@ -15 +15 @@
 import java.awt.event.MouseEvent;
 import java.time.LocalDateTime;
+import java.time.ZoneId;
 import java.time.format.DateTimeFormatter;
 import java.time.format.DateTimeParseException;
@@ -136 +137 @@
         if (!historicExist) {
             SelectorItem item = new SelectorItem(
-                    TRANSLATED_HISTORY + " " + LocalDateTime.now().format(FORMAT), query);
+                    TRANSLATED_HISTORY + " " + LocalDateTime.now(ZoneId.systemDefault()).format(FORMAT), query);
 
             this.items.put(item.getKey(), item);
@@ -540 +541 @@
                             this.query.getText(),
                             !newKey.equals(itemKey) || !newQuery.equals(itemQuery)
-                                ? LocalDateTime.now()
+                                ? LocalDateTime.now(ZoneId.systemDefault())
                                 : this.itemToEdit.getLastEdit()));
 
@@ -571 +572 @@
          */
         public SelectorItem(String key, String query) {
-            this(key, query, LocalDateTime.now());
+            this(key, query, LocalDateTime.now(ZoneId.systemDefault()));
         }
 

trunk/src/org/openstreetmap/josm/gui/io/importexport/GpxExporter.java

@@ -13 +13 @@
 import java.text.MessageFormat;
 import java.time.Year;
+import java.time.ZoneId;
 import java.util.Optional;
 
@@ -291 +292 @@
             if (copyrightYear.getText().isEmpty()) {
                 copyrightYear.setText(Optional.ofNullable(data.getString(META_COPYRIGHT_YEAR)).orElseGet(
-                        () -> Year.now().toString()));
+                        () -> Year.now(ZoneId.systemDefault()).toString()));
             }
             if (copyright.getText().isEmpty()) {

trunk/src/org/openstreetmap/josm/io/OverpassDownloadReader.java

@@ -10 +10 @@
 import java.time.LocalDateTime;
 import java.time.Period;
+import java.time.ZoneId;
 import java.time.ZoneOffset;
 import java.util.Arrays;
@@ -205 +206 @@
                 switch (matcher.group(1)) {
                     case "date":
-                        matcher.appendReplacement(sb, date(matcher.group(2), LocalDateTime.now()));
+                        matcher.appendReplacement(sb, date(matcher.group(2), LocalDateTime.now(ZoneId.systemDefault())));
                         break;
                     case "geocodeArea":