Changeset 86 in josm for src/org/openstreetmap/josm/io/OsmReaderOld.java

Timestamp:

2006-04-21T14:31:51+02:00 (18 years ago)

Author:

imi

Message:

• added conflicts and resolve conflict dialog

This is one of those "changed everything" checkpoint.

File:

• src/org/openstreetmap/josm/io/OsmReaderOld.java (modified) (8 diffs)

src/org/openstreetmap/josm/io/OsmReaderOld.java

@@ -11 +11 @@
 import org.openstreetmap.josm.data.coor.LatLon;
 import org.openstreetmap.josm.data.osm.DataSet;
-import org.openstreetmap.josm.data.osm.LineSegment;
+import org.openstreetmap.josm.data.osm.Segment;
 import org.openstreetmap.josm.data.osm.Node;
 import org.openstreetmap.josm.data.osm.OsmPrimitive;
@@ -80 +80 @@
                         return parseNode(e);
                 else if (e.getName().equals("segment"))
-                        return parseLineSegment(e, data);
+                        return parseSegment(e, data);
                 else if (e.getName().equals("way"))
                         return parseWay(e, data);
@@ -115 +115 @@
 
         /**
-         * Parse and return an line segment. The node information of the "from" and
+         * Parse and return an segment. The node information of the "from" and
          * "to" attributes must already be in the dataset.
-         * @param e             The line segment element to parse.
+         * @param e             The segment element to parse.
          * @param data  The dataset to obtain the node information from.
-         * @return The parsed line segment.
+         * @return The parsed segment.
          * @throws JDOMException In case of parsing errors.
          */
-        private LineSegment parseLineSegment(Element e, DataSet data) throws JDOMException {
+        private Segment parseSegment(Element e, DataSet data) throws JDOMException {
                 long startId = Long.parseLong(e.getAttributeValue("from"));
                 long endId = Long.parseLong(e.getAttributeValue("to"));
@@ -135 +135 @@
                 if (start == null || end == null)
                         throw new JDOMException("The 'from' or 'to' object has not been transfered before.");
-                LineSegment ls = new LineSegment(start, end);
+                Segment ls = new Segment(start, end);
                 parseCommon(ls, e);
                 return ls;
@@ -154 +154 @@
                         Element child = (Element)o;
                         long id = Long.parseLong(child.getAttributeValue("uid"));
-                        LineSegment ls = findLineSegment(data.lineSegments, id);
+                        Segment ls = findSegment(data.segments, id);
                         way.segments.add(ls);
                 }
@@ -189 +189 @@
                 
                 String action = e.getAttributeValue("action");
-                if ("delete".equals(action))
-                        data.setDeleted(true);
-                else if ("modify".equals(action))
-                        data.modified = data.modifiedProperties = true;
-                else if ("modify/property".equals(action))
-                        data.modifiedProperties = true;
-                else if ("modify/object".equals(action))
+                if (action == null)
+                        return;
+                if (action.equals("delete"))
+                        data.delete(true);
+                else if (action.startsWith("modify"))
                         data.modified = true;
         }
@@ -218 +216 @@
                         if (osm.id == id)
                                 return osm;
-                for (OsmPrimitive osm : data.lineSegments)
+                for (OsmPrimitive osm : data.segments)
                         if (osm.id == id)
                                 return osm;
@@ -230 +228 @@
          * Search for a segment in a collection by comparing the id.
          */
-        private LineSegment findLineSegment(Collection<LineSegment> segments, long id) throws JDOMException {
-                for (LineSegment ls : segments)
+        private Segment findSegment(Collection<Segment> segments, long id) throws JDOMException {
+                for (Segment ls : segments)
                         if (ls.id == id)
                                 return ls;
-                throw new JDOMException("Unknown line segment reference: "+id);
+                throw new JDOMException("Unknown segment reference: "+id);
         }
 }