X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=src%2Fmain%2Fjava%2Fnet%2Fpterodactylus%2Fsone%2Fdata%2FAlbum.java;h=b15bc009ba61c386b04fcaf3f37caf8565a40b93;hb=e4ae59234c87e77f95714462adae370790c6d5e6;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..b15bc00 100644
--- a/src/main/java/net/pterodactylus/sone/data/Album.java
+++ b/src/main/java/net/pterodactylus/sone/data/Album.java
@@ -152,6 +152,46 @@ 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
@@ -180,7 +220,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 +254,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 +426,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());
}