X-Git-Url: https://git.pterodactylus.net/?p=Sone.git;a=blobdiff_plain;f=src%2Fmain%2Fjava%2Fnet%2Fpterodactylus%2Fsone%2Fdata%2FAlbum.java;h=d53ba6e20d27ced5f0b15eb2ffcf7a67cc0b6004;hp=919f79743b78631dbb52cb8cc90b0a6035c52a44;hb=55ee8d58d39bf1e6f0edc3baebb1b1119f92a6c1;hpb=129815864bbd3cf5ce221eac24e29e2d0e9df036

diff --git a/src/main/java/net/pterodactylus/sone/data/Album.java b/src/main/java/net/pterodactylus/sone/data/Album.java
index 919f797..d53ba6e 100644
--- a/src/main/java/net/pterodactylus/sone/data/Album.java
+++ b/src/main/java/net/pterodactylus/sone/data/Album.java
@@ -21,6 +21,8 @@ import java.util.ArrayList;
 import java.util.List;
 import java.util.UUID;
 
+import net.pterodactylus.util.validation.Validation;
+
 /**
  * Container for images that can also contain nested {@link Album}s.
  *
@@ -31,6 +33,9 @@ public class Album {
 	/** The ID of this album. */
 	private final String id;
 
+	/** The Sone this album belongs to. */
+	private final Sone sone;
+
 	/** Nested albums. */
 	private final List<Album> albums = new ArrayList<Album>();
 
@@ -45,9 +50,12 @@ public class Album {
 
 	/**
 	 * Creates a new album with a random ID.
+	 *
+	 * @param sone
+	 *            The Sone this album belongs to
 	 */
-	public Album() {
-		this(UUID.randomUUID().toString());
+	public Album(Sone sone) {
+		this(UUID.randomUUID().toString(), sone);
 	}
 
 	/**
@@ -55,9 +63,13 @@ public class Album {
 	 *
 	 * @param id
 	 *            The ID of the album
+	 * @param sone
+	 *            The Sone this album belongs to
 	 */
-	public Album(String id) {
+	public Album(String id, Sone sone) {
+		Validation.begin().isNotNull("Album ID", id).isNotNull("Album Owner", sone).check();
 		this.id = id;
+		this.sone = sone;
 	}
 
 	//
@@ -74,6 +86,15 @@ public class Album {
 	}
 
 	/**
+	 * Returns the Sone this album belongs to.
+	 *
+	 * @return The Sone this album belongs to
+	 */
+	public Sone getSone() {
+		return sone;
+	}
+
+	/**
 	 * Returns the nested albums.
 	 *
 	 * @return The nested albums
@@ -83,6 +104,28 @@ public class Album {
 	}
 
 	/**
+	 * Adds an album to this album.
+	 *
+	 * @param album
+	 *            The album to add
+	 */
+	public void addAlbum(Album album) {
+		Validation.begin().isNotNull("Album", album).check().isEqual("Album Owner", album.sone, sone).check();
+		albums.add(album);
+	}
+
+	/**
+	 * Removes an album from this album.
+	 *
+	 * @param album
+	 *            The album to remove
+	 */
+	public void removeAlbum(Album album) {
+		Validation.begin().isNotNull("Album", album).check().isEqual("Album Owner", album.sone, sone).check();
+		albums.remove(album);
+	}
+
+	/**
 	 * Returns the images in this album.
 	 *
 	 * @return The images in this album
@@ -92,6 +135,28 @@ public class Album {
 	}
 
 	/**
+	 * Adds the given image to this album.
+	 *
+	 * @param image
+	 *            The image to add
+	 */
+	public void addImage(Image image) {
+		Validation.begin().isNotNull("Image", image).check().isEqual("Image Owner", image.getSone(), sone).check();
+		images.add(image);
+	}
+
+	/**
+	 * Removes the given image from this album.
+	 *
+	 * @param image
+	 *            The image to remove
+	 */
+	public void removeImage(Image image) {
+		Validation.begin().isNotNull("Image", image).check().isEqual("Image Owner", image.getSone(), sone).check();
+		images.remove(image);
+	}
+
+	/**
 	 * Returns the name of this album.
 	 *
 	 * @return The name of this album
@@ -108,6 +173,7 @@ public class Album {
 	 * @return This album
 	 */
 	public Album setName(String name) {
+		Validation.begin().isNotNull("Album Name", name).check();
 		this.name = name;
 		return this;
 	}
@@ -129,6 +195,7 @@ public class Album {
 	 * @return This album
 	 */
 	public Album setDescription(String description) {
+		Validation.begin().isNotNull("Album Description", description).check();
 		this.description = description;
 		return this;
 	}
@@ -146,7 +213,7 @@ public class Album {
 			return false;
 		}
 		Album album = (Album) object;
-		return id.equals(album.id);
+		return sone.equals(album.sone) && id.equals(album.id);
 	}
 
 }