X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=src%2Fmain%2Fjava%2Fnet%2Fpterodactylus%2Fsone%2Ftemplate%2FSubstringFilter.java;h=355b6a9a45d6a72ee480cbca1f2914f0b5d5fbb5;hb=62ef0f7790f226019d56f93e12f64cef1e897f72;hp=f0075e4576ca3fda9c2a0c80d8e8c791b70054c9;hpb=5a704af88b91a83ad78b5fb6dc3147a9b65d713d;p=Sone.git
diff --git a/src/main/java/net/pterodactylus/sone/template/SubstringFilter.java b/src/main/java/net/pterodactylus/sone/template/SubstringFilter.java
index f0075e4..355b6a9 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â2019 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 David âBombeâ Roden
*/
public class SubstringFilter implements Filter {
@@ -37,9 +35,9 @@ public class SubstringFilter implements Filter {
* {@inheritDoc}
*/
@Override
- public Object format(DataProvider dataProvider, Object data, Map parameters) {
- String startString = parameters.get("start");
- String lengthString = parameters.get("length");
+ public Object format(TemplateContext templateContext, Object data, Map 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) {