Merge branch 'release-0.9.5'

[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 458d40f..2f1526f 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–2013 David Roden
+ * Sone - ImageLinkFilter.java - Copyright © 2011–2016 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
@@ -80,16 +80,11 @@ public class ImageLinkFilter implements Filter {
                if (image == null) {
                        return null;
                }
-               String imageClass = Optional.fromNullable(parameters.get("class")).transform(new Function<Object, String>() {
-                       @Override
-                       public String apply(Object input) {
-                               return (input != null) ? input.toString() : null;
-                       }
-               }).orNull();
+               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 = valueOf(parameters.get("title"));
+               String title = Optional.fromNullable(parameters.get("title")).transform(getStringValue()).orNull();
 
                TemplateContext linkTemplateContext = templateContextFactory.createTemplateContext();
                linkTemplateContext.set("class", imageClass);
@@ -123,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;
+                       }
+               };
+       }
+
 }