IDEA-143263 Find In Path is not autopopulating a selection from Find Preview window

(cherry picked from commit f65be32)
This commit is contained in:
Maxim.Mossienko
2016-05-24 11:49:43 +02:00
committed by Maxim.Mossienko
parent f6412d9de5
commit 2c2cf3b387
2 changed files with 8 additions and 1 deletions
@@ -550,9 +550,14 @@ public class FindDialog extends DialogWrapper {
}
public void setModel(@NotNull FindModel model) {
String previousStringToFind = getStringToFind();
String newStringToFind = model.getStringToFind();
myModel = model;
updateReplaceVisibility();
updateTitle();
if (!Comparing.equal(newStringToFind, previousStringToFind)) {
myInputComboBox.getEditor().setItem(newStringToFind);
}
}
private void validateFindButton() {
@@ -172,7 +172,9 @@ public class FindManagerImpl extends FindManager {
};
myFindDialog.setModal(true);
}
else if (myFindDialog.getModel().isReplaceState() != model.isReplaceState()) {
else if (myFindDialog.getModel().isReplaceState() != model.isReplaceState() ||
!Comparing.equal(myFindDialog.getModel().getStringToFind(), model.getStringToFind())
) {
myFindDialog.setModel(model);
myFindDialog.setOkHandler(handler);
return;