MDS/openide
1
0
Fork 0
mirror of https://gitflic.ru/project/openide/openide.git synced 2026-09-27 10:03:11 +07:00
Code Issues Packages Projects Releases Wiki Activity

IDEA-182256 RunDashboard: fix NPE when types is added to dashboard

Browse Source 
- Fix toolbar layout when RC runs and tool window content is not initialized
This commit is contained in:
Konstantin Aleev
2017-11-19 21:07:22 +03:00
parent 952adac4b0
commit 14cb8624cb
1 changed files with 44 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files
platform/lang-impl/src/com/intellij/execution/dashboard/RunDashboardContent.java
+44 -26
View File
@@ -140,21 +140,7 @@ public class RunDashboardContent extends JPanel implements TreeContent, Disposab
myContentManagerListener = new ContentManagerAdapter() {
@Override
public void contentAdded(ContentManagerEvent event) {
Content content = event.getContent();
RunContentDescriptor descriptor = RunContentManagerImpl.getRunContentDescriptorByContent(content);
if (descriptor == null) {
return;
}
RunnerLayoutUi layoutUi = descriptor.getRunnerLayoutUi();
if (!(layoutUi instanceof RunnerLayoutUiImpl)) {
return;
}
RunnerLayoutUiImpl layoutUiImpl = (RunnerLayoutUiImpl)layoutUi;
layoutUiImpl.setLeftToolbarVisible(false);
layoutUiImpl.setContentToolbarBefore(false);
List<AnAction> leftToolbarActions = layoutUiImpl.getActions();
myContentActions.put(content, leftToolbarActions);
updateContentToolbar(content);
onContentAdded(event.getContent());
}
@Override
@@ -172,17 +158,9 @@ public class RunDashboardContent extends JPanel implements TreeContent, Disposab
if (ContentManagerEvent.ContentOperation.add != event.getOperation()) {
return;
}
contentAdded(event);
myBuilder.queueUpdate().doWhenDone(() -> myBuilder.accept(RunDashboardNode.class, new TreeVisitor<RunDashboardNode>() {
@Override
public boolean visit(@NotNull RunDashboardNode node) {
if (node.getContent() == event.getContent()) {
myBuilder.select(node);
}
return false;
}
}));
showContentPanel();
Content content = event.getContent();
onContentAdded(content);
onContentSelectionChanged(content);
}
};
myContentManager.addContentManagerListener(myContentManagerListener);
@@ -261,6 +239,16 @@ public class RunDashboardContent extends JPanel implements TreeContent, Disposab
new TreeSpeedSearch(myTree, TreeSpeedSearch.NODE_DESCRIPTOR_TOSTRING, true);
setTreeVisible(dashboardManager.isShowConfigurations());
// RunDashboardContent may be initialized when some contents have been already added to content manager.
// Process already added content.
for (Content content : myContentManager.getContents()) {
onContentAdded(content);
}
Content selectedContent = myContentManager.getSelectedContent();
if (selectedContent != null) {
onContentSelectionChanged(selectedContent);
}
}
private void setTreeVisible(boolean visible) {
@@ -331,6 +319,36 @@ public class RunDashboardContent extends JPanel implements TreeContent, Disposab
showMessagePanel(ExecutionBundle.message("run.dashboard.empty.selection.message"));
}
private void onContentAdded(Content content) {
RunContentDescriptor descriptor = RunContentManagerImpl.getRunContentDescriptorByContent(content);
if (descriptor == null) {
return;
}
RunnerLayoutUi layoutUi = descriptor.getRunnerLayoutUi();
if (!(layoutUi instanceof RunnerLayoutUiImpl)) {
return;
}
RunnerLayoutUiImpl layoutUiImpl = (RunnerLayoutUiImpl)layoutUi;
layoutUiImpl.setLeftToolbarVisible(false);
layoutUiImpl.setContentToolbarBefore(false);
List<AnAction> leftToolbarActions = layoutUiImpl.getActions();
myContentActions.put(content, leftToolbarActions);
updateContentToolbar(content);
}
private void onContentSelectionChanged(Content content) {
myBuilder.queueUpdate().doWhenDone(() -> myBuilder.accept(RunDashboardNode.class, new TreeVisitor<RunDashboardNode>() {
@Override
public boolean visit(@NotNull RunDashboardNode node) {
if (node.getContent() == content) {
myBuilder.select(node);
}
return false;
}
}));
showContentPanel();
}
private void showMessagePanel(String text) {
Content selectedContent = myContentManager.getSelectedContent();
if (selectedContent != null) {