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

"java.util.List" ->CommonClassNames.JAVA_UTIL_LIST

Browse Source
This commit is contained in:
Anna Kozlova
2012-05-30 13:29:29 +04:00
parent d189b84fb0
commit 17c796c922
12 changed files with 33 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files
java/java-tests/testSrc/com/intellij/codeInsight/daemon/ImportHelperTest.java
+16 -10
View File
@@ -63,21 +63,27 @@ public class ImportHelperTest extends DaemonAnalyzerTestCase {
@Override
public void run() {
try {
checkAddImport(file, "java.util.List", "java.util.List");
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, CommonClassNames.JAVA_UTIL_MAP, "java.util.ArrayList","java.util.HashMap","java.util.List",
checkAddImport(file, CommonClassNames.JAVA_UTIL_LIST, CommonClassNames.JAVA_UTIL_LIST);
checkAddImport(file, "java.util.ArrayList", "java.util.ArrayList", CommonClassNames.JAVA_UTIL_LIST);
checkAddImport(file, "java.util.HashMap", "java.util.ArrayList","java.util.HashMap", CommonClassNames.JAVA_UTIL_LIST);
checkAddImport(file, "java.util.SortedMap", "java.util.ArrayList","java.util.HashMap", CommonClassNames.JAVA_UTIL_LIST,"java.util.SortedMap");
checkAddImport(file, CommonClassNames.JAVA_UTIL_MAP, "java.util.ArrayList","java.util.HashMap",
CommonClassNames.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",
checkAddImport(file, "java.util.AbstractList", "java.util.AbstractList","java.util.ArrayList","java.util.HashMap",
CommonClassNames.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",
checkAddImport(file, "java.util.AbstractList", "java.util.AbstractList","java.util.ArrayList","java.util.HashMap",
CommonClassNames.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",
checkAddImport(file, "java.util.TreeMap", "java.util.AbstractList","java.util.ArrayList","java.util.HashMap",
CommonClassNames.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",
checkAddImport(file, "java.util.concurrent.atomic.AtomicBoolean", "java.util.AbstractList","java.util.ArrayList","java.util.HashMap",
CommonClassNames.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",
checkAddImport(file, "java.io.File", "java.io.File","java.util.AbstractList","java.util.ArrayList","java.util.HashMap",
CommonClassNames.JAVA_UTIL_LIST,
CommonClassNames.JAVA_UTIL_MAP,"java.util.SortedMap", "java.util.TreeMap", "java.util.concurrent.atomic.AtomicBoolean");
}
catch (Throwable e) {
java/java-tests/testSrc/com/intellij/psi/impl/source/tree/java/ShortenClassReferencesTest.java
+1 -1
View File
@@ -34,7 +34,7 @@ public class ShortenClassReferencesTest extends PsiTestCase {
final PsiMethod method = (PsiMethod)aClass.add(methodFromText);
final PsiDeclarationStatement declarationStatement = (PsiDeclarationStatement) method.getBody().getStatements()[0];
final PsiJavaCodeReferenceElement referenceElement = (PsiJavaCodeReferenceElement) declarationStatement.getFirstChild().getFirstChild();
final PsiClass javaUtilListClass = myJavaFacade.findClass("java.util.List", GlobalSearchScope.allScope(myPsiManager.getProject()));
final PsiClass javaUtilListClass = myJavaFacade.findClass(CommonClassNames.JAVA_UTIL_LIST, GlobalSearchScope.allScope(myPsiManager.getProject()));
assertNotNull(javaUtilListClass);
final PsiElement resultingElement = referenceElement.bindToElement(javaUtilListClass);
assertEquals("List<", resultingElement.getText());
java/java-tests/testSrc/com/intellij/refactoring/TurnRefsToSuperTest.java
+2 -1
View File
@@ -18,6 +18,7 @@ package com.intellij.refactoring;
import com.intellij.JavaTestUtil;
import com.intellij.openapi.fileEditor.FileDocumentManager;
import com.intellij.openapi.vfs.VirtualFile;
import com.intellij.psi.CommonClassNames;
import com.intellij.psi.PsiClass;
import com.intellij.psi.search.GlobalSearchScope;
import com.intellij.refactoring.turnRefsToSuper.TurnRefsToSuperProcessor;
@@ -85,7 +86,7 @@ public class TurnRefsToSuperTest extends MultiFileTestCase {
}
public void testScr34020() throws Exception {
doTest("java.util.List", "java.util.Collection", false);
doTest(CommonClassNames.JAVA_UTIL_LIST, "java.util.Collection", false);
}
public void testCommonInheritor() throws Exception {