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] use base LinearGraphController class instead of the ancestor

Browse Source
This commit is contained in:
Julia Beliaeva
2017-06-15 02:08:09 +03:00
parent f84b3ec176
commit c14d955f7a
5 changed files with 10 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/collapsing/BranchFilterController.java
+2 -1
View File
@@ -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<Integer> myIdsOfVisibleBranches;
public BranchFilterController(@NotNull CascadeController delegateLinearGraphController,
public BranchFilterController(@NotNull LinearGraphController delegateLinearGraphController,
@NotNull PermanentGraphInfo<?> permanentGraphInfo,
@Nullable Set<Integer> idsOfVisibleBranches) {
super(delegateLinearGraphController, permanentGraphInfo);
platform/vcs-log/graph/src/com/intellij/vcs/log/graph/collapsing/CollapsedController.java
+2 -1
View File
@@ -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<Integer> idsOfVisibleBranches) {
super(delegateLinearGraphController, permanentGraphInfo);
platform/vcs-log/graph/src/com/intellij/vcs/log/graph/impl/facade/CascadeController.java
+3 -3
View File
@@ -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;
}
platform/vcs-log/graph/src/com/intellij/vcs/log/graph/impl/facade/FilteredController.java
+1 -1
View File
@@ -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<Integer> matchedIds) {
super(delegateLinearGraphController, permanentGraphInfo);
platform/vcs-log/graph/src/com/intellij/vcs/log/graph/impl/facade/PermanentGraphImpl.java
+2 -2
View File
@@ -91,7 +91,7 @@ public class PermanentGraphImpl<CommitId> implements PermanentGraph<CommitId>, P
public VisibleGraph<CommitId> createVisibleGraph(@NotNull SortType sortType,
@Nullable Set<CommitId> visibleHeads,
@Nullable Set<CommitId> matchingCommits) {
CascadeController baseController;
LinearGraphController baseController;
if (sortType == SortType.Normal) {
baseController = new BaseController(this);
}
@@ -104,7 +104,7 @@ public class PermanentGraphImpl<CommitId> implements PermanentGraph<CommitId>, 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) {