azalea/kotlin-fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Move Declarations: Do not show "Package doesn't exist" message twice

Browse Source
This commit is contained in:
Alexey Sedunov
2015-08-13 13:49:38 +03:00
parent 3134e58251
commit 74ef93fd0c
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
idea/src/org/jetbrains/kotlin/idea/refactoring/move/moveTopLevelDeclarations/ui/MoveKotlinTopLevelDeclarationsDialog.java
+4 -4
View File
@@ -347,12 +347,12 @@ public class MoveKotlinTopLevelDeclarationsDialog extends RefactoringDialog {
} }
@Nullable @Nullable
private MoveDestination selectPackageBasedMoveDestination() { private MoveDestination selectPackageBasedMoveDestination(boolean askIfDoesNotExist) {
String packageName = getTargetPackage(); String packageName = getTargetPackage();
RecentsManager.getInstance(myProject).registerRecentEntry(RECENTS_KEY, packageName); RecentsManager.getInstance(myProject).registerRecentEntry(RECENTS_KEY, packageName);
PackageWrapper targetPackage = new PackageWrapper(PsiManager.getInstance(myProject), packageName); PackageWrapper targetPackage = new PackageWrapper(PsiManager.getInstance(myProject), packageName);
if (!targetPackage.exists()) { if (!targetPackage.exists() && askIfDoesNotExist) {
int ret = Messages.showYesNoDialog(myProject, RefactoringBundle.message("package.does.not.exist", packageName), int ret = Messages.showYesNoDialog(myProject, RefactoringBundle.message("package.does.not.exist", packageName),
RefactoringBundle.message("move.title"), Messages.getQuestionIcon()); RefactoringBundle.message("move.title"), Messages.getQuestionIcon());
if (ret != Messages.YES) return null; if (ret != Messages.YES) return null;
@@ -378,7 +378,7 @@ public class MoveKotlinTopLevelDeclarationsDialog extends RefactoringDialog {
setErrorText(null); setErrorText(null);
if (isMoveToPackage()) { if (isMoveToPackage()) {
final MoveDestination moveDestination = selectPackageBasedMoveDestination(); final MoveDestination moveDestination = selectPackageBasedMoveDestination(true);
if (moveDestination == null) return null; if (moveDestination == null) return null;
final String targetFileName = tfFileNameInPackage.getText(); final String targetFileName = tfFileNameInPackage.getText();
@@ -541,7 +541,7 @@ public class MoveKotlinTopLevelDeclarationsDialog extends RefactoringDialog {
if (elementsToMove.size() == sourceFile.getDeclarations().size()) { if (elementsToMove.size() == sourceFile.getDeclarations().size()) {
if (isMoveToPackage()) { if (isMoveToPackage()) {
final MoveDestination moveDestination = selectPackageBasedMoveDestination(); final MoveDestination moveDestination = selectPackageBasedMoveDestination(false);
//noinspection ConstantConditions //noinspection ConstantConditions
PsiDirectory targetDir = moveDestination.getTargetIfExists(sourceFile); PsiDirectory targetDir = moveDestination.getTargetIfExists(sourceFile);
final String targetFileName = tfFileNameInPackage.getText(); final String targetFileName = tfFileNameInPackage.getText();