From c14d955f7af089bc253e1f2d33f0fb4b1f60b619 Mon Sep 17 00:00:00 2001 From: Julia Beliaeva Date: Wed, 14 Jun 2017 19:15:08 +0300 Subject: [PATCH] [vcs-log] use base LinearGraphController class instead of the ancestor --- .../vcs/log/graph/collapsing/BranchFilterController.java | 3 ++- .../vcs/log/graph/collapsing/CollapsedController.java | 3 ++- .../vcs/log/graph/impl/facade/CascadeController.java | 6 +++--- .../vcs/log/graph/impl/facade/FilteredController.java | 2 +- .../vcs/log/graph/impl/facade/PermanentGraphImpl.java | 4 ++-- 5 files changed, 10 insertions(+), 8 deletions(-) diff --git a/platform/vcs-log/graph/src/com/intellij/vcs/log/graph/collapsing/BranchFilterController.java b/platform/vcs-log/graph/src/com/intellij/vcs/log/graph/collapsing/BranchFilterController.java index aef270d892da..c45d60023d75 100644 --- a/platform/vcs-log/graph/src/com/intellij/vcs/log/graph/collapsing/BranchFilterController.java +++ b/platform/vcs-log/graph/src/com/intellij/vcs/log/graph/collapsing/BranchFilterController.java @@ -19,6 +19,7 @@ import com.intellij.vcs.log.graph.api.LinearGraph; import com.intellij.vcs.log.graph.api.elements.GraphElement; import com.intellij.vcs.log.graph.api.permanent.PermanentGraphInfo; import com.intellij.vcs.log.graph.impl.facade.CascadeController; +import com.intellij.vcs.log.graph.impl.facade.LinearGraphController; import com.intellij.vcs.log.graph.impl.facade.ReachableNodes; import com.intellij.vcs.log.graph.utils.UnsignedBitSet; import org.jetbrains.annotations.NotNull; @@ -30,7 +31,7 @@ public class BranchFilterController extends CascadeController { @NotNull private CollapsedGraph myCollapsedGraph; @Nullable private final Set myIdsOfVisibleBranches; - public BranchFilterController(@NotNull CascadeController delegateLinearGraphController, + public BranchFilterController(@NotNull LinearGraphController delegateLinearGraphController, @NotNull PermanentGraphInfo permanentGraphInfo, @Nullable Set idsOfVisibleBranches) { super(delegateLinearGraphController, permanentGraphInfo); diff --git a/platform/vcs-log/graph/src/com/intellij/vcs/log/graph/collapsing/CollapsedController.java b/platform/vcs-log/graph/src/com/intellij/vcs/log/graph/collapsing/CollapsedController.java index 7f355354e32d..06b26eac0e54 100644 --- a/platform/vcs-log/graph/src/com/intellij/vcs/log/graph/collapsing/CollapsedController.java +++ b/platform/vcs-log/graph/src/com/intellij/vcs/log/graph/collapsing/CollapsedController.java @@ -23,6 +23,7 @@ import com.intellij.vcs.log.graph.api.elements.GraphNode; import com.intellij.vcs.log.graph.api.permanent.PermanentGraphInfo; import com.intellij.vcs.log.graph.impl.facade.CascadeController; import com.intellij.vcs.log.graph.impl.facade.GraphChanges; +import com.intellij.vcs.log.graph.impl.facade.LinearGraphController; import com.intellij.vcs.log.graph.impl.facade.ReachableNodes; import com.intellij.vcs.log.graph.utils.UnsignedBitSet; import org.jetbrains.annotations.NotNull; @@ -33,7 +34,7 @@ import java.util.Set; public class CollapsedController extends CascadeController { @NotNull private CollapsedGraph myCollapsedGraph; - public CollapsedController(@NotNull CascadeController delegateLinearGraphController, + public CollapsedController(@NotNull LinearGraphController delegateLinearGraphController, @NotNull final PermanentGraphInfo permanentGraphInfo, @Nullable Set idsOfVisibleBranches) { super(delegateLinearGraphController, permanentGraphInfo); diff --git a/platform/vcs-log/graph/src/com/intellij/vcs/log/graph/impl/facade/CascadeController.java b/platform/vcs-log/graph/src/com/intellij/vcs/log/graph/impl/facade/CascadeController.java index e95e0099d26d..681aa4f2618f 100644 --- a/platform/vcs-log/graph/src/com/intellij/vcs/log/graph/impl/facade/CascadeController.java +++ b/platform/vcs-log/graph/src/com/intellij/vcs/log/graph/impl/facade/CascadeController.java @@ -23,10 +23,10 @@ import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; public abstract class CascadeController implements LinearGraphController { - @Nullable private final CascadeController myDelegateController; + @Nullable private final LinearGraphController myDelegateController; @NotNull protected final PermanentGraphInfo myPermanentGraphInfo; - protected CascadeController(@Nullable CascadeController delegateController, @NotNull PermanentGraphInfo permanentGraphInfo) { + protected CascadeController(@Nullable LinearGraphController delegateController, @NotNull PermanentGraphInfo permanentGraphInfo) { myDelegateController = delegateController; myPermanentGraphInfo = permanentGraphInfo; } @@ -58,7 +58,7 @@ public abstract class CascadeController implements LinearGraphController { } @NotNull - protected CascadeController getDelegateController() { + protected LinearGraphController getDelegateController() { assert myDelegateController != null; return myDelegateController; } diff --git a/platform/vcs-log/graph/src/com/intellij/vcs/log/graph/impl/facade/FilteredController.java b/platform/vcs-log/graph/src/com/intellij/vcs/log/graph/impl/facade/FilteredController.java index 57d93bb91b3c..b89a4e4a7443 100644 --- a/platform/vcs-log/graph/src/com/intellij/vcs/log/graph/impl/facade/FilteredController.java +++ b/platform/vcs-log/graph/src/com/intellij/vcs/log/graph/impl/facade/FilteredController.java @@ -30,7 +30,7 @@ import java.util.Set; public class FilteredController extends CascadeController { @NotNull private final CollapsedGraph myCollapsedGraph; - protected FilteredController(@NotNull CascadeController delegateLinearGraphController, + protected FilteredController(@NotNull LinearGraphController delegateLinearGraphController, @NotNull PermanentGraphInfo permanentGraphInfo, @NotNull Set matchedIds) { super(delegateLinearGraphController, permanentGraphInfo); 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 6bf5c2331f87..b9dae790b524 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 @@ -91,7 +91,7 @@ public class PermanentGraphImpl implements PermanentGraph, P public VisibleGraph createVisibleGraph(@NotNull SortType sortType, @Nullable Set visibleHeads, @Nullable Set matchingCommits) { - CascadeController baseController; + LinearGraphController baseController; if (sortType == SortType.Normal) { baseController = new BaseController(this); } @@ -104,7 +104,7 @@ public class PermanentGraphImpl implements PermanentGraph, P // TODO this code is unclear and obviously needs some refactoring // I'll leave it for later to reorganize, and add some duplication for now, in order just to fix stuff - CascadeController controller; + LinearGraphController controller; if (matchingCommits != null) { controller = new FilteredController(baseController, this, myPermanentCommitsInfo.convertToNodeIds(matchingCommits)); if (visibleHeads != null) {