X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=src%2Fmain%2Fjava%2Fnet%2Fpterodactylus%2Fsone%2Ftemplate%2FImageLinkFilter.java;h=f56073137be729fdfdb76b8c85f92fc39bd4a07d;hb=91b8268946412b35bcce5b4406106ecd4cb58e3c;hp=7e3723ccddead0c3e0979c0562b864ab5e96feb9;hpb=6f019de1d4d9742981d851ac3c9097cca8bff58e;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 7e3723c..f560731 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–2013 David Roden
+ * Sone - ImageLinkFilter.java - Copyright © 2011–2015 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,19 +17,23 @@
 
 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.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.Function;
 import com.google.common.base.Optional;
 
 /**
@@ -76,11 +80,11 @@ public class ImageLinkFilter implements Filter {
 		if (image == null) {
 			return null;
 		}
-		String imageClass = String.valueOf(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 = String.valueOf(parameters.get("title"));
+		String imageClass = Optional.fromNullable(parameters.get("class")).transform(getStringValue()).orNull();
+		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 = Optional.fromNullable(parameters.get("title")).transform(getStringValue()).orNull();
 
 		TemplateContext linkTemplateContext = templateContextFactory.createTemplateContext();
 		linkTemplateContext.set("class", imageClass);
@@ -114,4 +118,13 @@ public class ImageLinkFilter implements Filter {
 		return stringWriter.toString();
 	}
 
+	private Function<Object, String> getStringValue() {
+		return new Function<Object, String>() {
+			@Override
+			public String apply(Object input) {
+				return (input != null) ? input.toString() : null;
+			}
+		};
+	}
+
 }