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

git4idea: The do not show convert line separators dialog condition is handled correctly

Browse Source
This commit is contained in:
Constantine Plotnikov
2009-11-03 15:58:31 +03:00
parent a1be517ee0
commit 2bc7c28fd3
1 changed files with 7 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
plugins/git4idea/src/git4idea/checkin/GitConvertFilesDialog.java
+7 -5
View File
@@ -76,9 +76,11 @@ public class GitConvertFilesDialog extends DialogWrapper {
/**
* The constructor
*
* @param project the project to which this dialog is related
* @param project the project to which this dialog is related
* @param settings the git settings
* @param filesToShow the files to show sorted by vcs root
*/
GitConvertFilesDialog(Project project, Map<VirtualFile, Set<VirtualFile>> filesToShow) {
GitConvertFilesDialog(Project project, GitVcsSettings settings, Map<VirtualFile, Set<VirtualFile>> filesToShow) {
super(project, true);
ArrayList<VirtualFile> roots = new ArrayList<VirtualFile>(filesToShow.keySet());
Collections.sort(roots, GitUtil.VIRTUAL_FILE_COMPARATOR);
@@ -194,15 +196,15 @@ public class GitConvertFilesDialog extends DialogWrapper {
public void run() {
VirtualFile[] selectedFiles = null;
if (settings.LINE_SEPARATORS_CONVERSION_ASK) {
GitConvertFilesDialog d = new GitConvertFilesDialog(project, files);
GitConvertFilesDialog d = new GitConvertFilesDialog(project, settings, files);
d.show();
if (d.isOK()) {
settings.LINE_SEPARATORS_CONVERSION_ASK = d.myDoNotShowCheckBox.isSelected();
settings.LINE_SEPARATORS_CONVERSION_ASK = !d.myDoNotShowCheckBox.isSelected();
settings.LINE_SEPARATORS_CONVERSION = GitVcsSettings.ConversionPolicy.PROJECT_LINE_SEPARATORS;
selectedFiles = d.myFilesToConvert.getCheckedNodes(VirtualFile.class, null);
}
else if (d.getExitCode() == DO_NOT_CONVERT) {
settings.LINE_SEPARATORS_CONVERSION_ASK = d.myDoNotShowCheckBox.isSelected();
settings.LINE_SEPARATORS_CONVERSION_ASK = !d.myDoNotShowCheckBox.isSelected();
settings.LINE_SEPARATORS_CONVERSION = GitVcsSettings.ConversionPolicy.NONE;
}
else {