Moved activities and services in the right folders

6 files changed, 13 insertions, 13 deletions

diff --git a/src/de/podfetcher/PodcastApp.java b/src/de/podfetcher/PodcastApp.java
index 94227b522..2587cf93f 100644
--- a/src/de/podfetcher/PodcastApp.java
+++ b/src/de/podfetcher/PodcastApp.java
@@ -1,7 +1,6 @@
 package de.podfetcher;
 
-import de.podfetcher.feed.FeedManager;
-import de.podfetcher.FeedlistActivity;
+import de.podfetcher.activity.PodfetcherActivity;
 import android.app.Application;
 import greendroid.app.GDApplication;
 
diff --git a/src/de/podfetcher/gui/AddFeedActivity.java b/src/de/podfetcher/activity/AddFeedActivity.java
index 1f6f5a568..a0c1e36d8 100644
--- a/src/de/podfetcher/gui/AddFeedActivity.java
+++ b/src/de/podfetcher/activity/AddFeedActivity.java
@@ -1,4 +1,4 @@
-package de.podfetcher.gui;
+package de.podfetcher.activity;
 
 import android.app.Activity;
 import android.os.Bundle;
diff --git a/src/de/podfetcher/FeedlistActivity.java b/src/de/podfetcher/activity/FeedlistActivity.java
index 106dcced6..caaf88568 100644
--- a/src/de/podfetcher/FeedlistActivity.java
+++ b/src/de/podfetcher/activity/FeedlistActivity.java
@@ -1,6 +1,6 @@
-package de.podfetcher;
+package de.podfetcher.activity;
 
-import de.podfetcher.gui.AddFeedActivity;
+import de.podfetcher.R;
 import greendroid.app.GDListActivity;
 import android.os.Bundle;
 import android.view.View;
diff --git a/src/de/podfetcher/PodfetcherActivity.java b/src/de/podfetcher/activity/PodfetcherActivity.java
index 199091c0c..5483f007b 100644
--- a/src/de/podfetcher/PodfetcherActivity.java
+++ b/src/de/podfetcher/activity/PodfetcherActivity.java
@@ -1,9 +1,10 @@
-package de.podfetcher;
+package de.podfetcher.activity;
 
 import javax.xml.parsers.ParserConfigurationException;
 
 import org.xml.sax.SAXException;
 
+import de.podfetcher.R;
 import de.podfetcher.feed.*;
 import de.podfetcher.storage.DownloadRequester;
 import greendroid.app.GDListActivity;
diff --git a/src/de/podfetcher/storage/DownloadService.java b/src/de/podfetcher/service/DownloadService.java
index b7e7fdac3..aa7356dfa 100644
--- a/src/de/podfetcher/storage/DownloadService.java
+++ b/src/de/podfetcher/service/DownloadService.java
@@ -4,9 +4,10 @@
  * */
 
 
-package de.podfetcher.storage;
+package de.podfetcher.service;
 
 import de.podfetcher.feed.*;
+import de.podfetcher.storage.DownloadRequester;
 import android.app.Service;
 import android.app.DownloadManager;
 import android.content.Intent;
@@ -85,16 +86,16 @@ public class DownloadService extends Service {
 			requester.downloadImage(context, feed.getImage());
 		}
 			// Notify FeedSyncService about the new Feed
-			sendBroadcast(item_intent);
+			sendBroadcast(intent);
 
 	}
 
 	/** Is called whenever a Feed-Image is downloaded */
-	private void handleCompletedImageDownload(Context contex, Intent intent) {
-			requester.removeImageByID(item_intent.getLongExtra(DownloadRequester.EXTRA_ITEM_ID, -1));
-			FeedImage image = manager.getFeedImage(item_intent.getLongExtra(DownloadRequester.EXTRA_ITEM_ID, -1));
+	private void handleCompletedImageDownload(Context context, Intent intent) {
+			requester.removeImageByID(intent.getLongExtra(DownloadRequester.EXTRA_ITEM_ID, -1));
+			FeedImage image = manager.getFeedImage(intent.getLongExtra(DownloadRequester.EXTRA_ITEM_ID, -1));
 			image.setFile_url(requester.getImagefilePath(context) + requester.getImagefileName(image.getId()));
-			sendBroadcast(item_intent);
+			sendBroadcast(intent);
 
 	}
 }
diff --git a/src/de/podfetcher/service/FeedSyncService.java b/src/de/podfetcher/service/FeedSyncService.java
index 18b0f7a5e..934e48ccc 100644
--- a/src/de/podfetcher/service/FeedSyncService.java
+++ b/src/de/podfetcher/service/FeedSyncService.java
@@ -12,7 +12,6 @@ import java.util.concurrent.TimeUnit;
 
 import de.podfetcher.feed.*;
 import de.podfetcher.storage.DownloadRequester;
-import de.podfetcher.storage.DownloadService;
 
 import android.app.Service;
 import android.content.Intent;