From 775fcf1fb5bc6f39c2298016fdccdae4b9d37342 Mon Sep 17 00:00:00 2001 From: anna Date: Mon, 5 Dec 2011 21:45:41 +0100 Subject: [PATCH] copy file: use inserted name (IDEA-78106 ) [yole] (cherry picked from commit ca9c57129e315a761373becce6a38d087b56fe68) --- .../intellij/refactoring/copy/CopyClassesHandler.java | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/java/java-impl/src/com/intellij/refactoring/copy/CopyClassesHandler.java b/java/java-impl/src/com/intellij/refactoring/copy/CopyClassesHandler.java index 6f51dfca2404..c9fa31e5e69b 100644 --- a/java/java-impl/src/com/intellij/refactoring/copy/CopyClassesHandler.java +++ b/java/java-impl/src/com/intellij/refactoring/copy/CopyClassesHandler.java @@ -177,6 +177,7 @@ public class CopyClassesHandler extends CopyHandlerDelegateBase { dialog.show(); if (dialog.isOK()) { targetDirectory = dialog.getTargetDirectory(); + className = dialog.getNewName(); } } } @@ -337,7 +338,13 @@ public class CopyClassesHandler extends CopyHandlerDelegateBase { } private static PsiFile copy(@NotNull PsiFile file, PsiDirectory directory, String name, String relativePath) { - final String fileName = name != null ? (name + "." + file.getViewProvider().getVirtualFile().getExtension()) : file.getName(); + final String fileName; + if (name != null) { + fileName = file instanceof PsiClassOwner ? name + "." + file.getViewProvider().getVirtualFile().getExtension() : name; + } + else { + fileName = file.getName(); + } if (relativePath != null && !relativePath.isEmpty()) { return buildRelativeDir(directory, relativePath).findOrCreateTargetDirectory().copyFileFrom(fileName, file); }