MDS/openide
1
0
Fork 0
mirror of https://gitflic.ru/project/openide/openide.git synced 2026-09-27 10:03:11 +07:00
Code Issues Packages Projects Releases Wiki Activity

"java.util.Set" ->CommonClassNames.JAVA_UTIL_SET

Browse Source
This commit is contained in:
Anna Kozlova
2012-05-30 13:29:27 +04:00
parent fcb6afc138
commit ca8083ca87
5 changed files with 6 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
java/java-tests/testSrc/com/intellij/psi/ClsRepositoryUseTest.java
+1 -1
View File
@@ -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);
plugins/InspectionGadgets/src/com/siyeh/ig/encapsulation/ReturnOfCollectionFieldInspection.java
+1 -1
View File
@@ -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");
plugins/generate-tostring/src/org/jetbrains/generate/tostring/psi/PsiAdapter.java
+1 -1
View File
@@ -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);
}
/**
plugins/groovy/src/org/jetbrains/plugins/groovy/lang/psi/impl/statements/expressions/TypesUtil.java
+1 -1
View File
@@ -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")) {
plugins/maven/src/main/java/org/jetbrains/idea/maven/dom/MavenPluginConfigurationDomExtender.java
+2 -1
View File
@@ -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<MavenDomConfiguration> {
public static final Key<ParameterData> PLUGIN_PARAMETER_KEY = Key.create("MavenPluginConfigurationDomExtender.PLUGIN_PARAMETER_KEY");
private static final Set<String> COLLECTIONS_TYPE_NAMES = ImmutableSet.of("java.util.Collection", "java.util.Set", "java.util.List",
private static final Set<String> COLLECTIONS_TYPE_NAMES = ImmutableSet.of("java.util.Collection", CommonClassNames.JAVA_UTIL_SET, "java.util.List",
"java.util.ArrayList", "java.util.HashSet",
"java.util.LinkedList");