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

@nullable (IDEA-140719)

Browse Source
This commit is contained in:
Anna Kozlova
2015-05-26 12:25:44 +02:00
parent 78d0f6a347
commit 206f7e2f08
1 changed files with 14 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
java/execution/impl/src/com/intellij/execution/junit/RefactoringListeners.java
+14 -2
View File
@@ -26,6 +26,7 @@ import com.intellij.refactoring.listeners.RefactoringElementAdapter;
import com.intellij.refactoring.listeners.RefactoringElementListener;
import com.intellij.refactoring.listeners.UndoRefactoringElementListener;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;
public class RefactoringListeners {
public static RefactoringElementListener getListener(final PsiPackage psiPackage, final Accessor<PsiPackage> accessor) {
@@ -112,6 +113,7 @@ public class RefactoringListeners {
}
}
@Nullable
protected abstract T findNewElement(T newParent, String qualifiedName);
protected abstract String getQualifiedName(T element);
@@ -141,9 +143,14 @@ public class RefactoringListeners {
super(accessor, path);
}
@Nullable
public PsiClass findNewElement(final PsiClass psiClass, final String qualifiedName) {
final Module module = JavaExecutionUtil.findModule(psiClass);
if (module == null) {
return null;
}
return JavaPsiFacade.getInstance(psiClass.getProject())
.findClass(qualifiedName.replace('$', '.'), GlobalSearchScope.moduleScope(JavaExecutionUtil.findModule(psiClass)));
.findClass(qualifiedName.replace('$', '.'), GlobalSearchScope.moduleScope(module));
}
public String getQualifiedName(final PsiClass psiClass) {
@@ -156,10 +163,15 @@ public class RefactoringListeners {
super(accessor, "*");
}
@Nullable
public PsiClass findNewElement(final PsiClass psiClass, final String qualifiedName) {
final Module module = JavaExecutionUtil.findModule(psiClass);
if (module == null) {
return null;
}
return JavaPsiFacade.getInstance(psiClass.getProject())
.findClass(qualifiedName.replace('$', '.').replace("\\*", psiClass.getName()),
GlobalSearchScope.moduleScope(JavaExecutionUtil.findModule(psiClass)));
GlobalSearchScope.moduleScope(module));
}
public String getQualifiedName(final PsiClass psiClass) {