Changeset 11288 in josm for trunk/src/org/openstreetmap/josm/tools

Timestamp:

2016-11-20T17:33:33+01:00 (4 years ago)

Author:

simon04

Message:

see #13376 - Use TimeUnit instead of combinations of 1000/60/60/24

Location:

trunk/src/org/openstreetmap/josm/tools

Files:

• ExifReader.java (modified) (2 diffs)
• HttpClient.java (modified) (2 diffs)
• Utils.java (modified) (2 diffs)
• date/DateUtils.java (modified) (2 diffs)

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

@@ -6 +6 @@
 import java.io.IOException;
 import java.util.Date;
+import java.util.concurrent.TimeUnit;
 
 import org.openstreetmap.josm.Main;
@@ -70 +71 @@
                 if (subSeconds != null) {
                     try {
-                        date.setTime(date.getTime() + (long) (1000L * Double.parseDouble("0." + subSeconds)));
+                        date.setTime(date.getTime() + (long) (TimeUnit.SECONDS.toMillis(1) * Double.parseDouble("0." + subSeconds)));
                     } catch (NumberFormatException e) {
                         Main.warn("Failed parsing sub seconds from [{0}]", subSeconds);

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

@@ -21 +21 @@
 import java.util.Scanner;
 import java.util.TreeMap;
+import java.util.concurrent.TimeUnit;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
@@ -43 +44 @@
     private URL url;
     private final String requestMethod;
-    private int connectTimeout = Main.pref.getInteger("socket.timeout.connect", 15) * 1000;
-    private int readTimeout = Main.pref.getInteger("socket.timeout.read", 30) * 1000;
+    private int connectTimeout = (int) TimeUnit.SECONDS.toMillis(Main.pref.getInteger("socket.timeout.connect", 15));
+    private int readTimeout = (int) TimeUnit.SECONDS.toMillis(Main.pref.getInteger("socket.timeout.read", 30));
     private byte[] requestBody;
     private long ifModifiedSince;

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

@@ -47 +47 @@
 import java.util.concurrent.ForkJoinWorkerThread;
 import java.util.concurrent.ThreadFactory;
+import java.util.concurrent.TimeUnit;
 import java.util.concurrent.atomic.AtomicLong;
 import java.util.function.Function;
@@ -79 +80 @@
     public static final Pattern WHITE_SPACES_PATTERN = Pattern.compile("\\s+");
 
-    private static final int MILLIS_OF_SECOND = 1000;
-    private static final int MILLIS_OF_MINUTE = 60_000;
-    private static final int MILLIS_OF_HOUR = 3_600_000;
-    private static final int MILLIS_OF_DAY = 86_400_000;
+    private static final long MILLIS_OF_SECOND = TimeUnit.SECONDS.toMillis(1);
+    private static final long MILLIS_OF_MINUTE = TimeUnit.MINUTES.toMillis(1);
+    private static final long MILLIS_OF_HOUR = TimeUnit.HOURS.toMillis(1);
+    private static final long MILLIS_OF_DAY = TimeUnit.DAYS.toMillis(1);
 
     /**

trunk/src/org/openstreetmap/josm/tools/date/DateUtils.java

@@ -13 +13 @@
 import java.util.Locale;
 import java.util.TimeZone;
+import java.util.concurrent.TimeUnit;
 
 import javax.xml.datatype.DatatypeConfigurationException;
@@ -145 +146 @@
      */
     public static synchronized String fromTimestamp(int timestamp) {
-        final ZonedDateTime temporal = Instant.ofEpochMilli(timestamp * 1000L).atZone(ZoneOffset.UTC);
+        final ZonedDateTime temporal = Instant.ofEpochMilli(TimeUnit.SECONDS.toMillis(timestamp)).atZone(ZoneOffset.UTC);
         return DateTimeFormatter.ISO_OFFSET_DATE_TIME.format(temporal);
     }