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

Timestamp:

2020-01-23T22:57:46+01:00 (4 years ago)

Author:

simon04

Message:

Introduce Stopwatch class to measure elapsed time

Location:

trunk/src/org/openstreetmap/josm/gui

Files:

• SplashScreen.java (modified) (3 diffs)
• layer/gpx/GpxDrawHelper.java (modified) (3 diffs)
• mappaint/MapPaintStyles.java (modified) (3 diffs)
• tagging/presets/TaggingPresetReader.java (modified) (3 diffs)

trunk/src/org/openstreetmap/josm/gui/SplashScreen.java

@@ -42 +42 @@
 import org.openstreetmap.josm.tools.ImageProvider;
 import org.openstreetmap.josm.tools.Logging;
+import org.openstreetmap.josm.tools.Stopwatch;
 import org.openstreetmap.josm.tools.Utils;
 
@@ -150 +151 @@
     private static class MeasurableTask extends Task {
         private final String name;
-        private final long start;
+        private final Stopwatch stopwatch;
         private String duration = "";
 
         MeasurableTask(String name) {
             this.name = name;
-            this.start = System.currentTimeMillis();
+            this.stopwatch = Stopwatch.createStarted();
         }
 
@@ -162 +163 @@
                 throw new IllegalStateException("This task has already been finished: " + name);
             }
-            long time = System.currentTimeMillis() - start;
-            if (time >= 0) {
-                duration = tr(" ({0})", Utils.getDurationString(time));
+            if (stopwatch.elapsed() >= 0) {
+                duration = tr(" ({0})", stopwatch);
             }
         }

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

@@ -58 +58 @@
 import org.openstreetmap.josm.tools.JosmRuntimeException;
 import org.openstreetmap.josm.tools.Logging;
+import org.openstreetmap.josm.tools.Stopwatch;
 import org.openstreetmap.josm.tools.Utils;
 
@@ -420 +421 @@
     public void drawAll(Graphics2D g, MapView mv, List<WayPoint> visibleSegments, Bounds clipBounds) {
 
-        final long timeStart = System.currentTimeMillis();
+        final Stopwatch stopwatch = Stopwatch.createStarted();
 
         checkCache();
@@ -487 +488 @@
         // show some debug info
         if (Logging.isDebugEnabled() && !visibleSegments.isEmpty()) {
-            final long timeDiff = System.currentTimeMillis() - timeStart;
-
             Logging.debug("gpxdraw::draw takes " +
-                         Utils.getDurationString(timeDiff) +
+                         stopwatch +
                          "(" +
                          "segments= " + visibleSegments.size() +
-                         ", per 10000 = " + Utils.getDurationString(10_000 * timeDiff / visibleSegments.size()) +
+                         ", per 10000 = " + Utils.getDurationString(10_000 * stopwatch.elapsed() / visibleSegments.size()) +
                          ")"
               );

trunk/src/org/openstreetmap/josm/gui/mappaint/MapPaintStyles.java

@@ -29 +29 @@
 import org.openstreetmap.josm.tools.ListenerList;
 import org.openstreetmap.josm.tools.Logging;
+import org.openstreetmap.josm.tools.Stopwatch;
 import org.openstreetmap.josm.tools.Utils;
 
@@ -321 +322 @@
 
     private static void loadStyleForFirstTime(StyleSource source) {
-        final long startTime = System.currentTimeMillis();
+        final Stopwatch stopwatch = Stopwatch.createStarted();
         source.loadStyleSource();
         if (Config.getPref().getBoolean("mappaint.auto_reload_local_styles", true) && source.isLocal()) {
@@ -331 +332 @@
         }
         if (Logging.isDebugEnabled() || !source.isValid()) {
-            final long elapsedTime = System.currentTimeMillis() - startTime;
-            String message = "Initializing map style " + source.url + " completed in " + Utils.getDurationString(elapsedTime);
+            String message = "Initializing map style " + source.url + " completed in " + stopwatch;
             if (!source.isValid()) {
                 Logging.warn(message + " (" + source.getErrors().size() + " errors, " + source.getWarnings().size() + " warnings)");

trunk/src/org/openstreetmap/josm/gui/tagging/presets/TaggingPresetReader.java

@@ -47 +47 @@
 import org.openstreetmap.josm.tools.I18n;
 import org.openstreetmap.josm.tools.Logging;
+import org.openstreetmap.josm.tools.Stopwatch;
 import org.openstreetmap.josm.tools.Utils;
 import org.openstreetmap.josm.tools.XmlObjectParser;
@@ -353 +354 @@
         Collection<TaggingPreset> tp;
         Logging.debug("Reading presets from {0}", source);
-        long startTime = System.currentTimeMillis();
+        Stopwatch stopwatch = Stopwatch.createStarted();
         try (
             CachedFile cf = new CachedFile(source).setHttpAccept(PRESET_MIME_TYPES);
@@ -368 +369 @@
         }
         if (Logging.isDebugEnabled()) {
-            Logging.debug("Presets read in {0}", Utils.getDurationString(System.currentTimeMillis() - startTime));
+            Logging.debug("Presets read in {0}", stopwatch);
         }
         return tp;