X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=src%2Fmain%2Fjava%2Fnet%2Fpterodactylus%2Fsone%2Fdata%2FAlbum.java;h=7b245f96697ba3091974cd412537665a09108274;hb=027615fa64c78ef5ebc198e852cfd6d39b18aad0;hp=09a7da4e7799c2cb3bd00c6f3762c24bb1cebbb7;hpb=c2f9f5293a81bdf2606f56f3822779a4639a1356;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 09a7da4..7b245f9 100644
--- a/src/main/java/net/pterodactylus/sone/data/Album.java
+++ b/src/main/java/net/pterodactylus/sone/data/Album.java
@@ -26,7 +26,11 @@ import java.util.Comparator;
import java.util.List;
import javax.annotation.Nonnull;
+import net.pterodactylus.sone.database.AlbumBuilderFactory;
+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;
@@ -36,7 +40,7 @@ import com.google.common.collect.ImmutableList;
*
* @author David âBombeâ Roden
*/
-public interface Album extends Identified, Fingerprintable {
+public interface Album extends Identified, Fingerprintable, AlbumBuilderFactory {
/** Compares two {@link Album}s by {@link #getTitle()}. */
Comparator TITLE_COMPARATOR = new Comparator() {
@@ -115,113 +119,16 @@ public interface Album extends Identified, Fingerprintable {
*/
Sone getSone();
- /**
- * Sets the owner of the album. The owner can only be set as long as the
- * current owner is {@code null}.
- *
- * @param sone
- * The album owner
- * @return This album
- */
- Album setSone(Sone sone);
-
- /**
- * Returns the nested albums.
- *
- * @return The nested albums
- */
List getAlbums();
/**
- * Adds an album to this album.
- *
- * @param album
- * The album to add
- */
- void addAlbum(Album album);
-
- /**
- * Removes an album from this album.
- *
- * @param album
- * The album to remove
- */
- void removeAlbum(Album album);
-
- /**
- * 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
- */
- 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
- * null
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 getImages();
- /**
- * Adds the given image to this album.
- *
- * @param image
- * The image to add
- */
- void addImage(Image image);
-
- /**
- * Removes the given image from this album.
- *
- * @param image
- * The image to remove
- */
- void removeImage(Image image);
-
- /**
- * 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
- * null
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
- * null
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 getAlbumImage();
/**
* Returns whether this album contains any other albums or images.
@@ -247,22 +154,6 @@ public interface Album extends Identified, Fingerprintable {
Album getParent();
/**
- * Sets the parent album of this album.
- *
- * @param parent
- * The new parent album of this album
- * @return This album
- */
- Album setParent(Album parent);
-
- /**
- * Removes the parent album of this album.
- *
- * @return This album
- */
- Album removeParent();
-
- /**
* Returns the title of this album.
*
* @return The title of this album
@@ -276,6 +167,8 @@ public interface Album extends Identified, Fingerprintable {
*/
String getDescription();
+ ImageBuilder newImageBuilder() throws IllegalStateException;
+
/**
* Returns a modifier for this album.
*
@@ -285,6 +178,12 @@ public interface Album extends Identified, Fingerprintable {
*/
Modifier modify() throws IllegalStateException;
+ void moveUp();
+
+ void moveDown();
+
+ void remove() throws IllegalStateException;
+
/**
* Allows modifying an album. Modifications are only performed once {@link
* #update()} has succesfully returned a new album with the modifications