Skip to content

Commit 3e98e48

Browse files
author
nat.pryce
committed
Formatting
1 parent b9250ff commit 3e98e48

26 files changed

+350
-358
lines changed

‎hamcrest-library/src/main/java/org/hamcrest/text/pattern/Field.java

Lines changed: 16 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -5,24 +5,23 @@
55
import org.hamcrest.text.pattern.internal.naming.GroupNamespace;
66

77
public class Field implements PatternComponent {
8-
9-
private String name;
10-
private PatternComponent sequence;
11-
12-
public Field(String name, PatternComponent pattern) {
13-
this.name = name;
14-
// TODO: clean this up and make the delimiter changeable
15-
Object[] args = new Object[] {"\"",new CaptureGroup(name, pattern),new Literal("\"")};
16-
this.sequence = Patterns.sequence(args);
17-
}
8+
private String name;
9+
private PatternComponent sequence;
1810

19-
public void buildRegex(StringBuilder builder, GroupNamespace groups) {
20-
sequence.buildRegex(builder, groups);
21-
}
11+
public Field(String name, PatternComponent pattern) {
12+
this.name = name;
13+
// TODO: clean this up and make the delimiter changeable
14+
Object[] args = new Object[] { "\"", new CaptureGroup(name, pattern),
15+
new Literal("\"") };
16+
this.sequence = Patterns.sequence(args);
17+
}
2218

23-
public String getName() {
24-
return name;
25-
}
26-
19+
public void buildRegex(StringBuilder builder, GroupNamespace groups) {
20+
sequence.buildRegex(builder, groups);
21+
}
22+
23+
public String getName() {
24+
return name;
25+
}
2726

2827
}

‎hamcrest-library/src/main/java/org/hamcrest/text/pattern/FromTo.java

Lines changed: 17 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -3,25 +3,24 @@
33
import org.hamcrest.text.pattern.internal.naming.GroupNamespace;
44

55
public class FromTo implements PatternComponent {
6-
private int minimumNumber;
7-
private int maximumNumber;
8-
private PatternComponent repeatedPattern;
6+
private int minimumNumber;
7+
private int maximumNumber;
8+
private PatternComponent repeatedPattern;
99

10+
public FromTo(int minimumNumber, int maximumNumber,
11+
PatternComponent repeatedPattern) {
12+
this.minimumNumber = minimumNumber;
13+
this.maximumNumber = maximumNumber;
14+
this.repeatedPattern = repeatedPattern;
15+
}
1016

11-
public FromTo(int minimumNumber, int maximumNumber, PatternComponent repeatedPattern) {
12-
this.minimumNumber = minimumNumber;
13-
this.maximumNumber = maximumNumber;
14-
this.repeatedPattern = repeatedPattern;
15-
}
17+
public void buildRegex(StringBuilder builder, GroupNamespace groups) {
18+
repeatedPattern.buildRegex(builder, groups);
19+
builder.append("{");
20+
builder.append(minimumNumber);
21+
builder.append(",");
22+
builder.append(maximumNumber);
23+
builder.append("}");
1624

17-
18-
public void buildRegex(StringBuilder builder, GroupNamespace groups) {
19-
repeatedPattern.buildRegex(builder, groups);
20-
builder.append("{");
21-
builder.append(minimumNumber);
22-
builder.append(",");
23-
builder.append(maximumNumber);
24-
builder.append("}");
25-
26-
}
25+
}
2726
}

‎hamcrest-library/src/main/java/org/hamcrest/text/pattern/Parse.java

Lines changed: 11 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -4,18 +4,17 @@
44

55
import org.hamcrest.text.pattern.internal.naming.GroupNamespace;
66

7-
87
public class Parse {
9-
private final GroupNamespace groups;
10-
private final MatchResult result;
8+
private final GroupNamespace groups;
9+
private final MatchResult result;
10+
11+
public Parse(GroupNamespace groups, MatchResult result) {
12+
this.groups = groups;
13+
this.result = result;
14+
}
1115

12-
public Parse(GroupNamespace groups, MatchResult result) {
13-
this.groups = groups;
14-
this.result = result;
15-
}
16-
17-
public String get(String name) {
18-
int groupIndex = groups.resolve(name);
19-
return result.group(groupIndex);
20-
}
16+
public String get(String name) {
17+
int groupIndex = groups.resolve(name);
18+
return result.group(groupIndex);
19+
}
2120
}

‎hamcrest-library/src/main/java/org/hamcrest/text/pattern/PatternComponent.java

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@
22

33
import org.hamcrest.text.pattern.internal.naming.GroupNamespace;
44

