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=913e0587ab2c267e9b1147b92c9095e8cd24b942;hb=62573c314957b1851f4fbe693b8746686caa940a;hpb=6f019de1d4d9742981d851ac3c9097cca8bff58e diff --git a/src/main/java/net/pterodactylus/sone/template/SubstringFilter.java b/src/main/java/net/pterodactylus/sone/template/SubstringFilter.java index 913e058..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–2013 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 @@ -28,8 +28,6 @@ import net.pterodactylus.util.template.TemplateContext; * “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 { @@ -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) {