Changeset 16068 in josm

Timestamp:

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

Author:

simon04

Message:

fix #18752 - Remove i18n from debug logging strings

Location:

trunk/src/org/openstreetmap/josm

Files:

• actions/DownloadAlongAction.java (modified) (2 diffs)
• data/osm/DatasetConsistencyTest.java (modified) (1 diff)
• data/validation/Test.java (modified) (1 diff)
• data/validation/tests/TagChecker.java (modified) (1 diff)
• io/CertificateAmendment.java (modified) (1 diff)

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

@@ -12 +12 @@
 import java.awt.geom.PathIterator;
 import java.awt.geom.Rectangle2D;
+import java.text.MessageFormat;
 import java.util.ArrayList;
 import java.util.Collection;
@@ -161 +162 @@
         intermediateNodes.add(p2);
         if (p1 != null && p2.greatCircleDistance(p1) > bufferDist) {
-            Double d = p2.greatCircleDistance(p1) / bufferDist;
-            int nbNodes = d.intValue();
+            double d = p2.greatCircleDistance(p1) / bufferDist;
+            int nbNodes = (int) d;
             if (Logging.isDebugEnabled()) {
-                Logging.debug(tr("{0} intermediate nodes to download.", nbNodes));
-                Logging.debug(tr("between {0} {1} and {2} {3}", p2.lat(), p2.lon(), p1.lat(), p1.lon()));
+                Logging.debug(MessageFormat.format("{0} intermediate nodes to download between {1} and {2}", nbNodes, p2, p1));
             }
             double latStep = (p2.lat() - p1.lat()) / (nbNodes + 1);

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

@@ -189 +189 @@
             StackTraceElement item = Thread.currentThread().getStackTrace()[2];
             String operation = getClass().getSimpleName() + '.' + item.getMethodName();
-            Logging.debug(tr("Test ''{0}'' completed in {1}",
+            Logging.debug(tr("{0} completed in {1}",
                     operation, stopwatch));
         }

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

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

trunk/src/org/openstreetmap/josm/data/validation/tests/TagChecker.java

@@ -283 +283 @@
                     } else if (line.charAt(0) == '-' && okValue != null) {
                         String hk = harmonizeKey(line.substring(1));
-                        if (!okValue.equals(hk) && harmonizedKeys.put(hk, okValue) != null) {
-                            Logging.debug(tr("Line was ignored: {0}", line));
+                        if (!okValue.equals(hk) && harmonizedKeys.put(hk, okValue) != null && Logging.isDebugEnabled()) {
+                            Logging.debug("Line was ignored: " + line);
                         }
                     } else {

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

@@ -259 +259 @@
             if (certificateIsMissing(keyStore, cert)) {
                 if (Logging.isDebugEnabled()) {
-                    Logging.debug(tr("Adding certificate for TLS connections: {0}", cert.getSubjectX500Principal().getName()));
+                    Logging.debug("Adding certificate for TLS connections: " + cert.getSubjectX500Principal().getName());
                 }
                 String alias = "josm:" + certAmend.filename;