From ac4c65c0e5d5ddefb8af27ebaf89f6cf9cdcfc17 Mon Sep 17 00:00:00 2001
From: Anna Kozlova <anna.kozlova@jetbrains.com>
Date: Thu, 16 Oct 2014 12:52:54 +0200
Subject: [PATCH] perform rename package as short name (IDEA-131378)

(cherry picked from commit 9e107f5616fb4ffa6cc2196cb22a38f8c7f4dd04)
---
 .../rename/RenamePsiPackageProcessor.java           | 13 ++++++++++++-
 1 file changed, 12 insertions(+), 1 deletion(-)

diff --git a/java/java-impl/src/com/intellij/refactoring/rename/RenamePsiPackageProcessor.java b/java/java-impl/src/com/intellij/refactoring/rename/RenamePsiPackageProcessor.java
index acc547eef311..ce9c16ec919f 100644
--- a/java/java-impl/src/com/intellij/refactoring/rename/RenamePsiPackageProcessor.java
+++ b/java/java-impl/src/com/intellij/refactoring/rename/RenamePsiPackageProcessor.java
@@ -66,10 +66,21 @@ public class RenamePsiPackageProcessor extends RenamePsiElementProcessor {
         return new String[]{((PsiPackage)element).getQualifiedName()};
       }
 
+      @Override
+      public String getNewName() {
+        final PsiPackage psiPackage = (PsiPackage)element;
+        final String oldName = psiPackage.getQualifiedName();
+        final String newName = super.getNewName();
+        if (!Comparing.strEqual(StringUtil.getPackageName(oldName), StringUtil.getPackageName(newName))) {
+          return newName;
+        }
+        return StringUtil.getShortName(newName);
+      }
+
       protected void doAction() {
         final PsiPackage psiPackage = (PsiPackage)element;
         final String oldName = psiPackage.getQualifiedName();
-        final String newName = getNewName();
+        final String newName = super.getNewName();
         if (!Comparing.strEqual(StringUtil.getPackageName(oldName), StringUtil.getPackageName(newName))) {
           invokeRefactoring(createRenameMoveProcessor(newName, psiPackage, isSearchInComments(), isSearchInNonJavaFiles()));
         } else {