MDS/openide
1
0
Fork 0
mirror of https://gitflic.ru/project/openide/openide.git synced 2026-09-18 09:34:34 +07:00
Code Issues Packages Projects Releases Wiki Activity

EA-89820 - NPE: HighlightDisplayLevel$SingleColorIcon.getColorInner

Browse Source
This commit is contained in:
Sergey Ignatov
2016-10-20 15:51:37 +03:00
parent 66cfaab543
commit dd830f4adf
1 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
platform/analysis-api/src/com/intellij/codeHighlighting/HighlightDisplayLevel.java
+6 -6
View File
@@ -1,5 +1,5 @@
/*
* Copyright 2000-2015 JetBrains s.r.o.
* Copyright 2000-2016 JetBrains s.r.o.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -151,10 +151,10 @@ public class HighlightDisplayLevel {
Color getColor();
}
public static class SingleColorIcon implements Icon, ColoredIcon {
private static class SingleColorIcon implements Icon, ColoredIcon {
private final TextAttributesKey myKey;
public SingleColorIcon(@NotNull TextAttributesKey key) {
private SingleColorIcon(@NotNull TextAttributesKey key) {
myKey = key;
}
@@ -164,13 +164,13 @@ public class HighlightDisplayLevel {
}
@Nullable
public Color getColorInner() {
private Color getColorInner() {
final EditorColorsManager manager = EditorColorsManager.getInstance();
if (manager != null) {
TextAttributes attributes = manager.getGlobalScheme().getAttributes(myKey);
Color stripe = attributes.getErrorStripeColor();
Color stripe = attributes == null ? null : attributes.getErrorStripeColor();
if (stripe != null) return stripe;
return attributes.getEffectColor();
return attributes != null ? attributes.getEffectColor() : null;
}
TextAttributes defaultAttributes = myKey.getDefaultAttributes();
if (defaultAttributes == null) defaultAttributes = TextAttributes.ERASE_MARKER;