Change code to use new way to specify filter parameters.

[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..06a11d7 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–2012 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
@@ -65,23 +65,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 {
+               }
+               if (image == null) {
                        return null;
                }
-               String imageClass = parameters.get("class");
+               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 = parameters.get("title");
-               if ((title != null) && title.startsWith("=")) {
-                       title = String.valueOf(templateContext.get(title.substring(1)));
-               }
+               String title = String.valueOf(parameters.get("title"));
 
                TemplateContext linkTemplateContext = templateContextFactory.createTemplateContext();
                linkTemplateContext.set("class", imageClass);