From 8560487a4fcfaab7c60f067922146ee9697d7b8e Mon Sep 17 00:00:00 2001 From: Konstantin Bulenkov Date: Sat, 20 May 2017 13:53:24 +0300 Subject: [PATCH] isJetbrainsJvm -> isJetBrainsJvm Signed-off-by: Konstantin Bulenkov --- platform/editor-ui-api/src/com/intellij/ide/ui/UISettings.kt | 2 +- .../application/options/colors/AbstractFontOptionsPanel.java | 4 ++-- .../src/com/intellij/ui/SimpleColoredComponent.java | 2 +- .../openapi/editor/impl/ComplementaryFontsRegistry.java | 4 ++-- .../src/com/intellij/openapi/editor/impl/EditorImpl.java | 2 +- .../openapi/fileChooser/impl/FileChooserFactoryImpl.java | 2 +- platform/util/src/com/intellij/Patches.java | 2 +- .../intellij/openapi/util/objectTree/ThrowableInterner.java | 2 +- platform/util/src/com/intellij/util/ui/UIUtil.java | 2 +- 9 files changed, 11 insertions(+), 11 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 c85456eb1df7..7e8990e12f9c 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 @@ -114,7 +114,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("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/lang-impl/src/com/intellij/application/options/colors/AbstractFontOptionsPanel.java b/platform/lang-impl/src/com/intellij/application/options/colors/AbstractFontOptionsPanel.java index 22b95d492cfd..88302a7404bf 100644 --- a/platform/lang-impl/src/com/intellij/application/options/colors/AbstractFontOptionsPanel.java +++ b/platform/lang-impl/src/com/intellij/application/options/colors/AbstractFontOptionsPanel.java @@ -106,7 +106,7 @@ public abstract class AbstractFontOptionsPanel extends JPanel implements Options ApplicationBundle.message("ligatures.jre.warning", ApplicationNamesInfo.getInstance().getFullProductName()))); warningIcon.setBorder(JBUI.Borders.emptyLeft(5)); - warningIcon.setVisible(!SystemInfo.isJetbrainsJvm); + warningIcon.setVisible(!SystemInfo.isJetBrainsJvm); panel.add(warningIcon); add(panel, "newline, sx 2"); @@ -291,7 +291,7 @@ public abstract class AbstractFontOptionsPanel extends JPanel implements Options mySizeLabel.setEnabled(!readOnly); myUseSecondaryFontCheckbox.setEnabled(!readOnly); - myEnableLigaturesCheckbox.setEnabled(!readOnly && SystemInfo.isJetbrainsJvm); + myEnableLigaturesCheckbox.setEnabled(!readOnly && SystemInfo.isJetBrainsJvm); myEnableLigaturesCheckbox.setSelected(fontPreferences.useLigatures()); myIsInSchemeChange = false; diff --git a/platform/platform-api/src/com/intellij/ui/SimpleColoredComponent.java b/platform/platform-api/src/com/intellij/ui/SimpleColoredComponent.java index 2ac4fbc9a724..6e0e4dd8204d 100644 --- a/platform/platform-api/src/com/intellij/ui/SimpleColoredComponent.java +++ b/platform/platform-api/src/com/intellij/ui/SimpleColoredComponent.java @@ -955,7 +955,7 @@ public class SimpleColoredComponent extends JComponent implements Accessible, Co public static int getTextBaseLine(@NotNull FontMetrics metrics, final int height) { // adding leading to ascent, just like in editor (leads to bad presentation for certain fonts with Oracle JDK, see IDEA-167541) return (height - metrics.getHeight()) / 2 + metrics.getAscent() + - (SystemInfo.isJetbrainsJvm ? metrics.getLeading() : 0); + (SystemInfo.isJetBrainsJvm ? metrics.getLeading() : 0); } private static void checkCanPaint(Graphics g) { diff --git a/platform/platform-impl/src/com/intellij/openapi/editor/impl/ComplementaryFontsRegistry.java b/platform/platform-impl/src/com/intellij/openapi/editor/impl/ComplementaryFontsRegistry.java index e89f98b489fa..5f8480e16e60 100644 --- a/platform/platform-impl/src/com/intellij/openapi/editor/impl/ComplementaryFontsRegistry.java +++ b/platform/platform-impl/src/com/intellij/openapi/editor/impl/ComplementaryFontsRegistry.java @@ -191,7 +191,7 @@ public class ComplementaryFontsRegistry { FontRenderContext context) { boolean tryDefaultFont = true; List fontFamilies = preferences.getEffectiveFontFamilies(); - boolean useLigatures = SystemInfo.isJetbrainsJvm && preferences.useLigatures(); + boolean useLigatures = SystemInfo.isJetBrainsJvm && preferences.useLigatures(); FontInfo result; //noinspection ForLoopReplaceableByForEach for (int i = 0, len = fontFamilies.size(); i < len; ++i) { // avoid foreach, it instantiates ArrayList$Itr, this traversal happens very often @@ -228,7 +228,7 @@ public class ComplementaryFontsRegistry { FontRenderContext context) { boolean tryDefaultFont = true; List fontFamilies = preferences.getEffectiveFontFamilies(); - boolean useLigatures = SystemInfo.isJetbrainsJvm && preferences.useLigatures(); + boolean useLigatures = SystemInfo.isJetBrainsJvm && preferences.useLigatures(); FontInfo result; //noinspection ForLoopReplaceableByForEach for (int i = 0, len = fontFamilies.size(); i < len; ++i) { // avoid foreach, it instantiates ArrayList$Itr, this traversal happens very often diff --git a/platform/platform-impl/src/com/intellij/openapi/editor/impl/EditorImpl.java b/platform/platform-impl/src/com/intellij/openapi/editor/impl/EditorImpl.java index f846111dedbb..46a65aa5d69d 100644 --- a/platform/platform-impl/src/com/intellij/openapi/editor/impl/EditorImpl.java +++ b/platform/platform-impl/src/com/intellij/openapi/editor/impl/EditorImpl.java @@ -554,7 +554,7 @@ public final class EditorImpl extends UserDataHolderBase implements EditorEx, Hi updateCaretCursor(); - if (SystemInfo.isJavaVersionAtLeast("1.8") && SystemInfo.isMacIntel64 && SystemInfo.isJetbrainsJvm && Registry.is("ide.mac.forceTouch")) { + if (SystemInfo.isJavaVersionAtLeast("1.8") && SystemInfo.isMacIntel64 && SystemInfo.isJetBrainsJvm && Registry.is("ide.mac.forceTouch")) { new MacGestureSupportForEditor(getComponent()); } backwardCompatibilityWithSoftWrapAppliancePlaces(mySettings, kind); diff --git a/platform/platform-impl/src/com/intellij/openapi/fileChooser/impl/FileChooserFactoryImpl.java b/platform/platform-impl/src/com/intellij/openapi/fileChooser/impl/FileChooserFactoryImpl.java index acd72f7210d7..a7c29e427953 100644 --- a/platform/platform-impl/src/com/intellij/openapi/fileChooser/impl/FileChooserFactoryImpl.java +++ b/platform/platform-impl/src/com/intellij/openapi/fileChooser/impl/FileChooserFactoryImpl.java @@ -84,7 +84,7 @@ public class FileChooserFactoryImpl extends FileChooserFactory { !descriptor.isForcedToUseIdeaFileChooser() && SystemProperties.getBooleanProperty("native.mac.file.chooser.enabled", true) && Registry.is("ide.mac.file.chooser.native") && - SystemInfo.isJetbrainsJvm; + SystemInfo.isJetBrainsJvm; } @NotNull diff --git a/platform/util/src/com/intellij/Patches.java b/platform/util/src/com/intellij/Patches.java index cfdc80f164e0..75a632d4a426 100644 --- a/platform/util/src/com/intellij/Patches.java +++ b/platform/util/src/com/intellij/Patches.java @@ -110,7 +110,7 @@ public class Patches { static { boolean value; if (!SystemInfo.isMac || SystemInfo.isJavaVersionAtLeast("9")) value = false; - else if (!SystemInfo.isJetbrainsJvm) value = true; + else if (!SystemInfo.isJetBrainsJvm) value = true; else { try { Class.forName("sun.font.CCompositeFont"); diff --git a/platform/util/src/com/intellij/openapi/util/objectTree/ThrowableInterner.java b/platform/util/src/com/intellij/openapi/util/objectTree/ThrowableInterner.java index 5eff1632efa6..41212e9c8143 100644 --- a/platform/util/src/com/intellij/openapi/util/objectTree/ThrowableInterner.java +++ b/platform/util/src/com/intellij/openapi/util/objectTree/ThrowableInterner.java @@ -85,7 +85,7 @@ public class ThrowableInterner { if (BACKTRACE_FIELD != null) { BACKTRACE_FIELD_OFFSET = LUCKILY_NOT_NEEDED; } - else if ((SystemInfo.isOracleJvm || SystemInfo.isJetbrainsJvm) && SystemInfo.isJavaVersionAtLeast("1.7")) { + else if ((SystemInfo.isOracleJvm || SystemInfo.isJetBrainsJvm) && SystemInfo.isJavaVersionAtLeast("1.7")) { Field firstField = Throwable.class.getDeclaredFields()[1]; long firstFieldOffset = AtomicFieldUpdater.getUnsafe().objectFieldOffset(firstField); BACKTRACE_FIELD_OFFSET = firstFieldOffset == 12 ? 8 : firstFieldOffset == 16 ? 12 : firstFieldOffset == 24 ? 16 : UNKNOWN; diff --git a/platform/util/src/com/intellij/util/ui/UIUtil.java b/platform/util/src/com/intellij/util/ui/UIUtil.java index 3d0648da4ba4..d89e396b7f17 100644 --- a/platform/util/src/com/intellij/util/ui/UIUtil.java +++ b/platform/util/src/com/intellij/util/ui/UIUtil.java @@ -2831,7 +2831,7 @@ public class UIUtil { if (Registry.is("ide.ui.scale.override")) { forcedScale = Float.valueOf((float)Registry.get("ide.ui.scale").asDouble()); } - else if (SystemInfo.isLinux && !SystemInfo.isJetbrainsJvm) { + else if (SystemInfo.isLinux && !SystemInfo.isJetBrainsJvm) { // With Oracle JDK: derive scale from X server DPI float scale = getScreenScale(); if (scale > 1f) {