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

do not search for java if there is no java package; no need to parse files (IDEA-67386)

Browse Source
This commit is contained in:
anna
2011-04-01 13:33:55 +02:00
parent 9f7567784b
commit d3a5d9c7c5
2 changed files with 6 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
java/java-impl/src/com/intellij/refactoring/move/moveClassesOrPackages/MoveClassesOrPackagesHandlerBase.java
+3 -3
View File
@@ -173,14 +173,14 @@ public class MoveClassesOrPackagesHandlerBase extends MoveHandlerDelegate {
@Override
public void visitElement(PsiElement element) {
if (containsJava[0]) return;
if (element instanceof PsiFile || element instanceof PsiDirectory) {
if (element instanceof PsiDirectory) {
super.visitElement(element);
}
}
@Override
public void visitJavaFile(PsiJavaFile file) {
containsJava[0] = true;
public void visitFile(PsiFile file) {
containsJava[0] = file instanceof PsiJavaFile;
}
});
return containsJava[0];
java/java-impl/src/com/intellij/refactoring/move/moveFilesOrDirectories/JavaMoveFilesOrDirectoriesHandler.java
+3 -1
View File
@@ -42,7 +42,9 @@ public class JavaMoveFilesOrDirectoriesHandler extends MoveFilesOrDirectoriesHan
for (PsiElement element : srcElements) {
if (element instanceof PsiDirectory) {
allJava &= JavaCopyFilesOrDirectoriesHandler.hasPackages((PsiDirectory)element);
allJava &= MoveClassesOrPackagesHandlerBase.hasJavaFiles((PsiDirectory)element);
if (allJava) {
allJava = MoveClassesOrPackagesHandlerBase.hasJavaFiles((PsiDirectory)element);
}
}
else if (element instanceof PsiFile) {
allJava &= element instanceof PsiJavaFile && !JspPsiUtil.isInJspFile(element) &&