From 3de45d9ed203f6a46bc42221d84dd361bf70770b Mon Sep 17 00:00:00 2001 From: Julia Beliaeva Date: Mon, 26 Jan 2015 18:12:06 +0300 Subject: [PATCH] [vcs-log][linear-bek] hide linear bek in registry --- platform/util/resources/misc/registry.properties | 1 + .../vcs/log/graph/impl/facade/bek/BekSorter.java | 13 +++++++------ .../com/intellij/vcs/log/ui/frame/MainFrame.java | 2 +- 3 files changed, 9 insertions(+), 7 deletions(-) diff --git a/platform/util/resources/misc/registry.properties b/platform/util/resources/misc/registry.properties index 93aaeb942708..b8847bbb1730 100644 --- a/platform/util/resources/misc/registry.properties +++ b/platform/util/resources/misc/registry.properties @@ -213,6 +213,7 @@ vcs.show.colored.annotations=true vcs.showConsole=true vcs.log.bek.sort=false vcs.log.bek.sort.disabled=false +vcs.log.linear.bek.sort=false psi.incremental.reparse.depth.limit=1000 psi.deferIconLoading=true diff --git a/platform/vcs-log/graph/src/com/intellij/vcs/log/graph/impl/facade/bek/BekSorter.java b/platform/vcs-log/graph/src/com/intellij/vcs/log/graph/impl/facade/bek/BekSorter.java index 0f2377dfe4e9..244a959b8971 100644 --- a/platform/vcs-log/graph/src/com/intellij/vcs/log/graph/impl/facade/bek/BekSorter.java +++ b/platform/vcs-log/graph/src/com/intellij/vcs/log/graph/impl/facade/bek/BekSorter.java @@ -37,6 +37,10 @@ public class BekSorter { return isBekEnabled || isInternal; } + public static boolean isLinearBekEnabled() { + return isBekEnabled() && Registry.is("vcs.log.linear.bek.sort"); + } + @NotNull public static BekIntMap createBekMap(@NotNull LinearGraph permanentGraph, @NotNull GraphLayoutImpl graphLayout, @@ -86,14 +90,11 @@ public class BekSorter { }; } - @NotNull - private final LinearGraph myPermanentGraph; + @NotNull private final LinearGraph myPermanentGraph; - @NotNull - private final GraphLayoutImpl myGraphLayout; + @NotNull private final GraphLayoutImpl myGraphLayout; - @NotNull - private final TimestampGetter myTimestampGetter; + @NotNull private final TimestampGetter myTimestampGetter; private BekSorter(@NotNull LinearGraph permanentGraph, @NotNull GraphLayoutImpl graphLayout, @NotNull TimestampGetter timestampGetter) { myPermanentGraph = permanentGraph; diff --git a/platform/vcs-log/impl/src/com/intellij/vcs/log/ui/frame/MainFrame.java b/platform/vcs-log/impl/src/com/intellij/vcs/log/ui/frame/MainFrame.java index ef456daa3ee6..02d947c09b73 100644 --- a/platform/vcs-log/impl/src/com/intellij/vcs/log/ui/frame/MainFrame.java +++ b/platform/vcs-log/impl/src/com/intellij/vcs/log/ui/frame/MainFrame.java @@ -354,7 +354,7 @@ public class MainFrame extends JPanel implements TypeSafeDataProvider { @Override public void update(AnActionEvent e) { super.update(e); - e.getPresentation().setVisible(BekSorter.isBekEnabled()); + e.getPresentation().setVisible(BekSorter.isLinearBekEnabled()); e.getPresentation().setEnabled(areGraphActionsEnabled() && myUI.isBek()); } }