Moved activities and services in the right folders

AndroidManifest.xml

@@ -17,17 +17,17 @@
 		android:name=".PodcastApp">
         <activity
             android:label="@string/app_name"
-			android:name=".PodfetcherActivity" >
+			android:name="de.podfetcher.activity.PodfetcherActivity" >
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
                 <category android:name="android.intent.category.LAUNCHER" />
             </intent-filter>
         </activity>
-		<activity android:name=".FeedlistActivity"/>
-		<activity android:name="de.podfetcher.gui.AddFeedActivity"/>
+		<activity android:name="de.podfetcher.activity.FeedlistActivity"/>
+		<activity android:name="de.podfetcher.activity.AddFeedActivity"/>
 		
-		<service android:enabled="true" android:name=".DownloadService" />
-		<service android:enabled="true" android:name=".FeedSyncService" > 
+		<service android:enabled="true" android:name="de.podfetcher.service.DownloadService" />
+		<service android:enabled="true" android:name="de.podfetcher.service.FeedSyncService" > 
 			<intent-filter>
 				<action android:name="action.de.podfetcher.storage.feed_download_completed"></action>
 			</intent-filter>

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;
 

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;

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;

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;

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);
 
 	}
 }

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;