From 7ea94de6b3101ad2825b45c97d1d4893d65843f2 Mon Sep 17 00:00:00 2001 From: =?utf8?q?David=20=E2=80=98Bombe=E2=80=99=20Roden?= Date: Fri, 23 Sep 2011 16:54:13 +0200 Subject: [PATCH] Return the image the given image was swapped with. --- src/main/java/net/pterodactylus/sone/data/Album.java | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) diff --git a/src/main/java/net/pterodactylus/sone/data/Album.java b/src/main/java/net/pterodactylus/sone/data/Album.java index 56bddb2..cc32f88 100644 --- a/src/main/java/net/pterodactylus/sone/data/Album.java +++ b/src/main/java/net/pterodactylus/sone/data/Album.java @@ -214,15 +214,18 @@ 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)); } /** @@ -231,15 +234,18 @@ public class Album implements Fingerprintable { * * @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)); } /** -- 2.7.4