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

diff: move place hint to the diff-api

Browse Source
This commit is contained in:
Aleksey Pivovarov
2015-09-28 16:17:35 +03:00
parent 182c25dfa2
commit c5ec2548c4
5 changed files with 5 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
platform/diff-api/src/com/intellij/diff/util/DiffUserDataKeys.java
+1
View File
@@ -44,6 +44,7 @@ public interface DiffUserDataKeys {
Key<Boolean> DO_NOT_IGNORE_WHITESPACES = Key.create("Diff.DoNotIgnoreWhitespaces");
Key<String> DIALOG_GROUP_KEY = Key.create("Diff.DialogGroupKey");
Key<String> PLACE = Key.create("Diff.Place");
Key<Boolean> DO_NOT_CHANGE_WINDOW_TITLE = Key.create("Diff.DoNotChangeWindowTitle");
platform/diff-impl/src/com/intellij/diff/impl/DiffRequestProcessor.java
+2 -2
View File
@@ -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<DiffTool>(getToolOrderFromSettings(myAvailableTools));
platform/diff-impl/src/com/intellij/diff/merge/MergeRequestProcessor.java
+1 -2
View File
@@ -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();
platform/diff-impl/src/com/intellij/diff/tools/util/base/TextDiffViewerUtil.java
+1 -1
View File
@@ -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);
platform/diff-impl/src/com/intellij/diff/util/DiffUserDataKeysEx.java
-1
View File
@@ -54,7 +54,6 @@ public interface DiffUserDataKeysEx extends DiffUserDataKeys {
// DiffContext
//
Key<String> PLACE = Key.create("Diff.Place");
Key<JComponent> BOTTOM_PANEL = Key.create("Diff.BottomPanel"); // Could implement Disposable
Key<Boolean> SHOW_READ_ONLY_LOCK = Key.create("Diff.ShowReadOnlyLock");