5-
65
public interface PatternComponent {
7-
void buildRegex(StringBuilder builder, GroupNamespace groups);
6+
void buildRegex(StringBuilder builder, GroupNamespace groups);
87
}

‎hamcrest-library/src/main/java/org/hamcrest/text/pattern/PatternMatchException.java

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
11
package org.hamcrest.text.pattern;
22

33
public class PatternMatchException extends Exception {
4-
private static final long serialVersionUID = 1L;
4+
private static final long serialVersionUID = 1L;
55

6-
public PatternMatchException(String message) {
7-
super(message);
8-
}
6+
public PatternMatchException(String message) {
7+
super(message);
8+
}
99

10-
public PatternMatchException(String message, Throwable cause) {
11-
super(message, cause);
12-
}
10+
public PatternMatchException(String message, Throwable cause) {
11+
super(message, cause);
12+
}
1313
}

‎hamcrest-library/src/main/java/org/hamcrest/text/pattern/PatternMatcher.java

Lines changed: 50 additions & 51 deletions
Original file line numberDiff line numberDiff line change
@@ -8,56 +8,55 @@
88
import org.hamcrest.TypeSafeMatcher;
99
import org.hamcrest.text.pattern.internal.naming.GroupNamespace;
1010

11-
1211
public class PatternMatcher extends TypeSafeMatcher<String> implements PatternComponent {
13-
private GroupNamespace groups = new GroupNamespace();
14-
private PatternComponent root;
15-
private Pattern pattern;
16-
17-
public PatternMatcher(PatternComponent root) {
18-
this.root = root;
19-
this.pattern = compile(root, groups);
20-
}
21-
22-
@Factory
23-
public static PatternMatcher matchesPattern(PatternComponent pattern) {
24-
return new PatternMatcher(pattern);
25-
}
26-
27-
@Factory
28-
public static PatternMatcher matchesPattern(PatternMatcher pattern) {
29-
return pattern;
30-
}
31-
32-
public String toString() {
33-
return pattern.toString();
34-
}
35-
36-
public void describeTo(Description description) {
37-
description.appendText("a string matching ");
38-
description.appendValue(this.toString());
39-
}
40-
41-
public boolean matchesSafely(String s) {
42-
return pattern.matcher(s).matches();
43-
}
44-
45-
public Parse parse(String input) throws PatternMatchException {
46-
Matcher matcher = pattern.matcher(input);
47-
if (matcher.matches()) {
48-
return new Parse(groups, matcher);
49-
} else {
50-
throw new PatternMatchException("did not match input: " + input);
51-
}
52-
}
53-
54-
public void buildRegex(StringBuilder builder, GroupNamespace groups) {
55-
root.buildRegex(builder, groups);
56-
}
57-
58-
private static Pattern compile(PatternComponent root, GroupNamespace groups) {
59-
StringBuilder builder = new StringBuilder();
60-
root.buildRegex(builder, groups);
61-
return Pattern.compile(builder.toString());
62-
}
12+
private GroupNamespace groups = new GroupNamespace();
13+
private PatternComponent root;
14+
private Pattern pattern;
15+
16+
public PatternMatcher(PatternComponent root) {
17+
this.root = root;
18+
this.pattern = compile(root, groups);
19+
}
20+
21+
@Factory
22+
public static PatternMatcher matchesPattern(PatternComponent pattern) {
23+
return new PatternMatcher(pattern);
24+
}
25+
26+
@Factory
27+
public static PatternMatcher matchesPattern(PatternMatcher pattern) {
28+
return pattern;
29+
}
30+
31+
public String toString() {
32+
return pattern.toString();
33+
}
34+
35+
public void describeTo(Description description) {
36+
description.appendText("a string matching ");
37+
description.appendValue(this.toString());
38+
}
39+
40+
public boolean matchesSafely(String s) {
41+
return pattern.matcher(s).matches();
42+
}
43+
44+
public Parse parse(String input) throws PatternMatchException {
45+
Matcher matcher = pattern.matcher(input);
46+
if (matcher.matches()) {
47+
return new Parse(groups, matcher);
48+
} else {
49+
throw new PatternMatchException("did not match input: " + input);
50+
}
51+
}
52+
53+
public void buildRegex(StringBuilder builder, GroupNamespace groups) {
54+
root.buildRegex(builder, groups);
55+
}
56+
57+
private static Pattern compile(PatternComponent root, GroupNamespace groups) {
58+
StringBuilder builder = new StringBuilder();
59+
root.buildRegex(builder, groups);
60+
return Pattern.compile(builder.toString());
61+
}
6362
}

0 commit comments

Comments
 (0)