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

Make the code green again

Browse Source
This commit is contained in:
Rustam Vishnyakov
2017-03-07 12:23:40 +03:00
parent ab28c52ce5
commit 96bd43fe07
2 changed files with 12 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
platform/editor-ui-ex/src/com/intellij/openapi/editor/colors/impl/AbstractColorsScheme.java
+9 -7
View File
@@ -35,7 +35,6 @@ import com.intellij.util.PlatformUtils;
import com.intellij.util.containers.ContainerUtilRt;
import com.intellij.util.containers.HashMap;
import com.intellij.util.ui.JBUI;
import com.intellij.util.ui.UIUtil;
import gnu.trove.THashMap;
import org.jdom.Element;
import org.jetbrains.annotations.NonNls;
@@ -54,6 +53,7 @@ import static com.intellij.openapi.editor.markup.TextAttributes.USE_INHERITED_MA
import static com.intellij.openapi.util.Couple.of;
import static com.intellij.ui.ColorUtil.fromHex;
@SuppressWarnings("UseJBColor")
public abstract class AbstractColorsScheme implements EditorColorsScheme, SerializableScheme {
private static final int CURR_VERSION = 142;
@@ -422,10 +422,11 @@ public abstract class AbstractColorsScheme implements EditorColorsScheme, Serial
}
continue;
}
TextAttributes attr = myValueReader.read(TextAttributes.class, valueElement);
myAttributesMap.put(key, attr);
migrateErrorStripeColorFrom14(key, attr);
if (attr != null) {
myAttributesMap.put(key, attr);
migrateErrorStripeColorFrom14(key, attr);
}
}
}
@@ -522,10 +523,11 @@ public abstract class AbstractColorsScheme implements EditorColorsScheme, Serial
}
private int readFontSize(Element element, boolean isDefault, Float fontScale) {
Float size = (float)myValueReader.read(Integer.class, element);
if (size == null) {
Integer intSize = myValueReader.read(Integer.class, element);
if (intSize == null) {
return -1;
}
Float size = (float)intSize;
if (!isDefault) {
size = (fontScale != null) ? size / fontScale : DEFAULT_FONT_SIZE.getSize();
}
@@ -562,7 +564,7 @@ public abstract class AbstractColorsScheme implements EditorColorsScheme, Serial
parentNode.setAttribute(NAME_ATTR, getName());
parentNode.setAttribute(VERSION_ATTR, Integer.toString(myVersion));
/**
/*
* FONT_SCALE is used to correctly identify the font size in both the JRE-managed HiDPI mode and
* the IDE-managed HiDPI mode: {@link UIUtil#isJreHiDPIEnabled()}. Also, it helps to distinguish
* the "hidpi-aware" scheme version from the previous one. Namely, the absence of the FONT_SCALE
platform/editor-ui-ex/src/com/intellij/openapi/editor/colors/impl/ValueElementReader.java
+3
View File
@@ -20,6 +20,7 @@ import com.intellij.openapi.util.SystemInfo;
import com.intellij.openapi.util.text.StringUtil;
import org.jdom.Element;
import org.jetbrains.annotations.NonNls;
import org.jetbrains.annotations.Nullable;
import java.awt.Color;
@@ -32,6 +33,7 @@ import java.awt.Color;
*
* @author Sergey.Malenkov
*/
@SuppressWarnings("UseJBColor")
class ValueElementReader {
@NonNls private static final String VALUE = "value";
@NonNls private static final String MAC = "mac";
@@ -60,6 +62,7 @@ class ValueElementReader {
* @param <T> the result type
* @return a value or {@code null} if it cannot be read
*/
@Nullable
public <T> T read(Class<T> type, Element element) {
T value = null;
if (element != null) {