MDS/openide
1
0
Fork 0
mirror of https://gitflic.ru/project/openide/openide.git synced 2026-09-27 10:03:11 +07:00
Code Issues Packages Projects Releases Wiki Activity

[vcs-log] better english in variable names

Browse Source
This commit is contained in:
Julia Beliaeva
2015-09-16 14:56:46 +03:00
parent 3aeafc9ff5
commit 29a947803d
2 changed files with 22 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files
platform/vcs-log/graph/src/com/intellij/vcs/log/graph/impl/print/PrintElementGeneratorImpl.java
+20 -20
View File
@@ -49,43 +49,43 @@ public class PrintElementGeneratorImpl extends AbstractPrintElementGenerator {
@NotNull private final EdgesInRowGenerator myEdgesInRowGenerator;
@NotNull private final Comparator<GraphElement> 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;
}
}
platform/vcs-log/graph/test/com/intellij/vcs/log/graph/impl/print/PrintElementGeneratorTest.kt
+2 -2
View File
@@ -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<Int> {
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)
}