From 9a07208560013a4f23bb85d5e2c3c8f9772bb7bf Mon Sep 17 00:00:00 2001 From: Julia Beliaeva Date: Sun, 1 Feb 2015 02:24:50 +0300 Subject: [PATCH] [vcs-log] minor: performDelegateUpdate -> delegateGraphChanged, convert -> convertToDelegate --- .../collapsing/CollapsedLinearGraphController.java | 4 ++-- .../impl/facade/BaseLinearGraphController.java | 2 +- .../impl/facade/BekBaseLinearGraphController.java | 4 ++-- .../impl/facade/CascadeLinearGraphController.java | 13 +++++++------ .../impl/facade/FilterLinearGraphController.java | 4 ++-- .../log/graph/linearBek/LinearBekController.java | 2 +- 6 files changed, 15 insertions(+), 14 deletions(-) diff --git a/platform/vcs-log/graph/src/com/intellij/vcs/log/graph/collapsing/CollapsedLinearGraphController.java b/platform/vcs-log/graph/src/com/intellij/vcs/log/graph/collapsing/CollapsedLinearGraphController.java index bd45a057bf87..d879b3197ac7 100644 --- a/platform/vcs-log/graph/src/com/intellij/vcs/log/graph/collapsing/CollapsedLinearGraphController.java +++ b/platform/vcs-log/graph/src/com/intellij/vcs/log/graph/collapsing/CollapsedLinearGraphController.java @@ -44,7 +44,7 @@ public class CollapsedLinearGraphController extends CascadeLinearGraphController @NotNull @Override - protected LinearGraphAnswer performDelegateUpdate(@NotNull LinearGraphAnswer delegateAnswer) { + protected LinearGraphAnswer delegateGraphChanged(@NotNull LinearGraphAnswer delegateAnswer) { if (delegateAnswer.getGraphChanges() != null) { LinearGraph delegateGraph = getDelegateLinearGraphController().getCompiledGraph(); myCollapsedGraph = CollapsedGraph.updateInstance(myCollapsedGraph, delegateGraph); @@ -108,7 +108,7 @@ public class CollapsedLinearGraphController extends CascadeLinearGraphController @Nullable @Override - protected GraphElement convert(@NotNull GraphElement graphElement) { + protected GraphElement convertToDelegate(@NotNull GraphElement graphElement) { if (graphElement instanceof GraphEdge) { Integer upIndex = ((GraphEdge)graphElement).getUpNodeIndex(); Integer downIndex = ((GraphEdge)graphElement).getDownNodeIndex(); diff --git a/platform/vcs-log/graph/src/com/intellij/vcs/log/graph/impl/facade/BaseLinearGraphController.java b/platform/vcs-log/graph/src/com/intellij/vcs/log/graph/impl/facade/BaseLinearGraphController.java index c6c5e57cdb38..156093b17071 100644 --- a/platform/vcs-log/graph/src/com/intellij/vcs/log/graph/impl/facade/BaseLinearGraphController.java +++ b/platform/vcs-log/graph/src/com/intellij/vcs/log/graph/impl/facade/BaseLinearGraphController.java @@ -27,7 +27,7 @@ public class BaseLinearGraphController extends CascadeLinearGraphController { @NotNull @Override - protected LinearGraphAnswer performDelegateUpdate(@NotNull LinearGraphAnswer delegateAnswer) { + protected LinearGraphAnswer delegateGraphChanged(@NotNull LinearGraphAnswer delegateAnswer) { throw new IllegalStateException(); } diff --git a/platform/vcs-log/graph/src/com/intellij/vcs/log/graph/impl/facade/BekBaseLinearGraphController.java b/platform/vcs-log/graph/src/com/intellij/vcs/log/graph/impl/facade/BekBaseLinearGraphController.java index 971292449bce..a1b2101c55d8 100644 --- a/platform/vcs-log/graph/src/com/intellij/vcs/log/graph/impl/facade/BekBaseLinearGraphController.java +++ b/platform/vcs-log/graph/src/com/intellij/vcs/log/graph/impl/facade/BekBaseLinearGraphController.java @@ -48,7 +48,7 @@ public class BekBaseLinearGraphController extends CascadeLinearGraphController { @NotNull @Override - protected LinearGraphAnswer performDelegateUpdate(@NotNull LinearGraphAnswer delegateAnswer) { + protected LinearGraphAnswer delegateGraphChanged(@NotNull LinearGraphAnswer delegateAnswer) { throw new IllegalStateException(); } @@ -65,7 +65,7 @@ public class BekBaseLinearGraphController extends CascadeLinearGraphController { @Nullable @Override - protected GraphElement convert(@NotNull GraphElement graphElement) { + protected GraphElement convertToDelegate(@NotNull GraphElement graphElement) { if (graphElement instanceof GraphEdge) { Integer upIndex = ((GraphEdge)graphElement).getUpNodeIndex(); Integer downIndex = ((GraphEdge)graphElement).getDownNodeIndex(); diff --git a/platform/vcs-log/graph/src/com/intellij/vcs/log/graph/impl/facade/CascadeLinearGraphController.java b/platform/vcs-log/graph/src/com/intellij/vcs/log/graph/impl/facade/CascadeLinearGraphController.java index 5763e9abaa14..cd7b5af6737d 100644 --- a/platform/vcs-log/graph/src/com/intellij/vcs/log/graph/impl/facade/CascadeLinearGraphController.java +++ b/platform/vcs-log/graph/src/com/intellij/vcs/log/graph/impl/facade/CascadeLinearGraphController.java @@ -39,8 +39,9 @@ public abstract class CascadeLinearGraphController implements LinearGraphControl public LinearGraphAnswer performLinearGraphAction(@NotNull LinearGraphAction action) { LinearGraphAnswer answer = performAction(action); if (answer == null && myDelegateLinearGraphController != null) { - answer = myDelegateLinearGraphController.performLinearGraphAction(new VisibleGraphImpl.LinearGraphActionImpl(convert(action.getAffectedElement()), action.getType())); - answer = performDelegateUpdate(answer); + answer = myDelegateLinearGraphController.performLinearGraphAction(new VisibleGraphImpl.LinearGraphActionImpl( + convertToDelegate(action.getAffectedElement()), action.getType())); + answer = delegateGraphChanged(answer); } if (answer != null) return answer; @@ -48,15 +49,15 @@ public abstract class CascadeLinearGraphController implements LinearGraphControl } @Nullable - private PrintElementWithGraphElement convert(@Nullable PrintElementWithGraphElement element) { + private PrintElementWithGraphElement convertToDelegate(@Nullable PrintElementWithGraphElement element) { if (element == null) return null; - GraphElement convertedGraphElement = convert(element.getGraphElement()); + GraphElement convertedGraphElement = convertToDelegate(element.getGraphElement()); if (convertedGraphElement == null) return null; return PrintElementWithGraphElement.converted(element, convertedGraphElement); } @Nullable - protected GraphElement convert(@NotNull GraphElement graphElement) { + protected GraphElement convertToDelegate(@NotNull GraphElement graphElement) { return graphElement; } @@ -72,7 +73,7 @@ public abstract class CascadeLinearGraphController implements LinearGraphControl } @NotNull - protected abstract LinearGraphAnswer performDelegateUpdate(@NotNull LinearGraphAnswer delegateAnswer); + protected abstract LinearGraphAnswer delegateGraphChanged(@NotNull LinearGraphAnswer delegateAnswer); // null mean that this action must be performed by delegateGraphController @Nullable diff --git a/platform/vcs-log/graph/src/com/intellij/vcs/log/graph/impl/facade/FilterLinearGraphController.java b/platform/vcs-log/graph/src/com/intellij/vcs/log/graph/impl/facade/FilterLinearGraphController.java index 565ff96d151e..99116cbc02ed 100644 --- a/platform/vcs-log/graph/src/com/intellij/vcs/log/graph/impl/facade/FilterLinearGraphController.java +++ b/platform/vcs-log/graph/src/com/intellij/vcs/log/graph/impl/facade/FilterLinearGraphController.java @@ -52,14 +52,14 @@ public class FilterLinearGraphController extends CascadeLinearGraphController { @Nullable @Override - protected GraphElement convert(@NotNull GraphElement graphElement) { + protected GraphElement convertToDelegate(@NotNull GraphElement graphElement) { // filter prohibits any actions on delegate graph for now return null; } @NotNull @Override - protected LinearGraphAnswer performDelegateUpdate(@NotNull LinearGraphAnswer delegateAnswer) { + protected LinearGraphAnswer delegateGraphChanged(@NotNull LinearGraphAnswer delegateAnswer) { if (delegateAnswer == LinearGraphUtils.DEFAULT_GRAPH_ANSWER) return delegateAnswer; throw new UnsupportedOperationException(); // todo fix later } diff --git a/platform/vcs-log/graph/src/com/intellij/vcs/log/graph/linearBek/LinearBekController.java b/platform/vcs-log/graph/src/com/intellij/vcs/log/graph/linearBek/LinearBekController.java index 81487d76c753..fb098df2be7d 100644 --- a/platform/vcs-log/graph/src/com/intellij/vcs/log/graph/linearBek/LinearBekController.java +++ b/platform/vcs-log/graph/src/com/intellij/vcs/log/graph/linearBek/LinearBekController.java @@ -55,7 +55,7 @@ public class LinearBekController extends CascadeLinearGraphController { @NotNull @Override - protected LinearGraphAnswer performDelegateUpdate(@NotNull LinearGraphAnswer delegateAnswer) { + protected LinearGraphAnswer delegateGraphChanged(@NotNull LinearGraphAnswer delegateAnswer) { return delegateAnswer; }