diff --git a/platform/vcs-log/impl/src/com/intellij/vcs/log/ui/frame/VcsLogGraphTable.java b/platform/vcs-log/impl/src/com/intellij/vcs/log/ui/frame/VcsLogGraphTable.java index b3b1ef099301..44728fc1ca33 100644 --- a/platform/vcs-log/impl/src/com/intellij/vcs/log/ui/frame/VcsLogGraphTable.java +++ b/platform/vcs-log/impl/src/com/intellij/vcs/log/ui/frame/VcsLogGraphTable.java @@ -8,7 +8,7 @@ import com.intellij.openapi.vcs.changes.Change; import com.intellij.openapi.vcs.changes.committed.CommittedChangesTreeBrowser; import com.intellij.openapi.vcs.changes.issueLinks.TableLinkMouseListener; import com.intellij.openapi.vfs.VirtualFile; -import com.intellij.ui.JBColor; +import com.intellij.ui.ColoredTableCellRenderer; import com.intellij.ui.PopupHandler; import com.intellij.ui.TableScrollingUtil; import com.intellij.ui.table.JBTable; @@ -20,12 +20,10 @@ import com.intellij.vcs.log.Hash; import com.intellij.vcs.log.VcsLogHighlighter; import com.intellij.vcs.log.data.DataPack; import com.intellij.vcs.log.data.VcsLogDataHolder; -import com.intellij.vcs.log.graph.ClickGraphAction; -import com.intellij.vcs.log.graph.MouseOverAction; import com.intellij.vcs.log.graph.*; -import com.intellij.vcs.log.ui.render.GraphCommitCell; import com.intellij.vcs.log.newgraph.render.PositionUtil; import com.intellij.vcs.log.ui.VcsLogUiImpl; +import com.intellij.vcs.log.ui.render.GraphCommitCell; import com.intellij.vcs.log.ui.render.GraphCommitCellRender; import com.intellij.vcs.log.ui.tables.AbstractVcsLogTableModel; import org.jetbrains.annotations.NotNull; @@ -34,7 +32,10 @@ import org.jetbrains.annotations.Nullable; import javax.swing.*; import javax.swing.event.ListSelectionEvent; import javax.swing.event.ListSelectionListener; -import javax.swing.table.*; +import javax.swing.table.DefaultTableModel; +import javax.swing.table.TableCellRenderer; +import javax.swing.table.TableColumn; +import javax.swing.table.TableModel; import java.awt.*; import java.awt.datatransfer.StringSelection; import java.awt.event.MouseAdapter; @@ -381,14 +382,12 @@ public class VcsLogGraphTable extends JBTable implements TypeSafeDataProvider, C } } - private class StringCellRenderer extends DefaultTableCellRenderer { + private class StringCellRenderer extends ColoredTableCellRenderer { @Override - public Component getTableCellRendererComponent(JTable table, Object value, boolean isSelected, boolean hasFocus, int row, int column) { - Component rendererComponent = super.getTableCellRendererComponent(table, value, isSelected, hasFocus, row, column); - setBackground(isSelected ? table.getSelectionBackground() : JBColor.WHITE); + protected void customizeCellRenderer(JTable table, Object value, boolean selected, boolean hasFocus, int row, int column) { + append(value.toString()); + applyHighlighters(this, row, selected); setBorder(null); - applyHighlighters(rendererComponent, row, isSelected); - return rendererComponent; } }