MDS/openide
1
0
Fork 0
mirror of https://gitflic.ru/project/openide/openide.git synced 2026-09-18 09:34:34 +07:00
Code Issues Packages Projects Releases Wiki Activity

delete: restore safe delete state; remember search for comments/text occurrences in safe mode only (IDEA-135022)

Browse Source
This commit is contained in:
Anna Kozlova
2015-01-08 19:54:21 +01:00
parent a7912bc4de
commit f4d2d3e65b
1 changed files with 23 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files
platform/lang-impl/src/com/intellij/refactoring/safeDelete/SafeDeleteDialog.java
+23 -28
View File
@@ -134,20 +134,13 @@ public class SafeDeleteDialog extends DialogWrapper {
panel.add(myCbSearchTextOccurrences, gbc);
}
if (myDelegate == null) {
final RefactoringSettings refactoringSettings = RefactoringSettings.getInstance();
myCbSearchInComments.setSelected(refactoringSettings.SAFE_DELETE_SEARCH_IN_COMMENTS);
if (myCbSearchTextOccurrences != null) {
myCbSearchTextOccurrences.setSelected(refactoringSettings.SAFE_DELETE_SEARCH_IN_NON_JAVA);
}
if (myCbSafeDelete != null) {
myCbSafeDelete.setSelected(refactoringSettings.SAFE_DELETE_WHEN_DELETE);
}
} else {
myCbSearchInComments.setSelected(myDelegate.isToSearchInComments(myElements[0]));
if (myCbSearchTextOccurrences != null) {
myCbSearchTextOccurrences.setSelected(myDelegate.isToSearchForTextOccurrences(myElements[0]));
}
final RefactoringSettings refactoringSettings = RefactoringSettings.getInstance();
if (myCbSafeDelete != null) {
myCbSafeDelete.setSelected(refactoringSettings.SAFE_DELETE_WHEN_DELETE);
}
myCbSearchInComments.setSelected(myDelegate != null ? myDelegate.isToSearchInComments(myElements[0]) : refactoringSettings.SAFE_DELETE_SEARCH_IN_COMMENTS);
if (myCbSearchTextOccurrences != null) {
myCbSearchTextOccurrences.setSelected(myDelegate != null ? myDelegate.isToSearchForTextOccurrences(myElements[0]) : refactoringSettings.SAFE_DELETE_SEARCH_IN_NON_JAVA);
}
updateControls(myCbSearchTextOccurrences);
updateControls(myCbSearchInComments);
@@ -203,20 +196,22 @@ public class SafeDeleteDialog extends DialogWrapper {
super.doOKAction();
}
if (myDelegate == null) {
final RefactoringSettings refactoringSettings = RefactoringSettings.getInstance();
refactoringSettings.SAFE_DELETE_SEARCH_IN_COMMENTS = isSearchInComments();
if (myCbSearchTextOccurrences != null) {
refactoringSettings.SAFE_DELETE_SEARCH_IN_NON_JAVA = isSearchForTextOccurences();
}
if (myCbSafeDelete != null) {
refactoringSettings.SAFE_DELETE_WHEN_DELETE = myCbSafeDelete.isSelected();
}
} else {
myDelegate.setToSearchInComments(myElements[0], isSearchInComments());
if (myCbSearchTextOccurrences != null) {
myDelegate.setToSearchForTextOccurrences(myElements[0], isSearchForTextOccurences());
final RefactoringSettings refactoringSettings = RefactoringSettings.getInstance();
if (myCbSafeDelete != null) {
refactoringSettings.SAFE_DELETE_WHEN_DELETE = myCbSafeDelete.isSelected();
}
if (isSafeDelete()) {
if (myDelegate == null) {
refactoringSettings.SAFE_DELETE_SEARCH_IN_COMMENTS = isSearchInComments();
if (myCbSearchTextOccurrences != null) {
refactoringSettings.SAFE_DELETE_SEARCH_IN_NON_JAVA = isSearchForTextOccurences();
}
} else {
myDelegate.setToSearchInComments(myElements[0], isSearchInComments());
if (myCbSearchTextOccurrences != null) {
myDelegate.setToSearchForTextOccurrences(myElements[0], isSearchForTextOccurences());
}
}
}
}