X-Git-Url: https://git.pterodactylus.net/?p=Sone.git;a=blobdiff_plain;f=src%2Fmain%2Fjava%2Fnet%2Fpterodactylus%2Fsone%2Fdata%2FAlbum.java;h=7d10e72253c0af1331665c62ec3a8db34b0fe930;hp=7d22858ea63b38f207c4ea5c319058ae29cdaaae;hb=6abf2d1fb158459383a7b9e983c1b730323ff759;hpb=69296993e8d1e34f03057399e30ffdd7cfb126f7

diff --git a/src/main/java/net/pterodactylus/sone/data/Album.java b/src/main/java/net/pterodactylus/sone/data/Album.java
index 7d22858..7d10e72 100644
--- a/src/main/java/net/pterodactylus/sone/data/Album.java
+++ b/src/main/java/net/pterodactylus/sone/data/Album.java
@@ -18,11 +18,13 @@
 package net.pterodactylus.sone.data;
 
 import java.util.ArrayList;
-import java.util.LinkedHashMap;
+import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 import java.util.UUID;
 
+import net.pterodactylus.util.collection.Mapper;
+import net.pterodactylus.util.collection.Mappers;
 import net.pterodactylus.util.validation.Validation;
 
 /**
@@ -41,8 +43,11 @@ public class Album implements Fingerprintable {
 	/** Nested albums. */
 	private final List<Album> albums = new ArrayList<Album>();
 
+	/** The image IDs in order. */
+	private final List<String> imageIds = new ArrayList<String>();
+
 	/** The images in this album. */
-	private final Map<String, Image> images = new LinkedHashMap<String, Image>();
+	private final Map<String, Image> images = new HashMap<String, Image>();
 
 	/** The parent album. */
 	private Album parent;
@@ -53,8 +58,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.
@@ -151,7 +156,15 @@ public class Album implements Fingerprintable {
 	 * @return The images in this album
 	 */
 	public List<Image> getImages() {
-		return new ArrayList<Image>(images.values());
+		return Mappers.mappedList(imageIds, new Mapper<String, Image>() {
+
+			@Override
+			@SuppressWarnings("synthetic-access")
+			public Image map(String imageId) {
+				return images.get(imageId);
+			}
+
+		});
 	}
 
 	/**
@@ -166,7 +179,11 @@ public class Album implements Fingerprintable {
 			image.getAlbum().removeImage(image);
 		}
 		image.setAlbum(this);
-		if (!images.containsKey(image.getId())) {
+		if (imageIds.isEmpty()) {
+			albumImage = image.getId();
+		}
+		if (!imageIds.contains(image.getId())) {
+			imageIds.add(image.getId());
 			images.put(image.getId(), image);
 		}
 	}
@@ -179,7 +196,15 @@ 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);
+		imageIds.remove(image.getId());
+		images.remove(image.getId());
+		if (image.getId().equals(albumImage)) {
+			if (images.isEmpty()) {
+				albumImage = null;
+			} else {
+				albumImage = images.values().iterator().next().getId();
+			}
+		}
 	}
 
 	/**
@@ -189,13 +214,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