X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;ds=inline;f=src%2Fmain%2Fjava%2Fnet%2Fpterodactylus%2Fsone%2Fdata%2FAlbum.java;h=efaa470bc390b953e24a5768392a0e119408d26c;hb=509b81185b3a1e82bb78308640d0d7b6b741d3e0;hp=5a02f199c65b67145299a5e8677248ec115e1d9d;hpb=c4ae226ec5052116cefc542ae2017036a7bc6332;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 5a02f19..efaa470 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â2016 David Roden
+ * Sone - Album.java - Copyright © 2011â2020 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());
@@ -76,32 +64,6 @@ public interface Album extends Identified, Fingerprintable {
};
/**
- * Filter that removes all albums that do not have any images in any album
- * below it.
- */
- Predicate NOT_EMPTY = new Predicate() {
-
- @Override
- public boolean apply(Album album) {
- /* so, we flatten all albums below the given one and check whether at least one album⦠*/
- return FluentIterable.from(asList(album)).transformAndConcat(FLATTENER).anyMatch(new Predicate() {
-
- @Override
- public boolean apply(Album album) {
- /* â¦contains any inserted images. */
- return !album.getImages().isEmpty() && FluentIterable.from(album.getImages()).allMatch(new Predicate() {
-
- @Override
- public boolean apply(Image input) {
- return input.isInserted();
- }
- });
- }
- });
- }
- };
-
- /**
* Returns the ID of this album.
*
* @return The ID of this album
@@ -271,8 +233,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 {