From 0ffd8427790278a93f632e6e55eff00d2ea85d1f Mon Sep 17 00:00:00 2001 From: Vladimir Krivosheev Date: Wed, 13 Aug 2014 15:06:27 +0200 Subject: [PATCH] simplify code --- .../src/com/intellij/execution/ui/RunContentManagerImpl.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/platform/lang-impl/src/com/intellij/execution/ui/RunContentManagerImpl.java b/platform/lang-impl/src/com/intellij/execution/ui/RunContentManagerImpl.java index 3d05f2bb1bbf..8825613709e0 100644 --- a/platform/lang-impl/src/com/intellij/execution/ui/RunContentManagerImpl.java +++ b/platform/lang-impl/src/com/intellij/execution/ui/RunContentManagerImpl.java @@ -281,14 +281,14 @@ public class RunContentManagerImpl implements RunContentManager, Disposable { final ContentManager contentManager = getContentManagerForRunner(executor); RunContentDescriptor oldDescriptor = chooseReuseContentForDescriptor(contentManager, descriptor, executionId, descriptor.getDisplayName()); final Content content; - Content oldAttachedContent = oldDescriptor == null ? null : oldDescriptor.getAttachedContent(); if (oldDescriptor == null) { content = createNewContent(contentManager, descriptor, executor); Icon icon = descriptor.getIcon(); content.setIcon(icon == null ? executor.getToolWindowIcon() : icon); } else { - content = oldAttachedContent; + content = oldDescriptor.getAttachedContent(); + LOG.assertTrue(content != null); getSyncPublisher().contentRemoved(oldDescriptor, executor); Disposer.dispose(oldDescriptor); // is of the same category, can be reused }