From 3fd4d4f1c61fbef7ba19552f560bbbe2db4aa1cd Mon Sep 17 00:00:00 2001
From: "Vassiliy.Kudryashov" <Vassiliy.Kudryashov@jetbrains.com>
Date: Tue, 21 Feb 2017 18:32:58 +0300
Subject: [PATCH] IDEA-144857 Find in Path layout

Prevent regression (IDEA-143263 Find In Path is not autopopulating a selection from Find Preview window)
---
 platform/lang-impl/src/com/intellij/find/impl/FindDialog.java | 4 ++--
 .../lang-impl/src/com/intellij/find/impl/FindPopupPanel.java  | 3 ++-
 platform/lang-impl/src/com/intellij/find/impl/FindUI.java     | 2 ++
 .../lang-impl/src/com/intellij/find/impl/FindUIHelper.java    | 1 +
 4 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/platform/lang-impl/src/com/intellij/find/impl/FindDialog.java b/platform/lang-impl/src/com/intellij/find/impl/FindDialog.java
index b8dc0bd26521..83f02bc8b2ff 100644
--- a/platform/lang-impl/src/com/intellij/find/impl/FindDialog.java
+++ b/platform/lang-impl/src/com/intellij/find/impl/FindDialog.java
@@ -1464,8 +1464,8 @@ public class FindDialog extends DialogWrapper implements FindUI {
     return mask;
   }
 
-
-  private void initByModel() {
+  @Override
+  public void initByModel() {
     FindModel myModel = myHelper.getModel();
     myCbCaseSensitive.setSelected(myModel.isCaseSensitive());
     myCbWholeWordsOnly.setSelected(myModel.isWholeWordsOnly());
diff --git a/platform/lang-impl/src/com/intellij/find/impl/FindPopupPanel.java b/platform/lang-impl/src/com/intellij/find/impl/FindPopupPanel.java
index 3e6228d6cf44..ef9811c798d5 100644
--- a/platform/lang-impl/src/com/intellij/find/impl/FindPopupPanel.java
+++ b/platform/lang-impl/src/com/intellij/find/impl/FindPopupPanel.java
@@ -635,7 +635,8 @@ public class FindPopupPanel extends JBPanel implements FindUI {
     myScopeSelectionToolbar.updateActionsImmediately();
   }
 
-  private void initByModel() {
+  @Override
+  public void initByModel() {
     FindModel myModel = myHelper.getModel();
     myCbCaseSensitive.setSelected(myModel.isCaseSensitive());
     myCbWholeWordsOnly.setSelected(myModel.isWholeWordsOnly());
diff --git a/platform/lang-impl/src/com/intellij/find/impl/FindUI.java b/platform/lang-impl/src/com/intellij/find/impl/FindUI.java
index a36886f2e04b..46d8dfb5ada7 100644
--- a/platform/lang-impl/src/com/intellij/find/impl/FindUI.java
+++ b/platform/lang-impl/src/com/intellij/find/impl/FindUI.java
@@ -25,6 +25,8 @@ public interface FindUI {
 
   String getFileTypeMask();
 
+  void initByModel();
+
   void updateReplaceVisibility();
 
   @NotNull
diff --git a/platform/lang-impl/src/com/intellij/find/impl/FindUIHelper.java b/platform/lang-impl/src/com/intellij/find/impl/FindUIHelper.java
index 8f1f65da2a92..a18ae29188e6 100644
--- a/platform/lang-impl/src/com/intellij/find/impl/FindUIHelper.java
+++ b/platform/lang-impl/src/com/intellij/find/impl/FindUIHelper.java
@@ -123,6 +123,7 @@ class FindUIHelper implements Disposable {
 
   public void setModel(@NotNull FindModel model) {
     myModel = model;
+    myUI.initByModel();
     myUI.updateReplaceVisibility();
   }