X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=src%2Fmain%2Fjava%2Fnet%2Fpterodactylus%2Fsone%2Fdata%2FAlbum.java;h=4f52f50457471d5cd944f4f3f41f820f2b4ab56f;hb=32cba82f14855a61174221c010bdcad42c336694;hp=76015c82bab446a0b72e9e2593517278bf407470;hpb=f38f21ad0a7703d84f826b01c4e107e4c7ba5fe6;p=Sone.git

diff --git a/src/main/java/net/pterodactylus/sone/data/Album.java b/src/main/java/net/pterodactylus/sone/data/Album.java
index 76015c8..4f52f50 100644
--- a/src/main/java/net/pterodactylus/sone/data/Album.java
+++ b/src/main/java/net/pterodactylus/sone/data/Album.java
@@ -34,7 +34,7 @@ public class Album implements Fingerprintable {
 	private final String id;
 
 	/** The Sone this album belongs to. */
-	private final Sone sone;
+	private Sone sone;
 
 	/** Nested albums. */
 	private final List<Album> albums = new ArrayList<Album>();
@@ -53,12 +53,9 @@ public class Album implements Fingerprintable {
 
 	/**
 	 * Creates a new album with a random ID.
-	 *
-	 * @param sone
-	 *            The Sone this album belongs to
 	 */
-	public Album(Sone sone) {
-		this(UUID.randomUUID().toString(), sone);
+	public Album() {
+		this(UUID.randomUUID().toString());
 	}
 
 	/**
@@ -66,13 +63,10 @@ public class Album implements Fingerprintable {
 	 *
 	 * @param id
 	 *            The ID of the album
-	 * @param sone
-	 *            The Sone this album belongs to
 	 */
-	public Album(String id, Sone sone) {
-		Validation.begin().isNotNull("Album ID", id).isNotNull("Album Owner", sone).check();
+	public Album(String id) {
+		Validation.begin().isNotNull("Album ID", id).check();
 		this.id = id;
-		this.sone = sone;
 	}
 
 	//
@@ -98,11 +92,25 @@ public class Album implements Fingerprintable {
 	}
 
 	/**
+	 * Sets the owner of the album. The owner can only be set as long as the
+	 * current owner is {@code null}.
+	 *
+	 * @param sone
+	 *            The album owner
+	 * @return This album
+	 */
+	public Album setSone(Sone sone) {
+		Validation.begin().isNull("Current Album Owner", this.sone).isNotNull("New Album Owner", sone).check();
+		this.sone = sone;
+		return this;
+	}
+
+	/**
 	 * Returns the nested albums.
 	 *
 	 * @return The nested albums
 	 */
-	public List<Album> getNestedAlbums() {
+	public List<Album> getAlbums() {
 		return new ArrayList<Album>(albums);
 	}
 
@@ -285,7 +293,7 @@ public class Album implements Fingerprintable {
 			return false;
 		}
 		Album album = (Album) object;
-		return sone.equals(album.sone) && id.equals(album.id);
+		return id.equals(album.id);
 	}
 
 }