Merge branch 'release/0.9-rc1'

[Sone.git] / src / main / java / net / pterodactylus / sone / template / ImageLinkFilter.java

diff --git a/src/main/java/net/pterodactylus/sone/template/ImageLinkFilter.java b/src/main/java/net/pterodactylus/sone/template/ImageLinkFilter.java
index 1684be7..9ede851 100644 (file)
--- a/src/main/java/net/pterodactylus/sone/template/ImageLinkFilter.java
+++ b/src/main/java/net/pterodactylus/sone/template/ImageLinkFilter.java
@@ -1,5 +1,5 @@
 /*
- * Sone - ImageLinkFilter.java - Copyright © 2011 David Roden
+ * Sone - ImageLinkFilter.java - Copyright © 2011–2013 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,20 +17,24 @@
 
 package net.pterodactylus.sone.template;
 
+import static java.lang.Integer.MAX_VALUE;
+import static java.lang.String.valueOf;
+import static net.pterodactylus.sone.utils.NumberParsers.parseInt;
+
 import java.io.StringReader;
 import java.io.StringWriter;
 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.
@@ -65,23 +69,21 @@ public class ImageLinkFilter implements Filter {
         * {@inheritDoc}
         */
        @Override
-       public Object format(TemplateContext templateContext, Object data, Map<String, String> parameters) {
+       public Object format(TemplateContext templateContext, Object data, Map<String, Object> parameters) {
                Image image = null;
                if (data instanceof String) {
                        image = core.getImage((String) data, false);
                } else if (data instanceof Image) {
                        image = (Image) data;
-               } else {
-                       return null;
                }
-               String imageClass = parameters.get("class");
-               int maxWidth = Numbers.safeParseInteger(parameters.get("max-width"), Integer.MAX_VALUE);
-               int maxHeight = Numbers.safeParseInteger(parameters.get("max-height"), Integer.MAX_VALUE);
-               String mode = String.valueOf(parameters.get("mode"));
-               String title = parameters.get("title");
-               if ((title != null) && title.startsWith("=")) {
-                       title = String.valueOf(templateContext.get(title.substring(1)));
+               if (image == null) {
+                       return null;
                }
+               String imageClass = valueOf(parameters.get("class"));
+               int maxWidth = parseInt(valueOf(parameters.get("max-width")), MAX_VALUE);
+               int maxHeight = parseInt(valueOf(parameters.get("max-height")), MAX_VALUE);
+               String mode = valueOf(parameters.get("mode"));
+               String title = valueOf(parameters.get("title"));
 
                TemplateContext linkTemplateContext = templateContextFactory.createTemplateContext();
                linkTemplateContext.set("class", imageClass);
@@ -107,8 +109,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);