Added getters and setters for feed classes

5 files changed, 103 insertions, 26 deletions

diff --git a/src/de/podfetcher/feed/Feed.java b/src/de/podfetcher/feed/Feed.java
index 823c8f198..66be64778 100644
--- a/src/de/podfetcher/feed/Feed.java
+++ b/src/de/podfetcher/feed/Feed.java
@@ -11,12 +11,12 @@ import java.util.ArrayList;
  *
  */
 public class Feed extends FeedFile{
-	public String title;
-	public String link;
-	public String description;
-	public FeedImage image;
-	public FeedCategory category;
-	public ArrayList<FeedItem> items;
+	private String title;
+	private String link;
+	private String description;
+	private FeedImage image;
+	private FeedCategory category;
+	private ArrayList<FeedItem> items;
 	
 	
 	public Feed() {
@@ -37,6 +37,58 @@ public class Feed extends FeedFile{
 		this.category = category;
 		items = new ArrayList<FeedItem>();
 	}
+
+	public String getTitle() {
+		return title;
+	}
+
+	public void setTitle(String title) {
+		this.title = title;
+	}
+
+	public String getLink() {
+		return link;
+	}
+
+	public void setLink(String link) {
+		this.link = link;
+	}
+
+	public String getDescription() {
+		return description;
+	}
+
+	public void setDescription(String description) {
+		this.description = description;
+	}
+
+	public FeedImage getImage() {
+		return image;
+	}
+
+	public void setImage(FeedImage image) {
+		this.image = image;
+	}
+
+	public FeedCategory getCategory() {
+		return category;
+	}
+
+	public void setCategory(FeedCategory category) {
+		this.category = category;
+	}
+
+	public ArrayList<FeedItem> getItems() {
+		return items;
+	}
+
+	public void setItems(ArrayList<FeedItem> items) {
+		this.items = items;
+	}
+
+	
+
+	
 	
 	
 	
diff --git a/src/de/podfetcher/feed/FeedComponent.java b/src/de/podfetcher/feed/FeedComponent.java
index 4c787c55a..4070eb161 100644
--- a/src/de/podfetcher/feed/FeedComponent.java
+++ b/src/de/podfetcher/feed/FeedComponent.java
@@ -7,10 +7,20 @@ package de.podfetcher.feed;
  */
 public class FeedComponent {
 
-	public long id;
+	protected long id;
 
 	public FeedComponent() {
 		super();
 	}
 
+	public long getId() {
+		return id;
+	}
+
+	public void setId(long id) {
+		this.id = id;
+	}
+	
+	
+
 }
\ No newline at end of file
diff --git a/src/de/podfetcher/feed/FeedFile.java b/src/de/podfetcher/feed/FeedFile.java
index 8335166b0..99871c9a2 100644
--- a/src/de/podfetcher/feed/FeedFile.java
+++ b/src/de/podfetcher/feed/FeedFile.java
@@ -1,7 +1,22 @@
 package de.podfetcher.feed;
 
 public abstract class FeedFile extends FeedComponent {
-	public String file_url;
-	public String download_url;
+	protected String file_url;
+	protected String download_url;
+	
+	public String getFile_url() {
+		return file_url;
+	}
+	public void setFile_url(String file_url) {
+		this.file_url = file_url;
+	}
+	public String getDownload_url() {
+		return download_url;
+	}
+	public void setDownload_url(String download_url) {
+		this.download_url = download_url;
+	}
+	
+	
 
 }
diff --git a/src/de/podfetcher/feed/FeedManager.java b/src/de/podfetcher/feed/FeedManager.java
index af003bdda..d5fabff00 100644
--- a/src/de/podfetcher/feed/FeedManager.java
+++ b/src/de/podfetcher/feed/FeedManager.java
@@ -18,8 +18,8 @@ public class FeedManager {
 	
 	private static FeedManager singleton;
 	
-	public ArrayList<Feed> feeds;
-	public ArrayList<FeedCategory> categories;
+	private ArrayList<Feed> feeds;
+	private ArrayList<FeedCategory> categories;
 	
 	Cursor feedlistCursor;
 
@@ -69,7 +69,7 @@ public class FeedManager {
 			item.read = foundItem.read;
 			adapter.setFeedItem(item);
 		} else {
-			foundFeed.items.add(item);	
+			foundFeed.getItems().add(item);	
 			item.id = adapter.setFeedItem(item);
 		}
 	}
@@ -77,7 +77,7 @@ public class FeedManager {
 	/** Get a Feed by its link */
 	private Feed searchFeedByLink(String link) {
 		for(Feed feed : feeds) {
-			if(feed.link.equals(link)) {
+			if(feed.getLink().equals(link)) {
 				return feed;
 			}
 		}
@@ -86,7 +86,7 @@ public class FeedManager {
 
 	/** Get a FeedItem by its link */
 	private FeedItem searchFeedItemByLink(Feed feed, String link) {
-		for(FeedItem item : feed.items) {
+		for(FeedItem item : feed.getItems()) {
 			if(item.link.equals(link)) {
 				return item;
 			}
@@ -133,16 +133,16 @@ public class FeedManager {
 				Feed feed = new Feed();
 				
 				feed.id = feedlistCursor.getLong(feedlistCursor.getColumnIndex(PodDBAdapter.KEY_ID));
-				feed.title = feedlistCursor.getString(feedlistCursor.getColumnIndex(PodDBAdapter.KEY_TITLE));
-				feed.link = feedlistCursor.getString(feedlistCursor.getColumnIndex(PodDBAdapter.KEY_LINK));
-				feed.description = feedlistCursor.getString(feedlistCursor.getColumnIndex(PodDBAdapter.KEY_DESCRIPTION));
-				feed.image = adapter.getFeedImage(feed);
+				feed.setTitle(feedlistCursor.getString(feedlistCursor.getColumnIndex(PodDBAdapter.KEY_TITLE)));
+				feed.setLink(feedlistCursor.getString(feedlistCursor.getColumnIndex(PodDBAdapter.KEY_LINK)));
+				feed.setDescription(feedlistCursor.getString(feedlistCursor.getColumnIndex(PodDBAdapter.KEY_DESCRIPTION)));
+				feed.setImage(adapter.getFeedImage(feed));
 				feed.file_url = feedlistCursor.getString(feedlistCursor.getColumnIndex(PodDBAdapter.KEY_FILE_URL));
 				feed.download_url = feedlistCursor.getString(feedlistCursor.getColumnIndex(PodDBAdapter.KEY_DOWNLOAD_URL));
 				
 				// Get FeedItem-Object
 				Cursor itemlistCursor = adapter.getAllItemsOfFeedCursor(feed);
-				feed.items = extractFeedItemsFromCursor(context, itemlistCursor);
+				feed.setItems(extractFeedItemsFromCursor(context, itemlistCursor));
 				
 				feeds.add(feed);
 			}while(feedlistCursor.moveToNext());
diff --git a/src/de/podfetcher/feed/RSSHandler.java b/src/de/podfetcher/feed/RSSHandler.java
index 7456026c8..91c94f407 100644
--- a/src/de/podfetcher/feed/RSSHandler.java
+++ b/src/de/podfetcher/feed/RSSHandler.java
@@ -36,7 +36,7 @@ public class RSSHandler extends DefaultHandler {
 
 	@Override
 	public void endDocument() throws SAXException {
-		feed.items = items;
+		feed.setItems(items);
 	}
 
 	@Override
@@ -47,21 +47,21 @@ public class RSSHandler extends DefaultHandler {
 			items.add(currentItem);
 		} else if (qName.equalsIgnoreCase(FeedHandler.TITLE)) {
 			if (active_root_element.equalsIgnoreCase(FeedHandler.CHANNEL)) {
-				feed.title = strBuilder.toString();
+				feed.setTitle(strBuilder.toString());
 			} else if(active_root_element.equalsIgnoreCase(FeedHandler.TITLE)) {
 				currentItem.title = strBuilder.toString();
 			} else if(active_root_element.equalsIgnoreCase(FeedHandler.IMAGE)) {
-				feed.image.title = strBuilder.toString();
+				feed.getImage().title = strBuilder.toString();
 			}
 		} else if (qName.equalsIgnoreCase(FeedHandler.DESCR)) {
 			if (active_root_element.equalsIgnoreCase(FeedHandler.CHANNEL)) {
-				feed.description = strBuilder.toString();
+				feed.setDescription(strBuilder.toString());
 			} else {
 				currentItem.description = strBuilder.toString();
 			}
 		} else if (qName.equalsIgnoreCase(FeedHandler.LINK)) {
 			if (active_root_element.equalsIgnoreCase(FeedHandler.CHANNEL)) {
-				feed.link = strBuilder.toString();
+				feed.setLink(strBuilder.toString());
 			} else if(active_root_element.equalsIgnoreCase(FeedHandler.TITLE)){
 				currentItem.link = strBuilder.toString();
 			} 
@@ -71,7 +71,7 @@ public class RSSHandler extends DefaultHandler {
 			}
 		} else if (qName.equalsIgnoreCase(FeedHandler.URL)) {
 			if(active_root_element.equalsIgnoreCase(FeedHandler.IMAGE)) {
-				feed.image.download_url = strBuilder.toString();
+				feed.getImage().download_url = strBuilder.toString();
 			}
 		} else if(qName.equalsIgnoreCase(FeedHandler.IMAGE)) {
 			active_root_element = FeedHandler.CHANNEL;
@@ -112,7 +112,7 @@ public class RSSHandler extends DefaultHandler {
 											  Long.parseLong(attributes.getValue(FeedHandler.ENC_LEN)),
 											  attributes.getValue(FeedHandler.ENC_TYPE));
 		} else if(qName.equalsIgnoreCase(FeedHandler.IMAGE)) {
-			feed.image = new FeedImage();
+			feed.setImage(new FeedImage());
 			active_root_element = qName;
 		} else if(qName.equalsIgnoreCase(FeedHandler.URL)) {
 			active_sub_element = qName;