diff --git a/ext/perzist-android-0.2-SNAPSHOT-sources.jar b/ext/perzist-android-0.2-SNAPSHOT-sources.jar
new file mode 100644
index 0000000..d0f944d
Binary files /dev/null and b/ext/perzist-android-0.2-SNAPSHOT-sources.jar differ
diff --git a/ext/perzist-android-0.2-SNAPSHOT.jar b/ext/perzist-android-0.2-SNAPSHOT.jar
new file mode 100644
index 0000000..8b8a051
Binary files /dev/null and b/ext/perzist-android-0.2-SNAPSHOT.jar differ
diff --git a/ext/perzist-core-0.2-SNAPSHOT-sources.jar b/ext/perzist-core-0.2-SNAPSHOT-sources.jar
new file mode 100644
index 0000000..1d812d0
Binary files /dev/null and b/ext/perzist-core-0.2-SNAPSHOT-sources.jar differ
diff --git a/ext/perzist-core-0.2-SNAPSHOT.jar b/ext/perzist-core-0.2-SNAPSHOT.jar
new file mode 100644
index 0000000..69f79d5
Binary files /dev/null and b/ext/perzist-core-0.2-SNAPSHOT.jar differ
diff --git a/src/com/turtleplayer/Player.java b/src/com/turtleplayer/Player.java
index 5a1cdd9..7197d72 100644
--- a/src/com/turtleplayer/Player.java
+++ b/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 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 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();
}
diff --git a/src/com/turtleplayer/common/MatchFilterVisitor.java b/src/com/turtleplayer/common/MatchFilterVisitor.java
index b68cb57..8d3b2d6 100644
--- a/src/com/turtleplayer/common/MatchFilterVisitor.java
+++ b/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;
diff --git a/src/com/turtleplayer/controller/TouchHandler.java b/src/com/turtleplayer/controller/TouchHandler.java
index d164c8b..fb80dd7 100644
--- a/src/com/turtleplayer/controller/TouchHandler.java
+++ b/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;
diff --git a/src/com/turtleplayer/dirchooser/DirChooser.java b/src/com/turtleplayer/dirchooser/DirChooser.java
index ec9450a..46f46e6 100644
--- a/src/com/turtleplayer/dirchooser/DirChooser.java
+++ b/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;
diff --git a/src/com/turtleplayer/model/AlbumDigest.java b/src/com/turtleplayer/model/AlbumDigest.java
index 4645433..b89bc20 100644
--- a/src/com/turtleplayer/model/AlbumDigest.java
+++ b/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
{
diff --git a/src/com/turtleplayer/model/ArtistDigest.java b/src/com/turtleplayer/model/ArtistDigest.java
index 5457c56..8152b57 100644
--- a/src/com/turtleplayer/model/ArtistDigest.java
+++ b/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
{
diff --git a/src/com/turtleplayer/model/FSobject.java b/src/com/turtleplayer/model/FSobject.java
index d666366..1e06ba6 100644
--- a/src/com/turtleplayer/model/FSobject.java
+++ b/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;
diff --git a/src/com/turtleplayer/model/GenreDigest.java b/src/com/turtleplayer/model/GenreDigest.java
index 3bcb0b0..cf2c8b0 100644
--- a/src/com/turtleplayer/model/GenreDigest.java
+++ b/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
diff --git a/src/com/turtleplayer/model/InstanceCreator.java b/src/com/turtleplayer/model/InstanceCreator.java
index 644f8e2..b112924 100644
--- a/src/com/turtleplayer/model/InstanceCreator.java
+++ b/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
diff --git a/src/com/turtleplayer/model/SongDigest.java b/src/com/turtleplayer/model/SongDigest.java
index 51e2ab0..ede2b70 100644
--- a/src/com/turtleplayer/model/SongDigest.java
+++ b/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
{
diff --git a/src/com/turtleplayer/persistance/framework/UniqueFieldGetter.java b/src/com/turtleplayer/persistance/framework/UniqueFieldGetter.java
deleted file mode 100644
index 1ec809c..0000000
--- a/src/com/turtleplayer/persistance/framework/UniqueFieldGetter.java
+++ /dev/null
@@ -1,25 +0,0 @@
-package com.turtleplayer.persistance.framework;
-
-import com.turtleplayer.persistance.source.relational.Field;
-
-/**
- * TURTLE PLAYER
- *
- * Licensed under MIT & GPL
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED,
- * INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR
- * PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
- * LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
- * TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE
- * OR OTHER DEALINGS IN THE SOFTWARE.
- *
- * More Information @ www.turtle-player.co.uk
- *
- * @author Simon Honegger (Hoene84)
- */
-
-public interface UniqueFieldGetter
-{
- Field getUniqueFields();
-}
diff --git a/src/com/turtleplayer/persistance/framework/creator/Creator.java b/src/com/turtleplayer/persistance/framework/creator/Creator.java
deleted file mode 100644
index 9a687bc..0000000
--- a/src/com/turtleplayer/persistance/framework/creator/Creator.java
+++ /dev/null
@@ -1,23 +0,0 @@
-package com.turtleplayer.persistance.framework.creator;
-
-/**
- * TURTLE PLAYER
- *
- * Licensed under MIT & GPL
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED,
- * INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR
- * PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
- * LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
- * TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE
- * OR OTHER DEALINGS IN THE SOFTWARE.
- *
- * More Information @ www.turtle-player.co.uk
- *
- * @author Simon Honegger (Hoene84)
- */
-
-public interface Creator
-{
- RESULT create(SOURCE source);
-}
\ No newline at end of file
diff --git a/src/com/turtleplayer/persistance/framework/creator/CreatorForList.java b/src/com/turtleplayer/persistance/framework/creator/CreatorForList.java
deleted file mode 100644
index bf71375..0000000
--- a/src/com/turtleplayer/persistance/framework/creator/CreatorForList.java
+++ /dev/null
@@ -1,51 +0,0 @@
-package com.turtleplayer.persistance.framework.creator;
-
-import java.util.*;
-
-/**
- * TURTLE PLAYER
- *
- * Licensed under MIT & GPL
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED,
- * INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR
- * PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
- * LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
- * TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE
- * OR OTHER DEALINGS IN THE SOFTWARE.
- *
- * More Information @ www.turtle-player.co.uk
- *
- * @author Simon Honegger (Hoene84)
- */
-
-/**
- * @param Instance type
- * @param Source type of row
- * @param Source type of table
- */
-public abstract class CreatorForList implements ResultCreator, M>
-{
- private final Creator creator;
-
- protected CreatorForList(Creator creator)
- {
- this.creator = creator;
- }
-
- public List create(M queryResult)
- {
- List result = new ArrayList();
-
- while(hasNext(queryResult))
- {
- result.add(creator.create(next(queryResult)));
- }
-
- return result;
- }
-
- protected abstract boolean hasNext(M queryResult);
-
- protected abstract S next(M queryResult);
-}
diff --git a/src/com/turtleplayer/persistance/framework/creator/ResultCreator.java b/src/com/turtleplayer/persistance/framework/creator/ResultCreator.java
deleted file mode 100644
index d4f4838..0000000
--- a/src/com/turtleplayer/persistance/framework/creator/ResultCreator.java
+++ /dev/null
@@ -1,23 +0,0 @@
-package com.turtleplayer.persistance.framework.creator;
-
-/**
- * TURTLE PLAYER
- *
- * Licensed under MIT & GPL
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED,
- * INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR
- * PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
- * LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
- * TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE
- * OR OTHER DEALINGS IN THE SOFTWARE.
- *
- * More Information @ www.turtle-player.co.uk
- *
- * @author Simon Honegger (Hoene84)
- */
-
-public interface ResultCreator extends Creator
-{
-
-}
diff --git a/src/com/turtleplayer/persistance/framework/db/Database.java b/src/com/turtleplayer/persistance/framework/db/Database.java
deleted file mode 100644
index 65ddf2b..0000000
--- a/src/com/turtleplayer/persistance/framework/db/Database.java
+++ /dev/null
@@ -1,39 +0,0 @@
-package com.turtleplayer.persistance.framework.db;
-
-/**
- * TURTLE PLAYER
- *
- * Licensed under MIT & GPL
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED,
- * INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR
- * PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
- * LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
- * TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE
- * OR OTHER DEALINGS IN THE SOFTWARE.
- *
- * More Information @ www.turtle-player.co.uk
- *
- * @author Simon Honegger (Hoene84)
- */
-
-/**
- * @param eg Cursor
- * @param eg sql as String
- * @param DB object for write operations
- */
-public interface Database
-{
- abstract I read(Q query, DbReadOp readOp);
- abstract int write(DbWriteOp writer, I instance);
-
- interface DbReadOp
- {
- public I read(C db);
- }
-
- interface DbWriteOp
- {
- public int write(D target, I instance);
- }
-}
diff --git a/src/com/turtleplayer/persistance/framework/executor/OperationExecutor.java b/src/com/turtleplayer/persistance/framework/executor/OperationExecutor.java
deleted file mode 100644
index dee96e1..0000000
--- a/src/com/turtleplayer/persistance/framework/executor/OperationExecutor.java
+++ /dev/null
@@ -1,57 +0,0 @@
-package com.turtleplayer.persistance.framework.executor;
-
-import com.turtleplayer.persistance.framework.db.Database;
-import com.turtleplayer.persistance.framework.query.OperationDelete;
-import com.turtleplayer.persistance.framework.query.OperationRead;
-import com.turtleplayer.persistance.framework.query.OperationInsert;
-
-/**
- * TURTLE PLAYER
- *
- * Licensed under MIT & GPL
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED,
- * INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR
- * PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
- * LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
- * TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE
- * OR OTHER DEALINGS IN THE SOFTWARE.
- *
- * More Information @ www.turtle-player.co.uk
- *
- * @author Simon Honegger (Hoene84)
- */
-
-public abstract class OperationExecutor
-{
- public static I execute(Database db, final OperationRead operation){
- return db.read(operation.get(), new Database.DbReadOp(){
- public I read(C c)
- {
- return operation.map(c);
- }
- });
- }
-
- public static int execute(Database db, final OperationInsert operation, final I instance){
- return db.write(new Database.DbWriteOp()
- {
- public int write(D target,
- I instance)
- {
- return operation.insert(target, instance);
- }
- }, instance);
- }
-
- public static void execute(Database db, final OperationDelete operation, T target){
- db.write(new Database.DbWriteOp()
- {
- public int write(D target,
- T instance)
- {
- return operation.delete(target, instance);
- }
- }, target);
- }
-}
diff --git a/src/com/turtleplayer/persistance/framework/filter/FieldFilter.java b/src/com/turtleplayer/persistance/framework/filter/FieldFilter.java
deleted file mode 100644
index 2f2621c..0000000
--- a/src/com/turtleplayer/persistance/framework/filter/FieldFilter.java
+++ /dev/null
@@ -1,85 +0,0 @@
-package com.turtleplayer.persistance.framework.filter;
-
-import com.turtleplayer.persistance.source.relational.FieldPersistable;
-
-/**
- * TURTLE PLAYER
- *
- * Licensed under MIT & GPL
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED,
- * INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR
- * PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
- * LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
- * TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE
- * OR OTHER DEALINGS IN THE SOFTWARE.
- *
- * More Information @ www.turtle-player.co.uk
- *
- * @author Simon Honegger (Hoene84)
- */
-
-public class FieldFilter implements Filter
-{
- protected final FieldPersistable field;
- protected final Operator operator;
- protected final TYPE value;
-
- public FieldFilter(FieldPersistable field,
- Operator operator,
- TYPE value)
- {
- this.field = field;
- this.operator = operator;
- this.value = value;
- }
-
- public FieldPersistable getField()
- {
- return field;
- }
-
- public TYPE getValue()
- {
- return value;
- }
-
- public Operator getOperator()
- {
- return operator;
- }
- public R accept(FilterVisitor visitor)
- {
- return visitor.visit(this);
- }
-
- @Override
- public String toString()
- {
- return getField().getName() + " " + operator.name() + " " + value;
- }
-
- @Override
- public boolean equals(Object o)
- {
- if (this == o) return true;
- if (!(o instanceof FieldFilter)) return false;
-
- FieldFilter that = (FieldFilter) o;
-
- if (!field.equals(that.field)) return false;
- if (operator != that.operator) return false;
- if (value != null ? !value.equals(that.value) : that.value != null) return false;
-
- return true;
- }
-
- @Override
- public int hashCode()
- {
- int result = field.hashCode();
- result = 31 * result + operator.hashCode();
- result = 31 * result + (value != null ? value.hashCode() : 0);
- return result;
- }
-}
diff --git a/src/com/turtleplayer/persistance/framework/filter/Filter.java b/src/com/turtleplayer/persistance/framework/filter/Filter.java
deleted file mode 100644
index ea9a23b..0000000
--- a/src/com/turtleplayer/persistance/framework/filter/Filter.java
+++ /dev/null
@@ -1,25 +0,0 @@
-package com.turtleplayer.persistance.framework.filter;
-
-import java.io.Serializable;
-
-/**
- * TURTLE PLAYER
- *
- * Licensed under MIT & GPL
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED,
- * INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR
- * PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
- * LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
- * TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE
- * OR OTHER DEALINGS IN THE SOFTWARE.
- *
- * More Information @ www.turtle-player.co.uk
- *
- * @author Simon Honegger (Hoene84)
- */
-
-public interface Filter extends Serializable
-{
- public abstract R accept(FilterVisitor visitor);
-}
diff --git a/src/com/turtleplayer/persistance/framework/filter/FilterSet.java b/src/com/turtleplayer/persistance/framework/filter/FilterSet.java
deleted file mode 100644
index fe0b790..0000000
--- a/src/com/turtleplayer/persistance/framework/filter/FilterSet.java
+++ /dev/null
@@ -1,80 +0,0 @@
-package com.turtleplayer.persistance.framework.filter;
-
-import java.util.Arrays;
-import java.util.HashSet;
-import java.util.Set;
-
-/**
- * TURTLE PLAYER
- *
- * Licensed under MIT & GPL
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED,
- * INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR
- * PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
- * LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
- * TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE
- * OR OTHER DEALINGS IN THE SOFTWARE.
- *
- * More Information @ www.turtle-player.co.uk
- *
- * @author Simon Honegger (Hoene84)
- */
-
-public class FilterSet implements Filter
-{
- private final Set> filters;
-
- public FilterSet(Filter... filter)
- {
- this.filters = new HashSet>(Arrays.asList(filter));
- }
-
- public FilterSet(Set> filters)
- {
- this.filters = new HashSet>(filters);
- }
-
- public R accept(FilterVisitor visitor)
- {
- return visitor.visit(this);
- }
-
- /**
- * @return never null, Set can be empty
- */
- public Set> getFilters()
- {
- return filters;
- }
-
- public boolean makesObsolete(Filter filter)
- {
- return false; //Not implemented yet
- }
-
- @Override
- public String toString()
- {
- return Arrays.deepToString(filters.toArray());
- }
-
- @Override
- public boolean equals(Object o)
- {
- if (this == o) return true;
- if (!(o instanceof FilterSet)) return false;
-
- FilterSet filterSet = (FilterSet) o;
-
- if (filters != null ? !filters.equals(filterSet.filters) : filterSet.filters != null) return false;
-
- return true;
- }
-
- @Override
- public int hashCode()
- {
- return filters != null ? filters.hashCode() : 0;
- }
-}
diff --git a/src/com/turtleplayer/persistance/framework/filter/FilterVisitor.java b/src/com/turtleplayer/persistance/framework/filter/FilterVisitor.java
deleted file mode 100644
index 87c583b..0000000
--- a/src/com/turtleplayer/persistance/framework/filter/FilterVisitor.java
+++ /dev/null
@@ -1,30 +0,0 @@
-package com.turtleplayer.persistance.framework.filter;
-
-/**
- * TURTLE PLAYER
- *
- * Licensed under MIT & GPL
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED,
- * INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR
- * PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
- * LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
- * TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE
- * OR OTHER DEALINGS IN THE SOFTWARE.
- *
- * More Information @ www.turtle-player.co.uk
- *
- * @author Simon Honegger (Hoene84)
- */
-
-/**
- * @param What the Visitor Produces (can be {@link Void} if nothing gets produced)
- */
-public interface FilterVisitor
-{
- R visit(FieldFilter fieldFilter);
-
- R visit(FilterSet filterSet);
-
- R visit(NotFilter notFilter);
-}
diff --git a/src/com/turtleplayer/persistance/framework/filter/FilterVisitorGenerified.java b/src/com/turtleplayer/persistance/framework/filter/FilterVisitorGenerified.java
deleted file mode 100644
index f69c7c0..0000000
--- a/src/com/turtleplayer/persistance/framework/filter/FilterVisitorGenerified.java
+++ /dev/null
@@ -1,31 +0,0 @@
-package com.turtleplayer.persistance.framework.filter;
-
-import com.turtleplayer.persistance.source.relational.FieldPersistable;
-
-/**
- * TURTLE PLAYER
- *
- * Licensed under MIT & GPL
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED,
- * INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR
- * PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
- * LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
- * TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE
- * OR OTHER DEALINGS IN THE SOFTWARE.
- *
- * More Information @ www.turtle-player.co.uk
- *
- * @author Simon Honegger (Hoene84)
- */
-
-public abstract class FilterVisitorGenerified implements FilterVisitor
-{
- public abstract R visit(FieldFilter fieldFilter,
- FieldPersistable field);
-
- final public R visit(FieldFilter fieldFilter)
- {
- return visit((FieldFilter) fieldFilter, (FieldPersistable) fieldFilter.getField());
- }
-}
diff --git a/src/com/turtleplayer/persistance/framework/filter/NotFilter.java b/src/com/turtleplayer/persistance/framework/filter/NotFilter.java
deleted file mode 100644
index 032f685..0000000
--- a/src/com/turtleplayer/persistance/framework/filter/NotFilter.java
+++ /dev/null
@@ -1,64 +0,0 @@
-package com.turtleplayer.persistance.framework.filter;
-
-/**
- * TURTLE PLAYER
- *
- * Licensed under MIT & GPL
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED,
- * INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR
- * PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
- * LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
- * TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE
- * OR OTHER DEALINGS IN THE SOFTWARE.
- *
- * More Information @ www.turtle-player.co.uk
- *
- * @author Simon Honegger (Hoene84)
- */
-
-public class NotFilter implements Filter
-{
- private final Filter filter;
-
- public NotFilter(Filter filter)
- {
- this.filter = filter;
- }
-
- public R accept(FilterVisitor visitor)
- {
- return visitor.visit(this);
- }
-
- public Filter getFilter()
- {
- return filter;
- }
-
- @Override
- public String toString()
- {
- return " NOT (" + filter.toString() + ") ";
- }
-
- @Override
- public boolean equals(Object o)
- {
- if (this == o) return true;
- if (!(o instanceof NotFilter)) return false;
-
- NotFilter notFilter = (NotFilter) o;
-
- if (filter != null ? !filter.equals(notFilter.filter) : notFilter.filter != null) return false;
-
- return true;
- }
-
- @Override
- public int hashCode()
- {
- return filter != null ? filter.hashCode() : 0;
- }
-
-}
diff --git a/src/com/turtleplayer/persistance/framework/filter/Operator.java b/src/com/turtleplayer/persistance/framework/filter/Operator.java
deleted file mode 100644
index b3f1c4e..0000000
--- a/src/com/turtleplayer/persistance/framework/filter/Operator.java
+++ /dev/null
@@ -1,30 +0,0 @@
-package com.turtleplayer.persistance.framework.filter;
-
-/**
- * TURTLE PLAYER
- *
- * Licensed under MIT & GPL
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED,
- * INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR
- * PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
- * LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
- * TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE
- * OR OTHER DEALINGS IN THE SOFTWARE.
- *
- * More Information @ www.turtle-player.co.uk
- *
- * @author Simon Honegger (Hoene84)
- */
-
-public enum Operator
-{
- GT,
- LT,
- GE,
- LE,
- EQ,
- NEQ,
- LIKE,
- NOT_LIKE
-}
diff --git a/src/com/turtleplayer/persistance/framework/filter/ResultFilter.java b/src/com/turtleplayer/persistance/framework/filter/ResultFilter.java
deleted file mode 100644
index ffce02b..0000000
--- a/src/com/turtleplayer/persistance/framework/filter/ResultFilter.java
+++ /dev/null
@@ -1,28 +0,0 @@
-package com.turtleplayer.persistance.framework.filter;
-
-import java.util.Set;
-
-/**
- * TURTLE PLAYER
- *
- * Licensed under MIT & GPL
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED,
- * INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR
- * PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
- * LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
- * TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE
- * OR OTHER DEALINGS IN THE SOFTWARE.
- *
- * More Information @ www.turtle-player.co.uk
- *
- * @author Simon Honegger (Hoene84)
- */
-
-/**
- * @param eg Instance
- */
-public interface ResultFilter
-{
- Set apply(Set results);
-}
diff --git a/src/com/turtleplayer/persistance/framework/mapping/Mapping.java b/src/com/turtleplayer/persistance/framework/mapping/Mapping.java
deleted file mode 100644
index 3fe30f1..0000000
--- a/src/com/turtleplayer/persistance/framework/mapping/Mapping.java
+++ /dev/null
@@ -1,32 +0,0 @@
-package com.turtleplayer.persistance.framework.mapping;
-
-import com.turtleplayer.persistance.framework.creator.Creator;
-
-/**
- * TURTLE PLAYER
- *
- * Licensed under MIT & GPL
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED,
- * INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR
- * PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
- * LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
- * TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE
- * OR OTHER DEALINGS IN THE SOFTWARE.
- *
- * More Information @ www.turtle-player.co.uk
- *
- * @author Simon Honegger (Hoene84)
- *
- * Knows how to create I's from C's which are dependent from Q
- * Eg: Knows How to create an Instance I from Query result Cursor C from Sql Q
- *
- * @param eg sql String
- * @param resulting instance
- * @param eg cursor
- */
-public interface Mapping extends Creator, QueryGenerator
-{
- Q get();
- I create(C queryResult);
-}
diff --git a/src/com/turtleplayer/persistance/framework/mapping/QueryGenerator.java b/src/com/turtleplayer/persistance/framework/mapping/QueryGenerator.java
deleted file mode 100644
index 8a1ed84..0000000
--- a/src/com/turtleplayer/persistance/framework/mapping/QueryGenerator.java
+++ /dev/null
@@ -1,23 +0,0 @@
-package com.turtleplayer.persistance.framework.mapping;
-
-/**
- * TURTLE PLAYER
- *
- * Licensed under MIT & GPL
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED,
- * INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR
- * PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
- * LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
- * TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE
- * OR OTHER DEALINGS IN THE SOFTWARE.
- *
- * More Information @ www.turtle-player.co.uk
- *
- * @author Simon Honegger (Hoene84)
- */
-
-public interface QueryGenerator
-{
- Q get();
-}
diff --git a/src/com/turtleplayer/persistance/framework/paging/Paging.java b/src/com/turtleplayer/persistance/framework/paging/Paging.java
deleted file mode 100644
index 8acd2f9..0000000
--- a/src/com/turtleplayer/persistance/framework/paging/Paging.java
+++ /dev/null
@@ -1,39 +0,0 @@
-package com.turtleplayer.persistance.framework.paging;
-
-import com.turtleplayer.persistance.framework.filter.*;
-import com.turtleplayer.persistance.framework.sort.*;
-
-/**
- * TURTLE PLAYER
- *
- * Licensed under MIT & GPL
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED,
- * INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR
- * PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
- * LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
- * TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE
- * OR OTHER DEALINGS IN THE SOFTWARE.
- *
- * More Information @ www.turtle-player.co.uk
- *
- * @author Simon Honegger (Hoene84)
- */
-
-public abstract class Paging
-{
-
- public static Filter getFilter(Filter oldFilters,
- RESULT instance,
- Order order)
- {
- if(instance != null)
- {
- return new FilterSet(order.accept(new PagingFilterBuilder(instance)), oldFilters);
- }
- else
- {
- return oldFilters;
- }
- }
-}
diff --git a/src/com/turtleplayer/persistance/framework/paging/PagingFilterBuilder.java b/src/com/turtleplayer/persistance/framework/paging/PagingFilterBuilder.java
deleted file mode 100644
index dbdf428..0000000
--- a/src/com/turtleplayer/persistance/framework/paging/PagingFilterBuilder.java
+++ /dev/null
@@ -1,118 +0,0 @@
-package com.turtleplayer.persistance.framework.paging;
-
-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.Operator;
-import com.turtleplayer.persistance.framework.sort.*;
-import com.turtleplayer.persistance.source.relational.FieldPersistable;
-
-/**
- * TURTLE PLAYER
- *
- * Licensed under MIT & GPL
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED,
- * INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR
- * PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
- * LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
- * TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE
- * OR OTHER DEALINGS IN THE SOFTWARE.
- *
- * More Information @ www.turtle-player.co.uk
- *
- * @author Simon Honegger (Hoene84)
- */
-
-public class PagingFilterBuilder extends OrderVisitorGenerified>
-{
- final RESULT instance;
-
- public PagingFilterBuilder(RESULT instance)
- {
- this.instance = instance;
- }
-
- @Override
- public Filter visit(FieldOrder fieldOrder,
- FieldPersistable field)
- {
- final Operator op;
-
- switch(fieldOrder.getOrder()){
- case ASC:
- op = Operator.GT;
- break;
- case DESC:
- op = Operator.LT;
- break;
- default:
- throw new IllegalArgumentException();
- }
- return new FieldFilter(field, op, field.get(instance));
- }
-
-// public Filter visit(FieldOrder fieldOrder)
-// {
-// FieldPersistable field = fieldOrder.getField();
-//
-// final Operator op;
-//
-// switch(fieldOrder.getOrder()){
-// case ASC:
-// op = Operator.GT;
-// break;
-// case DESC:
-// op = Operator.LT;
-// break;
-// default:
-// throw new IllegalArgumentException();
-// }
-// return new FieldFilter(field, op, field.get(instance));
-// }
-
- public Filter visit(RandomOrder orderFilter)
- {
- return null;
- }
-
- public Filter visit(OrderSet orderFilter)
- {
- if(!orderFilter.isEmpty()){
- Filter filterSet = new FilterSet();
- for( int i = 0; i < orderFilter.getOrders().size() -1; i++)
- {
- final Filter finalFilterSet = filterSet;
- filterSet = orderFilter.getOrders().get(i).accept(new OrderVisitorGenerified>()
- {
- public Filter visit(RandomOrder orderFilter)
- {
- // :-)
- return null;
- }
-
- @Override
- public Filter visit(FieldOrder fieldOrder,
- FieldPersistable field)
- {
- return new FilterSet(
- finalFilterSet,
- new FieldFilter(fieldOrder.getField(), Operator.EQ, field.get(instance)));
- }
-
- public Filter visit(OrderSet orderFilter)
- {
- return this.visit(orderFilter);
- }
- });
- }
-
- return new FilterSet(filterSet, orderFilter.getOrders().get(orderFilter.getOrders().size()-1).accept(this));
- }
- else
- {
- return null;
- }
- }
-
-}
diff --git a/src/com/turtleplayer/persistance/framework/query/OperationDelete.java b/src/com/turtleplayer/persistance/framework/query/OperationDelete.java
deleted file mode 100644
index 5655c42..0000000
--- a/src/com/turtleplayer/persistance/framework/query/OperationDelete.java
+++ /dev/null
@@ -1,23 +0,0 @@
-package com.turtleplayer.persistance.framework.query;
-
-/**
- * TURTLE PLAYER
- *
- * Licensed under MIT & GPL
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED,
- * INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR
- * PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
- * LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
- * TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE
- * OR OTHER DEALINGS IN THE SOFTWARE.
- *
- * More Information @ www.turtle-player.co.uk
- *
- * @author Simon Honegger (Hoene84)
- */
-
-public interface OperationDelete
-{
- int delete(D db, T target);
-}
diff --git a/src/com/turtleplayer/persistance/framework/query/OperationInsert.java b/src/com/turtleplayer/persistance/framework/query/OperationInsert.java
deleted file mode 100644
index f341200..0000000
--- a/src/com/turtleplayer/persistance/framework/query/OperationInsert.java
+++ /dev/null
@@ -1,27 +0,0 @@
-package com.turtleplayer.persistance.framework.query;
-
-/**
- * TURTLE PLAYER
- *
- * Licensed under MIT & GPL
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED,
- * INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR
- * PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
- * LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
- * TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE
- * OR OTHER DEALINGS IN THE SOFTWARE.
- *
- * More Information @ www.turtle-player.co.uk
- *
- * @author Simon Honegger (Hoene84)
- */
-
-/**
- * @param write target eg SQLiteDb
- * @param Object Type of the write information
- */
-public interface OperationInsert
-{
- int insert(D db, I instance);
-}
diff --git a/src/com/turtleplayer/persistance/framework/query/OperationRead.java b/src/com/turtleplayer/persistance/framework/query/OperationRead.java
deleted file mode 100644
index 21b857c..0000000
--- a/src/com/turtleplayer/persistance/framework/query/OperationRead.java
+++ /dev/null
@@ -1,30 +0,0 @@
-package com.turtleplayer.persistance.framework.query;
-
-/**
- * TURTLE PLAYER
- *
- * Licensed under MIT & GPL
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED,
- * INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR
- * PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
- * LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
- * TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE
- * OR OTHER DEALINGS IN THE SOFTWARE.
- *
- * More Information @ www.turtle-player.co.uk
- *
- * @author Simon Honegger (Hoene84)
- */
-
-/**
- * @param write target eg SQLiteDb
- * @param Object type that knows how to do the operation
- * @param Object Type of the write information
- */
-public interface OperationRead
-{
- I map(R dbResult);
-
- Q get();
-}
diff --git a/src/com/turtleplayer/persistance/framework/query/Query.java b/src/com/turtleplayer/persistance/framework/query/Query.java
deleted file mode 100644
index f7df6eb..0000000
--- a/src/com/turtleplayer/persistance/framework/query/Query.java
+++ /dev/null
@@ -1,69 +0,0 @@
-package com.turtleplayer.persistance.framework.query;
-
-import com.turtleplayer.persistance.framework.filter.Filter;
-import com.turtleplayer.persistance.framework.filter.FilterVisitor;
-import com.turtleplayer.persistance.framework.sort.Order;
-import com.turtleplayer.persistance.framework.sort.OrderVisitor;
-
-/**
- * TURTLE PLAYER
- *
- * Licensed under MIT & GPL
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED,
- * INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR
- * PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
- * LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
- * TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE
- * OR OTHER DEALINGS IN THE SOFTWARE.
- *
- * More Information @ www.turtle-player.co.uk
- *
- * @author Simon Honegger (Hoene84)
- */
-
-public abstract class Query implements FilterVisitor, OperationRead, OrderVisitor
-{
- private final Filter filter;
- private final Order order;
-
- protected Query()
- {
- this.filter = null;
- order = null;
- }
-
- protected Query(Filter filter)
- {
- this.filter = filter;
- order = null;
- }
-
- protected Query(Order order)
- {
- this.order = order;
- this.filter = null;
- }
-
- public Query(Filter filter, Order order)
- {
- this.filter = filter;
- this.order = order;
- }
-
- /**
- * @return can be null
- */
- public Filter getFilter()
- {
- return filter;
- }
-
- /**
- * @return can be null
- */
- public Order getOrder()
- {
- return order;
- }
-}
diff --git a/src/com/turtleplayer/persistance/framework/sort/FieldOrder.java b/src/com/turtleplayer/persistance/framework/sort/FieldOrder.java
deleted file mode 100644
index 899daea..0000000
--- a/src/com/turtleplayer/persistance/framework/sort/FieldOrder.java
+++ /dev/null
@@ -1,75 +0,0 @@
-package com.turtleplayer.persistance.framework.sort;
-
-import com.turtleplayer.persistance.framework.filter.FieldFilter;
-import com.turtleplayer.persistance.framework.filter.Filter;
-import com.turtleplayer.persistance.framework.filter.Operator;
-import com.turtleplayer.persistance.source.relational.FieldPersistable;
-
-import java.util.ArrayList;
-import java.util.List;
-
-/**
- * TURTLE PLAYER
- *
- * Licensed under MIT & GPL
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED,
- * INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR
- * PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
- * LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
- * TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE
- * OR OTHER DEALINGS IN THE SOFTWARE.
- *
- * More Information @ www.turtle-player.co.uk
- *
- * @author Simon Honegger (Hoene84)
- */
-
-public class FieldOrder implements Order
-{
- private final FieldPersistable field;
- private final SortOrder order;
-
- public FieldOrder(FieldPersistable field,
- SortOrder order)
- {
- this.field = field;
- this.order = order;
- }
-
- public FieldPersistable getField()
- {
- return field;
- }
-
- public SortOrder getOrder()
- {
- return order;
- }
-
- public R accept(OrderVisitor visitor)
- {
- return visitor.visit(this);
- }
-
- @Override
- public String toString()
- {
- return getField().getName() + " " + order;
- }
-
- public Filter asFilter(TYPE value, Operator op){
- return new FieldFilter(field, op, value);
- }
-
- public static Order getMultiFieldOrder(SortOrder order,
- FieldPersistable... fields)
- {
- List> orders = new ArrayList>();
- for(FieldPersistable field : fields)
- {
- orders.add(new FieldOrder(field, order));
- }
- return new OrderSet(orders);
- }
-}
diff --git a/src/com/turtleplayer/persistance/framework/sort/Order.java b/src/com/turtleplayer/persistance/framework/sort/Order.java
deleted file mode 100644
index 735d519..0000000
--- a/src/com/turtleplayer/persistance/framework/sort/Order.java
+++ /dev/null
@@ -1,26 +0,0 @@
-package com.turtleplayer.persistance.framework.sort;
-
-/**
- * TURTLE PLAYER
- *
- * Licensed under MIT & GPL
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED,
- * INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR
- * PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
- * LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
- * TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE
- * OR OTHER DEALINGS IN THE SOFTWARE.
- *
- * More Information @ www.turtle-player.co.uk
- *
- * @author Simon Honegger (Hoene84)
- */
-
-/**
- * @param eg sql as String
- */
-public interface Order
-{
- R accept(OrderVisitor visitor);
-}
diff --git a/src/com/turtleplayer/persistance/framework/sort/OrderSet.java b/src/com/turtleplayer/persistance/framework/sort/OrderSet.java
deleted file mode 100644
index ba974ab..0000000
--- a/src/com/turtleplayer/persistance/framework/sort/OrderSet.java
+++ /dev/null
@@ -1,71 +0,0 @@
-package com.turtleplayer.persistance.framework.sort;
-
-import java.util.*;
-
-/**
- * TURTLE PLAYER
- *
- * Licensed under MIT & GPL
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED,
- * INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR
- * PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
- * LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
- * TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE
- * OR OTHER DEALINGS IN THE SOFTWARE.
- *
- * More Information @ www.turtle-player.co.uk
- *
- * @author Simon Honegger (Hoene84)
- */
-
-public class OrderSet implements Order
-{
- private final List> orders = new ArrayList>();
-
- public OrderSet(Order... order)
- {
- Collections.addAll(orders, order);
- }
-
- public OrderSet(List> orders)
- {
- this.orders.addAll(orders);
- }
-
- /**
- * @return never null, Set can be empty
- */
- public List> getOrders()
- {
- return orders;
- }
-
- public R accept(OrderVisitor visitor)
- {
- return visitor.visit(this);
- }
-
- public OrderSet removeLast()
- {
- if(orders.size() > 1)
- {
- return new OrderSet(orders.subList(0, orders.size()-1));
- }
- else
- {
- return new OrderSet(new ArrayList>());
- }
- }
-
- public boolean isEmpty()
- {
- return orders.isEmpty();
- }
-
- @Override
- public String toString()
- {
- return Arrays.deepToString(orders.toArray());
- }
-}
diff --git a/src/com/turtleplayer/persistance/framework/sort/OrderVisitor.java b/src/com/turtleplayer/persistance/framework/sort/OrderVisitor.java
deleted file mode 100644
index 2448aa5..0000000
--- a/src/com/turtleplayer/persistance/framework/sort/OrderVisitor.java
+++ /dev/null
@@ -1,27 +0,0 @@
-package com.turtleplayer.persistance.framework.sort;
-
-/**
- * TURTLE PLAYER
- *
- * Licensed under MIT & GPL
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED,
- * INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR
- * PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
- * LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
- * TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE
- * OR OTHER DEALINGS IN THE SOFTWARE.
- *
- * More Information @ www.turtle-player.co.uk
- *
- * @author Simon Honegger (Hoene84)
- */
-
-public interface OrderVisitor
-{
- R visit(FieldOrder fieldOrder);
-
- R visit(RandomOrder orderFilter);
-
- R visit(OrderSet orderFilter);
-}
diff --git a/src/com/turtleplayer/persistance/framework/sort/OrderVisitorGenerified.java b/src/com/turtleplayer/persistance/framework/sort/OrderVisitorGenerified.java
deleted file mode 100644
index 0f73bd7..0000000
--- a/src/com/turtleplayer/persistance/framework/sort/OrderVisitorGenerified.java
+++ /dev/null
@@ -1,31 +0,0 @@
-package com.turtleplayer.persistance.framework.sort;
-
-import com.turtleplayer.persistance.source.relational.FieldPersistable;
-
-/**
- * TURTLE PLAYER
- *
- * Licensed under MIT & GPL
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED,
- * INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR
- * PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
- * LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
- * TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE
- * OR OTHER DEALINGS IN THE SOFTWARE.
- *
- * More Information @ www.turtle-player.co.uk
- *
- * @author Simon Honegger (Hoene84)
- */
-
-public abstract class OrderVisitorGenerified implements OrderVisitor
-{
- public abstract R visit(FieldOrder fieldOrder,
- FieldPersistable field);
-
- final public R visit(FieldOrder fieldOrder)
- {
- return visit((FieldOrder)fieldOrder, (FieldPersistable)fieldOrder.getField());
- }
-}
diff --git a/src/com/turtleplayer/persistance/framework/sort/RandomOrder.java b/src/com/turtleplayer/persistance/framework/sort/RandomOrder.java
deleted file mode 100644
index 2930744..0000000
--- a/src/com/turtleplayer/persistance/framework/sort/RandomOrder.java
+++ /dev/null
@@ -1,27 +0,0 @@
-package com.turtleplayer.persistance.framework.sort;
-
-/**
- * TURTLE PLAYER
- *
- * Licensed under MIT & GPL
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED,
- * INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR
- * PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
- * LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
- * TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE
- * OR OTHER DEALINGS IN THE SOFTWARE.
- *
- * More Information @ www.turtle-player.co.uk
- *
- * @author Simon Honegger (Hoene84)
- */
-
-public class RandomOrder implements Order
-{
-
- public R accept(OrderVisitor visitor)
- {
- return visitor.visit(this);
- }
-}
diff --git a/src/com/turtleplayer/persistance/framework/sort/SortOrder.java b/src/com/turtleplayer/persistance/framework/sort/SortOrder.java
deleted file mode 100644
index 63e0150..0000000
--- a/src/com/turtleplayer/persistance/framework/sort/SortOrder.java
+++ /dev/null
@@ -1,24 +0,0 @@
-package com.turtleplayer.persistance.framework.sort;
-
-/**
- * TURTLE PLAYER
- *
- * Licensed under MIT & GPL
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED,
- * INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR
- * PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
- * LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
- * TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE
- * OR OTHER DEALINGS IN THE SOFTWARE.
- *
- * More Information @ www.turtle-player.co.uk
- *
- * @author Simon Honegger (Hoene84)
- */
-
-public enum SortOrder
-{
- ASC,
- DESC
-}
diff --git a/src/com/turtleplayer/persistance/source/relational/Field.java b/src/com/turtleplayer/persistance/source/relational/Field.java
deleted file mode 100644
index 7e8b334..0000000
--- a/src/com/turtleplayer/persistance/source/relational/Field.java
+++ /dev/null
@@ -1,54 +0,0 @@
-package com.turtleplayer.persistance.source.relational;
-
-import java.io.Serializable;
-
-/**
- * TURTLE PLAYER
- *
- * Licensed under MIT & GPL
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED,
- * INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR
- * PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
- * LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
- * TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE
- * OR OTHER DEALINGS IN THE SOFTWARE.
- *
- * More Information @ www.turtle-player.co.uk
- *
- * @author Simon Honegger (Hoene84)
- */
-
-public class Field implements Serializable
-{
- private final String name;
-
- public Field(String name)
- {
- this.name = name;
- }
-
- public String getName()
- {
- return name;
- }
-
- @Override
- public boolean equals(Object o)
- {
- if (this == o) return true;
- if (o == null || getClass() != o.getClass()) return false;
-
- Field field = (Field) o;
-
- if (!name.equals(field.name)) return false;
-
- return true;
- }
-
- @Override
- public int hashCode()
- {
- return name.hashCode();
- }
-}
diff --git a/src/com/turtleplayer/persistance/source/relational/FieldPersistable.java b/src/com/turtleplayer/persistance/source/relational/FieldPersistable.java
deleted file mode 100644
index 979f19d..0000000
--- a/src/com/turtleplayer/persistance/source/relational/FieldPersistable.java
+++ /dev/null
@@ -1,45 +0,0 @@
-package com.turtleplayer.persistance.source.relational;
-
-import com.turtleplayer.persistance.framework.creator.Creator;
-import com.turtleplayer.persistance.source.relational.fieldtype.FieldVisitor;
-
-/**
- * TURTLE PLAYER
- *
- * Licensed under MIT & GPL
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED,
- * INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR
- * PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
- * LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
- * TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE
- * OR OTHER DEALINGS IN THE SOFTWARE.
- *
- * More Information @ www.turtle-player.co.uk
- *
- * @author Simon Honegger (Hoene84)
- */
-
-public abstract class FieldPersistable extends Field
-{
- private final Creator mapping;
-
- protected FieldPersistable(String name,
- Creator mapping)
- {
- super(name);
- this.mapping = mapping;
- }
-
- public FieldPersistable(FieldPersistable fieldPersistable)
- {
- this(fieldPersistable.getName(), fieldPersistable.mapping);
- }
-
- public TYPE get(RESULT type)
- {
- return mapping.create(type);
- }
-
- public abstract R accept(FieldVisitor visitor);
-}
diff --git a/src/com/turtleplayer/persistance/source/relational/Table.java b/src/com/turtleplayer/persistance/source/relational/Table.java
deleted file mode 100644
index ff57df8..0000000
--- a/src/com/turtleplayer/persistance/source/relational/Table.java
+++ /dev/null
@@ -1,42 +0,0 @@
-package com.turtleplayer.persistance.source.relational;
-
-import com.turtleplayer.util.Shorty;
-
-import java.util.Set;
-
-/**
- * TURTLE PLAYER
- *
- * Licensed under MIT & GPL
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED,
- * INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR
- * PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
- * LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
- * TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE
- * OR OTHER DEALINGS IN THE SOFTWARE.
- *
- * More Information @ www.turtle-player.co.uk
- *
- * @author Simon Honegger (Hoene84)
- */
-
-public abstract class Table implements View
-{
- final String name;
-
- public Table(String name)
- {
- this.name = name;
- }
-
- public String getName()
- {
- return name;
- }
-
- public Set
getTables()
- {
- return Shorty.oneElementSet(this);
- }
-}
diff --git a/src/com/turtleplayer/persistance/source/relational/View.java b/src/com/turtleplayer/persistance/source/relational/View.java
deleted file mode 100644
index 084b839..0000000
--- a/src/com/turtleplayer/persistance/source/relational/View.java
+++ /dev/null
@@ -1,29 +0,0 @@
-package com.turtleplayer.persistance.source.relational;
-
-import java.io.Serializable;
-import java.util.List;
-import java.util.Set;
-
-/**
- * TURTLE PLAYER
- *
- * Licensed under MIT & GPL
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED,
- * INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR
- * PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
- * LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
- * TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE
- * OR OTHER DEALINGS IN THE SOFTWARE.
- *
- * More Information @ www.turtle-player.co.uk
- *
- * @author Simon Honegger (Hoene84)
- */
-
-public interface View extends Serializable
-{
- public Set getTables();
-
- public List getFields();
-}
diff --git a/src/com/turtleplayer/persistance/source/relational/fieldtype/FieldPersistableAsDouble.java b/src/com/turtleplayer/persistance/source/relational/fieldtype/FieldPersistableAsDouble.java
deleted file mode 100644
index abeaa6e..0000000
--- a/src/com/turtleplayer/persistance/source/relational/fieldtype/FieldPersistableAsDouble.java
+++ /dev/null
@@ -1,41 +0,0 @@
-package com.turtleplayer.persistance.source.relational.fieldtype;
-
-import com.turtleplayer.persistance.framework.creator.Creator;
-import com.turtleplayer.persistance.source.relational.FieldPersistable;
-
-/**
- * TURTLE PLAYER
- *
- * Licensed under MIT & GPL
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED,
- * INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR
- * PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
- * LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
- * TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE
- * OR OTHER DEALINGS IN THE SOFTWARE.
- *
- * More Information @ www.turtle-player.co.uk
- *
- * @author Simon Honegger (Hoene84)
- */
-
-public class FieldPersistableAsDouble extends FieldPersistable
-{
- public FieldPersistableAsDouble(String name,
- Creator mapping)
- {
- super(name, mapping);
- }
-
- public FieldPersistableAsDouble(FieldPersistable fieldPersistable)
- {
- super(fieldPersistable);
- }
-
- @Override
- public R accept(FieldVisitor visitor)
- {
- return visitor.visit(this);
- }
-}
diff --git a/src/com/turtleplayer/persistance/source/relational/fieldtype/FieldPersistableAsInteger.java b/src/com/turtleplayer/persistance/source/relational/fieldtype/FieldPersistableAsInteger.java
deleted file mode 100644
index f141b23..0000000
--- a/src/com/turtleplayer/persistance/source/relational/fieldtype/FieldPersistableAsInteger.java
+++ /dev/null
@@ -1,41 +0,0 @@
-package com.turtleplayer.persistance.source.relational.fieldtype;
-
-import com.turtleplayer.persistance.framework.creator.Creator;
-import com.turtleplayer.persistance.source.relational.FieldPersistable;
-
-/**
- * TURTLE PLAYER
- *
- * Licensed under MIT & GPL
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED,
- * INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR
- * PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
- * LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
- * TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE
- * OR OTHER DEALINGS IN THE SOFTWARE.
- *
- * More Information @ www.turtle-player.co.uk
- *
- * @author Simon Honegger (Hoene84)
- */
-
-public class FieldPersistableAsInteger extends FieldPersistable
-{
- public FieldPersistableAsInteger(String name,
- Creator mapping)
- {
- super(name, mapping);
- }
-
- public FieldPersistableAsInteger(FieldPersistable fieldPersistable)
- {
- super(fieldPersistable);
- }
-
- @Override
- public R accept(FieldVisitor visitor)
- {
- return visitor.visit(this);
- }
-}
diff --git a/src/com/turtleplayer/persistance/source/relational/fieldtype/FieldPersistableAsString.java b/src/com/turtleplayer/persistance/source/relational/fieldtype/FieldPersistableAsString.java
deleted file mode 100644
index 29f0612..0000000
--- a/src/com/turtleplayer/persistance/source/relational/fieldtype/FieldPersistableAsString.java
+++ /dev/null
@@ -1,41 +0,0 @@
-package com.turtleplayer.persistance.source.relational.fieldtype;
-
-import com.turtleplayer.persistance.framework.creator.Creator;
-import com.turtleplayer.persistance.source.relational.FieldPersistable;
-
-/**
- * TURTLE PLAYER
- *
- * Licensed under MIT & GPL
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED,
- * INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR
- * PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
- * LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
- * TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE
- * OR OTHER DEALINGS IN THE SOFTWARE.
- *
- * More Information @ www.turtle-player.co.uk
- *
- * @author Simon Honegger (Hoene84)
- */
-
-public class FieldPersistableAsString extends FieldPersistable
-{
- public FieldPersistableAsString(String name,
- Creator mapping)
- {
- super(name, mapping);
- }
-
- public FieldPersistableAsString(FieldPersistable fieldPersistable)
- {
- super(fieldPersistable);
- }
-
- @Override
- public R accept(FieldVisitor visitor)
- {
- return visitor.visit(this);
- }
-}
diff --git a/src/com/turtleplayer/persistance/source/relational/fieldtype/FieldVisitor.java b/src/com/turtleplayer/persistance/source/relational/fieldtype/FieldVisitor.java
deleted file mode 100644
index f724cf7..0000000
--- a/src/com/turtleplayer/persistance/source/relational/fieldtype/FieldVisitor.java
+++ /dev/null
@@ -1,31 +0,0 @@
-package com.turtleplayer.persistance.source.relational.fieldtype;
-
-/**
- * TURTLE PLAYER
- *
- * Licensed under MIT & GPL
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED,
- * INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR
- * PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
- * LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
- * TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE
- * OR OTHER DEALINGS IN THE SOFTWARE.
- *
- * More Information @ www.turtle-player.co.uk
- *
- * @author Simon Honegger (Hoene84)
- */
-
-/**
- * @param What the Visitor Produces (can be {@link Void} if nothing gets produced)
- */
-public interface FieldVisitor
-{
- R visit(FieldPersistableAsString field);
-
- R visit(FieldPersistableAsDouble field);
-
- R visit(FieldPersistableAsInteger field);
-
-}
diff --git a/src/com/turtleplayer/persistance/source/relational/fieldtype/ToStringFieldVisitor.java b/src/com/turtleplayer/persistance/source/relational/fieldtype/ToStringFieldVisitor.java
deleted file mode 100644
index 2907d1a..0000000
--- a/src/com/turtleplayer/persistance/source/relational/fieldtype/ToStringFieldVisitor.java
+++ /dev/null
@@ -1,43 +0,0 @@
-package com.turtleplayer.persistance.source.relational.fieldtype;
-
-/**
- * TURTLE PLAYER
- *
- * Licensed under MIT & GPL
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED,
- * INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR
- * PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
- * LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
- * TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE
- * OR OTHER DEALINGS IN THE SOFTWARE.
- *
- * More Information @ www.turtle-player.co.uk
- *
- * @author Simon Honegger (Hoene84)
- */
-
-public class ToStringFieldVisitor implements FieldVisitor
-{
- final RESULT result;
-
- public ToStringFieldVisitor(RESULT result)
- {
- this.result = result;
- }
-
- public String visit(FieldPersistableAsString field)
- {
- return field.get(result);
- }
-
- public String visit(FieldPersistableAsDouble field)
- {
- return field.get(result).toString();
- }
-
- public String visit(FieldPersistableAsInteger field)
- {
- return field.get(result).toString();
- }
-}
diff --git a/src/com/turtleplayer/persistance/source/sql/Counter.java b/src/com/turtleplayer/persistance/source/sql/Counter.java
deleted file mode 100644
index 58089c8..0000000
--- a/src/com/turtleplayer/persistance/source/sql/Counter.java
+++ /dev/null
@@ -1,39 +0,0 @@
-package com.turtleplayer.persistance.source.sql;
-
-import android.database.Cursor;
-import com.turtleplayer.persistance.framework.mapping.Mapping;
-import com.turtleplayer.persistance.source.relational.Table;
-import com.turtleplayer.persistance.source.sql.query.Select;
-import com.turtleplayer.persistance.source.sql.query.Sql;
-
-/**
- * TURTLE PLAYER
- *
- * Licensed under MIT & GPL
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED,
- * INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR
- * PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
- * LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
- * TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE
- * OR OTHER DEALINGS IN THE SOFTWARE.
- *
- * More Information @ www.turtle-player.co.uk
- *
- * @author Simon Honegger (Hoene84)
- */
-
-public abstract class Counter implements Mapping
-{
- private final Table table;
-
- public Counter(Table table)
- {
- this.table = table;
- }
-
- public Select get()
- {
- return new Select(table, Select.SelectMethod.COUNT, Sql.FIELD_PSEUDO_STAR);
- }
-}
diff --git a/src/com/turtleplayer/persistance/source/sql/First.java b/src/com/turtleplayer/persistance/source/sql/First.java
deleted file mode 100644
index fc03bcf..0000000
--- a/src/com/turtleplayer/persistance/source/sql/First.java
+++ /dev/null
@@ -1,57 +0,0 @@
-package com.turtleplayer.persistance.source.sql;
-
-import android.database.Cursor;
-import com.turtleplayer.persistance.framework.creator.Creator;
-import com.turtleplayer.persistance.framework.mapping.Mapping;
-import com.turtleplayer.persistance.source.relational.Table;
-import com.turtleplayer.persistance.source.sql.query.Limit;
-import com.turtleplayer.persistance.source.sql.query.Select;
-
-/**
- * TURTLE PLAYER
- *
- * Licensed under MIT & GPL
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED,
- * INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR
- * PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
- * LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
- * TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE
- * OR OTHER DEALINGS IN THE SOFTWARE.
- *
- * More Information @ www.turtle-player.co.uk
- *
- * @author Simon Honegger (Hoene84)
- */
-
-public class First implements Mapping
-{
- private final Table table;
- private final Creator creator;
-
- public First(Table table,
- Creator creator)
- {
- this.table = table;
- this.creator = creator;
- }
-
- public Select get()
- {
- Select select = new Select(table);
- select.setLimit(new Limit(1));
- return select;
- }
-
- public I create(Cursor queryResult)
- {
- if(queryResult.moveToFirst()){
- return creator.create(queryResult);
- }
- else
- {
- return null;
- }
-
- }
-}
diff --git a/src/com/turtleplayer/persistance/source/sql/Limited.java b/src/com/turtleplayer/persistance/source/sql/Limited.java
deleted file mode 100644
index a29af42..0000000
--- a/src/com/turtleplayer/persistance/source/sql/Limited.java
+++ /dev/null
@@ -1,53 +0,0 @@
-package com.turtleplayer.persistance.source.sql;
-
-import android.database.Cursor;
-import com.turtleplayer.persistance.framework.creator.Creator;
-import com.turtleplayer.persistance.source.relational.Table;
-import com.turtleplayer.persistance.source.sql.query.Limit;
-import com.turtleplayer.persistance.source.sql.query.Select;
-
-import java.util.ArrayList;
-import java.util.List;
-
-/**
- * TURTLE PLAYER
- *
- * Licensed under MIT & GPL
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED,
- * INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR
- * PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
- * LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
- * TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE
- * OR OTHER DEALINGS IN THE SOFTWARE.
- *
- * More Information @ www.turtle-player.co.uk
- *
- * @author Simon Honegger (Hoene84)
- */
-
-public class Limited extends First>
-{
- private final int limit;
-
- public Limited(Table table,
- Creator, Cursor> creator,
- int limit)
- {
- super(table, creator);
- this.limit = limit;
- }
-
- public Select get()
- {
- Select select = super.get();
- select.setLimit(new Limit(limit));
- return select;
- }
-
- public List create(Cursor queryResult)
- {
- List result = super.create(queryResult);
- return result == null ? new ArrayList() : result;
- }
-}
diff --git a/src/com/turtleplayer/persistance/source/sql/MappingDistinct.java b/src/com/turtleplayer/persistance/source/sql/MappingDistinct.java
deleted file mode 100644
index 388e84a..0000000
--- a/src/com/turtleplayer/persistance/source/sql/MappingDistinct.java
+++ /dev/null
@@ -1,54 +0,0 @@
-package com.turtleplayer.persistance.source.sql;
-
-import android.database.Cursor;
-import com.turtleplayer.persistance.framework.creator.CreatorForList;
-import com.turtleplayer.persistance.framework.mapping.Mapping;
-import com.turtleplayer.persistance.source.relational.Field;
-import com.turtleplayer.persistance.source.relational.View;
-import com.turtleplayer.persistance.source.sql.query.Select;
-
-import java.util.Collection;
-import java.util.List;
-
-/**
- * TURTLE PLAYER
- *
- * Licensed under MIT & GPL
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED,
- * INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR
- * PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
- * LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
- * TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE
- * OR OTHER DEALINGS IN THE SOFTWARE.
- *
- * More Information @ www.turtle-player.co.uk
- *
- * @author Simon Honegger (Hoene84)
- */
-
-public class MappingDistinct implements Mapping, Cursor>
-{
- private final PROJECTION view;
- private final List fields;
- private final CreatorForList creator;
-
- public MappingDistinct(PROJECTION view,
- CreatorForList creator,
- TARGET target)
- {
- this.view = view;
- this.fields = target.getFields();
- this.creator = creator;
- }
-
- public Select get()
- {
- return new Select(view, Select.SelectMethod.DISTINCT, fields.toArray(new Field[fields.size()]));
- }
-
- public List create(Cursor queryResult)
- {
- return creator.create(queryResult);
- }
-}
diff --git a/src/com/turtleplayer/persistance/source/sql/MappingTable.java b/src/com/turtleplayer/persistance/source/sql/MappingTable.java
deleted file mode 100644
index c7ccc7e..0000000
--- a/src/com/turtleplayer/persistance/source/sql/MappingTable.java
+++ /dev/null
@@ -1,48 +0,0 @@
-package com.turtleplayer.persistance.source.sql;
-
-import android.database.Cursor;
-import com.turtleplayer.persistance.framework.creator.CreatorForList;
-import com.turtleplayer.persistance.framework.mapping.Mapping;
-import com.turtleplayer.persistance.source.relational.Table;
-import com.turtleplayer.persistance.source.sql.query.Select;
-
-import java.util.List;
-
-/**
- * TURTLE PLAYER
- *
- * Licensed under MIT & GPL
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED,
- * INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR
- * PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
- * LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
- * TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE
- * OR OTHER DEALINGS IN THE SOFTWARE.
- *
- * More Information @ www.turtle-player.co.uk
- *
- * @author Simon Honegger (Hoene84)
- */
-
-public class MappingTable implements Mapping, Cursor>
-{
- private final Table table;
- private final CreatorForList creator;
-
- public MappingTable(Table table, CreatorForList creator)
- {
- this.table = table;
- this.creator = creator;
- }
-
- public Select get()
- {
- return new Select(table);
- }
-
- public List create(Cursor queryResult)
- {
- return creator.create(queryResult);
- }
-}
diff --git a/src/com/turtleplayer/persistance/source/sql/QueryGeneratorTable.java b/src/com/turtleplayer/persistance/source/sql/QueryGeneratorTable.java
deleted file mode 100644
index 954f174..0000000
--- a/src/com/turtleplayer/persistance/source/sql/QueryGeneratorTable.java
+++ /dev/null
@@ -1,37 +0,0 @@
-package com.turtleplayer.persistance.source.sql;
-
-import android.content.ContentValues;
-import com.turtleplayer.persistance.framework.mapping.Mapping;
-import com.turtleplayer.persistance.source.relational.Table;
-
-/**
- * TURTLE PLAYER
- *
- * Licensed under MIT & GPL
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED,
- * INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR
- * PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
- * LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
- * TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE
- * OR OTHER DEALINGS IN THE SOFTWARE.
- *
- * More Information @ www.turtle-player.co.uk
- *
- * @author Simon Honegger (Hoene84)
- */
-
-public abstract class QueryGeneratorTable implements Mapping
-{
- final Table table;
-
- public QueryGeneratorTable(Table table)
- {
- this.table = table;
- }
-
- public Table get()
- {
- return table;
- }
-}
diff --git a/src/com/turtleplayer/persistance/source/sql/query/BoolOperator.java b/src/com/turtleplayer/persistance/source/sql/query/BoolOperator.java
deleted file mode 100644
index 166956f..0000000
--- a/src/com/turtleplayer/persistance/source/sql/query/BoolOperator.java
+++ /dev/null
@@ -1,37 +0,0 @@
-package com.turtleplayer.persistance.source.sql.query;
-
-/**
- * TURTLE PLAYER
- *
- * Licensed under MIT & GPL
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED,
- * INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR
- * PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
- * LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
- * TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE
- * OR OTHER DEALINGS IN THE SOFTWARE.
- *
- * More Information @ www.turtle-player.co.uk
- *
- * @author Simon Honegger (Hoene84)
- */
-
-public enum BoolOperator implements SqlFragment
-{
- AND(" and "),
- OR(" and ");
-
- private final String sql;
-
- private BoolOperator(String sql)
- {
- this.sql = sql;
- }
-
-
- public String toSql()
- {
- return sql;
- }
-}
diff --git a/src/com/turtleplayer/persistance/source/sql/query/FieldsPart.java b/src/com/turtleplayer/persistance/source/sql/query/FieldsPart.java
deleted file mode 100644
index a8cb7b1..0000000
--- a/src/com/turtleplayer/persistance/source/sql/query/FieldsPart.java
+++ /dev/null
@@ -1,43 +0,0 @@
-package com.turtleplayer.persistance.source.sql.query;
-
-import com.turtleplayer.persistance.source.relational.Field;
-
-import java.util.List;
-
-/**
- * TURTLE PLAYER
- *
- * Licensed under MIT & GPL
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED,
- * INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR
- * PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
- * LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
- * TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE
- * OR OTHER DEALINGS IN THE SOFTWARE.
- *
- * More Information @ www.turtle-player.co.uk
- *
- * @author Simon Honegger (Hoene84)
- */
-
-public class FieldsPart implements SqlFragment
-{
- private final List fields;
-
- public FieldsPart(List fields)
- {
- this.fields = fields;
- }
-
- public String toSql()
- {
- String[] fieldNames = new String[fields.size()];
- int i = 0;
- for(Field field : fields)
- {
- fieldNames[i++] = field.getName();
- }
- return Helper.getSeparatedList(", ", fieldNames);
- }
-}
diff --git a/src/com/turtleplayer/persistance/source/sql/query/Helper.java b/src/com/turtleplayer/persistance/source/sql/query/Helper.java
deleted file mode 100644
index 58f9740..0000000
--- a/src/com/turtleplayer/persistance/source/sql/query/Helper.java
+++ /dev/null
@@ -1,49 +0,0 @@
-package com.turtleplayer.persistance.source.sql.query;
-
-/**
- * TURTLE PLAYER
- *
- * Licensed under MIT & GPL
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED,
- * INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR
- * PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
- * LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
- * TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE
- * OR OTHER DEALINGS IN THE SOFTWARE.
- *
- * More Information @ www.turtle-player.co.uk
- *
- * @author Simon Honegger (Hoene84)
- */
-
-public abstract class Helper
-{
- public static String getSeparatedList(String separator, String... values){
-
- String result = "";
-
- for(String value : values)
- {
- result += value + separator;
- }
- return removeLast(result, separator);
- }
-
- public static String getSeparatedList(String separator, SqlFragment... fragments){
-
- String result = "";
-
- for(SqlFragment fragment : fragments)
- {
- result += fragment.toSql() + separator;
- }
- return removeLast(result, separator);
- }
-
- public static String removeLast(String s, String pattern){
- return s.endsWith(pattern) ?
- s.substring(0, s.length() - pattern.length()) :
- s; //cut off last pattern
- }
-}
diff --git a/src/com/turtleplayer/persistance/source/sql/query/Limit.java b/src/com/turtleplayer/persistance/source/sql/query/Limit.java
deleted file mode 100644
index eb8307a..0000000
--- a/src/com/turtleplayer/persistance/source/sql/query/Limit.java
+++ /dev/null
@@ -1,33 +0,0 @@
-package com.turtleplayer.persistance.source.sql.query;
-
-/**
- * TURTLE PLAYER
- *
- * Licensed under MIT & GPL
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED,
- * INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR
- * PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
- * LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
- * TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE
- * OR OTHER DEALINGS IN THE SOFTWARE.
- *
- * More Information @ www.turtle-player.co.uk
- *
- * @author Simon Honegger (Hoene84)
- */
-
-public class Limit implements SqlFragment
-{
- final int limit;
-
- public Limit(int limit)
- {
- this.limit = limit;
- }
-
- public String toSql()
- {
- return " LIMIT " + limit + " ";
- }
-}
diff --git a/src/com/turtleplayer/persistance/source/sql/query/Operator.java b/src/com/turtleplayer/persistance/source/sql/query/Operator.java
deleted file mode 100644
index 5a75cd9..0000000
--- a/src/com/turtleplayer/persistance/source/sql/query/Operator.java
+++ /dev/null
@@ -1,43 +0,0 @@
-package com.turtleplayer.persistance.source.sql.query;
-
-/**
- * TURTLE PLAYER
- *
- * Licensed under MIT & GPL
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED,
- * INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR
- * PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
- * LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
- * TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE
- * OR OTHER DEALINGS IN THE SOFTWARE.
- *
- * More Information @ www.turtle-player.co.uk
- *
- * @author Simon Honegger (Hoene84)
- */
-
-public enum Operator
-{
- GT(" > "),
- LT(" < "),
- GE(" >= "),
- LE(" <= "),
- EQ(" = "),
- NEQ(" != "),
- LIKE(" LIKE "),
- NOT_LIKE(" NOT LIKE ");
-
- final String string;
-
- private Operator(String op)
- {
- this.string = op;
- }
-
- @Override
- public String toString()
- {
- return string;
- }
-}
diff --git a/src/com/turtleplayer/persistance/source/sql/query/OrderClause.java b/src/com/turtleplayer/persistance/source/sql/query/OrderClause.java
deleted file mode 100644
index 51dbf1b..0000000
--- a/src/com/turtleplayer/persistance/source/sql/query/OrderClause.java
+++ /dev/null
@@ -1,26 +0,0 @@
-package com.turtleplayer.persistance.source.sql.query;
-
-/**
- * TURTLE PLAYER
- *
- * Licensed under MIT & GPL
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED,
- * INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR
- * PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
- * LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
- * TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE
- * OR OTHER DEALINGS IN THE SOFTWARE.
- *
- * More Information @ www.turtle-player.co.uk
- *
- * @author Simon Honegger (Hoene84)
- */
-
-/**
- * Marker Interface
- */
-public interface OrderClause extends SqlFragment, OrderClausePart
-{
- OrderClause apply(OrderClause orderClause);
-}
diff --git a/src/com/turtleplayer/persistance/source/sql/query/OrderClauseFields.java b/src/com/turtleplayer/persistance/source/sql/query/OrderClauseFields.java
deleted file mode 100644
index fce87dc..0000000
--- a/src/com/turtleplayer/persistance/source/sql/query/OrderClauseFields.java
+++ /dev/null
@@ -1,42 +0,0 @@
-package com.turtleplayer.persistance.source.sql.query;
-
-/**
- * TURTLE PLAYER
- *
- * Licensed under MIT & GPL
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED,
- * INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR
- * PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
- * LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
- * TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE
- * OR OTHER DEALINGS IN THE SOFTWARE.
- *
- * More Information @ www.turtle-player.co.uk
- *
- * @author Simon Honegger (Hoene84)
- */
-
-public class OrderClauseFields implements OrderClause
-{
- private final String sql;
-
- public OrderClauseFields(OrderClausePart... parts)
- {
- sql = Helper.getSeparatedList(" , ", parts);
- }
-
- private OrderClauseFields(OrderClause orderClause, OrderClause orderClause2)
- {
- sql = orderClause.toSql() + " , " + orderClause2.toSql();
- }
-
- public String toSql(){
- return sql;
- }
-
- public OrderClause apply(OrderClause orderClause)
- {
- return new OrderClauseFields(this, orderClause);
- }
-}
diff --git a/src/com/turtleplayer/persistance/source/sql/query/OrderClausePart.java b/src/com/turtleplayer/persistance/source/sql/query/OrderClausePart.java
deleted file mode 100644
index 9af795b..0000000
--- a/src/com/turtleplayer/persistance/source/sql/query/OrderClausePart.java
+++ /dev/null
@@ -1,22 +0,0 @@
-package com.turtleplayer.persistance.source.sql.query;
-
-/**
- * TURTLE PLAYER
- *
- * Licensed under MIT & GPL
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED,
- * INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR
- * PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
- * LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
- * TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE
- * OR OTHER DEALINGS IN THE SOFTWARE.
- *
- * More Information @ www.turtle-player.co.uk
- *
- * @author Simon Honegger (Hoene84)
- */
-
-public interface OrderClausePart extends SqlFragment
-{
-}
diff --git a/src/com/turtleplayer/persistance/source/sql/query/OrderClausePartField.java b/src/com/turtleplayer/persistance/source/sql/query/OrderClausePartField.java
deleted file mode 100644
index f034583..0000000
--- a/src/com/turtleplayer/persistance/source/sql/query/OrderClausePartField.java
+++ /dev/null
@@ -1,50 +0,0 @@
-package com.turtleplayer.persistance.source.sql.query;
-
-import com.turtleplayer.persistance.framework.sort.SortOrder;
-import com.turtleplayer.persistance.source.relational.Field;
-
-/**
- * TURTLE PLAYER
- *
- * Licensed under MIT & GPL
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED,
- * INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR
- * PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
- * LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
- * TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE
- * OR OTHER DEALINGS IN THE SOFTWARE.
- *
- * More Information @ www.turtle-player.co.uk
- *
- * @author Simon Honegger (Hoene84)
- */
-
-public class OrderClausePartField implements OrderClausePart
-{
- final Field field;
- final SqlOrder order;
-
- public OrderClausePartField(Field field,
- SortOrder order)
- {
- this.field = field;
-
- switch (order)
- {
- case ASC:
- this.order = SqlOrder.ASC;
- break;
- case DESC:
- this.order = SqlOrder.DESC;
- break;
- default:
- this.order = SqlOrder.ASC;
- }
- }
-
- public String toSql()
- {
- return " " + field.getName() + " " + order.toSql() + " ";
- }
-}
diff --git a/src/com/turtleplayer/persistance/source/sql/query/OrderClauseRandom.java b/src/com/turtleplayer/persistance/source/sql/query/OrderClauseRandom.java
deleted file mode 100644
index da3b17f..0000000
--- a/src/com/turtleplayer/persistance/source/sql/query/OrderClauseRandom.java
+++ /dev/null
@@ -1,31 +0,0 @@
-package com.turtleplayer.persistance.source.sql.query;
-
-/**
- * TURTLE PLAYER
- *
- * Licensed under MIT & GPLS
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED,
- * INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR
- * PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
- * LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
- * TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE
- * OR OTHER DEALINGS IN THE SOFTWARE.
- *
- * More Information @ www.turtle-player.co.uk
- *
- * @author Simon Honegger (Hoene84)
- */
-
-public class OrderClauseRandom implements OrderClause
-{
- public String toSql()
- {
- return " RANDOM() ";
- }
-
- public OrderClause apply(OrderClause orderClause)
- {
- throw new RuntimeException("random order cant be chained");
- }
-}
diff --git a/src/com/turtleplayer/persistance/source/sql/query/Select.java b/src/com/turtleplayer/persistance/source/sql/query/Select.java
deleted file mode 100644
index 768aaaa..0000000
--- a/src/com/turtleplayer/persistance/source/sql/query/Select.java
+++ /dev/null
@@ -1,105 +0,0 @@
-package com.turtleplayer.persistance.source.sql.query;
-
-import com.turtleplayer.persistance.source.relational.Field;
-import com.turtleplayer.persistance.source.relational.View;
-
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.List;
-
-/**
- * TURTLE PLAYER
- *
- * Licensed under MIT & GPL
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED,
- * INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR
- * PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
- * LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
- * TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE
- * OR OTHER DEALINGS IN THE SOFTWARE.
- *
- * More Information @ www.turtle-player.co.uk
- *
- * @author Simon Honegger (Hoene84)
- */
-
-public class Select implements Sql
-{
- private final String sql;
- private WhereClause whereClause;
- private OrderClause orderClause;
- private Limit limit;
-
- public enum SelectMethod{
- NORMAL,
- COUNT,
- DISTINCT
- }
-
- public Select(View view)
- {
- this.sql = "SELECT * FROM " + getTableList(view);
- }
-
- public Select(View view, Field... fields)
- {
- this(view, SelectMethod.NORMAL, fields);
- }
-
- public Select(View view, SelectMethod selectMethod, Field... fields)
- {
- this.sql = "SELECT " +
- getFieldsList(selectMethod, fields) +
- " FROM " + getTableList(view);
- }
-
- private String getFieldsList(SelectMethod selectMethod, Field... fields)
- {
- switch (selectMethod)
- {
- case NORMAL:
- return new FieldsPart(Arrays.asList(fields)).toSql();
- case COUNT:
- return " COUNT(" + new FieldsPart(Arrays.asList(fields)).toSql() + ")";
- case DISTINCT:
- return " DISTINCT " + new FieldsPart(Arrays.asList(fields)).toSql() + " ";
- default:
- throw new RuntimeException("Implement SelectMethod " + selectMethod.name());
- }
- }
-
- private String getTableList(View view)
- {
- return new TablesPart(view.getTables()).toSql();
- }
-
- public String toSql()
- {
- return sql
- + (whereClause != null ? " WHERE " + whereClause.toSql() : "")
- + (orderClause != null ? " ORDER BY " + orderClause.toSql() : "")
- + (limit != null ? limit.toSql() : "");
- }
-
- public List