MDS/openide
1
0
Fork 0
mirror of https://gitflic.ru/project/openide/openide.git synced 2026-09-27 10:03:11 +07:00
Code Issues Packages Projects Releases Wiki Activity

IG: less duplication

Browse Source
This commit is contained in:
Bas Leijdekkers
2015-08-14 22:15:06 +02:00
parent bf85d491a8
commit aedbc84de1
1 changed files with 9 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files
plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/psiutils/MethodUtils.java
+9 -32
View File
@@ -90,36 +90,7 @@ public class MethodUtils {
return false;
}
}
if (parameterTypes != null) {
final PsiParameterList parameterList = method.getParameterList();
if (parameterList.getParametersCount() != parameterTypes.length) {
return false;
}
final PsiParameter[] parameters = parameterList.getParameters();
for (int i = 0; i < parameters.length; i++) {
final PsiParameter parameter = parameters[i];
final PsiType type = parameter.getType();
final PsiType parameterType = parameterTypes[i];
if (PsiType.NULL.equals(parameterType)) {
continue;
}
if (parameterType != null &&
!EquivalenceChecker.typesAreEquivalent(type, parameterType)) {
return false;
}
}
}
if (returnType != null) {
final PsiType methodReturnType = method.getReturnType();
if (!EquivalenceChecker.typesAreEquivalent(returnType, methodReturnType)) {
return false;
}
}
if (containingClassName != null) {
final PsiClass containingClass = method.getContainingClass();
return InheritanceUtil.isInheritor(containingClass, containingClassName);
}
return true;
return methodMatches(method, containingClassName, returnType, parameterTypes);
}
/**
@@ -144,6 +115,13 @@ public class MethodUtils {
if (methodName != null && !methodName.equals(name)) {
return false;
}
return methodMatches(method, containingClassName, returnType, parameterTypes);
}
private static boolean methodMatches(@NotNull PsiMethod method,
@NonNls @Nullable String containingClassName,
@Nullable PsiType returnType,
@Nullable PsiType... parameterTypes) {
if (parameterTypes != null) {
final PsiParameterList parameterList = method.getParameterList();
if (parameterList.getParametersCount() != parameterTypes.length) {
@@ -157,8 +135,7 @@ public class MethodUtils {
if (PsiType.NULL.equals(parameterType)) {
continue;
}
if (parameterType != null &&
!EquivalenceChecker.typesAreEquivalent(type, parameterType)) {
if (parameterType != null && !EquivalenceChecker.typesAreEquivalent(type, parameterType)) {
return false;
}
}