Skip to content

Commit fbb1efe

Browse files
committed
Remove duplicate code.
1 parent 52e93b4 commit fbb1efe

File tree

3 files changed

+19
-25
lines changed

3 files changed

+19
-25
lines changed

src/main/java/org/junit/runners/model/FrameworkField.java

+2-10
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@
22

33
import java.lang.annotation.Annotation;
44
import java.lang.reflect.Field;
5-
import java.lang.reflect.Modifier;
65

76
import org.junit.runners.BlockJUnit4ClassRunner;
87

@@ -33,21 +32,14 @@ public Annotation[] getAnnotations() {
3332
return fField.getAnnotations();
3433
}
3534

36-
@Override
37-
public boolean isPublic() {
38-
int modifiers = fField.getModifiers();
39-
return Modifier.isPublic(modifiers);
40-
}
41-
4235
@Override
4336
public boolean isShadowedBy(FrameworkField otherMember) {
4437
return otherMember.getName().equals(getName());
4538
}
4639

4740
@Override
48-
public boolean isStatic() {
49-
int modifiers = fField.getModifiers();
50-
return Modifier.isStatic(modifiers);
41+
protected int getModifiers() {
42+
return fField.getModifiers();
5143
}
5244

5345
/**

src/main/java/org/junit/runners/model/FrameworkMember.java

+15-2
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
package org.junit.runners.model;
22

33
import java.lang.annotation.Annotation;
4+
import java.lang.reflect.Modifier;
45
import java.util.List;
56

67
/**
@@ -25,9 +26,21 @@ boolean isShadowedBy(List<T> members) {
2526
return false;
2627
}
2728

28-
public abstract boolean isPublic();
29+
protected abstract int getModifiers();
2930

30-
public abstract boolean isStatic();
31+
/**
32+
* Returns true if this member is static, false if not.
33+
*/
34+
public boolean isStatic() {
35+
return Modifier.isStatic(getModifiers());
36+
}
37+
38+
/**
39+
* Returns true if this member is public, false if not.
40+
*/
41+
public boolean isPublic() {
42+
return Modifier.isPublic(getModifiers());
43+
}
3144

3245
public abstract String getName();
3346

src/main/java/org/junit/runners/model/FrameworkMethod.java

+2-13
Original file line numberDiff line numberDiff line change
@@ -103,22 +103,11 @@ public void validatePublicVoid(boolean isStatic, List<Throwable> errors) {
103103
}
104104
}
105105

106-
/**
107-
* Returns true if this method is static, false if not
108-
*/
109106
@Override
110-
public boolean isStatic() {
111-
return Modifier.isStatic(fMethod.getModifiers());
107+
protected int getModifiers() {
108+
return fMethod.getModifiers();
112109
}
113110

114-
/**
115-
* Returns true if this method is public, false if not
116-
*/
117-
@Override
118-
public boolean isPublic() {
119-
return Modifier.isPublic(fMethod.getModifiers());
120-
}
121-
122111
/**
123112
* Returns the return type of the method
124113
*/

0 commit comments

Comments
 (0)