From 96f0e5327ff15d7ee6f1b5ef2f283e2e8ffc6ed7 Mon Sep 17 00:00:00 2001 From: Julia Beliaeva Date: Tue, 26 Dec 2017 23:02:26 +0300 Subject: [PATCH] [vcs-log] CommitPanel never gets LoadingDetails --- .../vcs/log/ui/frame/CommitPanel.java | 21 ++++++------------- 1 file changed, 6 insertions(+), 15 deletions(-) diff --git a/platform/vcs-log/impl/src/com/intellij/vcs/log/ui/frame/CommitPanel.java b/platform/vcs-log/impl/src/com/intellij/vcs/log/ui/frame/CommitPanel.java index 1aad78f026c2..0c27ffb1e248 100644 --- a/platform/vcs-log/impl/src/com/intellij/vcs/log/ui/frame/CommitPanel.java +++ b/platform/vcs-log/impl/src/com/intellij/vcs/log/ui/frame/CommitPanel.java @@ -96,27 +96,18 @@ public class CommitPanel extends JBPanel { public void setCommit(@NotNull VcsFullCommitDetails commitData) { if (!Comparing.equal(myCommit, commitData)) { - if (commitData instanceof LoadingDetails) { - myDataPanel.setData(null); - myRootPanel.setRoot("", null); + myDataPanel.setData(commitData); + VirtualFile root = commitData.getRoot(); + if (myColorManager.isMultipleRoots()) { + myRootPanel.setRoot(root.getName(), VcsLogGraphTable.getRootBackgroundColor(root, myColorManager)); } else { - myDataPanel.setData(commitData); - VirtualFile root = commitData.getRoot(); - if (myColorManager.isMultipleRoots()) { - myRootPanel.setRoot(root.getName(), VcsLogGraphTable.getRootBackgroundColor(root, myColorManager)); - } - else { - myRootPanel.setRoot("", null); - } + myRootPanel.setRoot("", null); } myCommit = commitData; } - List branches = null; - if (!(commitData instanceof LoadingDetails)) { - branches = myLogData.getContainingBranchesGetter().requestContainingBranches(commitData.getRoot(), commitData.getId()); - } + List branches = myLogData.getContainingBranchesGetter().requestContainingBranches(commitData.getRoot(), commitData.getId()); myContainingBranchesPanel.setBranches(branches); myDataPanel.update();