CommonClassNames.JAVA_LANG_STRING_BUILDER

This commit is contained in:
Maxim Medvedev
2011-10-04 22:06:44 +04:00
parent 86e64cf1bf
commit 9ebac656de
15 changed files with 21 additions and 20 deletions
@@ -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
@@ -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";
@@ -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;
}
@@ -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);
@@ -102,7 +102,7 @@ public class StringBufferReplaceableByStringBuilderInspection
extends BaseInspectionVisitor {
private static final Set<String> excludes = new HashSet(Arrays.asList(
"java.lang.StringBuilder",
CommonClassNames.JAVA_LANG_STRING_BUILDER,
CommonClassNames.JAVA_LANG_STRING_BUFFER));
@Override
@@ -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);
}
}
}
@@ -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();
@@ -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();
@@ -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);
}
}
}
@@ -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;
}
@@ -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 {
@@ -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) &&
@@ -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) &&
@@ -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();
@@ -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();