X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=src%2Fmain%2Fjava%2Fnet%2Fpterodactylus%2Fsone%2Fdata%2FAlbum.java;h=a173e194efc6ae25bb966d50051998b9cfe11bbc;hb=28b2e2b0d2ff2320f5b6a5ac36a858a604c7c7ba;hp=26da9b7c7751d1c672827e015c89ce06fb5f2340;hpb=f0c0d175ae5058661d3af7cc99d0c188616a4d8f;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 26da9b7..a173e19 100644
--- a/src/main/java/net/pterodactylus/sone/data/Album.java
+++ b/src/main/java/net/pterodactylus/sone/data/Album.java
@@ -30,6 +30,7 @@ import net.pterodactylus.sone.database.AlbumBuilder;
 import net.pterodactylus.sone.database.ImageBuilder;
 
 import com.google.common.base.Function;
+import com.google.common.base.Optional;
 import com.google.common.base.Predicate;
 import com.google.common.collect.FluentIterable;
 import com.google.common.collect.ImmutableList;
@@ -121,63 +122,13 @@ public interface Album extends Identified, Fingerprintable {
 	List<Album> getAlbums();
 
 	/**
-	 * 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
-	 *         <code>null</code> if the album did not change its place
-	 */
-	Album moveAlbumUp(Album album);
-
-	/**
-	 * 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
-	 *         <code>null</code> if the album did not change its place
-	 */
-	Album moveAlbumDown(Album album);
-
-	/**
 	 * Returns the images in this album.
 	 *
 	 * @return The images in this album
 	 */
 	List<Image> getImages();
 
-	/**
-	 * 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
-	 * @return The image that the given image swapped the place with, or
-	 *         <code>null</code> if the image did not change its place
-	 */
-	Image moveImageUp(Image image);
-
-	/**
-	 * 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
-	 *         <code>null</code> if the image did not change its place
-	 */
-	Image moveImageDown(Image image);
-
-	/**
-	 * Returns the album image of this album, or {@code null} if no album image has
-	 * been set.
-	 *
-	 * @return The image to show when this album is listed
-	 */
-	Image getAlbumImage();
+	Optional<Image> getAlbumImage();
 
 	/**
 	 * Returns whether this album contains any other albums or images.
@@ -229,6 +180,10 @@ public interface Album extends Identified, Fingerprintable {
 	 */
 	Modifier modify() throws IllegalStateException;
 
+	void moveUp();
+
+	void moveDown();
+
 	void remove() throws IllegalStateException;
 
 	/**