From 36cd4d3ffb97fcc4bacb79eed370afdf644cafb7 Mon Sep 17 00:00:00 2001 From: Julia Beliaeva Date: Sat, 8 Jun 2019 19:24:22 +0300 Subject: [PATCH] [file-history] create a separate color manager for details panel in the file history GitOrigin-RevId: 553e99e2d9202b9f8f50bb43f59097570da180b8 --- .../src/com/intellij/vcs/log/history/FileHistoryPanel.java | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/platform/vcs-log/impl/src/com/intellij/vcs/log/history/FileHistoryPanel.java b/platform/vcs-log/impl/src/com/intellij/vcs/log/history/FileHistoryPanel.java index e7ec66f130b3..86b4a494f840 100644 --- a/platform/vcs-log/impl/src/com/intellij/vcs/log/history/FileHistoryPanel.java +++ b/platform/vcs-log/impl/src/com/intellij/vcs/log/history/FileHistoryPanel.java @@ -35,9 +35,7 @@ import com.intellij.vcs.log.data.VcsLogData; import com.intellij.vcs.log.impl.CommonUiProperties; import com.intellij.vcs.log.impl.VcsLogContentUtil; import com.intellij.vcs.log.impl.VcsProjectLog; -import com.intellij.vcs.log.ui.VcsLogActionPlaces; -import com.intellij.vcs.log.ui.VcsLogInternalDataKeys; -import com.intellij.vcs.log.ui.VcsLogUiImpl; +import com.intellij.vcs.log.ui.*; import com.intellij.vcs.log.ui.actions.ShowPreviewEditorAction; import com.intellij.vcs.log.ui.frame.DetailsPanel; import com.intellij.vcs.log.ui.table.VcsLogGraphTable; @@ -52,6 +50,7 @@ import javax.swing.event.ListSelectionListener; import java.awt.*; import java.awt.event.MouseEvent; import java.util.Arrays; +import java.util.Collections; import java.util.List; import static com.intellij.util.ObjectUtils.notNull; @@ -89,7 +88,7 @@ public class FileHistoryPanel extends JPanel implements DataProvider, Disposable myGraphTable.setCompactReferencesView(true); myGraphTable.setShowTagNames(false); - myDetailsPanel = new DetailsPanel(logData, myUi.getColorManager(), this) { + myDetailsPanel = new DetailsPanel(logData, new VcsLogColorManagerImpl(Collections.singleton(myRoot)), this) { @Override protected void navigate(@NotNull CommitId commit) { VcsLogUiImpl mainLogUi = VcsProjectLog.getInstance(logData.getProject()).getMainLogUi();