Update Package Name, Fix a few Warnings & Clean up Project Files

.classpath

@@ -1,8 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
-	<classpathentry kind="con" path="com.android.ide.eclipse.adt.ANDROID_FRAMEWORK"/>
-	<classpathentry kind="con" path="com.android.ide.eclipse.adt.LIBRARIES"/>
+	<classpathentry exported="true" kind="con" path="com.android.ide.eclipse.adt.ANDROID_FRAMEWORK"/>
+	<classpathentry exported="true" kind="con" path="com.android.ide.eclipse.adt.LIBRARIES"/>
 	<classpathentry kind="src" path="src"/>
 	<classpathentry kind="src" path="gen"/>
+	<classpathentry exported="true" kind="con" path="com.android.ide.eclipse.adt.DEPENDENCIES"/>
 	<classpathentry kind="output" path="bin/classes"/>
 </classpath>

AndroidManifest.xml

@@ -1,18 +1,18 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="turtle.player"
-    android:versionCode="3"
-    android:versionName="2.3" >
+    package="com.turtleplayer"
+    android:versionCode="1"
+    android:versionName="1.0" >
 
     <uses-sdk android:minSdkVersion="10" />
     <uses-permission android:name="android.permission.READ_PHONE_STATE" />
 
     <application
         android:icon="@drawable/ic_launcher"
         android:label="@string/app_name"
-        android:name=".TurtlePlayer" >
+        android:name="com.turtleplayer.TurtlePlayer" >
         <activity
-            android:name=".Player"
+            android:name="com.turtleplayer.Player"
             android:label="@string/app_name"
             android:theme="@android:style/Theme.NoTitleBar"
             android:launchMode="singleTask">
@@ -22,15 +22,15 @@
             </intent-filter>
         </activity>
         <activity
-                android:name=".dirchooser.DirChooser"
+            	android:name=".dirchooser.DirChooser"
                 android:label="@string/dirchooser_label"
                 android:theme="@android:style/Theme.NoTitleBar" >
             <intent-filter>
-                <action android:name="turtle.player.DIR_CHOOSER" />
+                <action android:name="com.turtleplayer.DIR_CHOOSER" />
                 <category android:name="android.intent.category.DEFAULT" />
             </intent-filter>
-        </activity>
-        <service android:name=".player.PlayerService" />
+		</activity>
+   		<service android:name=".player.PlayerService" />
     </application>
 
 </manifest>

project.properties

@@ -11,4 +11,4 @@
 #proguard.config=${sdk.dir}/tools/proguard/proguard-android.txt:proguard-project.txt
 
 # Project target.
-target=android-10
+target=android-17

res/layout/bow_menu.xml

@@ -75,7 +75,7 @@
                     android:paddingTop="25dp"
                     android:paddingLeft="5dp">
 
-        <turtle.player.view.VerticalTextView
+        <com.turtleplayer.view.VerticalTextView
             android:id="@+id/track_instant_filter_left"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
@@ -122,7 +122,7 @@
                     android:paddingTop="25dp"
                     android:paddingRight="5dp">
 
-        <turtle.player.view.VerticalTextView
+        <com.turtleplayer.view.VerticalTextView
             android:id="@+id/track_instant_filter_right"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"

src/turtle/player/Player.java → src/com/turtleplayer/Player.java

@@ -16,7 +16,7 @@
  * 
  */
 
-package turtle.player;
+package com.turtleplayer;
 
 import android.app.ListActivity;
 import android.content.BroadcastReceiver;
@@ -35,38 +35,39 @@
 import android.widget.*;
 import android.widget.CompoundButton.OnCheckedChangeListener;
 import android.widget.SeekBar.OnSeekBarChangeListener;
