Changeset 35426 in osm for applications/editors/josm

Timestamp:

2020-04-18T13:01:12+02:00 (5 years ago)

Author:

simon04

Message:

Use Utils.getDurationString

File:

• applications/editors/josm/plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java (modified) (2 diffs)

applications/editors/josm/plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java

@@ -46 +46 @@
 import org.openstreetmap.josm.tools.JosmRuntimeException;
 import org.openstreetmap.josm.tools.Logging;
+import org.openstreetmap.josm.tools.Utils;
 
 /**
@@ -279 +280 @@
                 progressMonitor.worked(1);
 
-                float millisecsPerFile = ((float)(System.currentTimeMillis()-startTime))/((currentIndex+1)); // currentIndex starts at 0
-                int filesLeft = images.size()-currentIndex-1;
-                int secsLeft = (int)Math.ceil((millisecsPerFile*filesLeft/1000));
-                String timeLeft;
-                if (secsLeft < 60) {
-                        timeLeft = secsLeft + "s";
-                } else if (secsLeft < 3600) {
-                        timeLeft = secsLeft/60 + "min " + secsLeft%60 + "s";
-                } else {
-                        timeLeft = secsLeft/3600 + "h " + ((secsLeft)/60)%60 + "min " + secsLeft%60 + "s";
-                }
-                                progressMonitor.subTask(tr("Writing position information to image files... Estimated time left: {0}", timeLeft));
+                float millisecondsPerFile = (float) (System.currentTimeMillis() - startTime)
+                        / (currentIndex + 1); // currentIndex starts at 0
+                int filesLeft = images.size() - currentIndex - 1;
+                String timeLeft = Utils.getDurationString((long) Math.ceil(millisecondsPerFile * filesLeft));
+                progressMonitor.subTask(tr("Writing position information to image files... Estimated time left: {0}", timeLeft));
 
                 if (debug) {