From ca8083ca870bdad84db1ebc6a813447ec7b3a1f6 Mon Sep 17 00:00:00 2001 From: Anna Kozlova Date: Tue, 29 May 2012 22:10:46 +0400 Subject: [PATCH] "java.util.Set" ->CommonClassNames.JAVA_UTIL_SET --- .../testSrc/com/intellij/psi/ClsRepositoryUseTest.java | 2 +- .../ig/encapsulation/ReturnOfCollectionFieldInspection.java | 2 +- .../src/org/jetbrains/generate/tostring/psi/PsiAdapter.java | 2 +- .../groovy/lang/psi/impl/statements/expressions/TypesUtil.java | 2 +- .../idea/maven/dom/MavenPluginConfigurationDomExtender.java | 3 ++- 5 files changed, 6 insertions(+), 5 deletions(-) diff --git a/java/java-tests/testSrc/com/intellij/psi/ClsRepositoryUseTest.java b/java/java-tests/testSrc/com/intellij/psi/ClsRepositoryUseTest.java index 99650996f974..88781d154921 100644 --- a/java/java-tests/testSrc/com/intellij/psi/ClsRepositoryUseTest.java +++ b/java/java-tests/testSrc/com/intellij/psi/ClsRepositoryUseTest.java @@ -540,7 +540,7 @@ public class ClsRepositoryUseTest extends PsiTestCase{ final PsiClassType.ClassResolveResult setResolveResult = ret.resolveGenerics(); final PsiClass setResolveResultElement = setResolveResult.getElement(); assert setResolveResultElement != null : setResolveResult; - assertEquals("java.util.Set", setResolveResultElement.getQualifiedName()); + assertEquals(CommonClassNames.JAVA_UTIL_SET, setResolveResultElement.getQualifiedName()); final PsiTypeParameter typeParameter = setResolveResultElement.getTypeParameters()[0]; final PsiType substitutedResult = setResolveResult.getSubstitutor().substitute(typeParameter); diff --git a/plugins/InspectionGadgets/src/com/siyeh/ig/encapsulation/ReturnOfCollectionFieldInspection.java b/plugins/InspectionGadgets/src/com/siyeh/ig/encapsulation/ReturnOfCollectionFieldInspection.java index 4a15061dfea6..afa90843cdf1 100644 --- a/plugins/InspectionGadgets/src/com/siyeh/ig/encapsulation/ReturnOfCollectionFieldInspection.java +++ b/plugins/InspectionGadgets/src/com/siyeh/ig/encapsulation/ReturnOfCollectionFieldInspection.java @@ -91,7 +91,7 @@ public class ReturnOfCollectionFieldInspection extends BaseInspection { if (TypeUtils.expressionHasTypeOrSubtype(referenceExpression, "java.util.SortedSet")) { return new ReturnOfCollectionFieldFix("java.util.Collections.unmodifiableSortedSet(" + text + ')', "java.util.SortedSet"); } - return new ReturnOfCollectionFieldFix("java.util.Collections.unmodifiableSet(" + text + ')', "java.util.Set"); + return new ReturnOfCollectionFieldFix("java.util.Collections.unmodifiableSet(" + text + ')', CommonClassNames.JAVA_UTIL_SET); } else if (TypeUtils.expressionHasTypeOrSubtype(referenceExpression, CommonClassNames.JAVA_UTIL_LIST)) { return new ReturnOfCollectionFieldFix("java.util.Collections.unmodifiableList(" + text + ')', "java.util.List"); diff --git a/plugins/generate-tostring/src/org/jetbrains/generate/tostring/psi/PsiAdapter.java b/plugins/generate-tostring/src/org/jetbrains/generate/tostring/psi/PsiAdapter.java index d47db98e1e2d..58857160686a 100644 --- a/plugins/generate-tostring/src/org/jetbrains/generate/tostring/psi/PsiAdapter.java +++ b/plugins/generate-tostring/src/org/jetbrains/generate/tostring/psi/PsiAdapter.java @@ -148,7 +148,7 @@ public class PsiAdapter { * @return true if it's a Map type. */ public boolean isSetType(PsiElementFactory factory, PsiType type) { - return isTypeOf(factory, type, "java.util.Set"); + return isTypeOf(factory, type, CommonClassNames.JAVA_UTIL_SET); } /** diff --git a/plugins/groovy/src/org/jetbrains/plugins/groovy/lang/psi/impl/statements/expressions/TypesUtil.java b/plugins/groovy/src/org/jetbrains/plugins/groovy/lang/psi/impl/statements/expressions/TypesUtil.java index 0f8936451baf..5cd3a43943e5 100644 --- a/plugins/groovy/src/org/jetbrains/plugins/groovy/lang/psi/impl/statements/expressions/TypesUtil.java +++ b/plugins/groovy/src/org/jetbrains/plugins/groovy/lang/psi/impl/statements/expressions/TypesUtil.java @@ -717,7 +717,7 @@ public class TypesUtil { if (InheritanceUtil.isInheritor(collection, "java.util.LinkedHashSet")) { return createCollection(project, "java.util.LinkedHashSet", itemType); } - if (InheritanceUtil.isInheritor(collection, "java.util.Set")) { + if (InheritanceUtil.isInheritor(collection, CommonClassNames.JAVA_UTIL_SET)) { return createCollection(project, "java.util.HashSet", itemType); } if (InheritanceUtil.isInheritor(collection, "java.util.LinkedList")) { diff --git a/plugins/maven/src/main/java/org/jetbrains/idea/maven/dom/MavenPluginConfigurationDomExtender.java b/plugins/maven/src/main/java/org/jetbrains/idea/maven/dom/MavenPluginConfigurationDomExtender.java index 7656fc318d48..615b665bff8e 100644 --- a/plugins/maven/src/main/java/org/jetbrains/idea/maven/dom/MavenPluginConfigurationDomExtender.java +++ b/plugins/maven/src/main/java/org/jetbrains/idea/maven/dom/MavenPluginConfigurationDomExtender.java @@ -18,6 +18,7 @@ package org.jetbrains.idea.maven.dom; import com.google.common.collect.ImmutableSet; import com.intellij.openapi.util.Key; import com.intellij.openapi.util.text.StringUtil; +import com.intellij.psi.CommonClassNames; import com.intellij.psi.PsiElement; import com.intellij.psi.codeStyle.NameUtil; import com.intellij.psi.xml.XmlElement; @@ -47,7 +48,7 @@ import java.util.*; public class MavenPluginConfigurationDomExtender extends DomExtender { public static final Key PLUGIN_PARAMETER_KEY = Key.create("MavenPluginConfigurationDomExtender.PLUGIN_PARAMETER_KEY"); - private static final Set COLLECTIONS_TYPE_NAMES = ImmutableSet.of("java.util.Collection", "java.util.Set", "java.util.List", + private static final Set COLLECTIONS_TYPE_NAMES = ImmutableSet.of("java.util.Collection", CommonClassNames.JAVA_UTIL_SET, "java.util.List", "java.util.ArrayList", "java.util.HashSet", "java.util.LinkedList");