X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=src%2Fmain%2Fjava%2Fnet%2Fpterodactylus%2Fsone%2Ftemplate%2FImageLinkFilter.java;h=eea912142f6dfcdd5e069669ddf9cef36efc84e8;hb=d5efb086bee8f103cbe90c7a953ffbb7ff27b689;hp=06a11d7da26e9e3ddf69f82c60aca67699e0d9cf;hpb=0f7a91f4fa689a4084d7db5987a534b4b4fc3866;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 06a11d7..eea9121 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–2012 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
@@ -23,14 +23,15 @@ 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;
+import com.google.common.primitives.Ints;
+
 /**
  * Template filter that turns an {@link Image} into an HTML <img> tag,
  * using some parameters to influence parameters of the image.
@@ -76,8 +77,8 @@ public class ImageLinkFilter implements Filter {
 			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);
+		int maxWidth = Optional.fromNullable(Ints.tryParse(String.valueOf(parameters.get("max-width")))).or(Integer.MAX_VALUE);
+		int maxHeight = Optional.fromNullable(Ints.tryParse(String.valueOf(parameters.get("max-height")))).or(Integer.MAX_VALUE);
 		String mode = String.valueOf(parameters.get("mode"));
 		String title = String.valueOf(parameters.get("title"));
 
@@ -105,8 +106,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);