projects
/
Sone.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Return an Optional for the album image.
[Sone.git]
/
src
/
main
/
java
/
net
/
pterodactylus
/
sone
/
data
/
impl
/
DefaultAlbum.java
diff --git
a/src/main/java/net/pterodactylus/sone/data/impl/DefaultAlbum.java
b/src/main/java/net/pterodactylus/sone/data/impl/DefaultAlbum.java
index
32052d5
..
7102bfe
100644
(file)
--- a/
src/main/java/net/pterodactylus/sone/data/impl/DefaultAlbum.java
+++ b/
src/main/java/net/pterodactylus/sone/data/impl/DefaultAlbum.java
@@
-17,6
+17,8
@@
package net.pterodactylus.sone.data.impl;
package net.pterodactylus.sone.data.impl;
+import static com.google.common.base.Optional.absent;
+import static com.google.common.base.Optional.fromNullable;
import static com.google.common.base.Preconditions.checkState;
import java.util.ArrayList;
import static com.google.common.base.Preconditions.checkState;
import java.util.ArrayList;
@@
-102,11
+104,11
@@
public class DefaultAlbum extends AbstractAlbum {
}
@Override
}
@Override
- public
Image
getAlbumImage() {
+ public
Optional<Image>
getAlbumImage() {
if (albumImage == null) {
if (albumImage == null) {
- return
null
;
+ return
absent()
;
}
}
- return
Optional.fromNullable(images.get(albumImage)).or(images.values().iterator().next(
));
+ return
fromNullable(fromNullable(images.get(albumImage)).or(images.values().iterator().next()
));
}
@Override
}
@Override