Changeset 16069 in josm

Timestamp:

2020-03-08T09:25:04+01:00 (5 years ago)

Author:

simon04

Message:

see #18752 - Harmonize stopwatch logging

Location:

trunk/src/org/openstreetmap/josm

Files:

• actions/MergeLayerAction.java (modified) (2 diffs)
• data/osm/DatasetConsistencyTest.java (modified) (2 diffs)
• data/validation/OsmValidator.java (modified) (1 diff)
• data/validation/Test.java (modified) (1 diff)
• gui/SplashScreen.java (modified) (2 diffs)
• gui/layer/gpx/GpxDrawHelper.java (modified) (1 diff)
• gui/mappaint/MapPaintStyles.java (modified) (1 diff)
• gui/tagging/presets/TaggingPresetReader.java (modified) (1 diff)
• tools/Stopwatch.java (modified) (2 diffs)
• tools/XmlUtils.java (modified) (2 diffs)

trunk/src/org/openstreetmap/josm/actions/MergeLayerAction.java

@@ -90 +90 @@
                     }
 
-                    Logging.info(tr("{0} completed in {1}", actionName, stopwatch));
+                    Logging.info(stopwatch.toString(String.valueOf(actionName)));
                 });
             }
@@ -114 +114 @@
             if (layerMerged) {
                 getLayerManager().setActiveLayer(targetLayer);
-                Logging.info(tr("{0} completed in {1}", actionName, stopwatch));
+                Logging.info(stopwatch.toString(String.valueOf(actionName)));
             }
         });

trunk/src/org/openstreetmap/josm/data/osm/DatasetConsistencyTest.java

@@ -1 +1 @@
 // License: GPL. For details, see LICENSE file.
 package org.openstreetmap.josm.data.osm;
-
-import static org.openstreetmap.josm.tools.I18n.tr;
 
 import java.io.PrintWriter;
@@ -189 +187 @@
             StackTraceElement item = Thread.currentThread().getStackTrace()[2];
             String operation = getClass().getSimpleName() + '.' + item.getMethodName();
-            Logging.debug(tr("{0} completed in {1}",
-                    operation, stopwatch));
+            Logging.debug(stopwatch.toString(operation));
         }
     }

trunk/src/org/openstreetmap/josm/data/validation/OsmValidator.java

@@ -608 +608 @@
     public static synchronized void initializeTests() {
         if (!testsInitialized) {
-            Logging.debug("Initializing validator tests");
+            final String message = "Initializing validator tests";
+            Logging.debug(message);
             final Stopwatch stopwatch = Stopwatch.createStarted();
             initializeTests(getTests());
             testsInitialized = true;
-            Logging.debug("Initializing validator tests completed in {0}", stopwatch);
+            Logging.debug(stopwatch.toString("Initializing validator tests"));
         }
     }

trunk/src/org/openstreetmap/josm/data/validation/Test.java

@@ -198 +198 @@
         progressMonitor = null;
         if (stopwatch.elapsed() > 0) {
-            Logging.debug(tr("{0} completed in {1}", getName(), stopwatch));
+            Logging.debug(stopwatch.toString(getName()));
         }
     }

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

@@ -164 +164 @@
             }
             if (stopwatch.elapsed() >= 0) {
+                Logging.debug(stopwatch.toString(name));
                 duration = tr(" ({0})", stopwatch);
             }
@@ -299 +300 @@
             taskOptional.ifPresent(task -> {
                 ((MeasurableTask) task).finish();
-                if (Logging.isDebugEnabled()) {
-                    Logging.debug(tr("{0} completed in {1}", title, ((MeasurableTask) task).duration));
-                }
                 listener.stateChanged(null);
             });

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

@@ -488 +488 @@
         // show some debug info
         if (Logging.isDebugEnabled() && !visibleSegments.isEmpty()) {
-            Logging.debug("gpxdraw::draw takes " +
-                         stopwatch +
+            Logging.debug(stopwatch.toString("gpxdraw::draw") +
                          "(" +
                          "segments= " + visibleSegments.size() +

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

@@ -308 +308 @@
         }
         if (Logging.isDebugEnabled() || !source.isValid()) {
-            String message = "Initializing map style " + source.url + " completed in " + stopwatch;
+            String message = stopwatch.toString("Initializing map style " + source.url);
             if (!source.isValid()) {
                 Logging.warn(message + " (" + source.getErrors().size() + " errors, " + source.getWarnings().size() + " warnings)");

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

@@ -368 +368 @@
             }
         }
-        if (Logging.isDebugEnabled()) {
-            Logging.debug("Presets read in {0}", stopwatch);
-        }
+        Logging.debug(stopwatch.toString("Reading presets"));
         return tp;
     }

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

@@ -1 +1 @@
 // License: GPL. For details, see LICENSE file.
 package org.openstreetmap.josm.tools;
+
+import static org.openstreetmap.josm.tools.I18n.tr;
 
 /**
@@ -44 +46 @@
         return Utils.getDurationString(Math.max(0, elapsed()));
     }
+
+    /**
+     * Formats the given task name and duration since start as i18n string
+     * @param taskName the task name
+     * @return the task name and duration since start as i18n string
+     */
+    public String toString(String taskName) {
+        return tr("{0} completed in {1}", taskName, toString());
+    }
 }

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

@@ -87 +87 @@
         Logging.debug("Starting DOM parsing of {0}", is);
         Document result = newSafeDOMBuilder().parse(is);
-        Logging.debug("DOM parsing done in {0}", stopwatch);
+        Logging.debug(stopwatch.toString("DOM parsing"));
         return result;
     }
@@ -118 +118 @@
         Logging.debug("Starting SAX parsing of {0} using {1}", is, dh);
         newSafeSAXParser().parse(is, dh);
-        Logging.debug("SAX parsing done in {0}", stopwatch);
+        Logging.debug(stopwatch.toString("SAX parsing"));
     }