Changeset 11035 in josm for trunk/src/org/openstreetmap/josm/gui

Timestamp:

2016-09-20T22:46:47+02:00 (8 years ago)

Author:

simon04

Message:

see #13376 - Replace Calendar usages with Java 8 Date API

Location:

trunk/src/org/openstreetmap/josm/gui

Files:

• dialogs/changeset/query/AdvancedChangesetQueryPanel.java (modified) (8 diffs)
• layer/gpx/DateFilterPanel.java (modified) (2 diffs)

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

@@ -11 +11 @@
 import java.awt.event.ItemEvent;
 import java.awt.event.ItemListener;
-import java.text.DateFormat;
-import java.text.ParseException;
+import java.time.LocalDate;
+import java.time.LocalTime;
+import java.time.ZoneId;
+import java.time.ZonedDateTime;
+import java.time.format.DateTimeFormatter;
+import java.time.format.DateTimeParseException;
+import java.time.format.FormatStyle;
 import java.util.Date;
-import java.util.GregorianCalendar;
-import java.util.Locale;
 
 import javax.swing.BorderFactory;
@@ -842 +845 @@
                 throw new IllegalStateException(tr("Cannot build changeset query with time based restrictions. Input is not valid."));
             if (rbClosedAfter.isSelected()) {
-                GregorianCalendar cal = new GregorianCalendar();
-                Date d1 = valClosedAfterDate1.getDate();
-                Date d2 = valClosedAfterTime1.getDate();
-                cal.setTimeInMillis(d1.getTime() + (d2 == null ? 0 : d2.getTime()));
-                query.closedAfter(cal.getTime());
+                LocalDate d1 = valClosedAfterDate1.getDate();
+                LocalTime d2 = valClosedAfterTime1.getDate();
+                final Date d3 = new Date(d1.atTime(d2).atZone(ZoneId.systemDefault()).toInstant().toEpochMilli());
+                query.closedAfter(d3);
             } else if (rbClosedAfterAndCreatedBefore.isSelected()) {
-                GregorianCalendar cal = new GregorianCalendar();
-                Date d1 = valClosedAfterDate2.getDate();
-                Date d2 = valClosedAfterTime2.getDate();
-                cal.setTimeInMillis(d1.getTime() + (d2 == null ? 0 : d2.getTime()));
-                Date d3 = cal.getTime();
+                LocalDate d1 = valClosedAfterDate2.getDate();
+                LocalTime d2 = valClosedAfterTime2.getDate();
+                Date d3 = new Date(d1.atTime(d2).atZone(ZoneId.systemDefault()).toInstant().toEpochMilli());
 
                 d1 = valCreatedBeforeDate.getDate();
                 d2 = valCreatedBeforeTime.getDate();
-                cal.setTimeInMillis(d1.getTime() + (d2 == null ? 0 : d2.getTime()));
-                Date d4 = cal.getTime();
+                Date d4 = new Date(d1.atTime(d2).atZone(ZoneId.systemDefault()).toInstant().toEpochMilli());
 
                 query.closedAfterAndCreatedBefore(d3, d4);
@@ -1042 +1041 @@
 
         public String getStandardTooltipText() {
-            Date date = new Date();
+            final ZonedDateTime now = ZonedDateTime.now();
             return tr(
                     "Please enter a date in the usual format for your locale.<br>"
@@ -1049 +1048 @@
                     + "Example: {2}<br>"
                     + "Example: {3}<br>",
-                    DateFormat.getDateInstance(DateFormat.SHORT, Locale.getDefault()).format(date),
-                    DateFormat.getDateInstance(DateFormat.MEDIUM, Locale.getDefault()).format(date),
-                    DateFormat.getDateInstance(DateFormat.LONG, Locale.getDefault()).format(date),
-                    DateFormat.getDateInstance(DateFormat.FULL, Locale.getDefault()).format(date)
+                    DateTimeFormatter.ofLocalizedDate(FormatStyle.SHORT).format(now),
+                    DateTimeFormatter.ofLocalizedDate(FormatStyle.MEDIUM).format(now),
+                    DateTimeFormatter.ofLocalizedDate(FormatStyle.LONG).format(now),
+                    DateTimeFormatter.ofLocalizedDate(FormatStyle.FULL).format(now)
             );
         }
@@ -1068 +1067 @@
         }
 
