Changeset 5345 in josm for trunk/src/org/openstreetmap/josm/io/OsmChangeReader.java

Timestamp:

2012-07-15T16:34:27+02:00 (14 years ago)

Author:

Don-vip

Message:

fix #7857 - Mark osmChange primitives inside <modify> block as modified + allow to load remote .osc files

File:

• trunk/src/org/openstreetmap/josm/io/OsmChangeReader.java (modified) (5 diffs)

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

@@ -4 +4 @@
 
 import java.io.InputStream;
+import java.util.Arrays;
 
 import javax.xml.stream.XMLStreamConstants;
@@ -14 +15 @@
 public class OsmChangeReader extends OsmReader {
 
+    public static final String[] ACTIONS = {"create", "modify", "delete"};
+    
     /**
      * constructor (for private and subclasses use only)
@@ -46 +49 @@
             int event = parser.next();
             if (event == XMLStreamConstants.START_ELEMENT) {
-                if (parser.getLocalName().equals("create")) {
-                    parseCreate();
-                } else if (parser.getLocalName().equals("modify")) {
-                    parseModify();
-                } else if (parser.getLocalName().equals("delete")) {
-                    parseDelete();
+                if (Arrays.asList(ACTIONS).contains(parser.getLocalName())) {
+                    parseCommon(parser.getLocalName());
                 } else {
                     parseUnknown();
@@ -61 +60 @@
     }
 
-    private void parseDelete() throws XMLStreamException {
-        parseCommon(true);
-    }
-
-    private void parseModify() throws XMLStreamException {
-        parseCommon(false);
-    }
-
-    private void parseCreate() throws XMLStreamException {
-        parseCommon(false);
-    }
-
-    private void parseCommon(boolean deletePrimitive) throws XMLStreamException {
+    private void parseCommon(String action) throws XMLStreamException {
         while (parser.hasNext()) {
             int event = parser.next();
@@ -87 +74 @@
                     parseUnknown();
                 }
-                if (p != null && deletePrimitive) {
-                    p.setDeleted(true);
+                if (p != null && action != null) {
+                    if (action.equals("modify")) {
+                        p.setModified(true);
+                    } else if (action.equals("delete")) {
+                        p.setDeleted(true);
+                    }
                 }
             } else if (event == XMLStreamConstants.END_ELEMENT) {