Snapshot idea/138.1503 from git://git.jetbrains.org/idea/community.git

Change-Id: Ie01af1d8710ec0ff51d90301bda1a18b0b5c0faf

4 files changed, 1 insertions, 46 deletions

diff --git a/platform/lang-impl/src/com/intellij/openapi/editor/actions/SelectAllOccurrencesAction.java b/platform/lang-impl/src/com/intellij/openapi/editor/actions/SelectAllOccurrencesAction.java
index 3e284ff6b2cc..ae2a4dc0d53c 100644
--- a/platform/lang-impl/src/com/intellij/openapi/editor/actions/SelectAllOccurrencesAction.java
+++ b/platform/lang-impl/src/com/intellij/openapi/editor/actions/SelectAllOccurrencesAction.java
@@ -42,8 +42,6 @@ public class SelectAllOccurrencesAction extends EditorAction {
 
     @Override
     public void doExecute(final Editor editor, @Nullable Caret c, DataContext dataContext) {
-      if (executeEquivalentFindPanelAction(editor, dataContext)) return;
-
       Caret caret = c == null ? editor.getCaretModel().getPrimaryCaret() : c;
 
       boolean wholeWordsSearch = false;
@@ -88,10 +86,5 @@ public class SelectAllOccurrencesAction extends EditorAction {
       }, caretShiftFromSelectionStart);
       editor.getScrollingModel().scrollToCaret(ScrollType.RELATIVE);
     }
-
-    @Override
-    protected EditorHeaderAction getEquivalentFindPanelAction(EditorSearchComponent searchComponent) {
-      return new SelectAllAction(searchComponent);
-    }
   }
 }
diff --git a/platform/lang-impl/src/com/intellij/openapi/editor/actions/SelectNextOccurrenceAction.java b/platform/lang-impl/src/com/intellij/openapi/editor/actions/SelectNextOccurrenceAction.java
index 7d3c408ee152..74390f15b149 100644
--- a/platform/lang-impl/src/com/intellij/openapi/editor/actions/SelectNextOccurrenceAction.java
+++ b/platform/lang-impl/src/com/intellij/openapi/editor/actions/SelectNextOccurrenceAction.java
@@ -40,8 +40,6 @@ public class SelectNextOccurrenceAction extends EditorAction {
 
     @Override
     public void doExecute(Editor editor, @Nullable Caret c, DataContext dataContext) {
-      if (executeEquivalentFindPanelAction(editor, dataContext)) return;
-
       Caret caret = c == null ? editor.getCaretModel().getPrimaryCaret() : c;
       TextRange wordSelectionRange = getSelectionRange(editor, caret);
       boolean notFoundPreviously = getAndResetNotFoundStatus(editor);
@@ -56,7 +54,7 @@ public class SelectNextOccurrenceAction extends EditorAction {
 
         FindModel model = getFindModel(selectedText, wholeWordSearch);
 
-        findManager.setFindWasPerformed();
+        findManager.setSelectNextOccurrenceWasPerformed();
         findManager.setFindNextModel(model);
 
         int searchStartOffset = notFoundPreviously ? 0 : caret.getSelectionEnd();
@@ -84,10 +82,5 @@ public class SelectNextOccurrenceAction extends EditorAction {
       }
       editor.getScrollingModel().scrollToCaret(ScrollType.RELATIVE);
     }
-
-    @Override
-    protected EditorHeaderAction getEquivalentFindPanelAction(EditorSearchComponent searchComponent) {
-      return new AddOccurrenceAction(searchComponent);
-    }
   }
 }
diff --git a/platform/lang-impl/src/com/intellij/openapi/editor/actions/SelectOccurrencesActionHandler.java b/platform/lang-impl/src/com/intellij/openapi/editor/actions/SelectOccurrencesActionHandler.java
index 7b189281dfd0..1858ef53b3f5 100644
--- a/platform/lang-impl/src/com/intellij/openapi/editor/actions/SelectOccurrencesActionHandler.java
+++ b/platform/lang-impl/src/com/intellij/openapi/editor/actions/SelectOccurrencesActionHandler.java
@@ -107,25 +107,4 @@ abstract public class SelectOccurrencesActionHandler extends EditorActionHandler
     model.setWholeWordsOnly(wholeWords);
     return model;
   }
-
-  protected boolean executeEquivalentFindPanelAction(Editor editor, DataContext context) {
-    if (editor.getHeaderComponent() instanceof EditorSearchComponent) {
-      EditorSearchComponent searchComponent = (EditorSearchComponent)editor.getHeaderComponent();
-      EditorHeaderAction action = getEquivalentFindPanelAction(searchComponent);
-      if (action != null) {
-        Presentation presentation = new Presentation();
-        AnActionEvent event = new AnActionEvent(null, context, ActionPlaces.MAIN_MENU, presentation, ActionManager.getInstance(), 0);
-        action.update(event);
-        if (presentation.isEnabled()) {
-          action.actionPerformed(event);
-          return true;
-        }
-      }
-    }
-    return false;
-  }
-
-  protected EditorHeaderAction getEquivalentFindPanelAction(EditorSearchComponent searchComponent) {
-    return null;
-  }
 }
diff --git a/platform/lang-impl/src/com/intellij/openapi/editor/actions/UnselectPreviousOccurrenceAction.java b/platform/lang-impl/src/com/intellij/openapi/editor/actions/UnselectPreviousOccurrenceAction.java
index fffff56b12dc..a5657ff89b27 100644
--- a/platform/lang-impl/src/com/intellij/openapi/editor/actions/UnselectPreviousOccurrenceAction.java
+++ b/platform/lang-impl/src/com/intellij/openapi/editor/actions/UnselectPreviousOccurrenceAction.java
@@ -15,9 +15,6 @@
  */
 package com.intellij.openapi.editor.actions;
 
-import com.intellij.find.EditorSearchComponent;
-import com.intellij.find.editorHeaderActions.EditorHeaderAction;
-import com.intellij.find.editorHeaderActions.RemoveOccurrenceAction;
 import com.intellij.openapi.actionSystem.DataContext;
 import com.intellij.openapi.editor.Caret;
 import com.intellij.openapi.editor.Editor;
@@ -38,8 +35,6 @@ public class UnselectPreviousOccurrenceAction extends EditorAction {
 
     @Override
     public void doExecute(Editor editor, @Nullable Caret caret, DataContext dataContext) {
-      if (executeEquivalentFindPanelAction(editor, dataContext)) return;
-
       if (editor.getCaretModel().getCaretCount() > 1) {
         editor.getCaretModel().removeCaret(editor.getCaretModel().getPrimaryCaret());
       }
@@ -49,10 +44,5 @@ public class UnselectPreviousOccurrenceAction extends EditorAction {
       getAndResetNotFoundStatus(editor);
       editor.getScrollingModel().scrollToCaret(ScrollType.RELATIVE);
     }
-
-    @Override
-    protected EditorHeaderAction getEquivalentFindPanelAction(EditorSearchComponent searchComponent) {
-      return new RemoveOccurrenceAction(searchComponent);
-    }
   }
 }