refactor: use new CtMethod#isOverriding - simplification

INRIA · Apr 30, 2017 · 3cfb781 · 3cfb781
1 parent f8ba46e
commit 3cfb781
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 6 deletions.
diff --git a/src/main/java/spoon/reflect/visitor/filter/OverriddenMethodFilter.java b/src/main/java/spoon/reflect/visitor/filter/OverriddenMethodFilter.java
@@ -40,8 +40,7 @@ public OverriddenMethodFilter(CtMethod<?> method) {
 	public boolean matches(CtMethod<?> element) {
 		final CtType expectedParent = method.getParent(CtType.class);
 		final CtType<?> currentParent = element.getParent(CtType.class);
-		return expectedParent.isSubtypeOf(currentParent.getReference()) //
-				&& !currentParent.equals(expectedParent) //
-				&& method.getReference().isOverriding(element.getReference());
+		return !currentParent.equals(expectedParent) //
+				&& method.isOverriding(element);
 	}
 }
diff --git a/src/main/java/spoon/reflect/visitor/filter/OverridingMethodFilter.java b/src/main/java/spoon/reflect/visitor/filter/OverridingMethodFilter.java
@@ -40,8 +40,7 @@ public OverridingMethodFilter(CtMethod<?> method) {
 	public boolean matches(CtMethod<?> element) {
 		final CtType expectedParent = method.getParent(CtType.class);
 		final CtType<?> currentParent = element.getParent(CtType.class);
-		return currentParent.isSubtypeOf(expectedParent.getReference()) //
-				&& !currentParent.equals(expectedParent) //
-				&& element.getReference().isOverriding(method.getReference());
+		return !currentParent.equals(expectedParent) //
+				&& element.isOverriding(method);
 	}
 }