X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=src%2Fmain%2Fjava%2Fnet%2Fpterodactylus%2Fsone%2Fdata%2FAlbum.java;h=86f2c59193969fd8acf7ff501207d87c58c95c87;hb=0491a2dcdc6e6a8021ba9594b1786bdbc8622760;hp=16c99164163533b6923d5494469f830bfbb7ddc9;hpb=98b7cdc041f13752faa5c644fb6e1cf3eb7962ee;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 16c9916..86f2c59 100644
--- a/src/main/java/net/pterodactylus/sone/data/Album.java
+++ b/src/main/java/net/pterodactylus/sone/data/Album.java
@@ -45,8 +45,8 @@ public class Album implements Fingerprintable {
 	/** The parent album. */
 	private Album parent;
 
-	/** The name of this album. */
-	private String name;
+	/** The title of this album. */
+	private String title;
 
 	/** The description of this album. */
 	private String description;
@@ -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).check();
 		this.sone = sone;
 		return this;
 	}
@@ -157,7 +157,8 @@ public class Album implements Fingerprintable {
 	 *            The image to add
 	 */
 	public void addImage(Image image) {
-		Validation.begin().isNotNull("Image", image).check().isEqual("Image Owner", image.getSone(), sone).check();
+		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);
 	}
 
@@ -186,6 +187,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
@@ -220,24 +230,24 @@ public class Album implements Fingerprintable {
 	}
 
 	/**
-	 * Returns the name of this album.
+	 * Returns the title of this album.
 	 *
-	 * @return The name of this album
+	 * @return The title of this album
 	 */
-	public String getName() {
-		return name;
+	public String getTitle() {
+		return title;
 	}
 
 	/**
-	 * Sets the name of this album.
+	 * Sets the title of this album.
 	 *
-	 * @param name
-	 *            The name of this album
+	 * @param title
+	 *            The title of this album
 	 * @return This album
 	 */
-	public Album setName(String name) {
-		Validation.begin().isNotNull("Album Name", name).check();
-		this.name = name;
+	public Album setTitle(String title) {
+		Validation.begin().isNotNull("Album Title", title).check();
+		this.title = title;
 		return this;
 	}
 
@@ -275,7 +285,7 @@ public class Album implements Fingerprintable {
 		StringBuilder fingerprint = new StringBuilder();
 		fingerprint.append("Album(");
 		fingerprint.append("ID(").append(id).append(')');
-		fingerprint.append("Name(").append(name).append(')');
+		fingerprint.append("Title(").append(title).append(')');
 		fingerprint.append("Description(").append(description).append(')');
 
 		/* add nested albums. */
@@ -288,7 +298,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(')');
 
@@ -304,6 +316,14 @@ public class Album implements Fingerprintable {
 	 * {@inheritDoc}
 	 */
 	@Override
+	public int hashCode() {
+		return id.hashCode();
+	}
+
+	/**
+	 * {@inheritDoc}
+	 */
+	@Override
 	public boolean equals(Object object) {
 		if (!(object instanceof Album)) {
 			return false;