Changeset 11288 in josm for trunk/src/org/openstreetmap/josm/io/OsmServerWriter.java

Timestamp:

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

Author:

simon04

Message:

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

File:

• trunk/src/org/openstreetmap/josm/io/OsmServerWriter.java (modified) (3 diffs)

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

@@ -11 +11 @@
 import java.util.LinkedList;
 import java.util.List;
+import java.util.concurrent.TimeUnit;
 
 import org.openstreetmap.josm.data.osm.Changeset;
@@ -64 +65 @@
     private boolean canceled;
 
-    private static final int MSECS_PER_SECOND = 1000;
-    private static final int SECONDS_PER_MINUTE = 60;
-    private static final int MSECS_PER_MINUTE = MSECS_PER_SECOND * SECONDS_PER_MINUTE;
-
     private long uploadStartTime;
 
@@ -79 +76 @@
         double uploadsLeft = (double) listSize - progress;
         long msLeft = (long) (uploadsLeft / uploadsPerMs);
-        long minutesLeft = msLeft / MSECS_PER_MINUTE;
-        long secondsLeft = (msLeft / MSECS_PER_SECOND) % SECONDS_PER_MINUTE;
+        long minutesLeft = msLeft / TimeUnit.MINUTES.toMillis(1);
+        long secondsLeft = (msLeft / TimeUnit.SECONDS.toMillis(1)) % TimeUnit.MINUTES.toSeconds(1);
         StringBuilder timeLeftStr = new StringBuilder().append(minutesLeft).append(':');
         if (secondsLeft < 10) {