From 653e22d2dea40951f467b8e8d02a5951b26e436d Mon Sep 17 00:00:00 2001
From: Kirill Kirichenko <kirill.kirichenko@jetbrains.com>
Date: Mon, 24 Jun 2019 15:45:57 +0300
Subject: [PATCH] IDEA-215788 Remove group headers. PPreferences | Editor |
 General | Console

GitOrigin-RevId: 21e1e6caa188482b921413076a91222274e77802
---
 .../execution/console/ConsoleConfigurable.java   | 16 ++++++++++------
 .../src/com/intellij/ui/AddDeleteListPanel.java  |  7 ++++++-
 2 files changed, 16 insertions(+), 7 deletions(-)

diff --git a/platform/lang-impl/src/com/intellij/execution/console/ConsoleConfigurable.java b/platform/lang-impl/src/com/intellij/execution/console/ConsoleConfigurable.java
index b6bc9eb329cf..72a668ad205e 100644
--- a/platform/lang-impl/src/com/intellij/execution/console/ConsoleConfigurable.java
+++ b/platform/lang-impl/src/com/intellij/execution/console/ConsoleConfigurable.java
@@ -15,18 +15,17 @@ import com.intellij.openapi.ui.Messages;
 import com.intellij.openapi.ui.Splitter;
 import com.intellij.openapi.util.io.FileUtilRt;
 import com.intellij.openapi.util.text.StringUtil;
-import com.intellij.ui.AddEditDeleteListPanel;
-import com.intellij.ui.DocumentAdapter;
-import com.intellij.ui.JBColor;
-import com.intellij.ui.ListSpeedSearch;
+import com.intellij.ui.*;
 import com.intellij.ui.scale.JBUIScale;
 import com.intellij.util.containers.ContainerUtil;
 import com.intellij.util.ui.GridBag;
+import com.intellij.util.ui.JBUI;
 import org.jetbrains.annotations.Nls;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 
 import javax.swing.*;
+import javax.swing.border.Border;
 import javax.swing.event.DocumentEvent;
 import java.awt.*;
 import java.util.ArrayList;
@@ -91,8 +90,8 @@ public class ConsoleConfigurable implements SearchableConfigurable, Configurable
       Splitter splitter = new Splitter(true);
       myMainComponent.add(splitter, BorderLayout.CENTER);
       myPositivePanel =
-        new MyAddDeleteListPanel("Fold console lines that contain", "Enter a substring of a console line you'd like to see folded:");
-      myNegativePanel = new MyAddDeleteListPanel("Exceptions", "Enter a substring of a console line you don't want to fold:");
+        new MyAddDeleteListPanel("Fold console lines that contain:", "Enter a substring of a console line you'd like to see folded:");
+      myNegativePanel = new MyAddDeleteListPanel("Exceptions:", "Enter a substring of a console line you don't want to fold:");
       splitter.setFirstComponent(myPositivePanel);
       splitter.setSecondComponent(myNegativePanel);
 
@@ -233,6 +232,11 @@ public class ConsoleConfigurable implements SearchableConfigurable, Configurable
       new ListSpeedSearch(myList);
     }
 
+    @Override
+    protected Border createTitledBorder(String title) {
+      return IdeBorderFactory.createTitledBorder(title, false, JBUI.insetsTop(8)).setShowLine(false);
+    }
+
     @Override
     @Nullable
     protected String findItemToAdd() {
diff --git a/platform/platform-api/src/com/intellij/ui/AddDeleteListPanel.java b/platform/platform-api/src/com/intellij/ui/AddDeleteListPanel.java
index 959edb16a5d9..d95249f16472 100644
--- a/platform/platform-api/src/com/intellij/ui/AddDeleteListPanel.java
+++ b/platform/platform-api/src/com/intellij/ui/AddDeleteListPanel.java
@@ -10,6 +10,7 @@ import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 
 import javax.swing.*;
+import javax.swing.border.Border;
 import java.awt.*;
 import java.util.ArrayList;
 import java.util.List;
@@ -52,10 +53,14 @@ public abstract class AddDeleteListPanel<T> extends PanelWithButtons implements
     setLayout(new BorderLayout());
     add(decorator.createPanel(), BorderLayout.CENTER);
     if (myTitle != null) {
-      setBorder(IdeBorderFactory.createTitledBorder(myTitle, false));
+      setBorder(createTitledBorder(myTitle));
     }
   }
 
+  protected Border createTitledBorder(String title) {
+    return IdeBorderFactory.createTitledBorder(title, false);
+  }
+
   protected void customizeDecorator(ToolbarDecorator decorator) {
   }