From 9ebac656de3a5509f80470b0dc8a13b12558b52f Mon Sep 17 00:00:00 2001 From: Maxim Medvedev Date: Tue, 4 Oct 2011 15:59:31 +0400 Subject: [PATCH] CommonClassNames.JAVA_LANG_STRING_BUILDER --- .../codeInsight/daemon/impl/quickfix/ChangeToAppendFix.java | 4 ++-- java/java-psi-api/src/com/intellij/psi/CommonClassNames.java | 1 + .../ig/bugs/MismatchedStringBuilderQueryUpdateInspection.java | 2 +- .../src/com/siyeh/ig/memory/StringBufferFieldInspection.java | 2 +- .../StringBufferReplaceableByStringBuilderInspection.java | 2 +- .../LengthOneStringsInConcatenationInspection.java | 2 +- .../StringBufferMustHaveInitialCapacityInspection.java | 2 +- .../StringBufferReplaceableByStringInspection.java | 2 +- .../StringBufferToStringInConcatenationInspection.java | 2 +- ...StringConcatenationInsideStringBufferAppendInspection.java | 4 ++-- .../ig/performance/StringEqualsEmptyStringInspection.java | 2 +- .../src/com/siyeh/ipp/chartostring/CharToStringPredicate.java | 4 ++-- .../src/com/siyeh/ipp/chartostring/StringToCharPredicate.java | 4 ++-- .../src/com/siyeh/ipp/concatenation/AppendUtil.java | 4 ++-- .../ReplaceConcatenationWithStringBufferIntention.java | 4 ++-- 15 files changed, 21 insertions(+), 20 deletions(-) diff --git a/java/java-impl/src/com/intellij/codeInsight/daemon/impl/quickfix/ChangeToAppendFix.java b/java/java-impl/src/com/intellij/codeInsight/daemon/impl/quickfix/ChangeToAppendFix.java index 180af116ff2c..bc52ba819893 100644 --- a/java/java-impl/src/com/intellij/codeInsight/daemon/impl/quickfix/ChangeToAppendFix.java +++ b/java/java-impl/src/com/intellij/codeInsight/daemon/impl/quickfix/ChangeToAppendFix.java @@ -62,8 +62,8 @@ public class ChangeToAppendFix implements IntentionAction { return JavaTokenType.PLUSEQ == myTokenType && myAssignmentExpression.isValid() && myAssignmentExpression.getManager().isInProject(myAssignmentExpression) && - myRhsType.equalsToText("java.lang.String") && - (myLhsType.equalsToText("java.lang.StringBuilder") || myLhsType.equalsToText("java.lang.StringBuffer")); + myRhsType.equalsToText(CommonClassNames.JAVA_LANG_STRING) && + (myLhsType.equalsToText(CommonClassNames.JAVA_LANG_STRING_BUILDER) || myLhsType.equalsToText(CommonClassNames.JAVA_LANG_STRING_BUFFER)); } @Override diff --git a/java/java-psi-api/src/com/intellij/psi/CommonClassNames.java b/java/java-psi-api/src/com/intellij/psi/CommonClassNames.java index 4fb3775d9b16..629a3d6ccea7 100644 --- a/java/java-psi-api/src/com/intellij/psi/CommonClassNames.java +++ b/java/java-psi-api/src/com/intellij/psi/CommonClassNames.java @@ -74,6 +74,7 @@ public interface CommonClassNames { @NonNls String JAVA_LANG_CHARACTER = "java.lang.Character"; @NonNls String JAVA_LANG_STRING_BUFFER = "java.lang.StringBuffer"; + @NonNls String JAVA_LANG_STRING_BUILDER = "java.lang.StringBuilder"; @NonNls String JAVA_LANG_ABSTRACT_STRING_BUILDER = "java.lang.AbstractStringBuilder"; @NonNls String JAVA_LANG_CLONEABLE = "java.lang.Cloneable"; diff --git a/plugins/InspectionGadgets/src/com/siyeh/ig/bugs/MismatchedStringBuilderQueryUpdateInspection.java b/plugins/InspectionGadgets/src/com/siyeh/ig/bugs/MismatchedStringBuilderQueryUpdateInspection.java index edf069f7791a..9af11426326f 100644 --- a/plugins/InspectionGadgets/src/com/siyeh/ig/bugs/MismatchedStringBuilderQueryUpdateInspection.java +++ b/plugins/InspectionGadgets/src/com/siyeh/ig/bugs/MismatchedStringBuilderQueryUpdateInspection.java @@ -193,7 +193,7 @@ public class MismatchedStringBuilderQueryUpdateInspection } final PsiClass aClass = (PsiClass)target; final String qualifiedName = aClass.getQualifiedName(); - if (!"java.lang.StringBuilder".equals(qualifiedName) && + if (!CommonClassNames.JAVA_LANG_STRING_BUILDER.equals(qualifiedName) && !"java.lang.StringBuffer".equals(qualifiedName)) { return false; } diff --git a/plugins/InspectionGadgets/src/com/siyeh/ig/memory/StringBufferFieldInspection.java b/plugins/InspectionGadgets/src/com/siyeh/ig/memory/StringBufferFieldInspection.java index a2062759c229..9faa2f617636 100644 --- a/plugins/InspectionGadgets/src/com/siyeh/ig/memory/StringBufferFieldInspection.java +++ b/plugins/InspectionGadgets/src/com/siyeh/ig/memory/StringBufferFieldInspection.java @@ -54,7 +54,7 @@ public class StringBufferFieldInspection extends BaseInspection { super.visitField(field); final PsiType type = field.getType(); if (!type.equalsToText(CommonClassNames.JAVA_LANG_STRING_BUFFER) && - !type.equalsToText("java.lang.StringBuilder")) { + !type.equalsToText(CommonClassNames.JAVA_LANG_STRING_BUILDER)) { return; } registerFieldError(field, type); diff --git a/plugins/InspectionGadgets/src/com/siyeh/ig/migration/StringBufferReplaceableByStringBuilderInspection.java b/plugins/InspectionGadgets/src/com/siyeh/ig/migration/StringBufferReplaceableByStringBuilderInspection.java index 3b9926fc5bab..7c849a4e299e 100644 --- a/plugins/InspectionGadgets/src/com/siyeh/ig/migration/StringBufferReplaceableByStringBuilderInspection.java +++ b/plugins/InspectionGadgets/src/com/siyeh/ig/migration/StringBufferReplaceableByStringBuilderInspection.java @@ -102,7 +102,7 @@ public class StringBufferReplaceableByStringBuilderInspection extends BaseInspectionVisitor { private static final Set excludes = new HashSet(Arrays.asList( - "java.lang.StringBuilder", + CommonClassNames.JAVA_LANG_STRING_BUILDER, CommonClassNames.JAVA_LANG_STRING_BUFFER)); @Override diff --git a/plugins/InspectionGadgets/src/com/siyeh/ig/performance/LengthOneStringsInConcatenationInspection.java b/plugins/InspectionGadgets/src/com/siyeh/ig/performance/LengthOneStringsInConcatenationInspection.java index 54210b008d1f..ea1e398a3c61 100644 --- a/plugins/InspectionGadgets/src/com/siyeh/ig/performance/LengthOneStringsInConcatenationInspection.java +++ b/plugins/InspectionGadgets/src/com/siyeh/ig/performance/LengthOneStringsInConcatenationInspection.java @@ -148,7 +148,7 @@ public class LengthOneStringsInConcatenationInspection } final String className = methodClass.getQualifiedName(); return CommonClassNames.JAVA_LANG_STRING_BUFFER.equals(className) || - "java.lang.StringBuilder".equals(className); + CommonClassNames.JAVA_LANG_STRING_BUILDER.equals(className); } } } \ No newline at end of file diff --git a/plugins/InspectionGadgets/src/com/siyeh/ig/performance/StringBufferMustHaveInitialCapacityInspection.java b/plugins/InspectionGadgets/src/com/siyeh/ig/performance/StringBufferMustHaveInitialCapacityInspection.java index ec4497623130..554b2f33b42e 100644 --- a/plugins/InspectionGadgets/src/com/siyeh/ig/performance/StringBufferMustHaveInitialCapacityInspection.java +++ b/plugins/InspectionGadgets/src/com/siyeh/ig/performance/StringBufferMustHaveInitialCapacityInspection.java @@ -61,7 +61,7 @@ public class StringBufferMustHaveInitialCapacityInspection if (!TypeUtils.typeEquals(CommonClassNames.JAVA_LANG_STRING_BUFFER, type) && - !TypeUtils.typeEquals("java.lang.StringBuilder", type)) { + !TypeUtils.typeEquals(CommonClassNames.JAVA_LANG_STRING_BUILDER, type)) { return; } final PsiExpressionList argumentList = expression.getArgumentList(); diff --git a/plugins/InspectionGadgets/src/com/siyeh/ig/performance/StringBufferReplaceableByStringInspection.java b/plugins/InspectionGadgets/src/com/siyeh/ig/performance/StringBufferReplaceableByStringInspection.java index fe3a69de4d4f..5d6be63483a9 100644 --- a/plugins/InspectionGadgets/src/com/siyeh/ig/performance/StringBufferReplaceableByStringInspection.java +++ b/plugins/InspectionGadgets/src/com/siyeh/ig/performance/StringBufferReplaceableByStringInspection.java @@ -61,7 +61,7 @@ public class StringBufferReplaceableByStringInspection final PsiType type = variable.getType(); if (!TypeUtils.typeEquals(CommonClassNames.JAVA_LANG_STRING_BUFFER, type) && - !TypeUtils.typeEquals("java.lang.StringBuilder", type)) { + !TypeUtils.typeEquals(CommonClassNames.JAVA_LANG_STRING_BUILDER, type)) { return; } final PsiExpression initializer = variable.getInitializer(); diff --git a/plugins/InspectionGadgets/src/com/siyeh/ig/performance/StringBufferToStringInConcatenationInspection.java b/plugins/InspectionGadgets/src/com/siyeh/ig/performance/StringBufferToStringInConcatenationInspection.java index 2c21881982ac..7dc4948bfcf4 100644 --- a/plugins/InspectionGadgets/src/com/siyeh/ig/performance/StringBufferToStringInConcatenationInspection.java +++ b/plugins/InspectionGadgets/src/com/siyeh/ig/performance/StringBufferToStringInConcatenationInspection.java @@ -118,7 +118,7 @@ public class StringBufferToStringInConcatenationInspection } final String className = aClass.getQualifiedName(); return CommonClassNames.JAVA_LANG_STRING_BUFFER.equals(className) || - "java.lang.StringBuilder".equals(className); + CommonClassNames.JAVA_LANG_STRING_BUILDER.equals(className); } } } \ No newline at end of file diff --git a/plugins/InspectionGadgets/src/com/siyeh/ig/performance/StringConcatenationInsideStringBufferAppendInspection.java b/plugins/InspectionGadgets/src/com/siyeh/ig/performance/StringConcatenationInsideStringBufferAppendInspection.java index 5ff3ff4deb30..ccb0f3f18ba0 100644 --- a/plugins/InspectionGadgets/src/com/siyeh/ig/performance/StringConcatenationInsideStringBufferAppendInspection.java +++ b/plugins/InspectionGadgets/src/com/siyeh/ig/performance/StringConcatenationInsideStringBufferAppendInspection.java @@ -111,7 +111,7 @@ public class StringConcatenationInsideStringBufferAppendInspection else { useStringValueOf = !qualifiedName.equals( CommonClassNames.JAVA_LANG_STRING_BUFFER) && - !qualifiedName.equals("java.lang.StringBuilder"); + !qualifiedName.equals(CommonClassNames.JAVA_LANG_STRING_BUILDER); } } } @@ -245,7 +245,7 @@ public class StringConcatenationInsideStringBufferAppendInspection } final String className = containingClass.getQualifiedName(); if (CommonClassNames.JAVA_LANG_STRING_BUFFER.equals(className) || - "java.lang.StringBuilder".equals(className)) { + CommonClassNames.JAVA_LANG_STRING_BUILDER.equals(className)) { registerMethodCallError(expression, containingClass); return; } diff --git a/plugins/InspectionGadgets/src/com/siyeh/ig/performance/StringEqualsEmptyStringInspection.java b/plugins/InspectionGadgets/src/com/siyeh/ig/performance/StringEqualsEmptyStringInspection.java index b81cee2acf52..e5b7e2f765c1 100644 --- a/plugins/InspectionGadgets/src/com/siyeh/ig/performance/StringEqualsEmptyStringInspection.java +++ b/plugins/InspectionGadgets/src/com/siyeh/ig/performance/StringEqualsEmptyStringInspection.java @@ -154,7 +154,7 @@ public class StringEqualsEmptyStringInspection extends BaseInspection { if (HardcodedMethodConstants.TO_STRING.equals(referenceName) && type != null && (type.equalsToText( CommonClassNames.JAVA_LANG_STRING_BUFFER) || - type.equalsToText("java.lang.StringBuilder"))) { + type.equalsToText(CommonClassNames.JAVA_LANG_STRING_BUILDER))) { return qualifierExpression.getText(); } else { diff --git a/plugins/IntentionPowerPak/src/com/siyeh/ipp/chartostring/CharToStringPredicate.java b/plugins/IntentionPowerPak/src/com/siyeh/ipp/chartostring/CharToStringPredicate.java index 943286a4f1b4..9f3db5ec6d15 100644 --- a/plugins/IntentionPowerPak/src/com/siyeh/ipp/chartostring/CharToStringPredicate.java +++ b/plugins/IntentionPowerPak/src/com/siyeh/ipp/chartostring/CharToStringPredicate.java @@ -95,8 +95,8 @@ class CharToStringPredicate implements PsiElementPredicate { return false; } final String className = type.getCanonicalText(); - if ("java.lang.StringBuffer".equals(className) || - "java.lang.StringBuilder".equals(className)) { + if (CommonClassNames.JAVA_LANG_STRING_BUFFER.equals(className) || + CommonClassNames.JAVA_LANG_STRING_BUILDER.equals(className)) { @NonNls final String methodName = methodExpression.getReferenceName(); if (!"append".equals(methodName) && diff --git a/plugins/IntentionPowerPak/src/com/siyeh/ipp/chartostring/StringToCharPredicate.java b/plugins/IntentionPowerPak/src/com/siyeh/ipp/chartostring/StringToCharPredicate.java index 63e3d0a6a577..74d8801a9af2 100644 --- a/plugins/IntentionPowerPak/src/com/siyeh/ipp/chartostring/StringToCharPredicate.java +++ b/plugins/IntentionPowerPak/src/com/siyeh/ipp/chartostring/StringToCharPredicate.java @@ -114,8 +114,8 @@ class StringToCharPredicate implements PsiElementPredicate { return false; } final String className = type.getCanonicalText(); - if ("java.lang.StringBuffer".equals(className) || - "java.lang.StringBuilder".equals(className)) { + if (CommonClassNames.JAVA_LANG_STRING_BUFFER.equals(className) || + CommonClassNames.JAVA_LANG_STRING_BUILDER.equals(className)) { @NonNls final String methodName = methodExpression.getReferenceName(); if (!"append".equals(methodName) && diff --git a/plugins/IntentionPowerPak/src/com/siyeh/ipp/concatenation/AppendUtil.java b/plugins/IntentionPowerPak/src/com/siyeh/ipp/concatenation/AppendUtil.java index 23018bbd3c42..b877f42519ae 100644 --- a/plugins/IntentionPowerPak/src/com/siyeh/ipp/concatenation/AppendUtil.java +++ b/plugins/IntentionPowerPak/src/com/siyeh/ipp/concatenation/AppendUtil.java @@ -62,8 +62,8 @@ class AppendUtil { return false; } final String name = containingClass.getQualifiedName(); - if ("java.lang.StringBuffer".equals(name) || - "java.lang.StringBuilder".equals(name)) { + if (CommonClassNames.JAVA_LANG_STRING_BUFFER.equals(name) || + CommonClassNames.JAVA_LANG_STRING_BUILDER.equals(name)) { return true; } final Project project = containingClass.getProject(); diff --git a/plugins/IntentionPowerPak/src/com/siyeh/ipp/concatenation/ReplaceConcatenationWithStringBufferIntention.java b/plugins/IntentionPowerPak/src/com/siyeh/ipp/concatenation/ReplaceConcatenationWithStringBufferIntention.java index c66252169e76..f9f9059bc03b 100644 --- a/plugins/IntentionPowerPak/src/com/siyeh/ipp/concatenation/ReplaceConcatenationWithStringBufferIntention.java +++ b/plugins/IntentionPowerPak/src/com/siyeh/ipp/concatenation/ReplaceConcatenationWithStringBufferIntention.java @@ -110,8 +110,8 @@ public class ReplaceConcatenationWithStringBufferIntention extends MutablyNamedI return false; } final String className = type.getCanonicalText(); - if (!"java.lang.StringBuffer".equals(className) && - !"java.lang.StringBuilder".equals(className)) { + if (!CommonClassNames.JAVA_LANG_STRING_BUFFER.equals(className) && + !CommonClassNames.JAVA_LANG_STRING_BUILDER.equals(className)) { return false; } @NonNls final String methodName = methodExpression.getReferenceName();