X-Git-Url: https://git.pterodactylus.net/?p=Sone.git;a=blobdiff_plain;f=src%2Fmain%2Fjava%2Fnet%2Fpterodactylus%2Fsone%2Fdata%2FAlbum.java;h=cc32f8833b193b20bacbed1ea334693ffae0b694;hp=56bddb2b3f0635c66c20ee393f3383fd5f630705;hb=7ea94de6b3101ad2825b45c97d1d4893d65843f2;hpb=c951fbbe007ae876fb681ea1ce89169fb36e839f
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));
}
/**