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

correct fix, sorry

Browse Source
This commit is contained in:
Dmitry Jemerov
2009-09-11 17:36:10 +04:00
parent 848fbfa94d
commit b7acee4e18
2 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
java/java-impl/src/com/intellij/refactoring/copy/JavaCopyFilesOrDirectoriesHandler.java
+2 -1
View File
@@ -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;
}
}
java/java-impl/src/com/intellij/refactoring/move/moveFilesOrDirectories/JavaMoveFilesOrDirectoriesHandler.java
+2 -1
View File
@@ -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;