X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=src%2Fmain%2Fjava%2Fnet%2Fpterodactylus%2Fsone%2Fdata%2FAlbum.java;h=3eefc3e2601b90174d21b32954e828c2fa555447;hb=5473139d890c40c85712f59ba534583961c2772e;hp=e7e422a3f3628278b617b06eb809b6820724f1aa;hpb=62573c314957b1851f4fbe693b8746686caa940a;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 e7e422a..3eefc3e 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
@@ -17,52 +17,17 @@
 
 package net.pterodactylus.sone.data;
 
-import static java.util.Arrays.asList;
-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;
 
 import com.google.common.base.Function;
-import com.google.common.base.Predicate;
-import com.google.common.collect.FluentIterable;
-import com.google.common.collect.ImmutableList;
 
 /**
  * Container for images that can also contain nested {@link Album}s.
  */
 public interface Album extends Identified, Fingerprintable {
 
-	/** Compares two {@link Album}s by {@link #getTitle()}. */
-	Comparator<Album> TITLE_COMPARATOR = new Comparator<Album>() {
-
-		@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<Album, List<Album>> FLATTENER = new Function<Album, List<Album>>() {
-
-		@Override
-		@Nonnull
-		public List<Album> apply(Album album) {
-			if (album == null) {
-				return emptyList();
-			}
-			List<Album> albums = new ArrayList<Album>();
-			albums.add(album);
-			for (Album subAlbum : album.getAlbums()) {
-				albums.addAll(FluentIterable.from(ImmutableList.of(subAlbum)).transformAndConcat(FLATTENER).toList());
-			}
-			return albums;
-		}
-	};
-
 	/** Function that transforms an album into the images it contains. */
 	Function<Album, List<Image>> IMAGES = new Function<Album, List<Image>>() {
 
@@ -74,32 +39,6 @@ public interface Album extends Identified, Fingerprintable {
 	};
 
 	/**
-	 * Filter that removes all albums that do not have any images in any album
-	 * below it.
-	 */
-	Predicate<Album> NOT_EMPTY = new Predicate<Album>() {
-
-		@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<Album>() {
-
-				@Override
-				public boolean apply(Album album) {
-					/* …contains any inserted images. */
-					return !album.getImages().isEmpty() && FluentIterable.from(album.getImages()).allMatch(new Predicate<Image>() {
-
-						@Override
-						public boolean apply(Image input) {
-							return input.isInserted();
-						}
-					});
-				}
-			});
-		}
-	};
-
-	/**
 	 * Returns the ID of this album.
 	 *
 	 * @return The ID of this album