X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=src%2Fmain%2Fjava%2Fnet%2Fpterodactylus%2Fsone%2Fdata%2FAlbum.java;h=d7df84571084e3521d02920bd273ec4f388e5c7b;hb=147ca6215b8c951ad46e56f919c077e6c0f66ee2;hp=60fb296373a037dc7d8237415ecf00b772199169;hpb=e31ead2b972074c1e5ecc5213b2bdc34c453d8b6;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 60fb296..d7df845 100644
--- a/src/main/java/net/pterodactylus/sone/data/Album.java
+++ b/src/main/java/net/pterodactylus/sone/data/Album.java
@@ -45,12 +45,15 @@ 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;
 
+	/** The index of the album picture. */
+	private int albumImage = -1;
+
 	/**
 	 * Creates a new album with a random ID.
 	 */
@@ -100,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().isEqual("New Album Owner", sone, this.sone).check();
+		Validation.begin().isNull("Current Album Owner", this.sone).isNotNull("New Album Owner", sone).check();
 		this.sone = sone;
 		return this;
 	}
@@ -110,7 +113,7 @@ public class Album implements Fingerprintable {
 	 *
 	 * @return The nested albums
 	 */
-	public List<Album> getNestedAlbums() {
+	public List<Album> getAlbums() {
 		return new ArrayList<Album>(albums);
 	}
 
@@ -154,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);
 	}
 
@@ -170,6 +174,28 @@ public class Album implements Fingerprintable {
 	}
 
 	/**
+	 * Returns the album image of this album, or {@code null} if no album image
+	 * has been set.
+	 *
+	 * @return The image to show when this album is listed
+	 */
+	public Image getAlbumImage() {
+		if (albumImage == -1) {
+			return null;
+		}
+		return images.get(albumImage);
+	}
+
+	/**
+	 * 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
@@ -204,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;
 	}
 
@@ -259,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,6 +314,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;