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: accept List<Editors> with nullable values

Browse Source
This commit is contained in:
Aleksey Pivovarov
2015-05-13 15:55:28 +03:00
parent d3ecd5925f
commit 9868598cd4
2 changed files with 7 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
platform/diff-impl/src/com/intellij/diff/actions/impl/OpenInEditorWithMouseAction.java
+2 -1
View File
@@ -42,6 +42,7 @@ public abstract class OpenInEditorWithMouseAction extends AnAction implements Du
public void register(@NotNull List<? extends Editor> 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;
}
}
platform/diff-impl/src/com/intellij/diff/actions/impl/SetEditorSettingsAction.java
+5 -3
View File
@@ -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<? extends Editor> myEditors;
@@ -125,7 +125,7 @@ public abstract class SetEditorSettingsAction extends ActionGroup implements Dum
@Override
public void applyDefaults(@NotNull List<? extends Editor> 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<? extends Editor> editors) {
for (Editor editor : editors) {
if (editor == null) continue;
apply(editor, isSelected());
}
}