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

Cleanup (for Java runtime version check, "9" is more correct than "1.9")

Browse Source
This commit is contained in:
Roman Shevchenko
2017-04-05 15:51:09 +02:00
parent b363b4d64e
commit b036bfb437
2 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
platform/editor-ui-api/src/com/intellij/ide/ui/UISettings.kt
+1 -1
View File
@@ -113,7 +113,7 @@ class UISettings : BaseState(), PersistentStateComponent<UISettings> {
@get:OptionTag("MARK_MODIFIED_TABS_WITH_ASTERISK") var markModifiedTabsWithAsterisk by storedProperty(false)
@get:OptionTag("SHOW_TABS_TOOLTIPS") var showTabsTooltips by storedProperty(true)
@get:OptionTag("SHOW_DIRECTORY_FOR_NON_UNIQUE_FILENAMES") var showDirectoryForNonUniqueFilenames by storedProperty(true)
var smoothScrolling by storedProperty(SystemInfo.isMac && (SystemInfo.isJetbrainsJvm || SystemInfo.isJavaVersionAtLeast("1.9")))
var smoothScrolling by storedProperty(SystemInfo.isMac && (SystemInfo.isJetbrainsJvm || SystemInfo.isJavaVersionAtLeast("9")))
@get:OptionTag("NAVIGATE_TO_PREVIEW") var navigateToPreview by storedProperty(false)
@get:OptionTag("SORT_LOOKUP_ELEMENTS_LEXICOGRAPHICALLY") var sortLookupElementsLexicographically by storedProperty(false)
platform/util/src/com/intellij/Patches.java
+3 -3
View File
@@ -1,5 +1,5 @@
/*
* Copyright 2000-2016 JetBrains s.r.o.
* Copyright 2000-2017 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.
@@ -104,12 +104,12 @@ public class Patches {
public static final boolean JDK_MAC_FONT_STYLE_BUG = SystemInfo.isMac && !SystemInfo.isJavaVersionAtLeast("1.8.0_60");
/**
* On Mac OS font ligatures are not supported for natively loaded fonts, font needs to be loaded explicitly by JDK.
* On Mac OS font ligatures are not supported for natively loaded fonts, font needs to be loaded explicitly by JDK.
*/
public static final boolean JDK_BUG_ID_7162125;
static {
boolean value;
if (!SystemInfo.isMac || SystemInfo.isJavaVersionAtLeast("1.9")) value = false;
if (!SystemInfo.isMac || SystemInfo.isJavaVersionAtLeast("9")) value = false;
else if (!SystemInfo.isJetbrainsJvm) value = true;
else {
try {