TotalFreedomMC/TF-EssentialsX
1
0
Fork 0
mirror of https://github.com/TotalFreedomMC/TF-EssentialsX.git synced 2024-07-02 18:53:43 +00:00
Code Issues Projects Releases Wiki Activity

Also limit maxYears in parser

Browse source
This commit is contained in:
vemacs 2016-03-01 09:43:28 -07:00
parent 7d33814d5b
commit f6cbda0e04
1 changed files with 4 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
Essentials/src/com/earth2me/essentials/utils/DateUtil.java
View file

@ -10,6 +10,7 @@ import static com.earth2me.essentials.I18n.tl;
public class DateUtil { public class DateUtil {
private static Pattern timePattern = Pattern.compile("(?:([0-9]+)\\s*y[a-z]*[,\\s]*)?" + "(?:([0-9]+)\\s*mo[a-z]*[,\\s]*)?" + "(?:([0-9]+)\\s*w[a-z]*[,\\s]*)?" + "(?:([0-9]+)\\s*d[a-z]*[,\\s]*)?" + "(?:([0-9]+)\\s*h[a-z]*[,\\s]*)?" + "(?:([0-9]+)\\s*m[a-z]*[,\\s]*)?" + "(?:([0-9]+)\\s*(?:s[a-z]*)?)?", Pattern.CASE_INSENSITIVE); private static Pattern timePattern = Pattern.compile("(?:([0-9]+)\\s*y[a-z]*[,\\s]*)?" + "(?:([0-9]+)\\s*mo[a-z]*[,\\s]*)?" + "(?:([0-9]+)\\s*w[a-z]*[,\\s]*)?" + "(?:([0-9]+)\\s*d[a-z]*[,\\s]*)?" + "(?:([0-9]+)\\s*h[a-z]*[,\\s]*)?" + "(?:([0-9]+)\\s*m[a-z]*[,\\s]*)?" + "(?:([0-9]+)\\s*(?:s[a-z]*)?)?", Pattern.CASE_INSENSITIVE);
private static final int maxYears = 100000;
public static String removeTimePattern(String input) { public static String removeTimePattern(String input) {
return timePattern.matcher(input).replaceFirst("").trim(); return timePattern.matcher(input).replaceFirst("").trim();
@ -65,6 +66,9 @@ public class DateUtil {
} }
Calendar c = new GregorianCalendar(); Calendar c = new GregorianCalendar();
if (years > 0) { if (years > 0) {
if (years > maxYears) {
years = maxYears;
}
c.add(Calendar.YEAR, years * (future ? 1 : -1)); c.add(Calendar.YEAR, years * (future ? 1 : -1));
} }
if (months > 0) { if (months > 0) {
@ -95,7 +99,6 @@ public class DateUtil {
static int dateDiff(int type, Calendar fromDate, Calendar toDate, boolean future) { static int dateDiff(int type, Calendar fromDate, Calendar toDate, boolean future) {
int year = Calendar.YEAR; int year = Calendar.YEAR;
int maxYears = 100000;
int fromYear = fromDate.get(year); int fromYear = fromDate.get(year);
int toYear = toDate.get(year); int toYear = toDate.get(year);