Changeset 6334 in josm

Timestamp:

2013-10-27T04:06:10+01:00 (11 years ago)

Author:

Don-vip

Message:

Sonar/Findbugs - Format string should use %n rather than \n

Location:

trunk

Files:

• src/org/openstreetmap/josm/gui/dialogs/InspectPrimitiveDialog.java (modified) (1 diff)
• src/org/openstreetmap/josm/io/GpxWriter.java (modified) (1 diff)
• test/unit/org/openstreetmap/josm/data/osm/FilterTest.java (modified) (2 diffs)
• test/unit/org/openstreetmap/josm/data/projection/EllipsoidTest.java (modified) (1 diff)
• test/unit/org/openstreetmap/josm/data/projection/ProjectionRefTest.java (modified) (4 diffs)
• test/unit/org/openstreetmap/josm/data/projection/ProjectionRegressionTest.java (modified) (3 diffs)
• test/unit/org/openstreetmap/josm/data/projection/ProjectionTest.java (modified) (2 diffs)
• test/unit/org/openstreetmap/josm/data/projection/SwissGridTest.java (modified) (1 diff)

trunk/src/org/openstreetmap/josm/gui/dialogs/InspectPrimitiveDialog.java

@@ -231 +231 @@
                 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)));
                 }
             }

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

@@ -66 +66 @@
         out.println("<?xml version='1.0' encoding='UTF-8'?>");
         out.println("<gpx version=\"1.1\" creator=\"JOSM GPX export\" xmlns=\"http://www.topografix.com/GPX/1/1\"\n" +
-                (hasExtensions ? String.format("    xmlns:josm=\"%s\"\n", JOSM_EXTENSIONS_NAMESPACE_URI) : "") +
+                (hasExtensions ? String.format("    xmlns:josm=\"%s\"%n", JOSM_EXTENSIONS_NAMESPACE_URI) : "") +
                 "    xmlns:xsi=\"http://www.w3.org/2001/XMLSchema-instance\" \n" +
                 "    xsi:schemaLocation=\"http://www.topografix.com/GPX/1/1 http://www.topografix.com/GPX/1/1/gpx.xsd\">");

trunk/test/unit/org/openstreetmap/josm/data/osm/FilterTest.java

@@ -169 +169 @@
                     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 +175 @@
             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()));
         }
     }

trunk/test/unit/org/openstreetmap/josm/data/projection/EllipsoidTest.java

@@ -6 +6 @@
 import org.junit.Assert;
 import org.junit.Test;
-
 import org.openstreetmap.josm.data.coor.LatLon;
 

trunk/test/unit/org/openstreetmap/josm/data/projection/ProjectionRefTest.java

@@ -1 +1 @@
 // 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 +8 @@
 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 +64 @@
             {
                 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 +75 @@
             {
                 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)

trunk/test/unit/org/openstreetmap/josm/data/projection/ProjectionRegressionTest.java

@@ -108 +108 @@
             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 +178 @@
             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 +186 @@
             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);

trunk/test/unit/org/openstreetmap/josm/data/projection/ProjectionTest.java

@@ -65 +65 @@
             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 +86 @@
                 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);
         }
     }

trunk/test/unit/org/openstreetmap/josm/data/projection/SwissGridTest.java

@@ -52 +52 @@
             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));
             }
         }