-        public Date getDate() {
-            for (int format: new int[] {DateFormat.SHORT, DateFormat.MEDIUM, DateFormat.LONG, DateFormat.FULL}) {
-                DateFormat df = DateFormat.getDateInstance(format);
+        public LocalDate getDate() {
+            for (final FormatStyle format: FormatStyle.values()) {
+                DateTimeFormatter df = DateTimeFormatter.ofLocalizedDate(format);
                 try {
-                    return df.parse(getComponent().getText());
-                } catch (ParseException e) {
+                    return LocalDate.parse(getComponent().getText(), df);
+                } catch (DateTimeParseException e) {
                     // Try next format
                     Main.trace(e);
@@ -1109 +1108 @@
 
         public String getStandardTooltipText() {
-            Date date = new Date();
+            final ZonedDateTime now = ZonedDateTime.now();
             return tr(
                     "Please enter a valid time in the usual format for your locale.<br>"
@@ -1116 +1115 @@
                     + "Example: {2}<br>"
                     + "Example: {3}<br>",
-                    DateFormat.getTimeInstance(DateFormat.SHORT, Locale.getDefault()).format(date),
-                    DateFormat.getTimeInstance(DateFormat.MEDIUM, Locale.getDefault()).format(date),
-                    DateFormat.getTimeInstance(DateFormat.LONG, Locale.getDefault()).format(date),
-                    DateFormat.getTimeInstance(DateFormat.FULL, Locale.getDefault()).format(date)
+                    DateTimeFormatter.ofLocalizedTime(FormatStyle.SHORT).format(now),
+                    DateTimeFormatter.ofLocalizedTime(FormatStyle.MEDIUM).format(now),
+                    DateTimeFormatter.ofLocalizedTime(FormatStyle.LONG).format(now),
+                    DateTimeFormatter.ofLocalizedTime(FormatStyle.FULL).format(now)
             );
         }
@@ -1135 +1134 @@
         }
 
-        public Date getDate() {
+        public LocalTime getDate() {
             if (getComponent().getText().trim().isEmpty())
-                return null;
-
-            for (int style : new int[]{DateFormat.SHORT, DateFormat.MEDIUM, DateFormat.LONG, DateFormat.FULL}) {
+                return LocalTime.MIDNIGHT;
+
+            for (final FormatStyle format: FormatStyle.values()) {
+                DateTimeFormatter df = DateTimeFormatter.ofLocalizedTime(format);
                 try {
-                    return DateFormat.getTimeInstance(style, Locale.getDefault()).parse(getComponent().getText());
-                } catch (ParseException e) {
-                    continue;
+                    return LocalTime.parse(getComponent().getText(), df);
+                } catch (DateTimeParseException e) {
+                    // Try next format
+                    Main.trace(e);
                 }
             }
-            return null;
+            return LocalTime.MIDNIGHT;
         }
     }

trunk/src/org/openstreetmap/josm/gui/layer/gpx/DateFilterPanel.java

@@ -7 +7 @@
 import java.awt.GridBagLayout;
 import java.awt.event.ActionListener;
+import java.time.ZoneId;
+import java.time.ZonedDateTime;
 import java.util.Date;
-import java.util.GregorianCalendar;
 
 import javax.swing.JCheckBox;
@@ -49 +50 @@
         final Date startTime, endTime;
         Date[] bounds = layer.data.getMinMaxTimeForAllTracks();
-        startTime = (bounds.length == 0) ? new GregorianCalendar(2000, 1, 1).getTime() : bounds[0];
+        startTime = (bounds.length == 0) ? Date.from(ZonedDateTime.of(2000, 1, 1, 0, 0, 0, 0, ZoneId.systemDefault()).toInstant()) : bounds[0];
         endTime = (bounds.length == 0) ? new Date() : bounds[1];