X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=src%2Fmain%2Fjava%2Fnet%2Fpterodactylus%2Fsone%2Ftemplate%2FImageLinkFilter.java;h=ea863f9d5065790f102255748d4d96e89b9b7598;hb=78443031f591347e11bad7e3cc8d80df6c30ce1d;hp=a79cb0b38b27a9624bdd14d5742bddc5e93c36cb;hpb=513be9409e5d6eefa07e9d502e1e70bac4fce861;p=Sone.git

diff --git a/src/main/java/net/pterodactylus/sone/template/ImageLinkFilter.java b/src/main/java/net/pterodactylus/sone/template/ImageLinkFilter.java
index a79cb0b..ea863f9 100644
--- 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
@@ -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.
@@ -61,28 +62,22 @@ public class ImageLinkFilter implements Filter {
 		this.templateContextFactory = templateContextFactory;
 	}
 
-	/**
-	 * {@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);
+			image = core.getImage((String) data).orNull();
 		} else if (data instanceof Image) {
 			image = (Image) data;
 		}
 		if (image == null) {
 			return null;
 		}
-		String imageClass = parameters.get("class");
+		String imageClass = getParameterAsString(parameters, "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)));
-		}
+		String mode = getParameterAsString(parameters, "mode");
+		String title = getParameterAsString(parameters, "title");
 
 		TemplateContext linkTemplateContext = templateContextFactory.createTemplateContext();
 		linkTemplateContext.set("class", imageClass);
@@ -108,12 +103,17 @@ 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);
 		return stringWriter.toString();
 	}
 
+	private static String getParameterAsString(Map<String, Object> parameters, String key) {
+		Object parameter = parameters.get(key);
+		return (parameter == null) ? null : String.valueOf(parameter);
+	}
+
 }