From 3569a4c4a96f57b5fe993bf730a5f855f0e74cb0 Mon Sep 17 00:00:00 2001
From: Sergey Malenkov <sergey.malenkov@jetbrains.com>
Date: Thu, 11 May 2017 22:03:55 +0300
Subject: [PATCH] IDEA-165089 add ability to remove a label before combobox

---
 .../options/schemes/AbstractSchemesPanel.java     | 15 +++++++++++++--
 .../openapi/keymap/impl/ui/KeymapSelector.java    |  6 ++++++
 2 files changed, 19 insertions(+), 2 deletions(-)

diff --git a/platform/platform-impl/src/com/intellij/application/options/schemes/AbstractSchemesPanel.java b/platform/platform-impl/src/com/intellij/application/options/schemes/AbstractSchemesPanel.java
index a79baa59622b..273095518d46 100644
--- a/platform/platform-impl/src/com/intellij/application/options/schemes/AbstractSchemesPanel.java
+++ b/platform/platform-impl/src/com/intellij/application/options/schemes/AbstractSchemesPanel.java
@@ -70,8 +70,11 @@ public abstract class AbstractSchemesPanel<T extends Scheme, InfoComponent exten
   private void createUIComponents() {
     JPanel controlsPanel = new JPanel();
     controlsPanel.setLayout(new BoxLayout(controlsPanel, BoxLayout.LINE_AXIS));
-    controlsPanel.add(new JLabel(getSchemeTypeName() + ":"));
-    controlsPanel.add(Box.createRigidArea(new JBDimension(10, 0)));
+    String label = getComboBoxLabel();
+    if (label != null) {
+      controlsPanel.add(new JLabel(label));
+      controlsPanel.add(Box.createRigidArea(new JBDimension(10, 0)));
+    }
     myActions = createSchemeActions();
     mySchemesCombo = new EditableSchemesCombo<>(this);
     controlsPanel.add(mySchemesCombo.getComponent());
@@ -172,6 +175,14 @@ public abstract class AbstractSchemesPanel<T extends Scheme, InfoComponent exten
   @NotNull
   protected abstract InfoComponent createInfoComponent();
 
+  /**
+   * @return a string label to place before the combobox or {@code null} if it is not needed
+   */
+  @Nullable
+  protected String getComboBoxLabel() {
+    return getSchemeTypeName() + ":";
+  }
+
   protected String getSchemeTypeName() {
     return ApplicationBundle.message("editbox.scheme.type.name");
   }
diff --git a/platform/platform-impl/src/com/intellij/openapi/keymap/impl/ui/KeymapSelector.java b/platform/platform-impl/src/com/intellij/openapi/keymap/impl/ui/KeymapSelector.java
index 8f6eb9dd50df..8ee7f1dbf461 100644
--- a/platform/platform-impl/src/com/intellij/openapi/keymap/impl/ui/KeymapSelector.java
+++ b/platform/platform-impl/src/com/intellij/openapi/keymap/impl/ui/KeymapSelector.java
@@ -52,6 +52,12 @@ final class KeymapSelector extends SimpleSchemesPanel<KeymapScheme> {
     return getManager();
   }
 
+  @Nullable
+  @Override
+  protected String getComboBoxLabel() {
+    return null;
+  }
+
   @Override
   protected String getSchemeTypeName() {
     return "Keymap";