projects
/
Sone.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Replace utils’ Default with Guava’s Optional.
[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
f27251b
..
c1ae267
100644
(file)
--- a/
src/main/java/net/pterodactylus/sone/data/Album.java
+++ b/
src/main/java/net/pterodactylus/sone/data/Album.java
@@
-28,9
+28,8
@@
import java.util.List;
import java.util.Map;
import java.util.UUID;
import java.util.Map;
import java.util.UUID;
-import net.pterodactylus.util.object.Default;
-
import com.google.common.base.Function;
import com.google.common.base.Function;
+import com.google.common.base.Optional;
import com.google.common.base.Predicates;
import com.google.common.collect.Collections2;
import com.google.common.base.Predicates;
import com.google.common.collect.Collections2;
@@
-330,7
+329,7
@@
public class Album implements Fingerprintable {
if (albumImage == null) {
return null;
}
if (albumImage == null) {
return null;
}
- return
Default.forNull(images.get(albumImage),
images.values().iterator().next());
+ return
Optional.fromNullable(images.get(albumImage)).or(
images.values().iterator().next());
}
/**
}
/**