Extract Persistance Layer into separate Project (https://github.com/Hoene84/perzist)

src/com/turtleplayer/Player.java

@@ -32,18 +32,29 @@
 import android.util.Log;
 import android.view.View;
 import android.view.View.OnClickListener;
-import android.widget.*;
+import android.widget.CheckBox;
+import android.widget.CompoundButton;
 import android.widget.CompoundButton.OnCheckedChangeListener;
+import android.widget.ImageView;
+import android.widget.LinearLayout;
+import android.widget.ListView;
+import android.widget.ProgressBar;
+import android.widget.RelativeLayout;
+import android.widget.SeekBar;
 import android.widget.SeekBar.OnSeekBarChangeListener;
+import android.widget.TextView;
+import android.widget.Toast;
+import ch.hoene.perzist.access.filter.Filter;
+import ch.hoene.perzist.util.Shorty;
 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.ObservableDatabase;
 import com.turtleplayer.persistance.turtle.db.TurtleDatabase;
+import com.turtleplayer.persistance.turtle.db.TurtleDatabaseImpl;
 import com.turtleplayer.persistance.turtle.db.structure.Tables;
 import com.turtleplayer.player.ObservableOutput;
 import com.turtleplayer.player.Output;
@@ -57,7 +68,6 @@
 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;
 
@@ -241,7 +251,14 @@ else if(!Slides.NOW_PLAYING.equals(currSlide))
 	private void SetupApplication()
 	{
 		tp = (TurtlePlayer) getApplication();
-		tp.db = new TurtleDatabase(tp.getApplicationContext());
+		tp.db = new TurtleDatabase( new TurtleDatabaseImpl(tp.getApplicationContext())
+		{
+			@Override
+			public void dbResetted()
+			{
+				tp.db.notifyCleared();
+			}
+		});
 		tp.playlist = new Playlist(tp.getApplicationContext(), tp.db);
 		fileChooser = new FileChooser(FileChooser.Mode.Genre, tp, this)
 		{
@@ -257,7 +274,7 @@ protected void filterChoosen(Filter<? super Tables.Tracks> filter)
 		standartPlayOrderStrategy = new PlayOrderSorted(tp.db, tp.playlist);
 		shufflePlayOrderStrategy = new PlayOrderRandom(tp.db, tp.playlist);
 		playOrderStrategy = tp.playlist.preferences.get(Keys.SHUFFLE) ?
-				  shufflePlayOrderStrategy : standartPlayOrderStrategy;
+			shufflePlayOrderStrategy : standartPlayOrderStrategy;
 	}
 
 	// ========================================= //
@@ -267,9 +284,9 @@ protected void filterChoosen(Filter<? super Tables.Tracks> filter)
 	private void SetupButtons()
 	{
 		shuffleButton.setImageDrawable(
-				  tp.playlist.preferences.get(Keys.SHUFFLE) ?
-							 getResources().getDrawable(R.drawable.dice48_active) :
-							 getResources().getDrawable(R.drawable.dice48)
+			tp.playlist.preferences.get(Keys.SHUFFLE) ?
+				getResources().getDrawable(R.drawable.dice48_active) :
+				getResources().getDrawable(R.drawable.dice48)
 		);
 
 		shuffleCheckBox.setChecked(tp.playlist.preferences.get(Keys.SHUFFLE));
@@ -366,7 +383,7 @@ public boolean onLongClick(View v)
 		shuffleCheckBox.setOnCheckedChangeListener(new OnCheckedChangeListener()
 		{
 			public void onCheckedChanged(CompoundButton buttonView,
-												  boolean isChecked)
+										 boolean isChecked)
 			{
 				tp.playlist.preferences.set(Keys.SHUFFLE, isChecked);
 			}
@@ -401,7 +418,7 @@ public void onClick(View v)
 			{
 				Intent dirChooserIntent = new Intent(DIR_CHOOSER_ACTION);
 				dirChooserIntent.putExtra(DirChooserConstants.ACTIVITY_PARAM_KEY_DIR_CHOOSER_INITIAL_DIR,
-						  tp.playlist.preferences.getExitstingMediaPath().toString());
+					tp.playlist.preferences.getExitstingMediaPath().toString());
 				Player.this.startActivityForResult(dirChooserIntent, DIR_CHOOSER_REQUEST);
 			}
 		});
@@ -462,7 +479,7 @@ public void run()
 			}
 
 			public void unpauseRescan(final int alreadyProcessed,
-											  final int toProcess)
+									  final int toProcess)
 			{
 				runOnUiThread(new Runnable()
 				{
@@ -586,7 +603,7 @@ public void changed(AbstractKey<?, ?> key)
 						public void run()
 						{
 							shuffleButton.setImageDrawable(getResources().getDrawable(
-									  shuffle ? R.drawable.dice48_active : R.drawable.dice48));
+								shuffle ? R.drawable.dice48_active : R.drawable.dice48));
 							shuffleCheckBox.setChecked(shuffle);
 						}
 					});
@@ -661,8 +678,8 @@ public void onStartTrackingTouch(SeekBar seekBar)
 			}
 
 			public void onProgressChanged(SeekBar seekBar,
-													int progress,
-													boolean fromUser)
+										  int progress,
+										  boolean fromUser)
 			{
 				// Needed, Although Blank
 			}
