Ensure that an image is always set as album image, unless the album is empty.

[Sone.git] / src / main / java / net / pterodactylus / sone / data / Album.java

diff --git a/src/main/java/net/pterodactylus/sone/data/Album.java b/src/main/java/net/pterodactylus/sone/data/Album.java
index 7d22858..89823a8 100644 (file)
--- a/src/main/java/net/pterodactylus/sone/data/Album.java
+++ b/src/main/java/net/pterodactylus/sone/data/Album.java
@@ -53,8 +53,8 @@ public class Album implements Fingerprintable {
        /** The description of this album. */
        private String description;
 
-       /** The index of the album picture. */
-       private int albumImage = -1;
+       /** The ID of the album picture. */
+       private String albumImage;
 
        /**
         * Creates a new album with a random ID.
@@ -166,6 +166,9 @@ public class Album implements Fingerprintable {
                        image.getAlbum().removeImage(image);
                }
                image.setAlbum(this);
+               if (images.isEmpty()) {
+                       albumImage = image.getId();
+               }
                if (!images.containsKey(image.getId())) {
                        images.put(image.getId(), image);
                }
@@ -180,6 +183,13 @@ public class Album implements Fingerprintable {
        public void removeImage(Image image) {
                Validation.begin().isNotNull("Image", image).check().isEqual("Image Owner", image.getSone(), sone).check();
                images.remove(image);
+               if (image.getId().equals(albumImage)) {
+                       if (images.isEmpty()) {
+                               albumImage = null;
+                       } else {
+                               albumImage = images.values().iterator().next().getId();
+                       }
+               }
        }
 
        /**
@@ -189,13 +199,25 @@ public class Album implements Fingerprintable {
         * @return The image to show when this album is listed
         */
        public Image getAlbumImage() {
-               if (albumImage == -1) {
+               if (albumImage == null) {
                        return null;
                }
                return images.get(albumImage);
        }
 
        /**
+        * Sets the ID of the album image.
+        *
+        * @param id
+        *            The ID of the album image
+        * @return This album
+        */
+       public Album setAlbumImage(String id) {
+               this.albumImage = id;
+               return this;
+       }
+
+       /**
         * Returns whether this album contains any other albums or images.
         *
         * @return {@code true} if this album is empty, {@code false} otherwise