Implemented support for default Namespaces

3 files changed, 22 insertions, 7 deletions

diff --git a/src/de/podfetcher/syndication/handler/FeedHandler.java b/src/de/podfetcher/syndication/handler/FeedHandler.java
index dcc7e4ca7..110ac2b90 100644
--- a/src/de/podfetcher/syndication/handler/FeedHandler.java
+++ b/src/de/podfetcher/syndication/handler/FeedHandler.java
@@ -16,8 +16,8 @@ public class FeedHandler {
 	
 	public Feed parseFeed(Feed feed) {
 		TypeGetter tg = new TypeGetter();
-		tg.getType(feed);
-		SyndHandler handler = new SyndHandler(feed);
+		TypeGetter.Type type = tg.getType(feed);
+		SyndHandler handler = new SyndHandler(feed, type);
 		try {
 			SAXParserFactory factory =  SAXParserFactory.newInstance();
 			factory.setNamespaceAware(true);
diff --git a/src/de/podfetcher/syndication/handler/HandlerState.java b/src/de/podfetcher/syndication/handler/HandlerState.java
index 755388efb..088dd295a 100644
--- a/src/de/podfetcher/syndication/handler/HandlerState.java
+++ b/src/de/podfetcher/syndication/handler/HandlerState.java
@@ -17,11 +17,13 @@ public class HandlerState {
 	protected Stack<SyndElement> tagstack;
 	/** Namespaces that have been defined so far. */
 	protected HashMap<String, Namespace> namespaces;
+	protected Stack<Namespace> defaultNamespaces;
 	
 	public HandlerState(Feed feed) {
 		this.feed = feed;
 		tagstack = new Stack<SyndElement>();
 		namespaces = new HashMap<String, Namespace>();
+		defaultNamespaces = new Stack<Namespace>();
 	}
 	
 	
diff --git a/src/de/podfetcher/syndication/handler/SyndHandler.java b/src/de/podfetcher/syndication/handler/SyndHandler.java
index a6351afcf..f3a1d205b 100644
--- a/src/de/podfetcher/syndication/handler/SyndHandler.java
+++ b/src/de/podfetcher/syndication/handler/SyndHandler.java
@@ -12,15 +12,18 @@ import de.podfetcher.syndication.namespace.SyndElement;
 import de.podfetcher.syndication.namespace.atom.NSAtom;
 import de.podfetcher.syndication.namespace.rss20.NSRSS20;
 
-// TODO implement default namespace
+
 /** Superclass for all SAX Handlers which process Syndication formats */
 public class SyndHandler extends DefaultHandler {
 	private static final String TAG = "SyndHandler";
+	private static final String DEFAULT_PREFIX = "";
 	protected HandlerState state;
 
-	public SyndHandler(Feed feed) {
+	public SyndHandler(Feed feed, TypeGetter.Type type) {
 		state = new HandlerState(feed);
-		state.namespaces.put("", new NSRSS20()); // TODO remove later
+		if (type == TypeGetter.Type.RSS20) {
+			state.defaultNamespaces.push(new NSRSS20());
+		}
 	}
 
 	@Override
@@ -28,6 +31,9 @@ public class SyndHandler extends DefaultHandler {
 			Attributes attributes) throws SAXException {
 
 		Namespace handler = state.namespaces.get(uri);
+		if (handler == null &&  uri.equals(DEFAULT_PREFIX) && !state.defaultNamespaces.empty()) {
+			handler = state.defaultNamespaces.peek();
+		}
 		if (handler != null) {
 			handler.handleElementStart(localName, state, attributes);
 			state.tagstack.push(new SyndElement(localName, handler));
@@ -50,6 +56,9 @@ public class SyndHandler extends DefaultHandler {
 	public void endElement(String uri, String localName, String qName)
 			throws SAXException {
 		Namespace handler = state.namespaces.get(uri);
+		if (handler == null && uri.equals(DEFAULT_PREFIX) && !state.defaultNamespaces.empty()) {
+			handler = state.defaultNamespaces.peek();
+		}
 		if (handler != null) {
 			handler.handleElementEnd(localName, state);
 			state.tagstack.pop();
@@ -69,8 +78,12 @@ public class SyndHandler extends DefaultHandler {
 		Log.d(TAG, "Found Prefix Mapping with prefix " + prefix + " and uri "
 				+ uri);
 		// Find the right namespace
-		if (prefix.equals(NSAtom.NSTAG) || uri.equals(NSAtom.NSURI)) {
-			state.namespaces.put(uri, new NSAtom());
+		if (uri.equals(NSAtom.NSURI)) {
+			if (prefix.equals(DEFAULT_PREFIX)) {
+				state.defaultNamespaces.push(new NSAtom());
+			} else if (prefix.equals(NSAtom.NSTAG)) {
+				state.namespaces.put(uri, new NSAtom());
+			}
 		}
 	}