Changeset 14266 in josm for trunk/src

Timestamp:

2018-09-21T21:53:17+02:00 (7 years ago)

Author:

Don-vip

Message:

fix #16762 - support multiple notes in .osc files created by OsmAnd

Location:

trunk/src/org/openstreetmap/josm/io

Files:

• OsmChangeReader.java (modified) (1 diff)
• OsmReader.java (modified) (2 diffs)

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

@@ -113 +113 @@
                 case "comment":
                     text = parser.getAttributeValue(null, "text");
+                    jumpToEnd();
                     break;
                 default:

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

@@ -366 +366 @@
      * @throws XMLStreamException if there is an error processing the underlying XML source
      */
-    private void jumpToEnd(boolean printWarning) throws XMLStreamException {
+    protected final void jumpToEnd(boolean printWarning) throws XMLStreamException {
         while (true) {
             int event = parser.next();
@@ -376 +376 @@
     }
 
-    private void jumpToEnd() throws XMLStreamException {
+    protected final void jumpToEnd() throws XMLStreamException {
         jumpToEnd(true);
     }