item: When Android specific, abstract the class.

This refactors the work from 3fdfe1b in a more sensable way, so Android code
can cleanly be added as necessary.

This should make adding Android specific code to JMPDComm cleaner.

Author: avuton

.idea/scopes/JMPDComm.xml

@@ -30,13 +30,17 @@
 import android.os.Parcel;
 import android.os.Parcelable;
 
-/** A class to put org.a0z.mpd.item.Album in a Parcelable wrapper. */
-public class AlbumParcelable extends Album implements Parcelable {
+/**
+ * This is the Android backend {@code Album} item.
+ *
+ * @see org.a0z.mpd.item.AbstractAlbum For generic {@code Album} code.
+ */
+public class Album extends AbstractAlbum implements Parcelable {
 
     public static final Creator<Album> CREATOR = new Creator<Album>() {
         @Override
         public Album createFromParcel(final Parcel source) {
-            return new AlbumParcelable(source);
+            return new Album(source);
         }
 
         @Override
@@ -45,11 +49,25 @@ public Album[] newArray(final int size) {
         }
     };
 
-    public AlbumParcelable(final Album album) {
-        super(album);
+    public Album(final Album otherAlbum) {
+        super(otherAlbum);
+    }
+
+    public Album(final String name, final Artist artist) {
+        super(name, artist, false, 0L, 0L, 0L, null);
+    }
+
+    public Album(final String name, final Artist artist, final boolean hasAlbumArtist) {
+        super(name, artist, hasAlbumArtist, 0L, 0L, 0L, null);
+    }
+
+    public Album(final String name, final Artist artist, final boolean hasAlbumArtist,
+            final long songCount, final long duration,
+            final long year, final String path) {
+        super(name, artist, hasAlbumArtist, songCount, duration, year, path);
     }
 
-    protected AlbumParcelable(final Parcel in) {
+    protected Album(final Parcel in) {
         super(in.readString(), /** name */
                 new Artist(in.readString()), /** artist */
                 in.readInt() > 0, /** hasAlbumArtist */

JMPDComm/backends/android/src/main/java/org/a0z/mpd/item/AlbumParcelable.java JMPDComm/backends/android/src/main/java/org/a0z/mpd/item/Album.java

@@ -30,15 +30,19 @@
 import android.os.Parcel;
 import android.os.Parcelable;
 
-/** A class to put org.a0z.mpd.item.Artist in a Parcelable wrapper. */
-public class ArtistParcelable extends Artist implements Parcelable {
+/**
+ * This is the Android backend {@code Artist} item.
+ *
+ * @see org.a0z.mpd.item.AbstractArtist For generic {@code Artist} code.
+ */
+public class Artist extends AbstractArtist implements Parcelable {
 
     public static final Creator<Artist> CREATOR =
             new Creator<Artist>() {
 
                 @Override
                 public Artist createFromParcel(final Parcel source) {
-                    return new ArtistParcelable(source);
+                    return new Artist(source);
                 }
 
                 @Override
@@ -47,11 +51,19 @@ public Artist[] newArray(final int size) {
                 }
             };
 
-    public ArtistParcelable(final Artist artist) {
+    public Artist(final Artist artist) {
         super(artist);
     }
 
-    protected ArtistParcelable(final Parcel in) {
+    public Artist(final String name) {
+        super(name);
+    }
+
+    protected Artist(final String name, final String sort) {
+        super(name, sort);
+    }
+
+    protected Artist(final Parcel in) {
         super(in.readString(), /** name */
                 in.readString()); /** sort */
     }

JMPDComm/backends/android/src/main/java/org/a0z/mpd/item/ArtistParcelable.java JMPDComm/backends/android/src/main/java/org/a0z/mpd/item/Artist.java

@@ -30,13 +30,17 @@
 import android.os.Parcel;
 import android.os.Parcelable;
 
-/** A class to put org.a0z.mpd.item.Genre in a Parcelable wrapper. */
-public class GenreParcelable extends Genre implements Parcelable {
+/**
+ * This is the Android backend {@code Genre} item.
+ *
+ * @see org.a0z.mpd.item.AbstractGenre For generic {@code Genre} code.
+ */
+public class Genre extends AbstractGenre implements Parcelable {
 
     public static final Creator<Genre> CREATOR = new Creator<Genre>() {
         @Override
         public Genre createFromParcel(final Parcel source) {
-            return new GenreParcelable(source);
+            return new Genre(source);
         }
 
         @Override
@@ -45,11 +49,15 @@ public Genre[] newArray(final int size) {
         }
     };
 
-    public GenreParcelable(final Genre genre) {
+    public Genre(final Genre genre) {
         super(genre);
     }
 
-    protected GenreParcelable(final Parcel in) {
+    public Genre(final String name) {
+        super(name);
+    }
+
+    protected Genre(final Parcel in) {
         super(in.readString()); /** name */
     }
 

JMPDComm/backends/android/src/main/java/org/a0z/mpd/item/GenreParcelable.java JMPDComm/backends/android/src/main/java/org/a0z/mpd/item/Genre.java

@@ -30,38 +30,48 @@
 import android.os.Parcel;
 import android.os.Parcelable;
 
-/** A class to put org.a0z.mpd.item.Music in a Parcelable wrapper. */
-public class MusicParcelable extends Music implements Parcelable {
+/**
+ * This is the Android backend {@code Music} item.
+ *
+ * @see org.a0z.mpd.item.AbstractMusic For generic {@code Music} code.
+ */
+public class Music extends AbstractMusic implements Parcelable {
 
     public static final Creator<Music> CREATOR = new Creator<Music>() {
         @Override
         public Music createFromParcel(final Parcel source) {
-            return new MusicParcelable(source);
+            return new Music(source);
         }
 
         @Override
         public Music[] newArray(final int size) {
-            return new MusicParcelable[size];
+            return new Music[size];
         }
     };
 
-    /**
-     * Public constructor, used to encapsulate a {@link org.a0z.mpd.item.Music} into this {@link
-     * android.os.Parcelable}
-     *
-     * @param music The target {@link org.a0z.mpd.item.Music} object
-     */
-    public MusicParcelable(final Music music) {
+    public Music() {
+        super();
+    }
+
+    protected Music(final Music music) {
         super(music);
     }
 
+    protected Music(final String album, final String artist, final String albumArtist,
+            final String composer, final String fullPath, final int disc, final long date,
+            final String genre, final long time, final String title, final int totalTracks,
+            final int track, final int songId, final int songPos, final String name) {
+        super(album, artist, albumArtist, composer, fullPath, disc, date, genre, time, title,
+                totalTracks, track, songId, songPos, name);
+    }
+
     /**
      * Protected constructor, used by the Android framework when reconstructing the object from a
      * {@link android.os.Parcel}<br />
      *
      * @param in The {@link android.os.Parcel} that contains our object
      */
-    protected MusicParcelable(final Parcel in) {
+    protected Music(final Parcel in) {
         super(in.readString(), in.readString(), in.readString(), in.readString(), in.readString(),
                 in.readInt(), in.readLong(), in.readString(), in.readLong(), in.readString(),
                 in.readInt(), in.readInt(), in.readInt(), in.readInt(), in.readString());

JMPDComm/backends/android/src/main/java/org/a0z/mpd/item/MusicParcelable.java JMPDComm/backends/android/src/main/java/org/a0z/mpd/item/Music.java

@@ -0,0 +1,54 @@
+/*
+ * Copyright (C) 2004 Felipe Gustavo de Almeida
+ * Copyright (C) 2010-2014 The MPDroid Project
+ *
+ * All Rights Reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ *
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice,this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ * DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE FOR ANY
+ * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+ * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
+ * ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
+ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+package org.a0z.mpd.item;
+
+/**
+ * This is the Java backend {@code Album} item.
+ *
+ * @see org.a0z.mpd.item.AbstractAlbum For generic {@code Album} code.
+ */
+public class Album extends AbstractAlbum {
+
+    public Album(final Album otherAlbum) {
+        super(otherAlbum);
+    }
+
+    public Album(final String name, final Artist artist) {
+        super(name, artist, false, 0L, 0L, 0L, null);
+    }
+
+    public Album(final String name, final Artist artist, final boolean hasAlbumArtist) {
+        super(name, artist, hasAlbumArtist, 0L, 0L, 0L, null);
+    }
+
+    public Album(final String name, final Artist artist, final boolean hasAlbumArtist,
+            final long songCount, final long duration,
+            final long year, final String path) {
+        super(name, artist, hasAlbumArtist, songCount, duration, year, path);
+    }
+}

JMPDComm/backends/java/src/main/java/org/a0z/mpd/item/Album.java

@@ -0,0 +1,48 @@
+/*
+ * Copyright (C) 2004 Felipe Gustavo de Almeida
+ * Copyright (C) 2010-2014 The MPDroid Project
+ *
+ * All Rights Reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ *
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice,this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ * DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE FOR ANY
+ * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+ * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
+ * ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
+ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+package org.a0z.mpd.item;
+
+/**
+ * This is the Java backend {@code Artist} item.
+ *
+ * @see org.a0z.mpd.item.AbstractArtist For generic {@code Artist} code.
+ */
+public class Artist extends AbstractArtist {
+
+    public Artist(final Artist artist) {
+        super(artist);
+    }
+
+    public Artist(final String name) {
+        super(name);
+    }
+
+    protected Artist(final String name, final String sort) {
+        super(name, sort);
+    }
+}

JMPDComm/backends/java/src/main/java/org/a0z/mpd/item/Artist.java

@@ -0,0 +1,44 @@
+/*
+ * Copyright (C) 2004 Felipe Gustavo de Almeida
+ * Copyright (C) 2010-2014 The MPDroid Project
+ *
+ * All Rights Reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ *
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice,this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ * DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE FOR ANY
+ * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+ * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
+ * ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
+ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+package org.a0z.mpd.item;
+
+/**
+ * This is the Java backend {@code Genre} item.
+ *
+ * @see org.a0z.mpd.item.AbstractGenre For generic {@code Genre} code.
+ */
+public class Genre extends AbstractGenre {
+
+    public Genre(final Genre genre) {
+        super(genre);
+    }
+
+    public Genre(final String name) {
+        super(name);
+    }
+}