X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;ds=sidebyside;f=src%2Fmain%2Fjava%2Fnet%2Fpterodactylus%2Fsone%2Fdata%2FAlbum.java;h=c4af294651557ef07865be5fd5212f610c0ffb23;hb=3335cbf7681220fcf95cff4895e025251211bf8e;hp=09a7da4e7799c2cb3bd00c6f3762c24bb1cebbb7;hpb=f4f5fb752ff9aff0235a907e170c6961576562f6;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..c4af294 100644
--- a/src/main/java/net/pterodactylus/sone/data/Album.java
+++ b/src/main/java/net/pterodactylus/sone/data/Album.java
@@ -1,5 +1,5 @@
/*
- * Sone - Album.java - Copyright © 2011â2013 David Roden
+ * Sone - Album.java - Copyright © 2011â2019 David Roden
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
@@ -22,7 +22,6 @@ import static java.util.Collections.emptyList;
import java.util.ArrayList;
import java.util.Collections;
-import java.util.Comparator;
import java.util.List;
import javax.annotation.Nonnull;
@@ -33,20 +32,9 @@ import com.google.common.collect.ImmutableList;
/**
* Container for images that can also contain nested {@link Album}s.
- *
- * @author David âBombeâ Roden
*/
public interface Album extends Identified, Fingerprintable {
- /** Compares two {@link Album}s by {@link #getTitle()}. */
- Comparator TITLE_COMPARATOR = new Comparator() {
-
- @Override
- public int compare(Album leftAlbum, Album rightAlbum) {
- return leftAlbum.getTitle().compareToIgnoreCase(rightAlbum.getTitle());
- }
- };
-
/** Function that flattens the given album and all albums beneath it. */
Function> FLATTENER = new Function>() {
@@ -56,7 +44,7 @@ public interface Album extends Identified, Fingerprintable {
if (album == null) {
return emptyList();
}
- List albums = new ArrayList();
+ List albums = new ArrayList<>();
albums.add(album);
for (Album subAlbum : album.getAlbums()) {
albums.addAll(FluentIterable.from(ImmutableList.of(subAlbum)).transformAndConcat(FLATTENER).toList());
@@ -116,16 +104,6 @@ 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
@@ -216,14 +194,6 @@ public interface Album extends Identified, Fingerprintable {
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();
-
- /**
* Returns whether this album contains any other albums or images.
*
* @return {@code true} if this album is empty, {@code false} otherwise
@@ -289,8 +259,6 @@ public interface Album extends Identified, Fingerprintable {
* Allows modifying an album. Modifications are only performed once {@link
* #update()} has succesfully returned a new album with the modifications
* made.
- *
- * @author David âBombeâ Roden
*/
interface Modifier {
@@ -298,10 +266,10 @@ public interface Album extends Identified, Fingerprintable {
Modifier setDescription(String description);
- Modifier setAlbumImage(String imageId);
-
Album update() throws IllegalStateException;
+ class AlbumTitleMustNotBeEmpty extends IllegalStateException { }
+
}
}