X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=src%2Fmain%2Fjava%2Fnet%2Fpterodactylus%2Fsone%2Fdata%2FAlbum.java;h=7c62e33c8c15072b70ed59ed58191e5fdbbd74e9;hb=2f5fb64f08f66f2ea4f01c0b9eff685a3939624a;hp=2bbbb57cfe8105973d252fabf74068efc8eb716c;hpb=93f0ede3deb89c56f023a42e8ced4cd4cdc579a3;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 2bbbb57..7c62e33 100644 --- a/src/main/java/net/pterodactylus/sone/data/Album.java +++ b/src/main/java/net/pterodactylus/sone/data/Album.java @@ -1,5 +1,5 @@ /* - * Sone - Album.java - Copyright © 2011 David Roden + * Sone - Album.java - Copyright © 2011–2012 David Roden * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -18,16 +18,19 @@ package net.pterodactylus.sone.data; import java.util.ArrayList; +import java.util.Comparator; 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.object.Default; import net.pterodactylus.util.validation.Validation; +import com.google.common.base.Function; +import com.google.common.base.Predicates; +import com.google.common.collect.Collections2; + /** * Container for images that can also contain nested {@link Album}s. * @@ -35,6 +38,15 @@ import net.pterodactylus.util.validation.Validation; */ public class Album implements Fingerprintable { + /** Compares two {@link Album}s by {@link #getTitle()}. */ + public static final Comparator TITLE_COMPARATOR = new Comparator() { + + @Override + public int compare(Album leftAlbum, Album rightAlbum) { + return leftAlbum.getTitle().compareToIgnoreCase(rightAlbum.getTitle()); + } + }; + /** The ID of this album. */ private final String id; @@ -152,20 +164,59 @@ public class Album implements Fingerprintable { } /** + * Moves the given album up in this album’s albums. If the album is already + * the first album, nothing happens. + * + * @param album + * The album to move up + * @return The album that the given album swapped the place with, or + * null if the album did not change its place + */ + public Album moveAlbumUp(Album album) { + Validation.begin().isNotNull("Album", album).check().isEqual("Album Owner", album.sone, sone).isEqual("Album Parent", album.parent, this).check(); + int oldIndex = albums.indexOf(album); + if (oldIndex <= 0) { + return null; + } + albums.remove(oldIndex); + albums.add(oldIndex - 1, album); + return albums.get(oldIndex); + } + + /** + * Moves the given album down in this album’s albums. If the album is + * already the last album, nothing happens. + * + * @param album + * The album to move down + * @return The album that the given album swapped the place with, or + * null if the album did not change its place + */ + public Album moveAlbumDown(Album album) { + Validation.begin().isNotNull("Album", album).check().isEqual("Album Owner", album.sone, sone).isEqual("Album Parent", album.parent, this).check(); + int oldIndex = albums.indexOf(album); + if ((oldIndex < 0) || (oldIndex >= (albums.size() - 1))) { + return null; + } + albums.remove(oldIndex); + albums.add(oldIndex + 1, album); + return albums.get(oldIndex); + } + + /** * Returns the images in this album. * * @return The images in this album */ public List getImages() { - return Mappers.mappedList(imageIds, new Mapper() { + return new ArrayList(Collections2.filter(Collections2.transform(imageIds, new Function() { @Override @SuppressWarnings("synthetic-access") - public Image map(String imageId) { + public Image apply(String imageId) { return images.get(imageId); } - - }); + }), Predicates.notNull())); } /** @@ -180,7 +231,7 @@ public class Album implements Fingerprintable { image.getAlbum().removeImage(image); } image.setAlbum(this); - if (imageIds.isEmpty()) { + if (imageIds.isEmpty() && (albumImage == null)) { albumImage = image.getId(); } if (!imageIds.contains(image.getId())) { @@ -214,32 +265,38 @@ public class Album implements Fingerprintable { * * @param image * The image to move up + * @return The image that the given image swapped the place with, or + * null if the image did not change its place */ - public void moveImageUp(Image image) { + public Image 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; + return null; } imageIds.remove(image.getId()); imageIds.add(oldIndex - 1, image.getId()); + return images.get(imageIds.get(oldIndex)); } /** - * Move the given image down in this album’s images. If the image is already - * the last image, nothing happens. + * Moves 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 + * @return The image that the given image swapped the place with, or + * null if the image did not change its place */ - public void moveImageDown(Image image) { + public Image 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; + return null; } imageIds.remove(image.getId()); imageIds.add(oldIndex + 1, image.getId()); + return images.get(imageIds.get(oldIndex)); } /** @@ -380,7 +437,7 @@ public class Album implements Fingerprintable { /* add images. */ fingerprint.append("Images("); - for (Image image : images.values()) { + for (Image image : getImages()) { if (image.isInserted()) { fingerprint.append(image.getFingerprint()); }