@@ -825,9 +842,9 @@ private void SetupPhoneHandlers()
 
 	@Override
 	protected void onListItemClick(ListView l,
-											 View v,
-											 int position,
-											 long id)
+								   View v,
+								   int position,
+								   long id)
 	{
 		final Track trackSelected = fileChooser.choose((Instance) l.getItemAtPosition(position));
 		if (trackSelected != null)
@@ -892,15 +909,15 @@ protected void rescan()
 
 	@Override
 	protected void onActivityResult(int requestCode,
-											  int resultCode,
-											  Intent data)
+									int resultCode,
+									Intent data)
 	{
 		if (requestCode == DIR_CHOOSER_REQUEST)
 		{
 			if (resultCode == RESULT_OK)
 			{
 				tp.playlist.preferences.set(Keys.MEDIA_DIR,
-						  data.getStringExtra(DirChooserConstants.ACTIVITY_RETURN_KEY_DIR_CHOOSER_CHOOSED_DIR));
+					data.getStringExtra(DirChooserConstants.ACTIVITY_RETURN_KEY_DIR_CHOOSER_CHOOSED_DIR));
 				mediaDir.setText(tp.playlist.preferences.getExitstingMediaPath().toString());
 				rescan();
 			}

src/com/turtleplayer/common/MatchFilterVisitor.java

@@ -1,11 +1,16 @@
 package com.turtleplayer.common;
 
-import com.turtleplayer.persistance.framework.filter.*;
-import com.turtleplayer.persistance.source.relational.FieldPersistable;
-import com.turtleplayer.persistance.source.relational.fieldtype.FieldPersistableAsDouble;
-import com.turtleplayer.persistance.source.relational.fieldtype.FieldPersistableAsInteger;
-import com.turtleplayer.persistance.source.relational.fieldtype.FieldPersistableAsString;
-import com.turtleplayer.persistance.source.relational.fieldtype.FieldVisitor;
+import ch.hoene.perzist.access.filter.FieldFilter;
+import ch.hoene.perzist.access.filter.Filter;
+import ch.hoene.perzist.access.filter.FilterSet;
+import ch.hoene.perzist.access.filter.FilterVisitorGenerified;
+import ch.hoene.perzist.access.filter.NotFilter;
+import ch.hoene.perzist.access.filter.Operator;
+import ch.hoene.perzist.source.relational.FieldPersistable;
+import ch.hoene.perzist.source.relational.fieldtype.FieldPersistableAsDouble;
+import ch.hoene.perzist.source.relational.fieldtype.FieldPersistableAsInteger;
+import ch.hoene.perzist.source.relational.fieldtype.FieldPersistableAsString;
+import ch.hoene.perzist.source.relational.fieldtype.FieldVisitor;
 
 import java.util.regex.Pattern;
 

src/com/turtleplayer/controller/TouchHandler.java

@@ -8,9 +8,14 @@
 import android.view.View;
 import android.widget.ImageView;
 import android.widget.TextView;
+import ch.hoene.perzist.access.filter.FieldFilter;
+import ch.hoene.perzist.access.filter.Filter;
+import ch.hoene.perzist.access.filter.FilterSet;
+import ch.hoene.perzist.access.filter.FilterVisitor;
+import ch.hoene.perzist.access.filter.NotFilter;
+import ch.hoene.perzist.access.filter.Operator;
 import com.turtleplayer.R;
 import com.turtleplayer.model.Track;
-import com.turtleplayer.persistance.framework.filter.*;
 import com.turtleplayer.persistance.turtle.db.structure.Tables;
 import com.turtleplayer.persistance.turtle.filter.DirFilter;
 import com.turtleplayer.persistance.turtle.filter.TurtleFilterVisitor;

src/com/turtleplayer/dirchooser/DirChooser.java

@@ -22,7 +22,11 @@
 import android.content.Intent;
 import android.os.Bundle;
 import android.view.View;
-import android.widget.*;
+import android.widget.AdapterView;
+import android.widget.ArrayAdapter;
+import android.widget.ImageView;
+import android.widget.ListView;
+import android.widget.TextView;
 import com.turtleplayer.R;
 
 import java.io.File;

src/com/turtleplayer/model/AlbumDigest.java

@@ -18,7 +18,7 @@
 
 package com.turtleplayer.model;
 
-import com.turtleplayer.util.Shorty;
+import ch.hoene.perzist.util.Shorty;
 
 public class AlbumDigest implements Album
 {

src/com/turtleplayer/model/ArtistDigest.java

@@ -18,7 +18,7 @@
 
 package com.turtleplayer.model;
 
-import com.turtleplayer.util.Shorty;
+import ch.hoene.perzist.util.Shorty;
 
 public class ArtistDigest implements Artist
 {

src/com/turtleplayer/model/FSobject.java

@@ -18,7 +18,7 @@
 
 package com.turtleplayer.model;
 
-import com.turtleplayer.util.Shorty;
+import ch.hoene.perzist.util.Shorty;
 
 import java.io.File;
 

src/com/turtleplayer/model/GenreDigest.java

@@ -18,7 +18,7 @@
 
 package com.turtleplayer.model;
 
-import com.turtleplayer.util.Shorty;
+import ch.hoene.perzist.util.Shorty;
 import com.turtleplayer.util.TurtleUtil;
 
 public class GenreDigest implements Genre

src/com/turtleplayer/model/InstanceCreator.java

@@ -1,6 +1,6 @@
 package com.turtleplayer.model;
 
-import com.turtleplayer.persistance.framework.creator.Creator;
+import ch.hoene.perzist.access.creator.Creator;
 
 /**
  * TURTLE PLAYER

src/com/turtleplayer/model/SongDigest.java

@@ -19,7 +19,7 @@
 package com.turtleplayer.model;
 
 
-import com.turtleplayer.util.Shorty;
+import ch.hoene.perzist.util.Shorty;
 
 public class SongDigest implements Song
 {