#367 renaming method addEnclosingElementsIncludingSuper

This commit is contained in:
sjaakd 2014-12-02 21:49:14 +01:00
parent 0c26b78702
commit e4de641911

View File

@ -185,17 +185,17 @@ public class Executables {
*/ */
public static List<ExecutableElement> getAllEnclosedExecutableElements(Elements elementUtils, TypeElement element) { public static List<ExecutableElement> getAllEnclosedExecutableElements(Elements elementUtils, TypeElement element) {
List<ExecutableElement> enclosedElements = new ArrayList<ExecutableElement>(); List<ExecutableElement> enclosedElements = new ArrayList<ExecutableElement>();
addEnclosingElementsIncludingSuper( elementUtils, enclosedElements, element, element ); addEnclosedElementsInHierarchy( elementUtils, enclosedElements, element, element );
return enclosedElements; return enclosedElements;
} }
private static void addEnclosingElementsIncludingSuper(Elements elementUtils, List<ExecutableElement> alreadyAdded, private static void addEnclosedElementsInHierarchy(Elements elementUtils, List<ExecutableElement> alreadyAdded,
TypeElement element, TypeElement parentType) { TypeElement element, TypeElement parentType) {
addNotYetOverridden( elementUtils, alreadyAdded, methodsIn( element.getEnclosedElements() ), parentType ); addNotYetOverridden( elementUtils, alreadyAdded, methodsIn( element.getEnclosedElements() ), parentType );
if ( hasNonObjectSuperclass( element ) ) { if ( hasNonObjectSuperclass( element ) ) {
addEnclosingElementsIncludingSuper( addEnclosedElementsInHierarchy(
elementUtils, elementUtils,
alreadyAdded, alreadyAdded,
asTypeElement( element.getSuperclass() ), asTypeElement( element.getSuperclass() ),
@ -203,7 +203,7 @@ public class Executables {
} }
for ( TypeMirror interfaceType : element.getInterfaces() ) { for ( TypeMirror interfaceType : element.getInterfaces() ) {
addEnclosingElementsIncludingSuper( addEnclosedElementsInHierarchy(
elementUtils, elementUtils,
alreadyAdded, alreadyAdded,
asTypeElement( interfaceType ), asTypeElement( interfaceType ),