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

copy: allow to reject file type association and do not open editor afterwards (IDEA-156511)

Browse Source
This commit is contained in:
Anna Kozlova
2016-05-25 18:40:17 +03:00
parent 7f8b5f8952
commit 5d877a889b
1 changed files with 12 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
platform/lang-impl/src/com/intellij/refactoring/copy/CopyFilesOrDirectoriesDialog.java
+12 -4
View File
@@ -81,6 +81,8 @@ public class CopyFilesOrDirectoriesDialog extends DialogWrapper {
private JLabel myInformationLabel;
private TextFieldWithHistoryWithBrowseButton myTargetDirectoryField;
private JCheckBox myOpenFilesInEditor = createOpenInEditorCB();
private boolean myUnknownFileType = false;
private JTextField myNewNameField;
private final PsiElement[] myElements;
private final Project myProject;
@@ -248,7 +250,9 @@ public class CopyFilesOrDirectoriesDialog extends DialogWrapper {
}
public boolean openInEditor() {
return myOpenFilesInEditor.isSelected();
return myOpenFilesInEditor.isVisible() &&
myOpenFilesInEditor.isSelected() &&
!myUnknownFileType;
}
@Override
@@ -266,12 +270,16 @@ public class CopyFilesOrDirectoriesDialog extends DialogWrapper {
return;
}
if (myFileCopy && FileTypeChooser.getKnownFileTypeOrAssociate(myTargetDirectory.getVirtualFile(), newName, myProject) == null) {
return;
if (myFileCopy) {
if (FileTypeChooser.getKnownFileTypeOrAssociate(myTargetDirectory.getVirtualFile(), newName, myProject) == null) {
myUnknownFileType = true;
}
}
}
saveOpenInEditorState(myOpenFilesInEditor.isSelected());
if (myOpenFilesInEditor.isVisible()) {
saveOpenInEditorState(myOpenFilesInEditor.isSelected());
}
if (myShowDirectoryField) {
final String targetDirectoryName = myTargetDirectoryField.getChildComponent().getText();