X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=src%2Fmain%2Fjava%2Fnet%2Fpterodactylus%2Fsone%2Fdata%2FAlbum.java;h=5d4eeb7f0c0a281201260f862a87a36e293ea801;hb=c3acd80a6f7f0b4c7f8758056baf68f8bc84c30a;hp=a0a85de497811dc22dee35b81f684a9b9a44fc5d;hpb=7dfc9c778882083632f916b178a241f06c2a08fe;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 a0a85de..5d4eeb7 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).check(); this.sone = sone; return this; } @@ -158,7 +158,10 @@ 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(); - images.add(image); + image.setAlbum(this); + if (!images.contains(image)) { + images.add(image); + } } /** @@ -186,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 @@ -288,7 +300,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(')');