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

Timestamp:

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

Author:

simon04

Message:

see #18752 - Harmonize stopwatch logging

Location:

trunk/src/org/openstreetmap/josm/tools

Files:

• Stopwatch.java (modified) (2 diffs)
• XmlUtils.java (modified) (2 diffs)

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"));
     }