From 354f6db3c43a7c8fddf82a3dc8e5b2c85cf05289 Mon Sep 17 00:00:00 2001
From: Michel Marti <mcdmx@users.sf.net>
Date: Mon, 3 Nov 2008 14:25:38 +0100
Subject: [PATCH] GPX-Import: Make the SAX Parser Factory namespace aware.
---
src/org/openstreetmap/josm/io/GpxReader.java | 9 +++++----
1 files changed, 5 insertions(+), 4 deletions(-)
diff --git a/src/org/openstreetmap/josm/io/GpxReader.java b/src/org/openstreetmap/josm/io/GpxReader.java
index 6529672..e5ad95e 100644
a
|
b
|
public class GpxReader {
|
77 | 77 | parseCoord(atts.getValue("lon"))); |
78 | 78 | } |
79 | 79 | |
80 | | @Override public void startElement(String namespaceURI, String localName, String qName, Attributes atts) throws SAXException { |
| 80 | @Override public void startElement(String namespaceURI, String qName, String rqName, Attributes atts) throws SAXException { |
81 | 81 | switch(currentState) { |
82 | 82 | case init: |
83 | 83 | if (qName.equals("metadata")) { |
… |
… |
public class GpxReader {
|
180 | 180 | } |
181 | 181 | } |
182 | 182 | |
183 | | @Override public void endElement(String namespaceURI, String localName, String qName) { |
| 183 | @Override public void endElement(String namespaceURI, String qName, String rqName) { |
184 | 184 | switch (currentState) { |
185 | 185 | case metadata: |
186 | 186 | if (qName.equals("name") || qName.equals("desc") || |
… |
… |
public class GpxReader {
|
294 | 294 | Parser parser = new Parser(); |
295 | 295 | InputSource inputSource = new InputSource(new InputStreamReader(source, "UTF-8")); |
296 | 296 | try { |
297 | | SAXParserFactory.newInstance().newSAXParser().parse(inputSource, parser); |
298 | | data.storageFile = relativeMarkerPath; |
| 297 | SAXParserFactory factory = SAXParserFactory.newInstance(); |
| 298 | factory.setNamespaceAware(true); |
| 299 | factory.newSAXParser().parse(inputSource, parser); |
299 | 300 | } catch (ParserConfigurationException e) { |
300 | 301 | e.printStackTrace(); // broken SAXException chaining |
301 | 302 | throw new SAXException(e); |