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.Map" ->CommonClassNames.JAVA_UTIL_MAP

Browse Source
This commit is contained in:
Anna Kozlova
2012-05-30 13:29:26 +04:00
parent 0c79564b45
commit fcb6afc138
8 changed files with 23 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files
java/debugger/impl/src/com/intellij/debugger/settings/NodeRendererSettings.java
+1 -1
View File
@@ -76,7 +76,7 @@ public class NodeRendererSettings implements PersistentStateComponent<Element> {
// alternate collections
private final NodeRenderer[] myAlternateCollectionRenderers = new NodeRenderer[]{
createCompoundReferenceRenderer(
"Map", "java.util.Map",
"Map", CommonClassNames.JAVA_UTIL_MAP,
createLabelRenderer(" size = ", "size()", null),
createExpressionChildrenRenderer("entrySet().toArray()", "!isEmpty()")
),
java/java-impl/src/com/intellij/codeInsight/template/macro/IterableVariableMacro.java
+1 -1
View File
@@ -61,7 +61,7 @@ public class IterableVariableMacro extends VariableTypeMacroBase {
final GlobalSearchScope scope = file.getResolveScope();
PsiType iterableType = elementFactory.createTypeByFQClassName("java.lang.Iterable", scope);
PsiType mapType = elementFactory.createTypeByFQClassName("java.util.Map", scope);
PsiType mapType = elementFactory.createTypeByFQClassName(CommonClassNames.JAVA_UTIL_MAP, scope);
PsiVariable[] variables = MacroUtil.getVariablesVisibleAt(place, "");
for (PsiVariable var : variables) {
java/java-tests/testSrc/com/intellij/codeInsight/daemon/ImportHelperTest.java
+13 -7
View File
@@ -67,12 +67,18 @@ public class ImportHelperTest extends DaemonAnalyzerTestCase {
checkAddImport(file, "java.util.ArrayList", "java.util.ArrayList","java.util.List");
checkAddImport(file, "java.util.HashMap", "java.util.ArrayList","java.util.HashMap","java.util.List");
checkAddImport(file, "java.util.SortedMap", "java.util.ArrayList","java.util.HashMap","java.util.List","java.util.SortedMap");
checkAddImport(file, "java.util.Map", "java.util.ArrayList","java.util.HashMap","java.util.List","java.util.Map","java.util.SortedMap");
checkAddImport(file, "java.util.AbstractList", "java.util.AbstractList","java.util.ArrayList","java.util.HashMap","java.util.List","java.util.Map","java.util.SortedMap");
checkAddImport(file, "java.util.AbstractList", "java.util.AbstractList","java.util.ArrayList","java.util.HashMap","java.util.List","java.util.Map","java.util.SortedMap");
checkAddImport(file, "java.util.TreeMap", "java.util.AbstractList","java.util.ArrayList","java.util.HashMap","java.util.List","java.util.Map","java.util.SortedMap", "java.util.TreeMap");
checkAddImport(file, "java.util.concurrent.atomic.AtomicBoolean", "java.util.AbstractList","java.util.ArrayList","java.util.HashMap","java.util.List","java.util.Map","java.util.SortedMap", "java.util.TreeMap", "java.util.concurrent.atomic.AtomicBoolean");
checkAddImport(file, "java.io.File", "java.io.File","java.util.AbstractList","java.util.ArrayList","java.util.HashMap","java.util.List","java.util.Map","java.util.SortedMap", "java.util.TreeMap", "java.util.concurrent.atomic.AtomicBoolean");
checkAddImport(file, CommonClassNames.JAVA_UTIL_MAP, "java.util.ArrayList","java.util.HashMap","java.util.List",
CommonClassNames.JAVA_UTIL_MAP,"java.util.SortedMap");
checkAddImport(file, "java.util.AbstractList", "java.util.AbstractList","java.util.ArrayList","java.util.HashMap","java.util.List",
CommonClassNames.JAVA_UTIL_MAP,"java.util.SortedMap");
checkAddImport(file, "java.util.AbstractList", "java.util.AbstractList","java.util.ArrayList","java.util.HashMap","java.util.List",
CommonClassNames.JAVA_UTIL_MAP,"java.util.SortedMap");
checkAddImport(file, "java.util.TreeMap", "java.util.AbstractList","java.util.ArrayList","java.util.HashMap","java.util.List",
CommonClassNames.JAVA_UTIL_MAP,"java.util.SortedMap", "java.util.TreeMap");
checkAddImport(file, "java.util.concurrent.atomic.AtomicBoolean", "java.util.AbstractList","java.util.ArrayList","java.util.HashMap","java.util.List",
CommonClassNames.JAVA_UTIL_MAP,"java.util.SortedMap", "java.util.TreeMap", "java.util.concurrent.atomic.AtomicBoolean");
checkAddImport(file, "java.io.File", "java.io.File","java.util.AbstractList","java.util.ArrayList","java.util.HashMap","java.util.List",
CommonClassNames.JAVA_UTIL_MAP,"java.util.SortedMap", "java.util.TreeMap", "java.util.concurrent.atomic.AtomicBoolean");
}
catch (Throwable e) {
LOG.error(e);
@@ -128,7 +134,7 @@ public class ImportHelperTest extends DaemonAnalyzerTestCase {
CodeStyleSettingsManager.getInstance(getProject()).dropTemporarySettings();
}
assertOrder(file, "java.awt.*", "java.util.Map", "static java.lang.Math.max", "static java.lang.Math.min", "static javax.swing.SwingConstants.CENTER");
assertOrder(file, "java.awt.*", CommonClassNames.JAVA_UTIL_MAP, "static java.lang.Math.max", "static java.lang.Math.min", "static javax.swing.SwingConstants.CENTER");
}
catch (Throwable e) {
java/java-tests/testSrc/com/intellij/psi/ClsRepositoryUseTest.java
+2 -2
View File
@@ -579,7 +579,7 @@ public class ClsRepositoryUseTest extends PsiTestCase{
public void testGenericReturnType() throws Exception {
disableJdk();
final PsiClass map = myJavaFacade.findClass("java.util.Map", RESOLVE_SCOPE);
final PsiClass map = myJavaFacade.findClass(CommonClassNames.JAVA_UTIL_MAP, RESOLVE_SCOPE);
assert map != null;
final PsiElementFactory factory = myJavaFacade.getElementFactory();
final PsiClassType typeMapStringToInteger =
@@ -619,7 +619,7 @@ public class ClsRepositoryUseTest extends PsiTestCase{
public void testSimplerGenericInheritance() throws Exception {
PsiElementFactory factory = myJavaFacade.getElementFactory();
PsiClass map = myJavaFacade.findClass("java.util.Map", RESOLVE_SCOPE);
PsiClass map = myJavaFacade.findClass(CommonClassNames.JAVA_UTIL_MAP, RESOLVE_SCOPE);
PsiClass hashMap = myJavaFacade.findClass("java.util.HashMap", RESOLVE_SCOPE);
assert map != null && hashMap != null;
assertTrue(factory.createType(map).isAssignableFrom(factory.createType(hashMap)));
plugins/generate-tostring/src/org/jetbrains/generate/tostring/psi/PsiAdapter.java
+1 -1
View File
@@ -137,7 +137,7 @@ public class PsiAdapter {
* @return true if it's a Map type.
*/
public boolean isMapType(PsiElementFactory factory, PsiType type) {
return isTypeOf(factory, type, "java.util.Map");
return isTypeOf(factory, type, CommonClassNames.JAVA_UTIL_MAP);
}
/**
plugins/groovy/src/org/jetbrains/plugins/groovy/codeInspection/gpath/GroovyMapGetCanBeKeyedAccessInspection.java
+2 -1
View File
@@ -17,6 +17,7 @@ package org.jetbrains.plugins.groovy.codeInspection.gpath;
import com.intellij.codeInspection.ProblemDescriptor;
import com.intellij.openapi.project.Project;
import com.intellij.psi.CommonClassNames;
import com.intellij.psi.PsiElement;
import com.intellij.psi.PsiType;
import com.intellij.psi.util.InheritanceUtil;
@@ -113,7 +114,7 @@ public class GroovyMapGetCanBeKeyedAccessInspection extends BaseInspection {
if (referenceExpression.getDotTokenType() == GroovyTokenTypes.mOPTIONAL_DOT) return;
final PsiType type = qualifier.getType();
if (!InheritanceUtil.isInheritor(type, "java.util.Map")) {
if (!InheritanceUtil.isInheritor(type, CommonClassNames.JAVA_UTIL_MAP)) {
return;
}
registerMethodCallError(grMethodCallExpression);
plugins/groovy/src/org/jetbrains/plugins/groovy/codeInspection/gpath/GroovyMapPutCanBeKeyedAccessInspection.java
+2 -1
View File
@@ -17,6 +17,7 @@ package org.jetbrains.plugins.groovy.codeInspection.gpath;
import com.intellij.codeInspection.ProblemDescriptor;
import com.intellij.openapi.project.Project;
import com.intellij.psi.CommonClassNames;
import com.intellij.psi.PsiElement;
import com.intellij.psi.PsiType;
import com.intellij.psi.util.InheritanceUtil;
@@ -114,7 +115,7 @@ public class GroovyMapPutCanBeKeyedAccessInspection extends BaseInspection {
}
if (referenceExpression.getDotTokenType() == GroovyTokenTypes.mOPTIONAL_DOT) return;
final PsiType type = qualifier.getType();
if (!InheritanceUtil.isInheritor(type, "java.util.Map")) {
if (!InheritanceUtil.isInheritor(type, CommonClassNames.JAVA_UTIL_MAP)) {
return;
}
registerMethodCallError(grMethodCallExpression);
plugins/groovy/src/org/jetbrains/plugins/groovy/dsl/CustomMembersGenerator.java
+1 -1
View File
@@ -197,7 +197,7 @@ public class CustomMembersGenerator extends GroovyObjectSupport implements GdslM
private static String stringifyType(Object type) {
if (type == null) return CommonClassNames.JAVA_LANG_OBJECT;
if (type instanceof Closure) return GroovyCommonClassNames.GROOVY_LANG_CLOSURE;
if (type instanceof Map) return "java.util.Map";
if (type instanceof Map) return CommonClassNames.JAVA_UTIL_MAP;
if (type instanceof Class) return ((Class)type).getName();
String s = type.toString();