X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=src%2Fmain%2Fjava%2Fnet%2Fpterodactylus%2Fsone%2Fdata%2FAlbum.java;h=0abc59cd61271fe051f51fbc710aa378103323ac;hb=9418b7209b46bd5cbda6006ac00f855df2d383a4;hp=88bef2cd0da494c390cb62d3c430f99e2d156a0a;hpb=c06b0a6bc5e67e6cb5564631d5cc0e3a0dd57eb0;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 88bef2c..0abc59c 100644
--- a/src/main/java/net/pterodactylus/sone/data/Album.java
+++ b/src/main/java/net/pterodactylus/sone/data/Album.java
@@ -103,7 +103,7 @@ public class Album implements Fingerprintable {
 	 * @return This album
 	 */
 	public Album setSone(Sone sone) {
-		Validation.begin().isNull("Current Album Owner", this.sone).isNotNull("New Album Owner", sone).check();
+		Validation.begin().isNotNull("New Album Owner", sone).isEither("Old Album Owner", this.sone, null, sone).check();
 		this.sone = sone;
 		return this;
 	}
@@ -124,7 +124,7 @@ public class Album implements Fingerprintable {
 	 *            The album to add
 	 */
 	public void addAlbum(Album album) {
-		Validation.begin().isNotNull("Album", album).check().isEqual("Album Owner", album.sone, sone).isNull("Album Parent", album.parent).check();
+		Validation.begin().isNotNull("Album", album).check().isEqual("Album Owner", album.sone, sone).isEither("Old Album Parent", this.parent, null, album.parent).check();
 		albums.add(album);
 		album.setParent(this);
 	}
@@ -159,7 +159,9 @@ public class Album implements Fingerprintable {
 	public void addImage(Image image) {
 		Validation.begin().isNotNull("Image", image).check().isNotNull("Image Owner", image.getSone()).check().isEqual("Image Owner", image.getSone(), sone).check();
 		image.setAlbum(this);
-		images.add(image);
+		if (!images.contains(image)) {
+			images.add(image);
+		}
 	}
 
 	/**
@@ -187,6 +189,15 @@ public class Album implements Fingerprintable {
 	}
 
 	/**
+	 * Returns whether this album contains any other albums or images.
+	 *
+	 * @return {@code true} if this album is empty, {@code false} otherwise
+	 */
+	public boolean isEmpty() {
+		return albums.isEmpty() && images.isEmpty();
+	}
+
+	/**
 	 * Returns the parent album of this album.
 	 *
 	 * @return The parent album of this album, or {@code null} if this album
@@ -215,7 +226,6 @@ public class Album implements Fingerprintable {
 	 * @return This album
 	 */
 	protected Album removeParent() {
-		Validation.begin().isNotNull("Album Parent", parent).check();
 		this.parent = null;
 		return this;
 	}
@@ -289,7 +299,9 @@ public class Album implements Fingerprintable {
 		/* add images. */
 		fingerprint.append("Images(");
 		for (Image image : images) {
-			fingerprint.append(image.getFingerprint());
+			if (image.isInserted()) {
+				fingerprint.append(image.getFingerprint());
+			}
 		}
 		fingerprint.append(')');