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] minor: rename

Browse Source
This commit is contained in:
Julia Beliaeva
2015-02-13 15:52:14 +03:00
parent 8d5de869e1
commit ad87659a86
1 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
platform/vcs-log/graph/src/com/intellij/vcs/log/graph/impl/facade/PermanentGraphImpl.java
+8 -8
View File
@@ -97,8 +97,8 @@ public class PermanentGraphImpl<CommitId> implements PermanentGraph<CommitId>, P
@NotNull
@Override
public VisibleGraph<CommitId> createVisibleGraph(@NotNull SortType sortType,
@Nullable Set<CommitId> headsOfVisibleBranches,
@Nullable Set<CommitId> matchedCommits) {
@Nullable Set<CommitId> visibleHeads,
@Nullable Set<CommitId> matchingCommits) {
CascadeLinearGraphController baseController;
if (sortType == SortType.Normal) {
baseController = new BaseLinearGraphController(this);
@@ -111,12 +111,12 @@ public class PermanentGraphImpl<CommitId> implements PermanentGraph<CommitId>, P
}
LinearGraphController controller;
if (matchedCommits != null) {
controller = new FilterLinearGraphController(baseController, this, myPermanentCommitsInfo.convertToNodeIds(matchedCommits));
if (matchingCommits != null) {
controller = new FilterLinearGraphController(baseController, this, myPermanentCommitsInfo.convertToNodeIds(matchingCommits));
}
else if (sortType == SortType.LinearBek) {
if (headsOfVisibleBranches != null) {
controller = new BranchFilterGraphController(baseController, this, myPermanentCommitsInfo.convertToNodeIds(headsOfVisibleBranches));
if (visibleHeads != null) {
controller = new BranchFilterGraphController(baseController, this, myPermanentCommitsInfo.convertToNodeIds(visibleHeads));
}
else {
controller = baseController;
@@ -124,8 +124,8 @@ public class PermanentGraphImpl<CommitId> implements PermanentGraph<CommitId>, P
}
else {
Set<Integer> idOfVisibleBranches = null;
if (headsOfVisibleBranches != null) {
idOfVisibleBranches = myPermanentCommitsInfo.convertToNodeIds(headsOfVisibleBranches);
if (visibleHeads != null) {
idOfVisibleBranches = myPermanentCommitsInfo.convertToNodeIds(visibleHeads);
}
controller = new CollapsedLinearGraphController(baseController, this, idOfVisibleBranches);
}