From 848fbfa94d84970d1cd7969aa23d5bbe36b15a05 Mon Sep 17 00:00:00 2001 From: Dmitry Jemerov Date: Fri, 11 Sep 2009 17:22:52 +0400 Subject: [PATCH] fix copy/move for Java files outside source roots --- .../refactoring/copy/JavaCopyFilesOrDirectoriesHandler.java | 2 +- .../JavaMoveFilesOrDirectoriesHandler.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/java/java-impl/src/com/intellij/refactoring/copy/JavaCopyFilesOrDirectoriesHandler.java b/java/java-impl/src/com/intellij/refactoring/copy/JavaCopyFilesOrDirectoriesHandler.java index a6ee82affcf9..48a898a2f270 100644 --- a/java/java-impl/src/com/intellij/refactoring/copy/JavaCopyFilesOrDirectoriesHandler.java +++ b/java/java-impl/src/com/intellij/refactoring/copy/JavaCopyFilesOrDirectoriesHandler.java @@ -9,7 +9,7 @@ public class JavaCopyFilesOrDirectoriesHandler extends CopyFilesOrDirectoriesHan protected boolean canCopyFiles(final PsiElement[] elements) { for (PsiElement element : elements) { if (!(element instanceof PsiFile) || - element instanceof PsiJavaFile && !JspPsiUtil.isInJspFile(element)) { + element instanceof PsiJavaFile && !JspPsiUtil.isInJspFile(element) && ((PsiJavaFile) element).getClasses().length > 0) { return false; } } 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 63b7cb84f854..aa593582348b 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 @@ -17,7 +17,7 @@ public class JavaMoveFilesOrDirectoriesHandler extends MoveFilesOrDirectoriesHan allJava &= JavaCopyFilesOrDirectoriesHandler.hasPackages((PsiDirectory)element); } else if (element instanceof PsiFile) { - allJava &= element instanceof PsiJavaFile && !JspPsiUtil.isInJspFile(element); + allJava &= element instanceof PsiJavaFile && !JspPsiUtil.isInJspFile(element) && ((PsiJavaFile) element).getClasses().length > 0; } else { return false;