X-Git-Url: https://git.pterodactylus.net/?p=Sone.git;a=blobdiff_plain;f=src%2Fmain%2Fjava%2Fnet%2Fpterodactylus%2Fsone%2Fdata%2FAlbum.java;h=efaa470bc390b953e24a5768392a0e119408d26c;hp=f90a42f3b02a9154afe52b15012436bcc6f50b32;hb=509b81185b3a1e82bb78308640d0d7b6b741d3e0;hpb=a9fe72ff6a8605b52cda9f55108a344eda749f47 diff --git a/src/main/java/net/pterodactylus/sone/data/Album.java b/src/main/java/net/pterodactylus/sone/data/Album.java index f90a42f..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 @@ -44,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()); @@ -64,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