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/src/org/openstreetmap/josm/io/GpxReader.java
+++ b/src/org/openstreetmap/josm/io/GpxReader.java
@@ -77,7 +77,7 @@ public class GpxReader {
 				parseCoord(atts.getValue("lon")));
 		}
 
-		@Override public void startElement(String namespaceURI, String localName, String qName, Attributes atts) throws SAXException {
+		@Override public void startElement(String namespaceURI, String qName, String rqName, Attributes atts) throws SAXException {
 			switch(currentState) {
 			case init:
 				if (qName.equals("metadata")) {
@@ -180,7 +180,7 @@ public class GpxReader {
 			}
 		}
 
-		@Override public void endElement(String namespaceURI, String localName, String qName) {
+		@Override public void endElement(String namespaceURI, String qName, String rqName) {
 			switch (currentState) {
 			case metadata:
 				if (qName.equals("name") || qName.equals("desc") ||
@@ -294,8 +294,9 @@ public class GpxReader {
 		Parser parser = new Parser();
 		InputSource inputSource = new InputSource(new InputStreamReader(source, "UTF-8"));
 		try {
-			SAXParserFactory.newInstance().newSAXParser().parse(inputSource, parser);
-			data.storageFile = relativeMarkerPath;
+			SAXParserFactory factory = SAXParserFactory.newInstance();
+			factory.setNamespaceAware(true);
+			factory.newSAXParser().parse(inputSource, parser);
 		} catch (ParserConfigurationException e) {
 			e.printStackTrace(); // broken SAXException chaining
 			throw new SAXException(e);
-- 
1.5.6.5

