From 2c7f93dbeb71762be252eb47701696ca591ee9db Mon Sep 17 00:00:00 2001
From: "andrey.zaytsev" <andrey.zaytsev@jetbrains.com>
Date: Fri, 15 Jul 2011 19:09:08 +0400
Subject: [PATCH] replace: goto next occurrence after exclude. make actions
 dumb-aware.

---
 .../lang-impl/src/com/intellij/find/EditorSearchComponent.java | 1 +
 .../intellij/find/editorHeaderActions/CloseOnESCAction.java    | 3 ++-
 .../intellij/find/editorHeaderActions/ShowHistoryAction.java   | 2 +-
 .../com/intellij/find/editorHeaderActions/ShowMoreOptions.java | 3 ++-
 .../com/intellij/find/editorHeaderActions/SwitchToFind.java    | 3 ++-
 5 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/platform/lang-impl/src/com/intellij/find/EditorSearchComponent.java b/platform/lang-impl/src/com/intellij/find/EditorSearchComponent.java
index 56f16d58e076..e99c8d5f77ac 100644
--- a/platform/lang-impl/src/com/intellij/find/EditorSearchComponent.java
+++ b/platform/lang-impl/src/com/intellij/find/EditorSearchComponent.java
@@ -507,6 +507,7 @@ public class EditorSearchComponent extends JPanel implements DataProvider, Selec
       @Override
       public void actionPerformed(ActionEvent actionEvent) {
         myLivePreviewController.exclude();
+        moveCursor(SearchResults.Direction.DOWN);
       }
     });
     myExcludeButton.setMnemonic('l');
diff --git a/platform/lang-impl/src/com/intellij/find/editorHeaderActions/CloseOnESCAction.java b/platform/lang-impl/src/com/intellij/find/editorHeaderActions/CloseOnESCAction.java
index 33a409ffffd3..5097f2114351 100644
--- a/platform/lang-impl/src/com/intellij/find/editorHeaderActions/CloseOnESCAction.java
+++ b/platform/lang-impl/src/com/intellij/find/editorHeaderActions/CloseOnESCAction.java
@@ -6,6 +6,7 @@ import com.intellij.openapi.actionSystem.CustomShortcutSet;
 import com.intellij.openapi.actionSystem.KeyboardShortcut;
 import com.intellij.openapi.actionSystem.Shortcut;
 import com.intellij.openapi.keymap.KeymapUtil;
+import com.intellij.openapi.project.DumbAware;
 
 import javax.swing.*;
 import java.awt.event.ActionEvent;
@@ -14,7 +15,7 @@ import java.awt.event.InputEvent;
 import java.awt.event.KeyEvent;
 import java.util.ArrayList;
 
-public class CloseOnESCAction extends EditorHeaderAction {
+public class CloseOnESCAction extends EditorHeaderAction  implements DumbAware {
   public CloseOnESCAction(EditorSearchComponent editorSearchComponent, JComponent textField) {
     super(editorSearchComponent);
 
diff --git a/platform/lang-impl/src/com/intellij/find/editorHeaderActions/ShowHistoryAction.java b/platform/lang-impl/src/com/intellij/find/editorHeaderActions/ShowHistoryAction.java
index bb2c92b03e9a..3b465907c77d 100644
--- a/platform/lang-impl/src/com/intellij/find/editorHeaderActions/ShowHistoryAction.java
+++ b/platform/lang-impl/src/com/intellij/find/editorHeaderActions/ShowHistoryAction.java
@@ -46,7 +46,7 @@ public class ShowHistoryAction extends EditorHeaderAction implements DumbAware {
       getTextField().registerKeyboardAction(new ActionListener() {
         @Override
         public void actionPerformed(ActionEvent actionEvent) {
-          if (getEditorSearchComponent().getTextInField().isEmpty()) {
+          if (getTextField().getText().isEmpty()) {
             getEditorSearchComponent().showHistory(false, getTextField());
           }
         }
diff --git a/platform/lang-impl/src/com/intellij/find/editorHeaderActions/ShowMoreOptions.java b/platform/lang-impl/src/com/intellij/find/editorHeaderActions/ShowMoreOptions.java
index 956ac1bcdeae..8fd715960b9f 100644
--- a/platform/lang-impl/src/com/intellij/find/editorHeaderActions/ShowMoreOptions.java
+++ b/platform/lang-impl/src/com/intellij/find/editorHeaderActions/ShowMoreOptions.java
@@ -3,6 +3,7 @@ package com.intellij.find.editorHeaderActions;
 import com.intellij.openapi.actionSystem.*;
 import com.intellij.openapi.actionSystem.impl.ActionButton;
 import com.intellij.openapi.actionSystem.impl.ActionToolbarImpl;
+import com.intellij.openapi.project.DumbAware;
 
 import javax.swing.*;
 import javax.swing.text.JTextComponent;
@@ -16,7 +17,7 @@ import java.awt.event.KeyEvent;
 * Time: 22:24
 * To change this template use File | Settings | File Templates.
 */
-public class ShowMoreOptions extends AnAction {
+public class ShowMoreOptions extends AnAction implements DumbAware {
   private JComponent myToolbarComponent;
   public static final Shortcut SHORT_CUT = new KeyboardShortcut(KeyStroke.getKeyStroke(KeyEvent.VK_M, InputEvent.ALT_DOWN_MASK), null);
 
diff --git a/platform/lang-impl/src/com/intellij/find/editorHeaderActions/SwitchToFind.java b/platform/lang-impl/src/com/intellij/find/editorHeaderActions/SwitchToFind.java
index bcc7b5088bd9..440a76c87608 100644
--- a/platform/lang-impl/src/com/intellij/find/editorHeaderActions/SwitchToFind.java
+++ b/platform/lang-impl/src/com/intellij/find/editorHeaderActions/SwitchToFind.java
@@ -8,6 +8,7 @@ import com.intellij.openapi.actionSystem.AnAction;
 import com.intellij.openapi.actionSystem.AnActionEvent;
 import com.intellij.openapi.actionSystem.IdeActions;
 import com.intellij.openapi.keymap.KeymapUtil;
+import com.intellij.openapi.project.DumbAware;
 
 /**
 * Created by IntelliJ IDEA.
@@ -16,7 +17,7 @@ import com.intellij.openapi.keymap.KeymapUtil;
 * Time: 10:57
 * To change this template use File | Settings | File Templates.
 */
-public class SwitchToFind extends EditorHeaderAction {
+public class SwitchToFind extends EditorHeaderAction implements DumbAware {
   public SwitchToFind(EditorSearchComponent editorSearchComponent) {
     super(editorSearchComponent);
     AnAction findAction = ActionManager.getInstance().getAction(IdeActions.ACTION_FIND);