From b036bfb437c2e9ad26cbff966d9d5c6a4ca86c16 Mon Sep 17 00:00:00 2001 From: Roman Shevchenko Date: Wed, 5 Apr 2017 15:50:47 +0200 Subject: [PATCH] Cleanup (for Java runtime version check, "9" is more correct than "1.9") --- .../editor-ui-api/src/com/intellij/ide/ui/UISettings.kt | 2 +- platform/util/src/com/intellij/Patches.java | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/platform/editor-ui-api/src/com/intellij/ide/ui/UISettings.kt b/platform/editor-ui-api/src/com/intellij/ide/ui/UISettings.kt index 0913d32915ca..89a5b12e925a 100644 --- a/platform/editor-ui-api/src/com/intellij/ide/ui/UISettings.kt +++ b/platform/editor-ui-api/src/com/intellij/ide/ui/UISettings.kt @@ -113,7 +113,7 @@ class UISettings : BaseState(), PersistentStateComponent { @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) diff --git a/platform/util/src/com/intellij/Patches.java b/platform/util/src/com/intellij/Patches.java index f59bd79170d5..cfdc80f164e0 100644 --- a/platform/util/src/com/intellij/Patches.java +++ b/platform/util/src/com/intellij/Patches.java @@ -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 {