X-Git-Url: https://git.pterodactylus.net/?p=Sone.git;a=blobdiff_plain;f=src%2Fmain%2Fjava%2Fnet%2Fpterodactylus%2Fsone%2Ftemplate%2FSubstringFilter.java;h=66c2c3849ee9f46128fee7a96ca73d2a69f7093d;hp=f0075e4576ca3fda9c2a0c80d8e8c791b70054c9;hb=62573c314957b1851f4fbe693b8746686caa940a;hpb=5a704af88b91a83ad78b5fb6dc3147a9b65d713d

diff --git a/src/main/java/net/pterodactylus/sone/template/SubstringFilter.java b/src/main/java/net/pterodactylus/sone/template/SubstringFilter.java
index f0075e4..66c2c38 100644
--- a/src/main/java/net/pterodactylus/sone/template/SubstringFilter.java
+++ b/src/main/java/net/pterodactylus/sone/template/SubstringFilter.java
@@ -1,5 +1,5 @@
 /*
- * Sone - SubstringFilter.java - Copyright © 2010 David Roden
+ * Sone - SubstringFilter.java - Copyright © 2010–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
@@ -19,8 +19,8 @@ package net.pterodactylus.sone.template;
 
 import java.util.Map;
 
-import net.pterodactylus.util.template.DataProvider;
 import net.pterodactylus.util.template.Filter;
+import net.pterodactylus.util.template.TemplateContext;
 
 /**
  * {@link Filter} implementation that executes
@@ -28,8 +28,6 @@ import net.pterodactylus.util.template.Filter;
  * “start” and “length.” “length” is optional and defaults to “the rest of the
  * string.” “start” starts at {@code 0} and can be negative to denote starting
  * at the end of the string.
- *
- * @author <a href="mailto:bombe@pterodactylus.net">David ‘Bombe’ Roden</a>
  */
 public class SubstringFilter implements Filter {
 
@@ -37,9 +35,9 @@ public class SubstringFilter implements Filter {
 	 * {@inheritDoc}
 	 */
 	@Override
-	public Object format(DataProvider dataProvider, Object data, Map<String, String> parameters) {
-		String startString = parameters.get("start");
-		String lengthString = parameters.get("length");
+	public Object format(TemplateContext templateContext, Object data, Map<String, Object> parameters) {
+		String startString = String.valueOf(parameters.get("start"));
+		String lengthString = String.valueOf(parameters.get("length"));
 		int start = 0;
 		try {
 			start = Integer.parseInt(startString);
@@ -48,13 +46,7 @@ public class SubstringFilter implements Filter {
 		}
 		String dataString = String.valueOf(data);
 		int dataLength = dataString.length();
-		if (lengthString == null) {
-			if (start < 0) {
-				return dataString.substring(dataLength + start);
-			}
-			return dataString.substring(start);
-		}
-		int length = Integer.MAX_VALUE;
+		int length = dataLength;
 		try {
 			length = Integer.parseInt(lengthString);
 		} catch (NumberFormatException nfe1) {