X-Git-Url: https://git.pterodactylus.net/?p=Sone.git;a=blobdiff_plain;f=src%2Fmain%2Fjava%2Fnet%2Fpterodactylus%2Fsone%2Fdata%2FAlbum.java;h=ab5822b02b36dc5a4db696e6a11737c051a3dd3d;hp=16c99164163533b6923d5494469f830bfbb7ddc9;hb=b50dc71166ed2e9e7274fdfe545b21db614f820d;hpb=98b7cdc041f13752faa5c644fb6e1cf3eb7962ee diff --git a/src/main/java/net/pterodactylus/sone/data/Album.java b/src/main/java/net/pterodactylus/sone/data/Album.java index 16c9916..ab5822b 100644 --- a/src/main/java/net/pterodactylus/sone/data/Album.java +++ b/src/main/java/net/pterodactylus/sone/data/Album.java @@ -18,9 +18,13 @@ package net.pterodactylus.sone.data; import java.util.ArrayList; +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; /** @@ -39,20 +43,23 @@ public class Album implements Fingerprintable { /** Nested albums. */ private final List albums = new ArrayList(); + /** The image IDs in order. */ + private final List imageIds = new ArrayList(); + /** The images in this album. */ - private final List images = new ArrayList(); + private final Map images = new HashMap(); /** 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 +110,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 +131,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 +156,15 @@ public class Album implements Fingerprintable { * @return The images in this album */ public List getImages() { - return new ArrayList(images); + return Mappers.mappedList(imageIds, new Mapper() { + + @Override + @SuppressWarnings("synthetic-access") + public Image map(String imageId) { + return images.get(imageId); + } + + }); } /** @@ -157,8 +174,18 @@ 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(); - images.add(image); + Validation.begin().isNotNull("Image", image).check().isNotNull("Image Owner", image.getSone()).check().isEqual("Image Owner", image.getSone(), sone).check(); + if (image.getAlbum() != null) { + image.getAlbum().removeImage(image); + } + image.setAlbum(this); + if (imageIds.isEmpty()) { + albumImage = image.getId(); + } + if (!imageIds.contains(image.getId())) { + imageIds.add(image.getId()); + images.put(image.getId(), image); + } } /** @@ -169,7 +196,49 @@ 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(); + } + } + } + + /** + * Moves the given image up in this album’s images. If the image is already + * the first image, nothing happens. + * + * @param image + * The image to move up + */ + public void moveImageUp(Image image) { + Validation.begin().isNotNull("Image", image).check().isEqual("Image Album", image.getAlbum(), this).isEqual("Album Owner", image.getAlbum().getSone(), sone).check(); + int oldIndex = imageIds.indexOf(image.getId()); + if (oldIndex <= 0) { + return; + } + imageIds.remove(image.getId()); + imageIds.add(oldIndex - 1, image.getId()); + } + + /** + * Move the given image down in this album’s images. If the image is already + * the last image, nothing happens. + * + * @param image + * The image to move down + */ + public void moveImageDown(Image image) { + Validation.begin().isNotNull("Image", image).check().isEqual("Image Album", image.getAlbum(), this).isEqual("Album Owner", image.getAlbum().getSone(), sone).check(); + int oldIndex = imageIds.indexOf(image.getId()); + if ((oldIndex == -1) || (oldIndex >= (imageIds.size() - 1))) { + return; + } + imageIds.remove(image.getId()); + imageIds.add(oldIndex + 1, image.getId()); } /** @@ -179,13 +248,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 +304,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 +364,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 +376,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 +395,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;