Index: /trunk/src/org/openstreetmap/josm/gui/dialogs/InspectPrimitiveDialog.java =================================================================== --- /trunk/src/org/openstreetmap/josm/gui/dialogs/InspectPrimitiveDialog.java (revision 6333) +++ /trunk/src/org/openstreetmap/josm/gui/dialogs/InspectPrimitiveDialog.java (revision 6334) @@ -231,5 +231,5 @@ for (String key : o.keySet()) { s.append(INDENT).append(INDENT); - s.append(String.format("\"%s\"=\"%s\"\n", key, o.get(key))); + s.append(String.format("\"%s\"=\"%s\"%n", key, o.get(key))); } } Index: /trunk/src/org/openstreetmap/josm/io/GpxWriter.java =================================================================== --- /trunk/src/org/openstreetmap/josm/io/GpxWriter.java (revision 6333) +++ /trunk/src/org/openstreetmap/josm/io/GpxWriter.java (revision 6334) @@ -66,5 +66,5 @@ out.println(""); out.println(""); Index: /trunk/test/unit/org/openstreetmap/josm/data/osm/FilterTest.java =================================================================== --- /trunk/test/unit/org/openstreetmap/josm/data/osm/FilterTest.java (revision 6333) +++ /trunk/test/unit/org/openstreetmap/josm/data/osm/FilterTest.java (revision 6334) @@ -169,5 +169,5 @@ foundAtLeastOne = true; if (!osm.get(key).equals(filterCode(osm))) { - failedPrimitives.append(String.format("Object %s. Expected [%s] but was [%s]\n", osm.toString(), osm.get(key), filterCode(osm))); + failedPrimitives.append(String.format("Object %s. Expected [%s] but was [%s]%n", osm.toString(), osm.get(key), filterCode(osm))); } } @@ -175,5 +175,5 @@ assertTrue(foundAtLeastOne); if (failedPrimitives.length() != 0) - throw new AssertionError(String.format("Run #%d\n%s", i, failedPrimitives.toString())); + throw new AssertionError(String.format("Run #%d%n%s", i, failedPrimitives.toString())); } } Index: /trunk/test/unit/org/openstreetmap/josm/data/projection/EllipsoidTest.java =================================================================== --- /trunk/test/unit/org/openstreetmap/josm/data/projection/EllipsoidTest.java (revision 6333) +++ /trunk/test/unit/org/openstreetmap/josm/data/projection/EllipsoidTest.java (revision 6334) @@ -6,5 +6,4 @@ import org.junit.Assert; import org.junit.Test; - import org.openstreetmap.josm.data.coor.LatLon; Index: /trunk/test/unit/org/openstreetmap/josm/data/projection/ProjectionRefTest.java =================================================================== --- /trunk/test/unit/org/openstreetmap/josm/data/projection/ProjectionRefTest.java (revision 6333) +++ /trunk/test/unit/org/openstreetmap/josm/data/projection/ProjectionRefTest.java (revision 6334) @@ -1,6 +1,4 @@ // License: GPL. For details, see LICENSE file. package org.openstreetmap.josm.data.projection; - -import static org.openstreetmap.josm.tools.I18n.tr; import java.io.BufferedReader; @@ -10,6 +8,4 @@ import java.util.Collection; import java.util.HashMap; -import java.util.LinkedHashMap; -import java.util.List; import java.util.Map; import java.util.Map.Entry; @@ -68,7 +64,7 @@ { EastNorth en = p.latlon2eastNorth(new LatLon(lat, lon)); - String error = String.format("%s (%s): Projecting latlon(%s,%s):\n" + - " expected: eastnorth(%s,%s),\n" + - " but got: eastnorth(%s,%s)!\n", + String error = String.format("%s (%s): Projecting latlon(%s,%s):%n" + + " expected: eastnorth(%s,%s),%n" + + " but got: eastnorth(%s,%s)!%n", p.toString(), code, lat, lon, east, north, en.east(), en.north()); double EPSILON = 1e-3; // 1 mm accuracy @@ -79,7 +75,7 @@ { LatLon ll = p.eastNorth2latlon(new EastNorth(east, north)); - String error = String.format("%s (%s): Inverse projecting eastnorth(%s,%s):\n" + - " expected: latlon(%s,%s),\n" + - " but got: latlon(%s,%s)!\n", + String error = String.format("%s (%s): Inverse projecting eastnorth(%s,%s):%n" + + " expected: latlon(%s,%s),%n" + + " but got: latlon(%s,%s)!%n", p.toString(), code, east, north, lat, lon, ll.lat(), ll.lon()); double EPSILON = Math.toDegrees(1e-3 / 6378137); // 1 mm accuracy (or better) Index: /trunk/test/unit/org/openstreetmap/josm/data/projection/ProjectionRegressionTest.java =================================================================== --- /trunk/test/unit/org/openstreetmap/josm/data/projection/ProjectionRegressionTest.java (revision 6333) +++ /trunk/test/unit/org/openstreetmap/josm/data/projection/ProjectionRegressionTest.java (revision 6334) @@ -108,5 +108,5 @@ EastNorth en = proj.latlon2eastNorth(new LatLon(lat, lon)); LatLon ll2 = proj.eastNorth2latlon(en); - out.write(String.format("%s\n ll %s %s\n en %s %s\n ll2 %s %s\n", proj.toCode(), lat, lon, en.east(), en.north(), ll2.lat(), ll2.lon())); + out.write(String.format("%s%n ll %s %s%n en %s %s%n ll2 %s %s%n", proj.toCode(), lat, lon, en.east(), en.north(), ll2.lat(), ll2.lon())); } out.close(); @@ -178,7 +178,7 @@ EastNorth en = proj.latlon2eastNorth(data.ll); if (!en.equals(data.en)) { - String error = String.format("%s (%s): Projecting latlon(%s,%s):\n" + - " expected: eastnorth(%s,%s),\n" + - " but got: eastnorth(%s,%s)!\n", + String error = String.format("%s (%s): Projecting latlon(%s,%s):%n" + + " expected: eastnorth(%s,%s),%n" + + " but got: eastnorth(%s,%s)!%n", proj.toString(), data.code, data.ll.lat(), data.ll.lon(), data.en.east(), data.en.north(), en.east(), en.north()); fail.append(error); @@ -186,7 +186,7 @@ LatLon ll2 = proj.eastNorth2latlon(data.en); if (!ll2.equals(data.ll2)) { - String error = String.format("%s (%s): Inverse projecting eastnorth(%s,%s):\n" + - " expected: latlon(%s,%s),\n" + - " but got: latlon(%s,%s)!\n", + String error = String.format("%s (%s): Inverse projecting eastnorth(%s,%s):%n" + + " expected: latlon(%s,%s),%n" + + " but got: latlon(%s,%s)!%n", proj.toString(), data.code, data.en.east(), data.en.north(), data.ll2.lat(), data.ll2.lon(), ll2.lat(), ll2.lon()); fail.append(error); Index: /trunk/test/unit/org/openstreetmap/josm/data/projection/ProjectionTest.java =================================================================== --- /trunk/test/unit/org/openstreetmap/josm/data/projection/ProjectionTest.java (revision 6333) +++ /trunk/test/unit/org/openstreetmap/josm/data/projection/ProjectionTest.java (revision 6334) @@ -65,5 +65,5 @@ Bounds b = p.getWorldBoundsLatLon(); - text += String.format("*** %s %s\n", p.toString(), p.toCode()); + text += String.format("*** %s %s%n", p.toString(), p.toCode()); for (int num=0; num < 1000; ++num) { @@ -86,5 +86,5 @@ error = true; } - text += String.format("%s errorLat: %s errorLon: %s\n", mark, maxErrLat, maxErrLon); + text += String.format("%s errorLat: %s errorLon: %s%n", mark, maxErrLat, maxErrLon); } } Index: /trunk/test/unit/org/openstreetmap/josm/data/projection/SwissGridTest.java =================================================================== --- /trunk/test/unit/org/openstreetmap/josm/data/projection/SwissGridTest.java (revision 6333) +++ /trunk/test/unit/org/openstreetmap/josm/data/projection/SwissGridTest.java (revision 6334) @@ -52,5 +52,5 @@ EastNorth en2 = swiss.latlon2eastNorth(pd.ll); if (Math.abs(pd.en.east() - en2.east()) > EPSILON || Math.abs(pd.en.north() - en2.north()) > EPSILON) { - errs.append(String.format("%s should be: %s but is: %s\n", pd.name, pd.en, en2)); + errs.append(String.format("%s should be: %s but is: %s%n", pd.name, pd.en, en2)); } }