From ad87659a8696bdfc577a32314193fd9dc21c6862 Mon Sep 17 00:00:00 2001 From: Julia Beliaeva Date: Thu, 12 Feb 2015 23:19:17 +0300 Subject: [PATCH] [vcs-log] minor: rename --- .../graph/impl/facade/PermanentGraphImpl.java | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/platform/vcs-log/graph/src/com/intellij/vcs/log/graph/impl/facade/PermanentGraphImpl.java b/platform/vcs-log/graph/src/com/intellij/vcs/log/graph/impl/facade/PermanentGraphImpl.java index 18cc152b29fa..eb223af8b970 100644 --- a/platform/vcs-log/graph/src/com/intellij/vcs/log/graph/impl/facade/PermanentGraphImpl.java +++ b/platform/vcs-log/graph/src/com/intellij/vcs/log/graph/impl/facade/PermanentGraphImpl.java @@ -97,8 +97,8 @@ public class PermanentGraphImpl implements PermanentGraph, P @NotNull @Override public VisibleGraph createVisibleGraph(@NotNull SortType sortType, - @Nullable Set headsOfVisibleBranches, - @Nullable Set matchedCommits) { + @Nullable Set visibleHeads, + @Nullable Set matchingCommits) { CascadeLinearGraphController baseController; if (sortType == SortType.Normal) { baseController = new BaseLinearGraphController(this); @@ -111,12 +111,12 @@ public class PermanentGraphImpl implements PermanentGraph, 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 implements PermanentGraph, P } else { Set idOfVisibleBranches = null; - if (headsOfVisibleBranches != null) { - idOfVisibleBranches = myPermanentCommitsInfo.convertToNodeIds(headsOfVisibleBranches); + if (visibleHeads != null) { + idOfVisibleBranches = myPermanentCommitsInfo.convertToNodeIds(visibleHeads); } controller = new CollapsedLinearGraphController(baseController, this, idOfVisibleBranches); }