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

replace: goto next occurrence after exclude. make actions dumb-aware.

Browse Source
This commit is contained in:
andrey.zaytsev
2011-07-15 20:05:47 +04:00
parent 29f5bf705c
commit 2c7f93dbeb
5 changed files with 8 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
platform/lang-impl/src/com/intellij/find/EditorSearchComponent.java
+1
View File
@@ -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');
platform/lang-impl/src/com/intellij/find/editorHeaderActions/CloseOnESCAction.java
+2 -1
View File
@@ -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);
platform/lang-impl/src/com/intellij/find/editorHeaderActions/ShowHistoryAction.java
+1 -1
View File
@@ -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());
}
}
platform/lang-impl/src/com/intellij/find/editorHeaderActions/ShowMoreOptions.java
+2 -1
View File
@@ -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);
platform/lang-impl/src/com/intellij/find/editorHeaderActions/SwitchToFind.java
+2 -1
View File
@@ -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);