Changeset 10051 in josm

Timestamp:

2016-03-26T21:49:06+01:00 (8 years ago)

Author:

Don-vip

Message:

fix #12675 - fix XML encoding of user names in changeset requests

Location:

trunk

Files:

• src/org/openstreetmap/josm/io/OsmApi.java (modified) (2 diffs)
• src/org/openstreetmap/josm/io/OsmWriter.java (modified) (1 diff)
• test/unit/org/openstreetmap/josm/io/CertificateAmendmentTest.java (modified) (1 diff)
• test/unit/org/openstreetmap/josm/io/NoteImporterTest.java (modified) (1 diff)
• test/unit/org/openstreetmap/josm/io/OsmApiTest.java (added)

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

@@ -281 +281 @@
      * @return XML string
      */
-    private String toXml(IPrimitive o, boolean addBody) {
+    protected final String toXml(IPrimitive o, boolean addBody) {
         StringWriter swriter = new StringWriter();
         try (OsmWriter osmWriter = OsmWriterFactory.createOsmWriter(new PrintWriter(swriter), true, version)) {
@@ -302 +302 @@
      * @return XML string
      */
-    private String toXml(Changeset s) {
+    protected final String toXml(Changeset s) {
         StringWriter swriter = new StringWriter();
         try (OsmWriter osmWriter = OsmWriterFactory.createOsmWriter(new PrintWriter(swriter), true, version)) {

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

@@ -239 +239 @@
 
     public void visit(Changeset cs) {
-        out.print("  <changeset ");
-        out.print(" id='"+cs.getId()+'\'');
+        out.print("  <changeset id='"+cs.getId()+'\'');
         if (cs.getUser() != null) {
-            out.print(" user='"+cs.getUser().getName() +'\'');
+            out.print(" user='"+ XmlWriter.encode(cs.getUser().getName()) +'\'');
             out.print(" uid='"+cs.getUser().getId() +'\'');
         }

trunk/test/unit/org/openstreetmap/josm/io/CertificateAmendmentTest.java

@@ -20 +20 @@
     /**
      * Setup test.
-     * @throws IOException in case of I/O error
      */
     @BeforeClass
-    public static void setUp() throws IOException {
+    public static void setUp() {
         JOSMFixture.createUnitTestFixture().init();
     }

trunk/test/unit/org/openstreetmap/josm/io/NoteImporterTest.java

@@ -18 +18 @@
     /**
      * Non-regression test for <a href="https://josm.openstreetmap.de/ticket/12531">Bug #12531</a>.
-     * @throws Exception if any error occurs
      */
     @Test
-    public void testTicket12531() throws Exception {
+    public void testTicket12531() {
         assertNull(Main.map);
         assertTrue(new NoteImporter().importDataHandleExceptions(