diff --git a/platform/vcs-log/graph/src/com/intellij/vcs/log/graph/impl/print/PrintElementGeneratorImpl.java b/platform/vcs-log/graph/src/com/intellij/vcs/log/graph/impl/print/PrintElementGeneratorImpl.java index 49b25e3ccf46..738d01cf3657 100644 --- a/platform/vcs-log/graph/src/com/intellij/vcs/log/graph/impl/print/PrintElementGeneratorImpl.java +++ b/platform/vcs-log/graph/src/com/intellij/vcs/log/graph/impl/print/PrintElementGeneratorImpl.java @@ -49,43 +49,43 @@ public class PrintElementGeneratorImpl extends AbstractPrintElementGenerator { @NotNull private final EdgesInRowGenerator myEdgesInRowGenerator; @NotNull private final Comparator myGraphElementComparator; - private final int myLongSize; - private final int myShowingPartSize; - private final int myAddNearArrowSize; + private final int myLongEdgeSize; + private final int myVisiblePartSize; + private final int myEdgeWithArrowSize; public PrintElementGeneratorImpl(@NotNull LinearGraph graph, @NotNull PrintElementManager printElementManager, boolean showLongEdges) { super(graph, printElementManager); myEdgesInRowGenerator = new EdgesInRowGenerator(graph); myGraphElementComparator = printElementManager.getGraphElementComparator(); if (showLongEdges) { - myLongSize = VERY_LONG_EDGE_SIZE; - myShowingPartSize = VERY_LONG_EDGE_PART_SIZE; + myLongEdgeSize = VERY_LONG_EDGE_SIZE; + myVisiblePartSize = VERY_LONG_EDGE_PART_SIZE; if (SHOW_ARROW_WHEN_SHOW_LONG_EDGES) { - myAddNearArrowSize = LONG_EDGE_SIZE; + myEdgeWithArrowSize = LONG_EDGE_SIZE; } else { - myAddNearArrowSize = Integer.MAX_VALUE; + myEdgeWithArrowSize = Integer.MAX_VALUE; } } else { - myLongSize = LONG_EDGE_SIZE; - myShowingPartSize = LONG_EDGE_PART_SIZE; - myAddNearArrowSize = Integer.MAX_VALUE; + myLongEdgeSize = LONG_EDGE_SIZE; + myVisiblePartSize = LONG_EDGE_PART_SIZE; + myEdgeWithArrowSize = Integer.MAX_VALUE; } } @TestOnly public PrintElementGeneratorImpl(@NotNull LinearGraph graph, @NotNull PrintElementManager printElementManager, - int longSize, - int showingPartSize, - int addNearArrowSize) { + int longEdgeSize, + int visiblePartSize, + int edgeWithArrowSize) { super(graph, printElementManager); myEdgesInRowGenerator = new EdgesInRowGenerator(graph); myGraphElementComparator = printElementManager.getGraphElementComparator(); - myLongSize = longSize; - myShowingPartSize = showingPartSize; - myAddNearArrowSize = addNearArrowSize; + myLongEdgeSize = longEdgeSize; + myVisiblePartSize = visiblePartSize; + myEdgeWithArrowSize = edgeWithArrowSize; } @NotNull @@ -161,9 +161,9 @@ public class PrintElementGeneratorImpl extends AbstractPrintElementGenerator { int upOffset = visibleRowIndex - normalEdge.first; int downOffset = normalEdge.second - visibleRowIndex; - if (edgeSize >= myLongSize) addArrowIfNeeded(result, edge, position, upOffset, downOffset, myShowingPartSize); + if (edgeSize >= myLongEdgeSize) addArrowIfNeeded(result, edge, position, upOffset, downOffset, myVisiblePartSize); - if (edgeSize >= myAddNearArrowSize) addArrowIfNeeded(result, edge, position, upOffset, downOffset, 1); + if (edgeSize >= myEdgeWithArrowSize) addArrowIfNeeded(result, edge, position, upOffset, downOffset, 1); } else { // special edges @@ -206,11 +206,11 @@ public class PrintElementGeneratorImpl extends AbstractPrintElementGenerator { { return false; } - if (normalEdge.second - normalEdge.first < myLongSize) { + if (normalEdge.second - normalEdge.first < myLongEdgeSize) { return true; } else { - return visibleRowIndex - normalEdge.first <= myShowingPartSize || normalEdge.second - visibleRowIndex <= myShowingPartSize; + return visibleRowIndex - normalEdge.first <= myVisiblePartSize || normalEdge.second - visibleRowIndex <= myVisiblePartSize; } } diff --git a/platform/vcs-log/graph/test/com/intellij/vcs/log/graph/impl/print/PrintElementGeneratorTest.kt b/platform/vcs-log/graph/test/com/intellij/vcs/log/graph/impl/print/PrintElementGeneratorTest.kt index 4b8b16fe8fec..e2a73bf26779 100644 --- a/platform/vcs-log/graph/test/com/intellij/vcs/log/graph/impl/print/PrintElementGeneratorTest.kt +++ b/platform/vcs-log/graph/test/com/intellij/vcs/log/graph/impl/print/PrintElementGeneratorTest.kt @@ -62,7 +62,7 @@ public open class PrintElementGeneratorTest : AbstractTestWithTwoTextFile("eleme runTest(`in`, out, 7, 2, 10) } - private fun runTest(`in`: String, out: String, longSize: Int, showingPartSize: Int, addNearArrowSize: Int) { + private fun runTest(`in`: String, out: String, longEdgeSize: Int, visiblePartSize: Int, edgeWithArrowSize: Int) { val graph = LinearGraphParser.parse(`in`) val graphLayout = GraphLayoutBuilder.build(graph, object : Comparator { override fun compare(o1: Int, o2: Int): Int { @@ -75,7 +75,7 @@ public open class PrintElementGeneratorTest : AbstractTestWithTwoTextFile("eleme } }) val elementManager = TestPrintElementManager(graphElementComparator) - val printElementGenerator = PrintElementGeneratorImpl(graph, elementManager, longSize, showingPartSize, addNearArrowSize) + val printElementGenerator = PrintElementGeneratorImpl(graph, elementManager, longEdgeSize, visiblePartSize, edgeWithArrowSize) val actual = printElementGenerator.asString(graph.nodesCount()) assertEquals(out, actual) }