Skip to content

Commit 2ab54c7

Browse files
Enforced indentation style of 2 spaces (with further details matching Google's CheckStyle specs).
Formatted existing .java code to match. See #295
1 parent 5dd6a62 commit 2ab54c7

File tree

157 files changed

+7055
-6722
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

157 files changed

+7055
-6722
lines changed

checkstyle.xml

+13
Original file line numberDiff line numberDiff line change
@@ -8,4 +8,17 @@
88
<!-- Report on each line in each file -->
99
<property name="eachLine" value="true"/>
1010
</module>
11+
12+
13+
<module name="TreeWalker">
14+
<!-- Checks that the indentation style in this project is uniformly "2 spaces". -->
15+
<module name="Indentation">
16+
<property name="basicOffset" value="2"/>
17+
<property name="braceAdjustment" value="0"/>
18+
<property name="caseIndent" value="2"/>
19+
<property name="throwsIndent" value="4"/>
20+
<property name="lineWrappingIndentation" value="4"/>
21+
<property name="arrayInitIndent" value="2"/>
22+
</module>
23+
</module>
1124
</module>

hamcrest-integration/src/main/java/org/hamcrest/EasyMock2Matchers.java

+4-4
Original file line numberDiff line numberDiff line change
@@ -9,9 +9,9 @@
99
*/
1010
public class EasyMock2Matchers {
1111

12-
public static String equalTo(String string) {
13-
EasyMock2Adapter.adapt(IsEqual.equalTo(string));
14-
return null;
15-
}
12+
public static String equalTo(String string) {
13+
EasyMock2Adapter.adapt(IsEqual.equalTo(string));
14+
return null;
15+
}
1616

1717
}

hamcrest-integration/src/main/java/org/hamcrest/JMock1Matchers.java

+3-3
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66

77
public class JMock1Matchers {
88

9-
public static Constraint equalTo(String string) {
10-
return JMock1Adapter.adapt(IsEqual.equalTo(string));
11-
}
9+
public static Constraint equalTo(String string) {
10+
return JMock1Adapter.adapt(IsEqual.equalTo(string));
11+
}
1212
}

hamcrest-integration/src/main/java/org/hamcrest/JavaLangMatcherAssert.java

+7-4
Original file line numberDiff line numberDiff line change
@@ -10,9 +10,12 @@
1010
* @author Neil Dunn
1111
*/
1212
public class JavaLangMatcherAssert {
13-
private JavaLangMatcherAssert() {};
13+
private JavaLangMatcherAssert() {
14+
}
1415

15-
public static <T> boolean that(T argument, Matcher<? super T> matcher) {
16-
return matcher.matches(argument);
17-
}
16+
;
17+
18+
public static <T> boolean that(T argument, Matcher<? super T> matcher) {
19+
return matcher.matches(argument);
20+
}
1821
}

hamcrest-integration/src/main/java/org/hamcrest/integration/EasyMock2Adapter.java

+23-23
Original file line numberDiff line numberDiff line change
@@ -13,31 +13,31 @@
1313
*/
1414
public class EasyMock2Adapter implements IArgumentMatcher {
1515

16-
/**
17-
* Convenience factory method that will adapt a
18-
* Hamcrest {@link org.hamcrest.Matcher} to act as an
19-
* EasyMock {@link org.easymock.IArgumentMatcher} and
20-
* report it to EasyMock so it can be kept track of.
21-
*/
22-
public static IArgumentMatcher adapt(Matcher<?> matcher) {
23-
EasyMock2Adapter easyMock2Matcher = new EasyMock2Adapter(matcher);
24-
EasyMock.reportMatcher(easyMock2Matcher);
25-
return easyMock2Matcher;
26-
}
16+
/**
17+
* Convenience factory method that will adapt a
18+
* Hamcrest {@link org.hamcrest.Matcher} to act as an
19+
* EasyMock {@link org.easymock.IArgumentMatcher} and
20+
* report it to EasyMock so it can be kept track of.
21+
*/
22+
public static IArgumentMatcher adapt(Matcher<?> matcher) {
23+
EasyMock2Adapter easyMock2Matcher = new EasyMock2Adapter(matcher);
24+
EasyMock.reportMatcher(easyMock2Matcher);
25+
return easyMock2Matcher;
26+
}
2727

28-
private final Matcher<?> hamcrestMatcher;
28+
private final Matcher<?> hamcrestMatcher;
2929

30-
public EasyMock2Adapter(Matcher<?> matcher) {
31-
this.hamcrestMatcher = matcher;
32-
}
30+
public EasyMock2Adapter(Matcher<?> matcher) {
31+
this.hamcrestMatcher = matcher;
32+
}
3333

34-
@Override
35-
public boolean matches(Object argument) {
36-
return hamcrestMatcher.matches(argument);
37-
}
34+
@Override
35+
public boolean matches(Object argument) {
36+
return hamcrestMatcher.matches(argument);
37+
}
3838

39-
@Override
40-
public void appendTo(StringBuffer buffer) {
41-
hamcrestMatcher.describeTo(new StringDescription(buffer));
42-
}
39+
@Override
40+
public void appendTo(StringBuffer buffer) {
41+
hamcrestMatcher.describeTo(new StringDescription(buffer));
42+
}
4343
}

hamcrest-integration/src/main/java/org/hamcrest/integration/JMock1Adapter.java

+21-21
Original file line numberDiff line numberDiff line change
@@ -14,29 +14,29 @@
1414
*/
1515
public class JMock1Adapter implements Constraint {
1616

17-
/**
18-
* Convenience factory method that will adapt a
19-
* Hamcrest {@link org.hamcrest.Matcher} to act as an
20-
* jMock {@link org.jmock.core.Constraint}.
21-
*/
22-
public static Constraint adapt(Matcher<?> matcher) {
23-
return new JMock1Adapter(matcher);
24-
}
17+
/**
18+
* Convenience factory method that will adapt a
19+
* Hamcrest {@link org.hamcrest.Matcher} to act as an
20+
* jMock {@link org.jmock.core.Constraint}.
21+
*/
22+
public static Constraint adapt(Matcher<?> matcher) {
23+
return new JMock1Adapter(matcher);
24+
}
2525

26-
private final Matcher<?> hamcrestMatcher;
26+
private final Matcher<?> hamcrestMatcher;
2727

28-
public JMock1Adapter(Matcher<?> matcher) {
29-
this.hamcrestMatcher = matcher;
30-
}
28+
public JMock1Adapter(Matcher<?> matcher) {
29+
this.hamcrestMatcher = matcher;
30+
}
3131

32-
@Override
33-
public boolean eval(Object o) {
34-
return hamcrestMatcher.matches(o);
35-
}
32+
@Override
33+
public boolean eval(Object o) {
34+
return hamcrestMatcher.matches(o);
35+
}
3636

37-
@Override
38-
public StringBuffer describeTo(StringBuffer buffer) {
39-
hamcrestMatcher.describeTo(new StringDescription(buffer));
40-
return buffer;
41-
}
37+
@Override
38+
public StringBuffer describeTo(StringBuffer buffer) {
39+
hamcrestMatcher.describeTo(new StringDescription(buffer));
40+
return buffer;
41+
}
4242
}

0 commit comments

Comments
 (0)