Changeset 30 in josm for src/org/openstreetmap/josm/io/OsmReader.java

Timestamp:

2005-12-03T14:14:35+01:00 (20 years ago)

Author:

imi

Message:

• Removed edit layer, combine action, save gpx (integrated in normal save)
• Simplified and unified shortkeys
• many small code simplifications
• added undo
• broken checkin!

File:

• src/org/openstreetmap/josm/io/OsmReader.java (modified) (2 diffs)

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

@@ -118 +118 @@
                         else if (child.getName().equals("segment")) {
                                 LineSegment ls = parseLineSegment(child, data);
-                                if (data.pendingLineSegments.contains(ls))
+                                if (data.lineSegments.contains(ls))
                                         throw new JDOMException("Double segment definition "+ls.id);
                                 for (Track t : data.tracks)
                                         if (t.segments.contains(ls))
                                                 throw new JDOMException("Double segment definition "+ls.id);
-                                data.pendingLineSegments.add(ls);
+                                data.lineSegments.add(ls);
                         } else if (child.getName().equals("track")) {
                                 Track track = parseTrack(child, data);
@@ -175 +175 @@
                         Element child = (Element)o;
                         long id = Long.parseLong(child.getAttributeValue("uid"));
-                        LineSegment ls = findLineSegment(data.pendingLineSegments, id);
+                        LineSegment ls = findLineSegment(data.lineSegments, id);
                         if (ls != null) {
                                 track.segments.add(ls);
-                                data.pendingLineSegments.remove(ls);
+                                data.lineSegments.remove(ls);
                                 continue;
                         }