This commit is contained in:
Vladimir Krivosheev
2016-10-20 14:31:53 +02:00
parent 768cee3439
commit a70d9993d4
2 changed files with 3 additions and 3 deletions
@@ -639,7 +639,7 @@ public abstract class AbstractColorsScheme implements EditorColorsScheme, Serial
}
if (myParentScheme != null) {
// fallback attributes must be not used, otherwise derived scheme as copy will not have such ke
// fallback attributes must be not used, otherwise derived scheme as copy will not have such key
TextAttributes parentAttributes = myParentScheme instanceof AbstractColorsScheme
? ((AbstractColorsScheme)myParentScheme).getDirectlyDefinedAttributes(key)
: myParentScheme.getAttributes(key);
@@ -1,5 +1,5 @@
/*
* Copyright 2000-2009 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.
@@ -232,7 +232,7 @@ public abstract class ColorAndFontDescription extends TextAttributes implements
return false;
}
public boolean isInherited() {
public final boolean isInherited() {
return isInherited;
}