[vcs-log] check for rendering component being SimpleColoredComponent instead of direct call to GraphCommitCellRenderer method

EA-91206
This commit is contained in:
Julia Beliaeva
2016-11-07 17:02:29 +03:00
parent 0f30ce7977
commit 3ae90e31bb
3 changed files with 40 additions and 16 deletions
@@ -36,6 +36,7 @@ import com.intellij.vcs.log.paint.GraphCellPainter;
import com.intellij.vcs.log.paint.PositionUtil;
import com.intellij.vcs.log.ui.VcsLogUiImpl;
import com.intellij.vcs.log.ui.render.GraphCommitCellRenderer;
import com.intellij.vcs.log.ui.render.SimpleColoredComponentLinkMouseListener;
import com.intellij.vcs.log.ui.tables.GraphTableModel;
import com.intellij.vcs.log.util.VcsUserUtil;
import org.jetbrains.annotations.NotNull;
@@ -230,7 +231,7 @@ public class GraphTableController {
}
private class MyMouseAdapter extends MouseAdapter {
@NotNull private final TableLinkMouseListener myLinkListener = myCommitRenderer.createLinkListener();
@NotNull private final TableLinkMouseListener myLinkListener = new SimpleColoredComponentLinkMouseListener();
@Override
public void mouseClicked(MouseEvent e) {
@@ -22,7 +22,6 @@ import org.jetbrains.annotations.Nullable;
import javax.swing.*;
import java.awt.*;
import java.awt.event.MouseEvent;
import java.awt.image.BufferedImage;
import java.util.Collection;
@@ -107,10 +106,6 @@ public class GraphCommitCellRenderer extends TypeSafeTableCellRenderer<GraphComm
return myGraphTable.getColumnModel().getColumn(GraphTableModel.COMMIT_COLUMN).getWidth();
}
public TableLinkMouseListener createLinkListener() {
return new MyTableLinkMouseListener();
}
private static class MyComponent extends SimpleColoredRenderer {
@NotNull private final VcsLogData myLogData;
@NotNull private final VcsLogGraphTable myGraphTable;
@@ -259,14 +254,4 @@ public class GraphCommitCellRenderer extends TypeSafeTableCellRenderer<GraphComm
return myWidth;
}
}
public class MyTableLinkMouseListener extends TableLinkMouseListener {
@Override
protected Object tryGetTag(@NotNull MouseEvent e, @NotNull JTable table, int row, int column) {
SimpleColoredComponent component =
getTableCellRendererComponentImpl(table, getValue(table.getValueAt(row, column)), false, false, row, column);
Rectangle rc = table.getCellRect(row, column, false);
return component.getFragmentTagAt(e.getX() - rc.x);
}
}
}
@@ -0,0 +1,38 @@
/*
* Copyright 2000-2016 JetBrains s.r.o.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package com.intellij.vcs.log.ui.render;
import com.intellij.openapi.vcs.changes.issueLinks.TableLinkMouseListener;
import com.intellij.ui.SimpleColoredComponent;
import org.jetbrains.annotations.NotNull;
import javax.swing.*;
import javax.swing.table.TableCellRenderer;
import java.awt.*;
import java.awt.event.MouseEvent;
public class SimpleColoredComponentLinkMouseListener extends TableLinkMouseListener {
@Override
protected Object tryGetTag(@NotNull MouseEvent e, @NotNull JTable table, int row, int column) {
TableCellRenderer cellRenderer = table.getCellRenderer(row, column);
Component component = cellRenderer.getTableCellRendererComponent(table, table.getValueAt(row, column), false, false, row, column);
if (component instanceof SimpleColoredComponent) {
Rectangle rc = table.getCellRect(row, column, false);
return ((SimpleColoredComponent)component).getFragmentTagAt(e.getX() - rc.x);
}
return super.tryGetTag(e, table, row, column);
}
}