From 82b3c91de7166f75b85174d6100a129da224be4a Mon Sep 17 00:00:00 2001 From: Kirill Likhodedov Date: Thu, 13 Mar 2014 16:56:40 +0400 Subject: [PATCH] [log] IDEA-117920 Remember 'show long edges' setting between refreshes & restarts Persist the setting, restore it after each DataPack update. --- .../com/intellij/vcs/log/data/VcsLogUiProperties.java | 9 +++++++++ .../impl/src/com/intellij/vcs/log/ui/VcsLogUiImpl.java | 4 ++++ 2 files changed, 13 insertions(+) diff --git a/platform/vcs-log/impl/src/com/intellij/vcs/log/data/VcsLogUiProperties.java b/platform/vcs-log/impl/src/com/intellij/vcs/log/data/VcsLogUiProperties.java index 1955bfbba67e..05c8bda79a1f 100644 --- a/platform/vcs-log/impl/src/com/intellij/vcs/log/data/VcsLogUiProperties.java +++ b/platform/vcs-log/impl/src/com/intellij/vcs/log/data/VcsLogUiProperties.java @@ -41,6 +41,7 @@ public class VcsLogUiProperties implements PersistentStateComponent RECENTLY_FILTERED_USER_GROUPS = new ArrayDeque(); public Deque RECENTLY_FILTERED_BRANCH_GROUPS = new ArrayDeque(); } @@ -108,6 +109,14 @@ public class VcsLogUiProperties implements PersistentStateComponent users = new ArrayList(); diff --git a/platform/vcs-log/impl/src/com/intellij/vcs/log/ui/VcsLogUiImpl.java b/platform/vcs-log/impl/src/com/intellij/vcs/log/ui/VcsLogUiImpl.java index 4018c34b884b..43de441ca3e0 100644 --- a/platform/vcs-log/impl/src/com/intellij/vcs/log/ui/VcsLogUiImpl.java +++ b/platform/vcs-log/impl/src/com/intellij/vcs/log/ui/VcsLogUiImpl.java @@ -43,6 +43,7 @@ public class VcsLogUiImpl implements VcsLogUi, Disposable { @NotNull private final VcsLogColorManager myColorManager; @NotNull private final VcsLogFilterer myFilterer; @NotNull private final VcsLog myLog; + @NotNull private final VcsLogUiProperties myUiProperties; @NotNull private final Collection myFilterChangeListeners = ContainerUtil.newArrayList(); @@ -53,6 +54,7 @@ public class VcsLogUiImpl implements VcsLogUi, Disposable { myLogDataHolder = logDataHolder; myProject = project; myColorManager = manager; + myUiProperties = uiProperties; myDataPack = initialDataPack; Disposer.register(logDataHolder, this); @@ -152,6 +154,7 @@ public class VcsLogUiImpl implements VcsLogUi, Disposable { public void setLongEdgeVisibility(boolean visibility) { handleAnswer(myDataPack.getGraphFacade().performAction(LongEdgesAction.valueOf(visibility))); + myUiProperties.setLongEdgesVisibility(visibility); } public boolean areLongEdgesHidden() { @@ -288,6 +291,7 @@ public class VcsLogUiImpl implements VcsLogUi, Disposable { myDataPack = dataPack; setModel(newModel, myDataPack, previouslySelected); myMainFrame.updateDataPack(myDataPack); + setLongEdgeVisibility(myUiProperties.areLongEdgesVisible()); fireFilterChangeEvent(); repaintUI();