Merge remote-tracking branch 'aosp/upstream-master' into merge

Conflicts:
	.idea/modules.xml

Change-Id: I5e3d04bc83cdc26b2b56fca66b44b1dd8941b143

1 files changed, 13 insertions, 0 deletions

diff --git a/platform/platform-api/src/com/intellij/ui/ExpandedItemRendererComponentWrapper.java b/platform/platform-api/src/com/intellij/ui/ExpandedItemRendererComponentWrapper.java
index 4e6d1c5c3f41..eea201116350 100644
--- a/platform/platform-api/src/com/intellij/ui/ExpandedItemRendererComponentWrapper.java
+++ b/platform/platform-api/src/com/intellij/ui/ExpandedItemRendererComponentWrapper.java
@@ -19,6 +19,7 @@ import com.intellij.util.ui.AbstractLayoutManager;
 import org.jetbrains.annotations.NotNull;
 
 import javax.swing.*;
+import javax.swing.border.Border;
 import java.awt.*;
 
 public class ExpandedItemRendererComponentWrapper extends JComponent {
@@ -40,4 +41,16 @@ public class ExpandedItemRendererComponentWrapper extends JComponent {
       }
     });
   }
+
+  @Override
+  public void setBorder(Border border) {
+    if (getComponentCount() == 1) {
+      Component component = getComponent(0);
+      if (component instanceof JComponent) {
+        ((JComponent)component).setBorder(border);
+        return;
+      }
+    }
+    super.setBorder(border);
+  }
 }