From b7acee4e18ccdd5cca069a0304631b1def9e594f Mon Sep 17 00:00:00 2001
From: Dmitry Jemerov <yole@intellij.com>
Date: Fri, 11 Sep 2009 17:36:10 +0400
Subject: [PATCH] correct fix, sorry

---
 .../refactoring/copy/JavaCopyFilesOrDirectoriesHandler.java    | 3 ++-
 .../JavaMoveFilesOrDirectoriesHandler.java                     | 3 ++-
 2 files changed, 4 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 48a898a2f270..9ba69633bc31 100644
--- a/java/java-impl/src/com/intellij/refactoring/copy/JavaCopyFilesOrDirectoriesHandler.java
+++ b/java/java-impl/src/com/intellij/refactoring/copy/JavaCopyFilesOrDirectoriesHandler.java
@@ -1,6 +1,7 @@
 package com.intellij.refactoring.copy;
 
 import com.intellij.psi.*;
+import com.intellij.codeInsight.daemon.impl.CollectHighlightsUtil;
 
 /**
  * @author yole
@@ -9,7 +10,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) && ((PsiJavaFile) element).getClasses().length > 0) {
+          element instanceof PsiJavaFile && !JspPsiUtil.isInJspFile(element) && !CollectHighlightsUtil.isOutOfSourceRootJavaFile((PsiJavaFile) element)) {
         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 aa593582348b..6915493072fd 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
@@ -4,6 +4,7 @@ import com.intellij.openapi.project.Project;
 import com.intellij.psi.*;
 import com.intellij.refactoring.copy.JavaCopyFilesOrDirectoriesHandler;
 import com.intellij.refactoring.move.MoveCallback;
+import com.intellij.codeInsight.daemon.impl.CollectHighlightsUtil;
 
 public class JavaMoveFilesOrDirectoriesHandler extends MoveFilesOrDirectoriesHandler {
   @Override
@@ -17,7 +18,7 @@ public class JavaMoveFilesOrDirectoriesHandler extends MoveFilesOrDirectoriesHan
         allJava &= JavaCopyFilesOrDirectoriesHandler.hasPackages((PsiDirectory)element);
       }
       else if (element instanceof PsiFile) {
-        allJava &= element instanceof PsiJavaFile && !JspPsiUtil.isInJspFile(element) && ((PsiJavaFile) element).getClasses().length > 0;
+        allJava &= element instanceof PsiJavaFile && !JspPsiUtil.isInJspFile(element) && !CollectHighlightsUtil.isOutOfSourceRootJavaFile((PsiJavaFile) element);
       }
       else {
         return false;