From dc5cdd12ee3bb8eb7ece1a0fb3d99f5de1a17448 Mon Sep 17 00:00:00 2001 From: Julia Beliaeva Date: Wed, 28 Jan 2015 11:45:05 +0300 Subject: [PATCH] [vcs-log] code issues: rename isEdgeDown/isEdgeUp and a bunch of toUp and toDown variables --- .../vcs/log/graph/api/LiteLinearGraph.java | 4 ++-- .../collapsing/DottedFilterEdgesGenerator.java | 16 ++++++++-------- .../log/graph/collapsing/FragmentGenerator.java | 16 ++++++++-------- .../graph/collapsing/TreeSetNodeIterator.java | 4 ++-- .../impl/print/PrintElementGeneratorImpl.java | 6 +++--- .../vcs/log/graph/linearBek/LinearBekGraph.java | 2 +- .../vcs/log/graph/utils/LinearGraphUtils.java | 10 +++++----- .../intellij/vcs/log/graph/TestGraphBuilder.kt | 4 ++-- 8 files changed, 31 insertions(+), 31 deletions(-) diff --git a/platform/vcs-log/graph/src/com/intellij/vcs/log/graph/api/LiteLinearGraph.java b/platform/vcs-log/graph/src/com/intellij/vcs/log/graph/api/LiteLinearGraph.java index 51d744878d56..a24906a14638 100644 --- a/platform/vcs-log/graph/src/com/intellij/vcs/log/graph/api/LiteLinearGraph.java +++ b/platform/vcs-log/graph/src/com/intellij/vcs/log/graph/api/LiteLinearGraph.java @@ -45,8 +45,8 @@ public interface LiteLinearGraph { this.edgeFilter = edgeFilter; } - public static NodeFilter filter(boolean toUp) { - return toUp ? UP : DOWN; + public static NodeFilter filter(boolean isUp) { + return isUp ? UP : DOWN; } } } diff --git a/platform/vcs-log/graph/src/com/intellij/vcs/log/graph/collapsing/DottedFilterEdgesGenerator.java b/platform/vcs-log/graph/src/com/intellij/vcs/log/graph/collapsing/DottedFilterEdgesGenerator.java index 3fdd27bbaeee..e855e9103228 100644 --- a/platform/vcs-log/graph/src/com/intellij/vcs/log/graph/collapsing/DottedFilterEdgesGenerator.java +++ b/platform/vcs-log/graph/src/com/intellij/vcs/log/graph/collapsing/DottedFilterEdgesGenerator.java @@ -57,8 +57,8 @@ public class DottedFilterEdgesGenerator { myModification.createEdge(new GraphEdge(nodeIndex1, nodeIndex2, null, DOTTED)); } - private void addDottedArrow(int nodeIndex, boolean toUp) { - myModification.createEdge(new GraphEdge(nodeIndex, null, null, toUp ? DOTTED_ARROW_UP : DOTTED_ARROW_DOWN)); + private void addDottedArrow(int nodeIndex, boolean isUp) { + myModification.createEdge(new GraphEdge(nodeIndex, null, null, isUp ? DOTTED_ARROW_UP : DOTTED_ARROW_DOWN)); } // update specified range @@ -67,23 +67,23 @@ public class DottedFilterEdgesGenerator { upWalk(); } - private boolean hasDottedEdges(int nodeIndex, boolean toUp) { + private boolean hasDottedEdges(int nodeIndex, boolean isUp) { for (GraphEdge edge : myModification.getEdgesToAdd().getAdjacentEdges(nodeIndex, EdgeFilter.NORMAL_ALL)) { if (edge.getType() == DOTTED) { - if (toUp && LinearGraphUtils.isEdgeToUp(edge, nodeIndex)) return true; - if (!toUp && LinearGraphUtils.isEdgeToDown(edge, nodeIndex)) return false; + if (isUp && LinearGraphUtils.isEdgeUp(edge, nodeIndex)) return true; + if (!isUp && LinearGraphUtils.isEdgeDown(edge, nodeIndex)) return false; } } return false; } - private void addEdgeOrArrow(int currentNodeIndex, int anotherNodeIndex, boolean toUp) { - if (hasDottedEdges(currentNodeIndex, toUp)) { + private void addEdgeOrArrow(int currentNodeIndex, int anotherNodeIndex, boolean isUp) { + if (hasDottedEdges(currentNodeIndex, isUp)) { if (nodeIsVisible(anotherNodeIndex)) { addDottedEdge(currentNodeIndex, anotherNodeIndex); } else { - addDottedArrow(currentNodeIndex, toUp); + addDottedArrow(currentNodeIndex, isUp); } } } diff --git a/platform/vcs-log/graph/src/com/intellij/vcs/log/graph/collapsing/FragmentGenerator.java b/platform/vcs-log/graph/src/com/intellij/vcs/log/graph/collapsing/FragmentGenerator.java index 32bea4e8fd0e..029d1bffb639 100644 --- a/platform/vcs-log/graph/src/com/intellij/vcs/log/graph/collapsing/FragmentGenerator.java +++ b/platform/vcs-log/graph/src/com/intellij/vcs/log/graph/collapsing/FragmentGenerator.java @@ -86,10 +86,10 @@ public class FragmentGenerator { } @Nullable - public Integer getNearRedNode(int startNode, int maxWalkSize, boolean toUp) { + public Integer getNearRedNode(int startNode, int maxWalkSize, boolean isUp) { if (myRedNodes.value(startNode)) return startNode; - TreeSetNodeIterator walker = new TreeSetNodeIterator(startNode, toUp); + TreeSetNodeIterator walker = new TreeSetNodeIterator(startNode, isUp); while (walker.notEmpty()) { Integer next = walker.pop(); @@ -98,7 +98,7 @@ public class FragmentGenerator { if (maxWalkSize < 0) return null; maxWalkSize--; - walker.addAll(getNodes(next, toUp)); + walker.addAll(getNodes(next, isUp)); } return null; @@ -126,15 +126,15 @@ public class FragmentGenerator { } @NotNull - private Set getWalkNodes(int startNode, boolean toUp, Condition stopFunction) { + private Set getWalkNodes(int startNode, boolean isUp, Condition stopFunction) { Set walkNodes = new HashSet(); - TreeSetNodeIterator walker = new TreeSetNodeIterator(startNode, toUp); + TreeSetNodeIterator walker = new TreeSetNodeIterator(startNode, isUp); while (walker.notEmpty()) { Integer next = walker.pop(); if (!stopFunction.value(next)) { walkNodes.add(next); - walker.addAll(getNodes(next, toUp)); + walker.addAll(getNodes(next, isUp)); } } @@ -142,8 +142,8 @@ public class FragmentGenerator { } @NotNull - private List getNodes(int nodeIndex, boolean toUp) { - return myGraph.getNodes(nodeIndex, LiteLinearGraph.NodeFilter.filter(toUp)); + private List getNodes(int nodeIndex, boolean isUp) { + return myGraph.getNodes(nodeIndex, LiteLinearGraph.NodeFilter.filter(isUp)); } @NotNull diff --git a/platform/vcs-log/graph/src/com/intellij/vcs/log/graph/collapsing/TreeSetNodeIterator.java b/platform/vcs-log/graph/src/com/intellij/vcs/log/graph/collapsing/TreeSetNodeIterator.java index dfd1703a5c4f..dba38e77d986 100644 --- a/platform/vcs-log/graph/src/com/intellij/vcs/log/graph/collapsing/TreeSetNodeIterator.java +++ b/platform/vcs-log/graph/src/com/intellij/vcs/log/graph/collapsing/TreeSetNodeIterator.java @@ -25,11 +25,11 @@ import java.util.TreeSet; class TreeSetNodeIterator { private final SortedSet myWalkNodes; - TreeSetNodeIterator(int startNode, final boolean toUp) { + TreeSetNodeIterator(int startNode, final boolean isUp) { myWalkNodes = new TreeSet(new Comparator() { @Override public int compare(@NotNull Integer o1, @NotNull Integer o2) { - if (toUp) + if (isUp) return o2 - o1; return o1 - o2; } 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 56e198df3e14..6e9061d54ec4 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 @@ -104,7 +104,7 @@ public class PrintElementGeneratorImpl extends AbstractPrintElementGenerator { if (element instanceof GraphNode) { int nodeIndex = ((GraphNode)element).getNodeIndex(); for (GraphEdge edge : myLinearGraph.getAdjacentEdges(nodeIndex, EdgeFilter.ALL)) { - if (isEdgeToDown(edge, nodeIndex)) { + if (isEdgeDown(edge, nodeIndex)) { Integer endPos = endPosition.fun(edge); if (endPos != null) result.add(new ShortEdge(edge, startPosition, endPos)); } @@ -224,13 +224,13 @@ public class PrintElementGeneratorImpl extends AbstractPrintElementGenerator { if (rowIndex > 0) { for (GraphEdge edge : myLinearGraph.getAdjacentEdges(rowIndex - 1, EdgeFilter.SPECIAL)) { assert !edge.getType().isNormalEdge(); - if (isEdgeToDown(edge, rowIndex - 1)) result.add(edge); + if (isEdgeDown(edge, rowIndex - 1)) result.add(edge); } } if (rowIndex < myLinearGraph.nodesCount() - 1) { for (GraphEdge edge : myLinearGraph.getAdjacentEdges(rowIndex + 1, EdgeFilter.SPECIAL)) { assert !edge.getType().isNormalEdge(); - if (isEdgeToUp(edge, rowIndex + 1)) result.add(edge); + if (isEdgeUp(edge, rowIndex + 1)) result.add(edge); } } } diff --git a/platform/vcs-log/graph/src/com/intellij/vcs/log/graph/linearBek/LinearBekGraph.java b/platform/vcs-log/graph/src/com/intellij/vcs/log/graph/linearBek/LinearBekGraph.java index 87962b8a8bd6..76c36fb81dc3 100644 --- a/platform/vcs-log/graph/src/com/intellij/vcs/log/graph/linearBek/LinearBekGraph.java +++ b/platform/vcs-log/graph/src/com/intellij/vcs/log/graph/linearBek/LinearBekGraph.java @@ -103,7 +103,7 @@ public class LinearBekGraph implements LinearGraph { List downDottedEdges = ContainerUtil.filter(hiddenDotted, new Condition() { @Override public boolean value(GraphEdge graphEdge) { - return LinearGraphUtils.isEdgeToDown(graphEdge, tail); + return LinearGraphUtils.isEdgeDown(graphEdge, tail); } }); diff --git a/platform/vcs-log/graph/src/com/intellij/vcs/log/graph/utils/LinearGraphUtils.java b/platform/vcs-log/graph/src/com/intellij/vcs/log/graph/utils/LinearGraphUtils.java index e6199defd395..08b5f5dd1b87 100644 --- a/platform/vcs-log/graph/src/com/intellij/vcs/log/graph/utils/LinearGraphUtils.java +++ b/platform/vcs-log/graph/src/com/intellij/vcs/log/graph/utils/LinearGraphUtils.java @@ -40,11 +40,11 @@ public class LinearGraphUtils { return value != null && value == number; } - public static boolean isEdgeToUp(@NotNull GraphEdge edge, int nodeIndex) { + public static boolean isEdgeUp(@NotNull GraphEdge edge, int nodeIndex) { return intEqual(edge.getDownNodeIndex(), nodeIndex); } - public static boolean isEdgeToDown(@NotNull GraphEdge edge, int nodeIndex) { + public static boolean isEdgeDown(@NotNull GraphEdge edge, int nodeIndex) { return intEqual(edge.getUpNodeIndex(), nodeIndex); } @@ -100,7 +100,7 @@ public class LinearGraphUtils { @Nullable @Override public Integer fun(GraphEdge graphEdge) { - if (isEdgeToDown(graphEdge, nodeIndex)) { + if (isEdgeDown(graphEdge, nodeIndex)) { if (graphEdge.getType() == GraphEdgeType.NOT_LOAD_COMMIT) return graphEdge.getTargetId(); return graphEdge.getDownNodeIndex(); @@ -124,8 +124,8 @@ public class LinearGraphUtils { return ContainerUtil.mapNotNull(graph.getAdjacentEdges(nodeIndex, filter.edgeFilter), new Function() { @Override public Integer fun(GraphEdge edge) { - if (isEdgeToUp(edge, nodeIndex)) return edge.getUpNodeIndex(); - if (isEdgeToDown(edge, nodeIndex)) return edge.getDownNodeIndex(); + if (isEdgeUp(edge, nodeIndex)) return edge.getUpNodeIndex(); + if (isEdgeDown(edge, nodeIndex)) return edge.getDownNodeIndex(); return null; } diff --git a/platform/vcs-log/graph/test/com/intellij/vcs/log/graph/TestGraphBuilder.kt b/platform/vcs-log/graph/test/com/intellij/vcs/log/graph/TestGraphBuilder.kt index f0046299e2c8..ca94c769955c 100644 --- a/platform/vcs-log/graph/test/com/intellij/vcs/log/graph/TestGraphBuilder.kt +++ b/platform/vcs-log/graph/test/com/intellij/vcs/log/graph/TestGraphBuilder.kt @@ -130,8 +130,8 @@ class TestGraphBuilder: BaseTestGraphBuilder { override fun getAdjacentEdges(nodeIndex: Int, filter: EdgeFilter) = edges[nodeIndex].filter { if (it.getType().isNormalEdge()) { - (LinearGraphUtils.isEdgeToUp(it, nodeIndex) && filter.upNormal) - || (LinearGraphUtils.isEdgeToDown(it, nodeIndex) && filter.downNormal) + (LinearGraphUtils.isEdgeUp(it, nodeIndex) && filter.upNormal) + || (LinearGraphUtils.isEdgeDown(it, nodeIndex) && filter.downNormal) } else { filter.special }