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-graph] cleanup code: use separate branches for nodes and edges

Browse Source
This commit is contained in:
Julia Beliaeva
2019-04-18 16:15:05 +03:00
parent 20999582e5
commit 0b05b96778
1 changed files with 17 additions and 21 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/ColorGetterByLayoutIndex.java
+17 -21
View File
@@ -39,41 +39,37 @@ public class ColorGetterByLayoutIndex<CommitId> {
}
public int getColorId(@NotNull GraphElement element) {
int upNodeIndex, downNodeIndex;
if (element instanceof GraphNode) {
upNodeIndex = ((GraphNode)element).getNodeIndex();
downNodeIndex = upNodeIndex;
int nodeIndex = ((GraphNode)element).getNodeIndex();
return getNodeColor(nodeIndex, getLayoutIndex(nodeIndex));
}
else {
GraphEdge edge = (GraphEdge)element;
NormalEdge normalEdge = LinearGraphUtils.asNormalEdge(edge);
if (normalEdge != null) {
upNodeIndex = normalEdge.up;
downNodeIndex = normalEdge.down;
if (normalEdge == null) {
int nodeIndex = LinearGraphUtils.getNotNullNodeIndex(edge);
return getNodeColor(nodeIndex, getLayoutIndex(nodeIndex));
}
else {
upNodeIndex = LinearGraphUtils.getNotNullNodeIndex(edge);
downNodeIndex = upNodeIndex;
int upLayoutIndex = getLayoutIndex(normalEdge.up);
int downLayoutIndex = getLayoutIndex(normalEdge.down);
if (upLayoutIndex >= downLayoutIndex) {
return getNodeColor(normalEdge.up, upLayoutIndex);
}
return getNodeColor(normalEdge.down, downLayoutIndex);
}
int upLayoutIndex = getLayoutIndex(upNodeIndex);
int downLayoutIndex = getLayoutIndex(downNodeIndex);
if (upLayoutIndex >= downLayoutIndex) {
return getNodeColor(getHeadNodeId(upNodeIndex), upLayoutIndex);
}
return getNodeColor(getHeadNodeId(downNodeIndex), downLayoutIndex);
}
protected int getNodeColor(int headNodeId, int nodeLayoutIndex) {
protected int getNodeColor(int nodeIndex, int layoutIndex) {
int headNodeId = getHeadNodeId(nodeIndex);
CommitId headCommitId = myPermanentGraphInfo.getPermanentCommitsInfo().getCommitId(headNodeId);
if (nodeLayoutIndex == myPermanentGraphInfo.getPermanentGraphLayout().getLayoutIndex(headNodeId)) {
if (layoutIndex == myPermanentGraphInfo.getPermanentGraphLayout().getLayoutIndex(headNodeId)) {
return myColorManager.getColorOfBranch(headCommitId);
}
else {
return myColorManager.getColorOfFragment(headCommitId, nodeLayoutIndex);
return myColorManager.getColorOfFragment(headCommitId, layoutIndex);
}
}