From 79188ffd5672069db3c142bcc5a7b97e65211522 Mon Sep 17 00:00:00 2001 From: "Vassiliy.Kudryashov" Date: Tue, 31 Mar 2015 13:53:35 +0300 Subject: [PATCH] https://ea.jetbrains.com/browser/ea_problems/48070 NPE --- .../intellij/openapi/wm/impl/ToolWindowsPane.java | 13 ++++--------- 1 file changed, 4 insertions(+), 9 deletions(-) diff --git a/platform/platform-impl/src/com/intellij/openapi/wm/impl/ToolWindowsPane.java b/platform/platform-impl/src/com/intellij/openapi/wm/impl/ToolWindowsPane.java index cd5612cd5ea4..d11fefbb8595 100644 --- a/platform/platform-impl/src/com/intellij/openapi/wm/impl/ToolWindowsPane.java +++ b/platform/platform-impl/src/com/intellij/openapi/wm/impl/ToolWindowsPane.java @@ -1063,17 +1063,12 @@ public final class ToolWindowsPane extends JBLayeredPane implements Disposable { JComponent c = getComponentAt(anchor); if (c instanceof Splitter) { Splitter splitter = (Splitter)c; - if (myInfo.isSplit()) { - InternalDecorator component = (InternalDecorator)splitter.getFirstComponent(); - if (component != null) { + final InternalDecorator component = + myInfo.isSplit() ? (InternalDecorator)splitter.getFirstComponent() : (InternalDecorator)splitter.getSecondComponent(); + if (myInfo.isSplit() && component != null) { myId2SplitProportion.put(component.getWindowInfo().getId(), splitter.getProportion()); - } - setComponent(component, anchor, component != null ? component.getWindowInfo().getWeight() : 0); - } - else { - InternalDecorator component = (InternalDecorator)splitter.getSecondComponent(); - setComponent(component, anchor, component != null ? component.getWindowInfo().getWeight() : 0); } + setComponent(component, anchor, component != null ? component.getWindowInfo().getWeight() : 0); } else { setComponent(null, anchor, 0); }