From c2d87b934db5ed0d7b473beb943cb048b7e9e570 Mon Sep 17 00:00:00 2001 From: Tagir Valeev Date: Thu, 25 Aug 2016 17:06:25 +0300 Subject: [PATCH] CommonClassNames.JAVA_LANG_MATH and JAVA_LANG_STRICTMATH --- .../InvalidComparatorMethodReferenceInspection.java | 5 +++-- .../com/intellij/psi/filters/getters/JavaMembersGetter.java | 2 +- platform/core-api/src/com/intellij/psi/CommonClassNames.java | 3 +++ .../src/com/siyeh/ig/bugs/MathRandomCastToIntInspection.java | 2 +- .../src/com/siyeh/ig/numeric/ConstantMathCallInspection.java | 4 ++-- .../siyeh/ig/numeric/NonReproducibleMathCallInspection.java | 2 +- .../security/UnsecureRandomNumberGenerationInspection.java | 2 +- 7 files changed, 12 insertions(+), 8 deletions(-) diff --git a/java/java-analysis-impl/src/com/intellij/codeInspection/InvalidComparatorMethodReferenceInspection.java b/java/java-analysis-impl/src/com/intellij/codeInspection/InvalidComparatorMethodReferenceInspection.java index 25fa03ecb734..2b85bcbf475d 100644 --- a/java/java-analysis-impl/src/com/intellij/codeInspection/InvalidComparatorMethodReferenceInspection.java +++ b/java/java-analysis-impl/src/com/intellij/codeInspection/InvalidComparatorMethodReferenceInspection.java @@ -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 diff --git a/java/java-impl/src/com/intellij/psi/filters/getters/JavaMembersGetter.java b/java/java-impl/src/com/intellij/psi/filters/getters/JavaMembersGetter.java index f823b3368c68..f9abb4a2e86a 100644 --- a/java/java-impl/src/com/intellij/psi/filters/getters/JavaMembersGetter.java +++ b/java/java-impl/src/com/intellij/psi/filters/getters/JavaMembersGetter.java @@ -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; } } diff --git a/platform/core-api/src/com/intellij/psi/CommonClassNames.java b/platform/core-api/src/com/intellij/psi/CommonClassNames.java index c8fc3e29c239..f2da8bc222e4 100644 --- a/platform/core-api/src/com/intellij/psi/CommonClassNames.java +++ b/platform/core-api/src/com/intellij/psi/CommonClassNames.java @@ -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"; diff --git a/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/bugs/MathRandomCastToIntInspection.java b/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/bugs/MathRandomCastToIntInspection.java index a7608b23abb7..3ae0b6e6038b 100644 --- a/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/bugs/MathRandomCastToIntInspection.java +++ b/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/bugs/MathRandomCastToIntInspection.java @@ -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); diff --git a/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/numeric/ConstantMathCallInspection.java b/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/numeric/ConstantMathCallInspection.java index dc253778b505..34befc99b31d 100644 --- a/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/numeric/ConstantMathCallInspection.java +++ b/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/numeric/ConstantMathCallInspection.java @@ -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); diff --git a/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/numeric/NonReproducibleMathCallInspection.java b/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/numeric/NonReproducibleMathCallInspection.java index 094a5474c3d5..cb340cabfb9e 100644 --- a/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/numeric/NonReproducibleMathCallInspection.java +++ b/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/numeric/NonReproducibleMathCallInspection.java @@ -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); diff --git a/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/security/UnsecureRandomNumberGenerationInspection.java b/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/security/UnsecureRandomNumberGenerationInspection.java index 32a85a3fb37d..041439826c3a 100644 --- a/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/security/UnsecureRandomNumberGenerationInspection.java +++ b/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/security/UnsecureRandomNumberGenerationInspection.java @@ -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);