X-Git-Url: https://git.pterodactylus.net/?p=Sone.git;a=blobdiff_plain;f=src%2Fmain%2Fjava%2Fnet%2Fpterodactylus%2Fsone%2Ftemplate%2FImageLinkFilter.java;h=7e3723ccddead0c3e0979c0562b864ab5e96feb9;hp=9b148825f4a8729a92ab8b375053d588d3ce38c3;hb=06ae2e6649e61e3e3bff71690caa0e98e4ac01ba;hpb=0facc7dc37d9ef2b0d6c311e3ba28697c895810e diff --git a/src/main/java/net/pterodactylus/sone/template/ImageLinkFilter.java b/src/main/java/net/pterodactylus/sone/template/ImageLinkFilter.java index 9b14882..7e3723c 100644 --- a/src/main/java/net/pterodactylus/sone/template/ImageLinkFilter.java +++ b/src/main/java/net/pterodactylus/sone/template/ImageLinkFilter.java @@ -24,13 +24,14 @@ import java.util.Map; import net.pterodactylus.sone.core.Core; import net.pterodactylus.sone.data.Image; import net.pterodactylus.util.number.Numbers; -import net.pterodactylus.util.object.Default; import net.pterodactylus.util.template.Filter; import net.pterodactylus.util.template.Template; import net.pterodactylus.util.template.TemplateContext; import net.pterodactylus.util.template.TemplateContextFactory; import net.pterodactylus.util.template.TemplateParser; +import com.google.common.base.Optional; + /** * Template filter that turns an {@link Image} into an HTML <img> tag, * using some parameters to influence parameters of the image. @@ -105,8 +106,8 @@ public class ImageLinkFilter implements Filter { linkTemplateContext.set("width", (int) (imageWidth * scale + 0.5)); linkTemplateContext.set("height", (int) (imageHeight * scale + 0.5)); } - linkTemplateContext.set("alt", Default.forNull(title, image.getDescription())); - linkTemplateContext.set("title", Default.forNull(title, image.getTitle())); + linkTemplateContext.set("alt", Optional.fromNullable(title).or(image.getDescription())); + linkTemplateContext.set("title", Optional.fromNullable(title).or(image.getTitle())); StringWriter stringWriter = new StringWriter(); linkTemplate.render(linkTemplateContext, stringWriter);