-import turtle.player.common.MatchFilterVisitor;
-import turtle.player.controller.BroadcastsHandler;
-import turtle.player.controller.PhoneStateHandler;
-import turtle.player.dirchooser.DirChooserConstants;
-import turtle.player.model.Instance;
-import turtle.player.model.Track;
-import turtle.player.persistance.framework.db.ObservableDatabase;
-import turtle.player.persistance.framework.filter.Filter;
-import turtle.player.persistance.turtle.db.TurtleDatabase;
-import turtle.player.player.ObservableOutput;
-import turtle.player.player.Output;
-import turtle.player.player.OutputCommand;
-import turtle.player.player.OutputUsingOnClickListener;
-import turtle.player.playlist.Playlist;
-import turtle.player.playlist.playorder.PlayOrderRandom;
-import turtle.player.playlist.playorder.PlayOrderSorted;
-import turtle.player.playlist.playorder.PlayOrderStrategy;
-import turtle.player.preferences.AbstractKey;
-import turtle.player.preferences.Keys;
-import turtle.player.preferences.Preferences;
-import turtle.player.preferences.PreferencesObserver;
-import turtle.player.util.Shorty;
-import turtle.player.view.AlbumArtView;
-import turtle.player.view.FileChooser;
 
 import java.util.HashSet;
 import java.util.Set;
 
