Merge branch 'master' of alkmene:joerg/net
This commit is contained in:
commit
1e41ab1255
4 changed files with 17 additions and 2 deletions
|
@ -33,3 +33,12 @@ task javadocJar(type: Jar, dependsOn: javadoc) {
|
||||||
artifacts {
|
artifacts {
|
||||||
archives sourcesJar, javadocJar
|
archives sourcesJar, javadocJar
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
tasks.withType(JavaCompile) {
|
||||||
|
options.compilerArgs << '-Xlint:all'
|
||||||
|
}
|
||||||
|
|
||||||
|
javadoc {
|
||||||
|
options.addStringOption('Xdoclint:none', '-quiet')
|
||||||
|
}
|
||||||
|
|
|
@ -4,4 +4,10 @@ module org.xbib.net.url {
|
||||||
exports org.xbib.net.matcher;
|
exports org.xbib.net.matcher;
|
||||||
exports org.xbib.net.scheme;
|
exports org.xbib.net.scheme;
|
||||||
exports org.xbib.net.template;
|
exports org.xbib.net.template;
|
||||||
|
exports org.xbib.net.template.expression;
|
||||||
|
exports org.xbib.net.template.parse;
|
||||||
|
exports org.xbib.net.template.render;
|
||||||
|
exports org.xbib.net.template.vars;
|
||||||
|
exports org.xbib.net.template.vars.specs;
|
||||||
|
exports org.xbib.net.template.vars.values;
|
||||||
}
|
}
|
||||||
|
|
|
@ -10,7 +10,7 @@ import java.util.regex.Pattern;
|
||||||
/**
|
/**
|
||||||
* Path string matcher.
|
* Path string matcher.
|
||||||
*/
|
*/
|
||||||
class PathStringMatcher {
|
public class PathStringMatcher {
|
||||||
|
|
||||||
private static final Pattern GLOB_PATTERN = Pattern.compile("\\?|\\*|\\{((?:\\{[^/]+?\\}|[^/{}]|\\\\[{}])+?)\\}");
|
private static final Pattern GLOB_PATTERN = Pattern.compile("\\?|\\*|\\{((?:\\{[^/]+?\\}|[^/{}]|\\\\[{}])+?)\\}");
|
||||||
|
|
||||||
|
@ -20,7 +20,7 @@ class PathStringMatcher {
|
||||||
|
|
||||||
private final Pattern pattern;
|
private final Pattern pattern;
|
||||||
|
|
||||||
PathStringMatcher(String pattern, boolean caseSensitive) {
|
public PathStringMatcher(String pattern, boolean caseSensitive) {
|
||||||
StringBuilder patternBuilder = new StringBuilder();
|
StringBuilder patternBuilder = new StringBuilder();
|
||||||
Matcher matcher = GLOB_PATTERN.matcher(pattern);
|
Matcher matcher = GLOB_PATTERN.matcher(pattern);
|
||||||
int end = 0;
|
int end = 0;
|
||||||
|
|
Loading…
Reference in a new issue