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

Fix NPE in editor color schemes

Browse Source 
(not sure though why the key is null)
This commit is contained in:
Roman Shevchenko
2012-10-31 16:50:04 +01:00
parent 69ef683691
commit 4e8c07f53f
1 changed files with 13 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files
platform/platform-impl/src/com/intellij/openapi/editor/colors/impl/EditorColorsSchemeImpl.java
+13 -14
View File
@@ -1,5 +1,5 @@
/*
* Copyright 2000-2009 JetBrains s.r.o.
* Copyright 2000-2012 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.
@@ -13,10 +13,6 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
/**
* @author Yura Cangea
*/
package com.intellij.openapi.editor.colors.impl;
import com.intellij.openapi.editor.colors.ColorKey;
@@ -31,16 +27,16 @@ import org.jetbrains.annotations.NotNull;
import java.awt.*;
/**
* @author Yura Cangea
*/
public class EditorColorsSchemeImpl extends AbstractColorsScheme implements ExternalizableScheme {
private final ExternalInfo myExternalInfo = new ExternalInfo();
public EditorColorsSchemeImpl(EditorColorsScheme parenScheme, DefaultColorSchemesManager defaultColorSchemesManager) {
super(parenScheme, defaultColorSchemesManager);
public EditorColorsSchemeImpl(EditorColorsScheme parentScheme, DefaultColorSchemesManager defaultColorSchemesManager) {
super(parentScheme, defaultColorSchemesManager);
}
// -------------------------------------------------------------------------
// Getters & Setters
// -------------------------------------------------------------------------
@Override
public void setAttributes(TextAttributesKey key, TextAttributes attributes) {
if (!Comparing.equal(attributes, getAttributes(key))) {
@@ -60,9 +56,11 @@ public class EditorColorsSchemeImpl extends AbstractColorsScheme implements Exte
if (myAttributesMap.containsKey(key)) {
return myAttributesMap.get(key);
}
TextAttributesKey fallbackKey = key.getFallbackAttributeKey();
if (fallbackKey != null && myAttributesMap.containsKey(fallbackKey)) {
return myAttributesMap.get(fallbackKey);
if (key != null) {
TextAttributesKey fallbackKey = key.getFallbackAttributeKey();
if (fallbackKey != null && myAttributesMap.containsKey(fallbackKey)) {
return myAttributesMap.get(fallbackKey);
}
}
return myParentScheme.getAttributes(key);
}
@@ -71,7 +69,8 @@ public class EditorColorsSchemeImpl extends AbstractColorsScheme implements Exte
public Color getColor(ColorKey key) {
if (myColorsMap.containsKey(key)) {
return myColorsMap.get(key);
} else {
}
else {
return myParentScheme.getColor(key);
}
}