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

IDEA-83191 Refactor > Copy does not copy directory structure when performed over hierarchy under source root

Browse Source 
(cherry picked from commit c88ab2e711b18fed65368feeeba55b13f907ef0f)
This commit is contained in:
anna
2012-03-21 18:02:14 +01:00
parent 946bcf9941
commit c2cd81a916
1 changed files with 7 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
java/java-impl/src/com/intellij/refactoring/copy/CopyClassesHandler.java
+7 -3
View File
@@ -298,7 +298,7 @@ public class CopyClassesHandler extends CopyHandlerDelegateBase {
@Nullable
public static PsiElement doCopyClasses(final Map<PsiFile, PsiClass[]> fileToClasses,
HashMap<PsiFile, String> map, final String copyClassName,
@Nullable HashMap<PsiFile, String> map, final String copyClassName,
final PsiDirectory targetDirectory,
final Project project) throws IncorrectOperationException {
PsiElement newElement = null;
@@ -345,8 +345,12 @@ public class CopyClassesHandler extends CopyHandlerDelegateBase {
for (PsiFile file : files) {
try {
final PsiFile fileCopy =
CopyFilesOrDirectoriesHandler.copyToDirectory(file, getNewFileName(file, copyClassName), targetDirectory, choice);
PsiDirectory finalTarget = targetDirectory;
final String relativePath = map != null ? map.get(file) : null;
if (relativePath != null && !relativePath.isEmpty()) {
finalTarget = buildRelativeDir(targetDirectory, relativePath).findOrCreateTargetDirectory();
}
final PsiFile fileCopy = CopyFilesOrDirectoriesHandler.copyToDirectory(file, getNewFileName(file, copyClassName), finalTarget, choice);
if (fileCopy != null) {
createdFiles.add(fileCopy);
}