From d3a5d9c7c509ac3391146240a6ddd0402b3d1f8f Mon Sep 17 00:00:00 2001 From: anna Date: Fri, 1 Apr 2011 13:31:26 +0200 Subject: [PATCH] do not search for java if there is no java package; no need to parse files (IDEA-67386) --- .../MoveClassesOrPackagesHandlerBase.java | 6 +++--- .../JavaMoveFilesOrDirectoriesHandler.java | 4 +++- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/java/java-impl/src/com/intellij/refactoring/move/moveClassesOrPackages/MoveClassesOrPackagesHandlerBase.java b/java/java-impl/src/com/intellij/refactoring/move/moveClassesOrPackages/MoveClassesOrPackagesHandlerBase.java index ec86a76f7c96..b77a7c33c909 100644 --- a/java/java-impl/src/com/intellij/refactoring/move/moveClassesOrPackages/MoveClassesOrPackagesHandlerBase.java +++ b/java/java-impl/src/com/intellij/refactoring/move/moveClassesOrPackages/MoveClassesOrPackagesHandlerBase.java @@ -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]; diff --git a/java/java-impl/src/com/intellij/refactoring/move/moveFilesOrDirectories/JavaMoveFilesOrDirectoriesHandler.java b/java/java-impl/src/com/intellij/refactoring/move/moveFilesOrDirectories/JavaMoveFilesOrDirectoriesHandler.java index 0412ec0d99d7..73f22929d339 100644 --- a/java/java-impl/src/com/intellij/refactoring/move/moveFilesOrDirectories/JavaMoveFilesOrDirectoriesHandler.java +++ b/java/java-impl/src/com/intellij/refactoring/move/moveFilesOrDirectories/JavaMoveFilesOrDirectoriesHandler.java @@ -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) &&