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

move inner: remember custom package name on ok (IDEA-191186)

Browse Source
This commit is contained in:
Anna Kozlova
2018-05-02 20:06:11 +02:00
parent 330cb9b87e
commit 4acf542669
1 changed files with 10 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
java/java-impl/src/com/intellij/refactoring/move/moveInner/MoveInnerDialog.java
+10 -7
View File
@@ -42,6 +42,7 @@ import com.intellij.refactoring.util.CommonRefactoringUtil;
import com.intellij.refactoring.util.RefactoringMessageUtil;
import com.intellij.refactoring.util.RefactoringUtil;
import com.intellij.ui.EditorTextField;
import com.intellij.ui.RecentsManager;
import com.intellij.util.IncorrectOperationException;
import org.jetbrains.annotations.NonNls;
import org.jetbrains.annotations.NotNull;
@@ -205,7 +206,7 @@ public class MoveInnerDialog extends MoveDialogBase {
final PsiDirectory psiDirectory = (PsiDirectory)myTargetContainer;
PsiPackage oldPackage = getTargetPackage();
String name = oldPackage == null ? "" : oldPackage.getQualifiedName();
final String targetName = myPackageNameField.getText();
final String targetName = getPackageName();
if (!Comparing.equal(name, targetName)) {
final ProjectRootManager projectRootManager = ProjectRootManager.getInstance(myProject);
final List<VirtualFile> contentSourceRoots = JavaProjectRootsUtil.getSuitableDestinationSourceRoots(myProject);
@@ -302,7 +303,7 @@ public class MoveInnerDialog extends MoveDialogBase {
message = RefactoringMessageUtil.checkCanCreateClass((PsiDirectory)target, className);
if (message == null) {
final String packageName = myPackageNameField.getText().trim();
final String packageName = getPackageName();
if (packageName.length() > 0 && !PsiNameHelper.getInstance(myProject).isQualifiedName(packageName)) {
message = RefactoringMessageUtil.getIncorrectIdentifierMessage(packageName);
}
@@ -319,6 +320,7 @@ public class MoveInnerDialog extends MoveDialogBase {
return;
}
RecentsManager.getInstance(myProject).registerRecentEntry(RECENTS_KEY, getPackageName());
myProcessor.setup(getInnerClass(), className, isPassOuterClass(), parameterName,
isSearchInComments(), isSearchInNonJavaFiles(), target);
@@ -328,6 +330,10 @@ public class MoveInnerDialog extends MoveDialogBase {
invokeRefactoring(myProcessor);
}
private String getPackageName() {
return myPackageNameField.getText().trim();
}
protected void doHelpAction() {
HelpManager.getInstance().invokeHelp(HelpID.MOVE_INNER_UPPER);
}
@@ -345,12 +351,9 @@ public class MoveInnerDialog extends MoveDialogBase {
myParameterField.getComponent().setEnabled(false);
}
myPackageNameField = new PackageNameReferenceEditorCombo("", myProject, RECENTS_KEY,
RefactoringBundle.message("choose.destination.package"));
PsiPackage psiPackage = getTargetPackage();
if (psiPackage != null) {
myPackageNameField.prependItem(psiPackage.getQualifiedName());
}
myPackageNameField = new PackageNameReferenceEditorCombo(psiPackage != null ? psiPackage.getQualifiedName() : "", myProject, RECENTS_KEY,
RefactoringBundle.message("choose.destination.package"));
}
@Nullable