Merge pull request #837 from querydsl/i836

Use numbered capturing groups instead of named in favor of Java 6
This commit is contained in:
Timo Westkämper 2014-07-06 12:13:01 +03:00
commit 4e11409f28

View File

@ -36,9 +36,9 @@ public class TemplateFactory {
private static final Constant<String> PERCENT = ConstantImpl.create("%");
private static final Pattern elementPattern = Pattern.compile("\\{"
+ "(?<premod>%?%?)"
+ "(?<index>\\d+)"
+ "(?<postmod>[slu%]?%?)"
+ "(%?%?)"
+ "(\\d+)"
+ "([slu%]?%?)"
+ "\\}");
private final Map<String,Template> cache = new ConcurrentHashMap<String,Template>();
@ -177,9 +177,9 @@ public class TemplateFactory {
if (m.start() > end) {
elements.add(new Template.StaticText(template.substring(end, m.start())));
}
String premodifiers = m.group("premod").toLowerCase(Locale.ENGLISH);
int index = Integer.parseInt(m.group("index"));
String postmodifiers = m.group("postmod").toLowerCase(Locale.ENGLISH);
String premodifiers = m.group(1).toLowerCase(Locale.ENGLISH);
int index = Integer.parseInt(m.group(2));
String postmodifiers = m.group(3).toLowerCase(Locale.ENGLISH);
boolean asString = false;
Function<Object, Object> transformer = null;
switch (premodifiers.length()) {