/*
- * Sone - SubstringFilter.java - Copyright © 2010–2012 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
* “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 {
* {@inheritDoc}
*/
@Override
- public Object format(TemplateContext templateContext, 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);
}
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) {