From 2d444c02da0b3866ff9c393dfc9fcaf2f46bb287 Mon Sep 17 00:00:00 2001 From: Alexey Gopachenko Date: Sun, 15 Feb 2015 09:22:26 +0100 Subject: [PATCH] Fix java.lang.IllegalArgumentException: Argument for @NotNull parameter 'name' of com/intellij/application/options/colors/ColorAndFontDescription. must not be null at com.intellij.application.options.colors.ColorAndFontDescription.(ColorAndFontDescription.java) at com.intellij.application.options.colors.TextAttributesDescription.(TextAttributesDescription.java:38) at com.intellij.ide.todo.configurable.PatternDialog$1.(PatternDialog.java:73) --- .../application/options/colors/TextAttributesDescription.java | 3 ++- .../src/com/intellij/ide/todo/configurable/PatternDialog.java | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/platform/lang-impl/src/com/intellij/application/options/colors/TextAttributesDescription.java b/platform/lang-impl/src/com/intellij/application/options/colors/TextAttributesDescription.java index a1c98172d1bc..0eb73e3cdf40 100644 --- a/platform/lang-impl/src/com/intellij/application/options/colors/TextAttributesDescription.java +++ b/platform/lang-impl/src/com/intellij/application/options/colors/TextAttributesDescription.java @@ -23,6 +23,7 @@ import com.intellij.openapi.editor.colors.EditorColorsScheme; import com.intellij.openapi.editor.colors.TextAttributesKey; import com.intellij.openapi.editor.markup.EffectType; import com.intellij.openapi.editor.markup.TextAttributes; +import org.jetbrains.annotations.NotNull; import javax.swing.*; import java.awt.*; @@ -30,7 +31,7 @@ import java.awt.*; public abstract class TextAttributesDescription extends ColorAndFontDescription { private final TextAttributes myAttributes; - public TextAttributesDescription(String name, + public TextAttributesDescription(@NotNull String name, String group, TextAttributes attributes, TextAttributesKey type, diff --git a/platform/lang-impl/src/com/intellij/ide/todo/configurable/PatternDialog.java b/platform/lang-impl/src/com/intellij/ide/todo/configurable/PatternDialog.java index 9f46a7121956..260ab24796f1 100644 --- a/platform/lang-impl/src/com/intellij/ide/todo/configurable/PatternDialog.java +++ b/platform/lang-impl/src/com/intellij/ide/todo/configurable/PatternDialog.java @@ -69,7 +69,7 @@ class PatternDialog extends DialogWrapper{ TextAttributes attributes = myPattern.getAttributes().getCustomizedTextAttributes(); - myColorAndFontDescription = new TextAttributesDescription(null, null, attributes, null, EditorColorsManager.getInstance().getGlobalScheme(), + myColorAndFontDescription = new TextAttributesDescription("null", null, attributes, null, EditorColorsManager.getInstance().getGlobalScheme(), null, null) { @Override public void apply(EditorColorsScheme scheme) {