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

Timestamp:

2006-04-03T22:25:02+02:00 (18 years ago)

Author:

imi

Message:

• fixed bug in osm import (now reject id=0)
• added WMS server layer (not finished)
• added save state for dialogs

File:

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

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

@@ -74 +74 @@
                                         throw new SAXException("Unknown version.");
                                 if (!"0.3".equals(atts.getValue("version")))
-                                        throw new SAXException("Unknown version: "+atts.getValue("version"));
+                                        throw new SAXException("Unknown version "+atts.getValue("version"));
                         } else if (qName.equals("node")) {
                                 Node n = new Node(new LatLon(getDouble(atts, "lat"), getDouble(atts, "lon")));
@@ -93 +93 @@
                                 if (current instanceof Way) {
                                         long id = getLong(atts, "id");
+                                        if (id == 0)
+                                                throw new SAXException("Incomplete line segment with id=0");
                                         LineSegment ls = lineSegments.get(id);
                                         if (ls == null) {
@@ -105 +107 @@
                         }
                 } catch (NumberFormatException x) {
+            x.printStackTrace(); // SAXException does not chain correctly
                         throw new SAXException(x.getMessage(), x);
                 } catch (NullPointerException x) {
@@ -122 +125 @@
          * Read out the common attributes from atts and put them into this.current.
          */
-        private void readCommon(Attributes atts) {
+        private void readCommon(Attributes atts) throws SAXException {
                 current.id = getLong(atts, "id");
+                if (current.id == 0)
+                        throw new SAXException("Illegal object with id=0");
                 String action = atts.getValue("action");
                 if ("delete".equals(action))