CommonClassNames.JAVA_LANG_MATH and JAVA_LANG_STRICTMATH

This commit is contained in:
Tagir Valeev
2016-08-25 17:07:58 +03:00
parent e9bb924531
commit c2d87b934d
7 changed files with 12 additions and 8 deletions
@@ -48,7 +48,7 @@ public class InvalidComparatorMethodReferenceInspection extends BaseJavaBatchLoc
return;
}
String targetClassName = targetType.getQualifiedName();
if(targetClassName == null || !targetClassName.equals(CommonClassNames.JAVA_UTIL_COMPARATOR)) {
if (targetClassName == null || !targetClassName.equals(CommonClassNames.JAVA_UTIL_COMPARATOR)) {
return;
}
PsiElement refType = ((PsiReference)qualifierExpression).resolve();
@@ -56,7 +56,8 @@ public class InvalidComparatorMethodReferenceInspection extends BaseJavaBatchLoc
return;
}
String className = ((PsiClass)refType).getQualifiedName();
if (className == null || (!className.equals(CommonClassNames.JAVA_LANG_INTEGER) && !className.equals(Math.class.getName()))) {
if (!CommonClassNames.JAVA_LANG_INTEGER.equals(className) && !CommonClassNames.JAVA_LANG_MATH
.equals(className)) {
return;
}
//noinspection DialogTitleCapitalization
@@ -106,7 +106,7 @@ public class JavaMembersGetter extends MembersGetter {
final PsiElement element = result.getElement();
if (element instanceof PsiMethod) {
final PsiClass aClass = ((PsiMethod)element).getContainingClass();
if (aClass != null && !"java.lang.Math".equals(aClass.getQualifiedName())) {
if (aClass != null && !CommonClassNames.JAVA_LANG_MATH.equals(aClass.getQualifiedName())) {
return aClass;
}
}
@@ -92,6 +92,9 @@ public interface CommonClassNames {
@NonNls String JAVA_LANG_STRING_BUILDER = "java.lang.StringBuilder";
@NonNls String JAVA_LANG_ABSTRACT_STRING_BUILDER = "java.lang.AbstractStringBuilder";
@NonNls String JAVA_LANG_MATH = "java.lang.Math";
@NonNls String JAVA_LANG_STRICT_MATH = "java.lang.StrictMath";
@NonNls String JAVA_LANG_CLONEABLE = "java.lang.Cloneable";
@NonNls String JAVA_LANG_COMPARABLE = "java.lang.Comparable";
@@ -161,7 +161,7 @@ public class MathRandomCastToIntInspection extends BaseInspection {
return;
}
final String qualifiedName = containingClass.getQualifiedName();
if (!"java.lang.Math".equals(qualifiedName) && !"java.lang.StrictMath".equals(qualifiedName)) {
if (!CommonClassNames.JAVA_LANG_MATH.equals(qualifiedName) && !CommonClassNames.JAVA_LANG_STRICT_MATH.equals(qualifiedName)) {
return;
}
registerError(methodCallExpression, expression, type);
@@ -358,8 +358,8 @@ public class ConstantMathCallInspection extends BaseInspection {
return;
}
final String className = referencedClass.getQualifiedName();
if (!"java.lang.Math".equals(className)
&& !"java.lang.StrictMath".equals(className)) {
if (!CommonClassNames.JAVA_LANG_MATH.equals(className)
&& !CommonClassNames.JAVA_LANG_STRICT_MATH.equals(className)) {
return;
}
registerMethodCallError(expression);
@@ -130,7 +130,7 @@ public class NonReproducibleMathCallInspection extends BaseInspection {
return;
}
final String className = referencedClass.getQualifiedName();
if (!"java.lang.Math".equals(className)) {
if (!CommonClassNames.JAVA_LANG_MATH.equals(className)) {
return;
}
registerMethodCallError(expression);
@@ -103,7 +103,7 @@ public class UnsecureRandomNumberGenerationInspection
return;
}
final String className = containingClass.getQualifiedName();
if (!"java.lang.Math".equals(className)) {
if (!CommonClassNames.JAVA_LANG_MATH.equals(className)) {
return;
}
registerMethodCallError(expression, expression);