From 9868598cd49e569a3a9632d5ac8fa776d33a023e Mon Sep 17 00:00:00 2001 From: Aleksey Pivovarov Date: Tue, 5 May 2015 17:15:33 +0300 Subject: [PATCH] diff: accept List with nullable values --- .../diff/actions/impl/OpenInEditorWithMouseAction.java | 3 ++- .../diff/actions/impl/SetEditorSettingsAction.java | 8 +++++--- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/platform/diff-impl/src/com/intellij/diff/actions/impl/OpenInEditorWithMouseAction.java b/platform/diff-impl/src/com/intellij/diff/actions/impl/OpenInEditorWithMouseAction.java index 81f55ece4fda..35bcd9f61a6c 100644 --- a/platform/diff-impl/src/com/intellij/diff/actions/impl/OpenInEditorWithMouseAction.java +++ b/platform/diff-impl/src/com/intellij/diff/actions/impl/OpenInEditorWithMouseAction.java @@ -42,6 +42,7 @@ public abstract class OpenInEditorWithMouseAction extends AnAction implements Du public void register(@NotNull List editors) { myEditors = editors; for (Editor editor : editors) { + if (editor == null) continue; registerCustomShortcutSet(getShortcutSet(), (EditorGutterComponentEx)editor.getGutter()); } } @@ -118,7 +119,7 @@ public abstract class OpenInEditorWithMouseAction extends AnAction implements Du @Nullable private Editor getEditor(@NotNull Component component) { for (Editor editor : myEditors) { - if (editor.getGutter() == component) { + if (editor != null && editor.getGutter() == component) { return editor; } } diff --git a/platform/diff-impl/src/com/intellij/diff/actions/impl/SetEditorSettingsAction.java b/platform/diff-impl/src/com/intellij/diff/actions/impl/SetEditorSettingsAction.java index 1dcf1f000300..59b1ba668e7e 100644 --- a/platform/diff-impl/src/com/intellij/diff/actions/impl/SetEditorSettingsAction.java +++ b/platform/diff-impl/src/com/intellij/diff/actions/impl/SetEditorSettingsAction.java @@ -30,7 +30,7 @@ import org.jetbrains.annotations.Nullable; import java.util.List; -public abstract class SetEditorSettingsAction extends ActionGroup implements DumbAware { +public class SetEditorSettingsAction extends ActionGroup implements DumbAware { @NotNull private final TextDiffSettingsHolder.TextDiffSettings myTextSettings; @NotNull private final List myEditors; @@ -125,7 +125,7 @@ public abstract class SetEditorSettingsAction extends ActionGroup implements Dum @Override public void applyDefaults(@NotNull List editors) { for (Editor editor : editors) { - if (editor.getUserData(EditorImpl.FORCED_SOFT_WRAPS) != null) myForcedSoftWrap = true; + if (editor != null && editor.getUserData(EditorImpl.FORCED_SOFT_WRAPS) != null) myForcedSoftWrap = true; } super.applyDefaults(editors); } @@ -157,8 +157,9 @@ public abstract class SetEditorSettingsAction extends ActionGroup implements Dum @Override public void setSelected(AnActionEvent e, boolean state) { + setSelected(state); for (Editor editor : myEditors) { - setSelected(state); + if (editor == null) continue; apply(editor, state); } } @@ -171,6 +172,7 @@ public abstract class SetEditorSettingsAction extends ActionGroup implements Dum public void applyDefaults(@NotNull List editors) { for (Editor editor : editors) { + if (editor == null) continue; apply(editor, isSelected()); } }