projects
/
Sone.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Update French translation.
[Sone.git]
/
src
/
main
/
java
/
net
/
pterodactylus
/
sone
/
data
/
Album.java
diff --git
a/src/main/java/net/pterodactylus/sone/data/Album.java
b/src/main/java/net/pterodactylus/sone/data/Album.java
index
aa14ede
..
70478f3
100644
(file)
--- a/
src/main/java/net/pterodactylus/sone/data/Album.java
+++ b/
src/main/java/net/pterodactylus/sone/data/Album.java
@@
-21,13
+21,16
@@
import static com.google.common.base.Preconditions.checkArgument;
import static com.google.common.base.Preconditions.checkNotNull;
import static com.google.common.base.Preconditions.checkState;
import static java.util.Arrays.asList;
import static com.google.common.base.Preconditions.checkNotNull;
import static com.google.common.base.Preconditions.checkState;
import static java.util.Arrays.asList;
+import static java.util.Collections.emptyList;
import java.util.ArrayList;
import java.util.ArrayList;
+import java.util.Collections;
import java.util.Comparator;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
import java.util.UUID;
import java.util.Comparator;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
import java.util.UUID;
+import javax.annotation.Nonnull;
import com.google.common.base.Function;
import com.google.common.base.Optional;
import com.google.common.base.Function;
import com.google.common.base.Optional;
@@
-44,7
+47,7
@@
import com.google.common.hash.Hashing;
*
* @author <a href="mailto:bombe@pterodactylus.net">David ‘Bombe’ Roden</a>
*/
*
* @author <a href="mailto:bombe@pterodactylus.net">David ‘Bombe’ Roden</a>
*/
-public class Album implements Fingerprintable {
+public class Album implements
Identified,
Fingerprintable {
/** Compares two {@link Album}s by {@link #getTitle()}. */
public static final Comparator<Album> TITLE_COMPARATOR = new Comparator<Album>() {
/** Compares two {@link Album}s by {@link #getTitle()}. */
public static final Comparator<Album> TITLE_COMPARATOR = new Comparator<Album>() {
@@
-59,7
+62,11
@@
public class Album implements Fingerprintable {
public static final Function<Album, List<Album>> FLATTENER = new Function<Album, List<Album>>() {
@Override
public static final Function<Album, List<Album>> FLATTENER = new Function<Album, List<Album>>() {
@Override
+ @Nonnull
public List<Album> apply(Album album) {
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()) {
List<Album> albums = new ArrayList<Album>();
albums.add(album);
for (Album subAlbum : album.getAlbums()) {
@@
-73,8
+80,9
@@
public class Album implements Fingerprintable {
public static final Function<Album, List<Image>> IMAGES = new Function<Album, List<Image>>() {
@Override
public static final Function<Album, List<Image>> IMAGES = new Function<Album, List<Image>>() {
@Override
+ @Nonnull
public List<Image> apply(Album album) {
public List<Image> apply(Album album) {
- return
album.getImages
();
+ return
(album != null) ? album.getImages() : Collections.<Image>emptyList
();
}
};
}
};
@@
-86,11
+94,19
@@
public class Album implements Fingerprintable {
@Override
public boolean apply(Album 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) {
return FluentIterable.from(asList(album)).transformAndConcat(FLATTENER).anyMatch(new Predicate<Album>() {
@Override
public boolean apply(Album album) {
- return !album.getImages().isEmpty();
+ /* …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();
+ }
+ });
}
});
}
}
});
}
@@
-400,6
+416,16
@@
public class Album implements Fingerprintable {
}
/**
}
/**
+ * Returns whether this album is an identitiy’s root album.
+ *
+ * @return {@code true} if this album is an identity’s root album, {@code
+ * false} otherwise
+ */
+ public boolean isRoot() {
+ return parent == null;
+ }
+
+ /**
* Returns the parent album of this album.
*
* @return The parent album of this album, or {@code null} if this album
* Returns the parent album of this album.
*
* @return The parent album of this album, or {@code null} if this album