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 d808e7c..89823a8 100644 (file)
--- a/src/main/java/net/pterodactylus/sone/data/Album.java
+++ b/src/main/java/net/pterodactylus/sone/data/Album.java
@@ -18,7 +18,9 @@
 package net.pterodactylus.sone.data;
 
 import java.util.ArrayList;
+import java.util.LinkedHashMap;
 import java.util.List;
+import java.util.Map;
 import java.util.UUID;
 
 import net.pterodactylus.util.validation.Validation;
@@ -40,19 +42,19 @@ public class Album implements Fingerprintable {
        private final List<Album> albums = new ArrayList<Album>();
 
        /** The images in this album. */
-       private final List<Image> images = new ArrayList<Image>();
+       private final Map<String, Image> images = new LinkedHashMap<String, Image>();
 
        /** 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;
+       /** The ID of the album picture. */
+       private String albumImage;
 
        /**
         * Creates a new album with a random ID.
@@ -103,7 +105,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,9 +126,11 @@ 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();
-               albums.add(album);
+               Validation.begin().isNotNull("Album", album).check().isEqual("Album Owner", album.sone, sone).isEither("Old Album Parent", this.parent, null, album.parent).check();
                album.setParent(this);
+               if (!albums.contains(album)) {
+                       albums.add(album);
+               }
        }
 
        /**
@@ -147,7 +151,7 @@ public class Album implements Fingerprintable {
         * @return The images in this album
         */
        public List<Image> getImages() {
-               return new ArrayList<Image>(images);
+               return new ArrayList<Image>(images.values());
        }
 
        /**
@@ -158,7 +162,16 @@ 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);
+               if (image.getAlbum() != null) {
+                       image.getAlbum().removeImage(image);
+               }
+               image.setAlbum(this);
+               if (images.isEmpty()) {
+                       albumImage = image.getId();
+               }
+               if (!images.containsKey(image.getId())) {
+                       images.put(image.getId(), image);
+               }
        }
 
        /**
@@ -170,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();
+                       }
+               }
        }
 
        /**
@@ -179,13 +199,34 @@ 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
+        */
+       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
@@ -214,30 +255,29 @@ public class Album implements Fingerprintable {
         * @return This album
         */
        protected Album removeParent() {
-               Validation.begin().isNotNull("Album Parent", parent).check();
                this.parent = null;
                return this;
        }
 
        /**
-        * 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 +315,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. */
@@ -287,8 +327,10 @@ public class Album implements Fingerprintable {
 
                /* add images. */
                fingerprint.append("Images(");
-               for (Image image : images) {
-                       fingerprint.append(image.getFingerprint());
+               for (Image image : images.values()) {
+                       if (image.isInserted()) {
+                               fingerprint.append(image.getFingerprint());
+                       }
                }
                fingerprint.append(')');
 
@@ -304,6 +346,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;