+import com.turtleplayer.common.MatchFilterVisitor;
+import com.turtleplayer.controller.BroadcastsHandler;
+import com.turtleplayer.controller.PhoneStateHandler;
+import com.turtleplayer.dirchooser.DirChooserConstants;
+import com.turtleplayer.model.Instance;
+import com.turtleplayer.model.Track;
+import com.turtleplayer.persistance.framework.db.ObservableDatabase;
+import com.turtleplayer.persistance.framework.filter.Filter;
+import com.turtleplayer.persistance.turtle.db.TurtleDatabase;
+import com.turtleplayer.player.ObservableOutput;
+import com.turtleplayer.player.Output;
+import com.turtleplayer.player.OutputCommand;
+import com.turtleplayer.player.OutputUsingOnClickListener;
+import com.turtleplayer.playlist.Playlist;
+import com.turtleplayer.playlist.playorder.PlayOrderRandom;
+import com.turtleplayer.playlist.playorder.PlayOrderSorted;
+import com.turtleplayer.playlist.playorder.PlayOrderStrategy;
+import com.turtleplayer.preferences.AbstractKey;
+import com.turtleplayer.preferences.Keys;
+import com.turtleplayer.preferences.Preferences;
+import com.turtleplayer.preferences.PreferencesObserver;
+import com.turtleplayer.util.Shorty;
+import com.turtleplayer.view.AlbumArtView;
+import com.turtleplayer.view.FileChooser;
+
 public class Player extends ListActivity
 {
 
-	public static final String DIR_CHOOSER_ACTION = "turtle.player.DIR_CHOOSER";
+	public static final String DIR_CHOOSER_ACTION = "com.turtleplayer.DIR_CHOOSER";
 	public static final int DIR_CHOOSER_REQUEST = 0;
 
 	public enum Slides
@@ -881,7 +882,7 @@ private String ConvertToMinutes(int time)
 	}
 
 	/**
-	 * Async rescan, returns immediately, use {@link turtle.player.playlist.Playlist.PlaylistObserver} to receive changes
+	 * Async rescan, returns immediately, use {@link com.turtleplayer.playlist.Playlist.PlaylistObserver} to receive changes
 	 */
 	protected void rescan()
 	{

src/turtle/player/Stats.java → src/com/turtleplayer/Stats.java

@@ -17,7 +17,7 @@
  */
 
 // Package
-package turtle.player;
+package com.turtleplayer;
 
 
 public class Stats

src/turtle/player/TurtlePlayer.java → src/com/turtleplayer/TurtlePlayer.java

@@ -17,13 +17,14 @@
  */
 
 // Package
-package turtle.player;
+package com.turtleplayer;
+
+import com.turtleplayer.persistance.turtle.db.TurtleDatabase;
+import com.turtleplayer.player.ObservableOutput;
+import com.turtleplayer.player.PlayerServiceConnector;
+import com.turtleplayer.playlist.Playlist;
 
 import android.app.Application;
-import turtle.player.persistance.turtle.db.TurtleDatabase;
-import turtle.player.player.ObservableOutput;
-import turtle.player.player.PlayerServiceConnector;
-import turtle.player.playlist.Playlist;
 
 public class TurtlePlayer extends Application
 {

src/turtle/player/common/MatchFilterVisitor.java → src/com/turtleplayer/common/MatchFilterVisitor.java

@@ -1,10 +1,9 @@
-package turtle.player.common;
+package com.turtleplayer.common;
 
-import turtle.player.persistance.framework.filter.*;
-import turtle.player.persistance.source.relational.fieldtype.FieldPersistableAsDouble;
-import turtle.player.persistance.source.relational.fieldtype.FieldPersistableAsInteger;
-import turtle.player.persistance.source.relational.fieldtype.FieldPersistableAsString;
-import turtle.player.persistance.source.relational.fieldtype.FieldVisitor;
+import com.turtleplayer.persistance.framework.filter.*;
+import com.turtleplayer.persistance.source.relational.fieldtype.FieldPersistableAsDouble;
+import com.turtleplayer.persistance.source.relational.fieldtype.FieldPersistableAsInteger;
+import com.turtleplayer.persistance.source.relational.fieldtype.FieldPersistableAsString;
 
 /**
  * TURTLE PLAYER

src/turtle/player/common/filefilter/AccessableFileFilter.java → src/com/turtleplayer/common/filefilter/AccessableFileFilter.java

@@ -16,7 +16,7 @@
  * @author Simon Honegger (Hoene84)
  */
 
-package turtle.player.common.filefilter;
+package com.turtleplayer.common.filefilter;
 
 
 import java.io.File;

src/turtle/player/common/filefilter/FileFilters.java → src/com/turtleplayer/common/filefilter/FileFilters.java

@@ -16,7 +16,7 @@
  * @author Simon Honegger (Hoene84)
  */
 
-package turtle.player.common.filefilter;
+package com.turtleplayer.common.filefilter;
 
 import java.io.FilenameFilter;
 import java.util.Arrays;

src/turtle/player/common/filefilter/NameFilter.java → src/com/turtleplayer/common/filefilter/NameFilter.java

@@ -16,7 +16,7 @@
  * @author Simon Honegger (Hoene84)
  */
 
-package turtle.player.common.filefilter;
+package com.turtleplayer.common.filefilter;
 
 import java.io.File;
 

src/turtle/player/controller/BroadcastsHandler.java → src/com/turtleplayer/controller/BroadcastsHandler.java

@@ -1,12 +1,13 @@
-package turtle.player.controller;
+package com.turtleplayer.controller;
+
+import com.turtleplayer.player.Output;
+import com.turtleplayer.player.OutputAccess;
+import com.turtleplayer.player.OutputCommand;
 
 import android.content.BroadcastReceiver;
 import android.content.Context;
 import android.content.Intent;
 import android.widget.Toast;
-import turtle.player.player.Output;
-import turtle.player.player.OutputAccess;
-import turtle.player.player.OutputCommand;
 
 /**
 * TURTLE PLAYER

src/turtle/player/controller/Observer.java → src/com/turtleplayer/controller/Observer.java

@@ -1,4 +1,4 @@
-package turtle.player.controller;
+package com.turtleplayer.controller;
 
 /**
  * TURTLE PLAYER

src/turtle/player/controller/PhoneStateHandler.java → src/com/turtleplayer/controller/PhoneStateHandler.java

@@ -1,10 +1,11 @@
-package turtle.player.controller;
+package com.turtleplayer.controller;
+
+import com.turtleplayer.player.Output;
+import com.turtleplayer.player.OutputAccess;
+import com.turtleplayer.player.OutputCommand;
 
 import android.telephony.PhoneStateListener;
 import android.telephony.TelephonyManager;
-import turtle.player.player.Output;
-import turtle.player.player.OutputAccess;
-import turtle.player.player.OutputCommand;
 
 /**
  * TURTLE PLAYER

src/turtle/player/controller/TouchHandler.java → src/com/turtleplayer/controller/TouchHandler.java

@@ -1,4 +1,4 @@
-package turtle.player.controller;
+package com.turtleplayer.controller;
 
 import android.app.Activity;
 import android.graphics.Point;
@@ -7,20 +7,21 @@
 import android.view.View;
 import android.widget.ImageView;
 import android.widget.TextView;
-import turtle.player.R;
-import turtle.player.model.Track;
-import turtle.player.persistance.framework.filter.FieldFilter;
-import turtle.player.persistance.framework.filter.Filter;
-import turtle.player.persistance.framework.filter.FilterSet;
-import turtle.player.persistance.framework.filter.FilterVisitor;
-import turtle.player.persistance.source.relational.FieldPersistable;
-import turtle.player.persistance.turtle.db.structure.Tables;
-import turtle.player.player.ObservableOutput;
-import turtle.player.playlist.Playlist;
 
 import java.util.HashMap;
 import java.util.Map;
 
+import com.turtleplayer.R;
+import com.turtleplayer.model.Track;
+import com.turtleplayer.persistance.framework.filter.FieldFilter;
+import com.turtleplayer.persistance.framework.filter.Filter;
+import com.turtleplayer.persistance.framework.filter.FilterSet;
+import com.turtleplayer.persistance.framework.filter.FilterVisitor;
+import com.turtleplayer.persistance.source.relational.FieldPersistable;
+import com.turtleplayer.persistance.turtle.db.structure.Tables;
+import com.turtleplayer.player.ObservableOutput;
+import com.turtleplayer.playlist.Playlist;
+
 /**
  * TURTLE PLAYER
  * <p/>

src/turtle/player/dirchooser/DirChooser.java → src/com/turtleplayer/dirchooser/DirChooser.java

@@ -16,18 +16,19 @@
  * @author Simon Honegger (Hoene84)
  */
 
-package turtle.player.dirchooser;
+package com.turtleplayer.dirchooser;
 
 import android.app.Activity;
 import android.content.Intent;
 import android.os.Bundle;
 import android.view.View;
 import android.widget.*;
-import turtle.player.R;
 
 import java.io.File;
 import java.util.Stack;
 
+import com.turtleplayer.R;
+
 /**
  * Activity with result to choose a folder.
  * Input: Extra / String / {@link DirChooserConstants#ACTIVITY_PARAM_KEY_DIR_CHOOSER_INITIAL_DIR}

src/turtle/player/dirchooser/DirChooserConstants.java → src/com/turtleplayer/dirchooser/DirChooserConstants.java

@@ -16,7 +16,7 @@
  * @author Simon Honegger (Hoene84)
  */
 
-package turtle.player.dirchooser;
+package com.turtleplayer.dirchooser;
 
 
 public class DirChooserConstants

src/turtle/player/dirchooser/FileAdapter.java → src/com/turtleplayer/dirchooser/FileAdapter.java

@@ -16,7 +16,7 @@
  * @author Simon Honegger (Hoene84)
  */
 
-package turtle.player.dirchooser;
+package com.turtleplayer.dirchooser;
 
 import android.content.Context;
 import android.view.LayoutInflater;
@@ -25,10 +25,11 @@
 import android.widget.ArrayAdapter;
 import android.widget.ImageView;
 import android.widget.TextView;
-import turtle.player.R;
 
 import java.io.File;
 
+import com.turtleplayer.R;
+
 
 public class FileAdapter extends ArrayAdapter<File>
 {

src/turtle/player/dirchooser/FileSorter.java → src/com/turtleplayer/dirchooser/FileSorter.java

@@ -16,7 +16,7 @@
  * @author Simon Honegger (Hoene84)
  */
 
-package turtle.player.dirchooser;
+package com.turtleplayer.dirchooser;
 
 import java.io.File;
 import java.text.Collator;