From 1d93445205e6acac074766dec9534edb2b94c18c Mon Sep 17 00:00:00 2001
From: daniel <daniel@danielpc>
Date: Fri, 8 Jun 2012 20:04:40 +0200
Subject: [PATCH] Moved RSSHandler and FeedHandler to new package

---
 src/de/podfetcher/feed/FeedImage.java                |  5 +++++
 src/de/podfetcher/service/DownloadService.java       |  1 +
 .../{feed => syndication}/FeedHandler.java           |  6 ++++--
 .../podfetcher/{feed => syndication}/RSSHandler.java | 12 ++++++++----
 4 files changed, 18 insertions(+), 6 deletions(-)
 rename src/de/podfetcher/{feed => syndication}/FeedHandler.java (90%)
 rename src/de/podfetcher/{feed => syndication}/RSSHandler.java (92%)

diff --git a/src/de/podfetcher/feed/FeedImage.java b/src/de/podfetcher/feed/FeedImage.java
index 098aa15b6..5d39b69b4 100644
--- a/src/de/podfetcher/feed/FeedImage.java
+++ b/src/de/podfetcher/feed/FeedImage.java
@@ -28,6 +28,11 @@ public class FeedImage extends FeedFile {
 	public String getTitle() {
 		return title;
 	}
+	
+
+	public void setTitle(String title) {
+		this.title = title;
+	}
 
 	public Bitmap getImageBitmap() {
 		if(image_bitmap == null) {
diff --git a/src/de/podfetcher/service/DownloadService.java b/src/de/podfetcher/service/DownloadService.java
index ab4629f85..261341db9 100644
--- a/src/de/podfetcher/service/DownloadService.java
+++ b/src/de/podfetcher/service/DownloadService.java
@@ -13,6 +13,7 @@ import java.util.concurrent.Executors;
 import java.util.concurrent.TimeUnit;
 import de.podfetcher.feed.*;
 import de.podfetcher.storage.DownloadRequester;
+import de.podfetcher.syndication.FeedHandler;
 import android.app.Service;
 import android.app.DownloadManager;
 import android.content.Intent;
diff --git a/src/de/podfetcher/feed/FeedHandler.java b/src/de/podfetcher/syndication/FeedHandler.java
similarity index 90%
rename from src/de/podfetcher/feed/FeedHandler.java
rename to src/de/podfetcher/syndication/FeedHandler.java
index 5457febba..2b6cc9c08 100644
--- a/src/de/podfetcher/feed/FeedHandler.java
+++ b/src/de/podfetcher/syndication/FeedHandler.java
@@ -1,4 +1,4 @@
-package de.podfetcher.feed;
+package de.podfetcher.syndication;
 
 import java.io.File;
 import java.io.IOException;
@@ -9,6 +9,8 @@ import javax.xml.parsers.SAXParserFactory;
 
 import org.xml.sax.SAXException;
 
+import de.podfetcher.feed.Feed;
+
 public class FeedHandler {
 	public final static String CHANNEL = "channel";
 	public final static String ITEM = "item";
@@ -29,7 +31,7 @@ public class FeedHandler {
 		try {
 			SAXParserFactory factory =  SAXParserFactory.newInstance();
 			SAXParser saxParser = factory.newSAXParser();
-			saxParser.parse(new File(feed.file_url), handler);
+			saxParser.parse(new File(feed.getFile_url()), handler);
 		} catch (SAXException e) {
 			e.printStackTrace();
 		} catch (IOException e) {
diff --git a/src/de/podfetcher/feed/RSSHandler.java b/src/de/podfetcher/syndication/RSSHandler.java
similarity index 92%
rename from src/de/podfetcher/feed/RSSHandler.java
rename to src/de/podfetcher/syndication/RSSHandler.java
index 80e7fab87..cfabd1415 100644
--- a/src/de/podfetcher/feed/RSSHandler.java
+++ b/src/de/podfetcher/syndication/RSSHandler.java
@@ -1,7 +1,11 @@
-package de.podfetcher.feed;
+package de.podfetcher.syndication;
 
 import java.util.ArrayList;
-import de.podfetcher.feed.FeedHandler;
+
+import de.podfetcher.feed.Feed;
+import de.podfetcher.feed.FeedImage;
+import de.podfetcher.feed.FeedItem;
+import de.podfetcher.feed.FeedMedia;
 
 import org.xml.sax.Attributes;
 import org.xml.sax.SAXException;
@@ -51,7 +55,7 @@ public class RSSHandler extends DefaultHandler {
 			} else if(active_root_element.equalsIgnoreCase(FeedHandler.ITEM)) {
 				currentItem.setTitle(strBuilder.toString());
 			} else if(active_root_element.equalsIgnoreCase(FeedHandler.IMAGE)) {
-				feed.getImage().title = strBuilder.toString();
+				feed.getImage().setTitle(strBuilder.toString());
 			}
 		} else if (qName.equalsIgnoreCase(FeedHandler.DESCR)) {
 			if (active_root_element.equalsIgnoreCase(FeedHandler.CHANNEL)) {
@@ -71,7 +75,7 @@ public class RSSHandler extends DefaultHandler {
 			}
 		} else if (qName.equalsIgnoreCase(FeedHandler.URL)) {
 			if(active_root_element.equalsIgnoreCase(FeedHandler.IMAGE)) {
-				feed.getImage().download_url = strBuilder.toString();
+				feed.getImage().setDownload_url(strBuilder.toString());
 			}
 		} else if(qName.equalsIgnoreCase(FeedHandler.IMAGE)) {
 			active_root_element = FeedHandler.CHANNEL;