From 04cb6d5adbe4ca98230fcbb1fbf5cf9a1dedc3c5 Mon Sep 17 00:00:00 2001 From: Konstantin Bulenkov Date: Tue, 16 Sep 2014 12:58:56 +0200 Subject: [PATCH] move to method --- .../intellij/ide/ui/EditorOptionsTopHitProvider.java | 9 +++++---- .../com/intellij/ide/ui/InspectionsTopHitProvider.java | 6 +++--- .../src/com/intellij/ide/ui/OptionsTopHitProvider.java | 10 +++------- 3 files changed, 11 insertions(+), 14 deletions(-) diff --git a/platform/platform-impl/src/com/intellij/ide/ui/EditorOptionsTopHitProvider.java b/platform/platform-impl/src/com/intellij/ide/ui/EditorOptionsTopHitProvider.java index 4571b1c87a48..fb0c9723dba7 100644 --- a/platform/platform-impl/src/com/intellij/ide/ui/EditorOptionsTopHitProvider.java +++ b/platform/platform-impl/src/com/intellij/ide/ui/EditorOptionsTopHitProvider.java @@ -32,16 +32,17 @@ import java.util.List; public class EditorOptionsTopHitProvider extends OptionsTopHitProvider { private static final Collection ourOptions = createOptions(); - public EditorOptionsTopHitProvider() { - super("editor"); - } - @NotNull @Override public Collection getOptions(Project project) { return ourOptions; } + @Override + public String getId() { + return "editor"; + } + private static Collection createOptions() { final List options = new ArrayList(); options.add(editorMouse("IS_MOUSE_CLICK_SELECTION_HONORS_CAMEL_WORDS", "checkbox.honor.camelhumps.words.settings.on.double.click")); diff --git a/platform/platform-impl/src/com/intellij/ide/ui/InspectionsTopHitProvider.java b/platform/platform-impl/src/com/intellij/ide/ui/InspectionsTopHitProvider.java index 165323e9349b..c10c59faf884 100644 --- a/platform/platform-impl/src/com/intellij/ide/ui/InspectionsTopHitProvider.java +++ b/platform/platform-impl/src/com/intellij/ide/ui/InspectionsTopHitProvider.java @@ -29,9 +29,9 @@ import java.util.List; * @author Konstantin Bulenkov */ public class InspectionsTopHitProvider extends OptionsTopHitProvider { - - public InspectionsTopHitProvider() { - super("inspections"); + @Override + public String getId() { + return "inspections"; } @NotNull diff --git a/platform/platform-impl/src/com/intellij/ide/ui/OptionsTopHitProvider.java b/platform/platform-impl/src/com/intellij/ide/ui/OptionsTopHitProvider.java index e472efa7fa7c..4e0604f60af4 100644 --- a/platform/platform-impl/src/com/intellij/ide/ui/OptionsTopHitProvider.java +++ b/platform/platform-impl/src/com/intellij/ide/ui/OptionsTopHitProvider.java @@ -32,12 +32,6 @@ import java.util.List; * @author Konstantin Bulenkov */ public abstract class OptionsTopHitProvider implements SearchTopHitProvider { - @NonNls private final String myId; - - public OptionsTopHitProvider(String optionId) { - myId = optionId.toLowerCase(); - } - @NotNull public abstract Collection getOptions(Project project); @@ -50,7 +44,7 @@ public abstract class OptionsTopHitProvider implements SearchTopHitProvider { if (parts.size() == 0) return; String id = parts.get(0); - if (myId.startsWith(id)) { + if (getId().startsWith(id)) { pattern = pattern.substring(id.length()).trim().toLowerCase(); final MinusculeMatcher matcher = NameUtil.buildMatcher("*" + pattern, NameUtil.MatchingCaseSensitivity.NONE); for (BooleanOptionDescription option : getOptions(project)) { @@ -60,4 +54,6 @@ public abstract class OptionsTopHitProvider implements SearchTopHitProvider { } } } + + public abstract String getId(); }