1 files changed, 4 insertions, 7 deletions
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 b6e3be4b86bd..a081ff233ca6 100644
--- a/java/java-impl/src/com/intellij/refactoring/copy/CopyClassesHandler.java
+++ b/java/java-impl/src/com/intellij/refactoring/copy/CopyClassesHandler.java
@@ -37,7 +37,6 @@ import com.intellij.refactoring.MoveDestination;
 import com.intellij.refactoring.RefactoringBundle;
 import com.intellij.refactoring.move.moveClassesOrPackages.MoveDirectoryWithClassesProcessor;
 import com.intellij.util.ArrayUtil;
-import com.intellij.util.ArrayUtilRt;
 import com.intellij.util.IncorrectOperationException;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
@@ -184,16 +183,14 @@ public class CopyClassesHandler extends CopyHandlerDelegateBase {
     String className = null;
     boolean openInEditor = true;
     if (copyOneClass(classes)) {
-      final String commonPath =
-        ArrayUtilRt.find(elements, classes.values().iterator().next()) == -1 ? normalizeRelativeMap(relativePathsMap) : null;
+      final String commonPath = ArrayUtil.find(elements, classes.values().iterator().next()) == -1 ? normalizeRelativeMap(relativePathsMap) : null;
       CopyClassDialog dialog = new CopyClassDialog(classes.values().iterator().next()[0], defaultTargetDirectory, project, false){
         @Override
         protected String getQualifiedName() {
-          final String qualifiedName = super.getQualifiedName();
-          if (commonPath != null && !commonPath.isEmpty() && !qualifiedName.endsWith(commonPath)) {
-            return StringUtil.getQualifiedName(qualifiedName, commonPath.replaceAll("/", "."));
+          if (commonPath != null && !commonPath.isEmpty()) {
+            return StringUtil.getQualifiedName(super.getQualifiedName(), commonPath.replaceAll("/", "."));
           }
-          return qualifiedName;
+          return super.getQualifiedName();
         }
       };
       dialog.setTitle(RefactoringBundle.message("copy.handler.copy.class"));