Merged SyndElement with NSElement

3 files changed, 6 insertions, 35 deletions

diff --git a/src/de/podfetcher/syndication/handler/SyndHandler.java b/src/de/podfetcher/syndication/handler/SyndHandler.java
index 4fc47fb63..c772fdbaf 100644
--- a/src/de/podfetcher/syndication/handler/SyndHandler.java
+++ b/src/de/podfetcher/syndication/handler/SyndHandler.java
@@ -25,12 +25,8 @@ public abstract class SyndHandler extends DefaultHandler{
 			Attributes attributes) throws SAXException {
 		state.tagstack.push(new SyndElement(qName));
 		
-		String[] parts = qName.split(":");
-		String prefix = "";
-		if (parts.length >= 2) {
-			prefix = parts[0];
-		}
-		Namespace handler = state.namespaces.get(prefix);
+		
+		Namespace handler = state.namespaces.get(uri);
 		if (handler != null) {
 			handler.handleElement(localName, state, attributes);
 		}
@@ -48,7 +44,7 @@ public abstract class SyndHandler extends DefaultHandler{
 
 	@Override
 	public void endPrefixMapping(String prefix) throws SAXException {
-		state.namespaces.remove(prefix);
+		// TODO remove Namespace
 	}
 
 
@@ -59,7 +55,7 @@ public abstract 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(prefix, new NSAtom());
+			state.namespaces.put(uri, new NSAtom());
 		}
 	}
 
diff --git a/src/de/podfetcher/syndication/namespace/NSElement.java b/src/de/podfetcher/syndication/namespace/NSElement.java
deleted file mode 100644
index 5bfeae212..000000000
--- a/src/de/podfetcher/syndication/namespace/NSElement.java
+++ /dev/null
@@ -1,25 +0,0 @@
-package de.podfetcher.syndication.namespace;
-
-import org.xml.sax.Attributes;
-
-import de.podfetcher.feed.Feed;
-import de.podfetcher.syndication.handler.HandlerState;
-
-/** Defines a XML Element of a specific namespace */
-public abstract class NSElement extends SyndElement{
-	protected Namespace namespace;
-	
-	public NSElement(String name, Namespace namespace) {
-		super(name);
-		this.namespace = namespace;
-	}
-
-	/** Called by its namespace if the processing of the element gets more complex */
-	public abstract void handleElement(String localName, HandlerState state, Attributes attributes);
-
-	@Override
-	public Namespace getNamespace() {
-		return namespace;
-	}
-	
-}
diff --git a/src/de/podfetcher/syndication/namespace/SyndElement.java b/src/de/podfetcher/syndication/namespace/SyndElement.java
index e4d250f0b..627ac7b6d 100644
--- a/src/de/podfetcher/syndication/namespace/SyndElement.java
+++ b/src/de/podfetcher/syndication/namespace/SyndElement.java
@@ -3,9 +3,9 @@ package de.podfetcher.syndication.namespace;
 /** Defines a XML Element that is pushed on the tagstack */
 public class SyndElement {
 	protected String name;
-
+	protected Namespace namespace;
 	
-	public SyndElement(String name) {
+	public SyndElement(String name, Namespace namespace) {
 		super();
 		this.name = name;
 	}