From c5ec2548c4b5cd432822dd5ca5bbd1d0e23953fd Mon Sep 17 00:00:00 2001 From: Aleksey Pivovarov Date: Mon, 28 Sep 2015 16:16:05 +0300 Subject: [PATCH] diff: move place hint to the diff-api --- .../diff-api/src/com/intellij/diff/util/DiffUserDataKeys.java | 1 + .../src/com/intellij/diff/impl/DiffRequestProcessor.java | 4 ++-- .../src/com/intellij/diff/merge/MergeRequestProcessor.java | 3 +-- .../com/intellij/diff/tools/util/base/TextDiffViewerUtil.java | 2 +- .../src/com/intellij/diff/util/DiffUserDataKeysEx.java | 1 - 5 files changed, 5 insertions(+), 6 deletions(-) diff --git a/platform/diff-api/src/com/intellij/diff/util/DiffUserDataKeys.java b/platform/diff-api/src/com/intellij/diff/util/DiffUserDataKeys.java index 8583f1e342fc..0c6936b0a6a2 100644 --- a/platform/diff-api/src/com/intellij/diff/util/DiffUserDataKeys.java +++ b/platform/diff-api/src/com/intellij/diff/util/DiffUserDataKeys.java @@ -44,6 +44,7 @@ public interface DiffUserDataKeys { Key DO_NOT_IGNORE_WHITESPACES = Key.create("Diff.DoNotIgnoreWhitespaces"); Key DIALOG_GROUP_KEY = Key.create("Diff.DialogGroupKey"); + Key PLACE = Key.create("Diff.Place"); Key DO_NOT_CHANGE_WINDOW_TITLE = Key.create("Diff.DoNotChangeWindowTitle"); diff --git a/platform/diff-impl/src/com/intellij/diff/impl/DiffRequestProcessor.java b/platform/diff-impl/src/com/intellij/diff/impl/DiffRequestProcessor.java index d8bd7d78a895..4e40b499e588 100644 --- a/platform/diff-impl/src/com/intellij/diff/impl/DiffRequestProcessor.java +++ b/platform/diff-impl/src/com/intellij/diff/impl/DiffRequestProcessor.java @@ -98,7 +98,7 @@ public abstract class DiffRequestProcessor implements Disposable { } public DiffRequestProcessor(@Nullable Project project, @NotNull String place) { - this(project, DiffUtil.createUserDataHolder(DiffUserDataKeysEx.PLACE, place)); + this(project, DiffUtil.createUserDataHolder(DiffUserDataKeys.PLACE, place)); } public DiffRequestProcessor(@Nullable Project project, @NotNull UserDataHolder context) { @@ -107,7 +107,7 @@ public abstract class DiffRequestProcessor implements Disposable { myContext = new MyDiffContext(context); myActiveRequest = new LoadingDiffRequest(); - mySettings = DiffSettingsHolder.getInstance().getSettings(myContext.getUserData(DiffUserDataKeysEx.PLACE)); + mySettings = DiffSettingsHolder.getInstance().getSettings(myContext.getUserData(DiffUserDataKeys.PLACE)); myAvailableTools = DiffManagerEx.getInstance().getDiffTools(); myToolOrder = new LinkedList(getToolOrderFromSettings(myAvailableTools)); diff --git a/platform/diff-impl/src/com/intellij/diff/merge/MergeRequestProcessor.java b/platform/diff-impl/src/com/intellij/diff/merge/MergeRequestProcessor.java index 471aca3b2aab..a34b876e6f0c 100644 --- a/platform/diff-impl/src/com/intellij/diff/merge/MergeRequestProcessor.java +++ b/platform/diff-impl/src/com/intellij/diff/merge/MergeRequestProcessor.java @@ -22,7 +22,6 @@ import com.intellij.diff.tools.util.DiffDataKeys; import com.intellij.diff.tools.util.PrevNextDifferenceIterable; import com.intellij.diff.util.DiffPlaces; import com.intellij.diff.util.DiffUserDataKeys; -import com.intellij.diff.util.DiffUserDataKeysEx; import com.intellij.diff.util.DiffUtil; import com.intellij.ide.DataManager; import com.intellij.ide.impl.DataManagerImpl; @@ -78,7 +77,7 @@ public abstract class MergeRequestProcessor implements Disposable { myRequest = request; myContext = new MyDiffContext(); - myContext.putUserData(DiffUserDataKeysEx.PLACE, DiffPlaces.MERGE); + myContext.putUserData(DiffUserDataKeys.PLACE, DiffPlaces.MERGE); myAvailableTools = DiffManagerEx.getInstance().getMergeTools(); diff --git a/platform/diff-impl/src/com/intellij/diff/tools/util/base/TextDiffViewerUtil.java b/platform/diff-impl/src/com/intellij/diff/tools/util/base/TextDiffViewerUtil.java index 7cc6a23984b7..2fd15a20a67f 100644 --- a/platform/diff-impl/src/com/intellij/diff/tools/util/base/TextDiffViewerUtil.java +++ b/platform/diff-impl/src/com/intellij/diff/tools/util/base/TextDiffViewerUtil.java @@ -72,7 +72,7 @@ public class TextDiffViewerUtil { public static TextDiffSettings getTextSettings(@NotNull DiffContext context) { TextDiffSettings settings = context.getUserData(TextDiffSettingsHolder.KEY); if (settings == null) { - settings = TextDiffSettings.getSettings(context.getUserData(DiffUserDataKeysEx.PLACE)); + settings = TextDiffSettings.getSettings(context.getUserData(DiffUserDataKeys.PLACE)); context.putUserData(TextDiffSettingsHolder.KEY, settings); if (DiffUtil.isUserDataFlagSet(DiffUserDataKeys.DO_NOT_IGNORE_WHITESPACES, context)) { settings.setIgnorePolicy(IgnorePolicy.DEFAULT); diff --git a/platform/diff-impl/src/com/intellij/diff/util/DiffUserDataKeysEx.java b/platform/diff-impl/src/com/intellij/diff/util/DiffUserDataKeysEx.java index 5e8a95124d89..083a2463be32 100644 --- a/platform/diff-impl/src/com/intellij/diff/util/DiffUserDataKeysEx.java +++ b/platform/diff-impl/src/com/intellij/diff/util/DiffUserDataKeysEx.java @@ -54,7 +54,6 @@ public interface DiffUserDataKeysEx extends DiffUserDataKeys { // DiffContext // - Key PLACE = Key.create("Diff.Place"); Key BOTTOM_PANEL = Key.create("Diff.BottomPanel"); // Could implement Disposable Key SHOW_READ_ONLY_LOCK = Key.create("Diff.ShowReadOnlyLock");