Choose a better name

Author: Fabrice Tiercelin

plugin/src/main/java/org/autorefactor/jdt/internal/corext/dom/ASTNodes.java

@@ -383,6 +383,7 @@ public static <T extends Expression> T as(final Expression expression, final Cla
 			if (exprClass.isAssignableFrom(expression.getClass())) {
 				return (T) expression;
 			}
+
 			if (expression instanceof ParenthesizedExpression) {
 				return as(((ParenthesizedExpression) expression).getExpression(), exprClass);
 			}
@@ -679,7 +680,9 @@ public static <T extends ASTNode> T getTypedAncestor(final ASTNode node, final C
 		if (node == null || node.getParent() == null) {
 			return null;
 		}
+
 		ASTNode parent= node.getParent();
+
 		if (ancestorClass.isAssignableFrom(parent.getClass())) {
 			return (T) parent;
 		}
@@ -698,18 +701,19 @@ public static <T extends ASTNode> T getTypedAncestor(final ASTNode node, final C
 	 * @see #getTypedAncestorOrCrash(ASTNode, Class)
 	 * @see #getTypedAncestor(ASTNode, Class)
 	 */
-	public static ASTNode getFirstAncestorOrNull(final ASTNode node, final Class<?>... ancestorClasses) {
+	public static ASTNode getFirstAncestorOrNull(final ASTNode node, final Class<? extends ASTNode>... ancestorClasses) {
 		if (ancestorClasses.length == 1) {
 			throw new IllegalArgumentException("Please use ASTHelper.getAncestor(ASTNode, Class<?>) instead"); //$NON-NLS-1$
 		}
+
 		if (node == null || node.getParent() == null || ancestorClasses.length == 0) {
 			return null;
 		}
+
 		ASTNode parent= node.getParent();
-		for (Class<?> ancestorClass : ancestorClasses) {
-			if (ancestorClass.isAssignableFrom(parent.getClass())) {
-				return parent;
-			}
+
+		if (instanceOf(parent, ancestorClasses)) {
+			return parent;
 		}
 
 		return getFirstAncestorOrNull(parent, ancestorClasses);
@@ -747,7 +751,7 @@ public static boolean isParent(ASTNode node, final ASTNode parent) {
 	 * @return the enclosing type of the provided node, or {@code null}
 	 */
 	public static ASTNode getEnclosingType(final ASTNode node) {
-		Class<?>[] ancestorClasses= { AbstractTypeDeclaration.class, AnonymousClassDeclaration.class };
+		Class<? extends ASTNode>[] ancestorClasses= new Class[] { AbstractTypeDeclaration.class, AnonymousClassDeclaration.class };
 		ASTNode ancestor= getFirstAncestorOrNull(node, ancestorClasses);
 		if (ancestor == null) {
 			throw new IllegalStateException(node,
@@ -2331,22 +2335,22 @@ public static boolean isSameVariable(ASTNode node1, ASTNode node2) {
 	 * @return the last parent node of the provided classes, or the current node
 	 *         otherwise
 	 */
-	public static ASTNode getMatchingParent(final ASTNode node, final Class<?>... includedClasses) {
+	public static ASTNode getHighestCompatibleNode(final ASTNode node, final Class<? extends ASTNode>... includedClasses) {
 		ASTNode parent= node.getParent();
 
 		if (instanceOf(parent, includedClasses)) {
-			return getMatchingParent(parent, includedClasses);
+			return getHighestCompatibleNode(parent, includedClasses);
 		}
 
 		return node;
 	}
 
-	private static boolean instanceOf(final ASTNode node, final Class<?>... clazzes) {
+	private static boolean instanceOf(final ASTNode node, final Class<? extends ASTNode>... clazzes) {
 		if (node == null) {
 			return false;
 		}
 
-		for (Class<?> clazz : clazzes) {
+		for (Class<? extends ASTNode> clazz : clazzes) {
 			if (clazz.isAssignableFrom(node.getClass())) {
 				return true;
 			}

plugin/src/main/java/org/autorefactor/jdt/internal/ui/fix/EntrySetRatherThanKeySetAndValueSearchCleanUp.java

@@ -97,7 +97,7 @@ private VariableNameDecider(final ASTNode scope, final int insertionPoint) {
 		}
 
 		private ASTNode getNamingScope(final ASTNode scope) {
-			Class<?>[] ancestorClasses= { MethodDeclaration.class, Initializer.class };
+			Class<? extends ASTNode>[] ancestorClasses= new Class[] { MethodDeclaration.class, Initializer.class };
 			ASTNode ancestor= ASTNodes.getFirstAncestorOrNull(scope, ancestorClasses);
 			if (ancestor == null) {
 				throw new IllegalStateException(scope, "Expected to find an ancestor among the types " //$NON-NLS-1$

plugin/src/main/java/org/autorefactor/jdt/internal/ui/fix/IncrementStatementRatherThanIncrementExpressionCleanUp.java

@@ -221,7 +221,7 @@ private void extractIncrement(final Expression visited, final Expression variabl
 			ASTNodeFactory ast= cuRewrite.getASTBuilder();
 			TextEditGroup group= new TextEditGroup(MultiFixMessages.IncrementStatementRatherThanIncrementExpressionCleanUp_description);
 
-			ASTNodes.replaceButKeepComment(rewrite, ASTNodes.getMatchingParent(visited, ParenthesizedExpression.class), ast.createCopyTarget(variable), group);
+			ASTNodes.replaceButKeepComment(rewrite, ASTNodes.getHighestCompatibleNode(visited, ParenthesizedExpression.class), ast.createCopyTarget(variable), group);
 
 			if (visited instanceof PostfixExpression) {
 				Statement newAssignment= ast.newExpressionStatement(ASTNodes.createMoveTarget(rewrite, visited));

plugin/src/main/java/org/autorefactor/jdt/internal/ui/fix/NoAssignmentInIfConditionCleanUp.java

@@ -187,13 +187,13 @@ private boolean moveAssignmentBeforeIfStatement(final IfStatement node, final As
 
 			if (fragment != null && (fragment.getInitializer() == null || ASTNodes.isPassive(fragment.getInitializer()))) {
 				rewrite.set(fragment, VariableDeclarationFragment.INITIALIZER_PROPERTY, assignment.getRightHandSide(), group);
-				ASTNodes.replaceButKeepComment(rewrite, ASTNodes.getMatchingParent(assignment, ParenthesizedExpression.class), ast.createCopyTarget(lhs), group);
+				ASTNodes.replaceButKeepComment(rewrite, ASTNodes.getHighestCompatibleNode(assignment, ParenthesizedExpression.class), ast.createCopyTarget(lhs), group);
 				result= false;
 				return false;
 			}
 
 			if (!ASTNodes.isInElse(node)) {
-				ASTNodes.replaceButKeepComment(rewrite, ASTNodes.getMatchingParent(assignment, ParenthesizedExpression.class), ast.createCopyTarget(lhs), group);
+				ASTNodes.replaceButKeepComment(rewrite, ASTNodes.getHighestCompatibleNode(assignment, ParenthesizedExpression.class), ast.createCopyTarget(lhs), group);
 				Statement newAssignment= ast.newExpressionStatement(ASTNodes.createMoveTarget(rewrite, assignment));
 
 				if (ASTNodes.canHaveSiblings(node)) {

plugin/src/main/java/org/autorefactor/jdt/internal/ui/fix/SimpleNameRatherThanQualifiedNameCleanUp.java

@@ -285,7 +285,7 @@ private ITypeBinding getDeclaringTypeInTypeHierarchy(final ITypeBinding typeBind
 
 		private ITypeBinding getDeclaringTypeInTopLevelHierarchy(final String simpleName, final FqnType fqnType,
 				final ASTNode node) {
-			Class<?>[] ancestorClasses= { AbstractTypeDeclaration.class, AnonymousClassDeclaration.class };
+			Class<? extends ASTNode>[] ancestorClasses= new Class[] { AbstractTypeDeclaration.class, AnonymousClassDeclaration.class };
 			ASTNode enclosingType= ASTNodes.getFirstAncestorOrNull(node, ancestorClasses);
 
 			while (enclosingType != null) {