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

isJetbrainsJvm -> isJetBrainsJvm

Browse Source 
Signed-off-by: Konstantin Bulenkov <kb@jetbrains.com>
This commit is contained in:
Konstantin Bulenkov
2017-05-20 13:53:24 +03:00
parent e34674d4b3
commit 8560487a4f
9 changed files with 11 additions and 11 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
@@ -114,7 +114,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("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/lang-impl/src/com/intellij/application/options/colors/AbstractFontOptionsPanel.java
+2 -2
View File
@@ -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;
platform/platform-api/src/com/intellij/ui/SimpleColoredComponent.java
+1 -1
View File
@@ -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) {
platform/platform-impl/src/com/intellij/openapi/editor/impl/ComplementaryFontsRegistry.java
+2 -2
View File
@@ -191,7 +191,7 @@ public class ComplementaryFontsRegistry {
FontRenderContext context) {
boolean tryDefaultFont = true;
List<String> 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<String> 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
platform/platform-impl/src/com/intellij/openapi/editor/impl/EditorImpl.java
+1 -1
View File
@@ -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);
platform/platform-impl/src/com/intellij/openapi/fileChooser/impl/FileChooserFactoryImpl.java
+1 -1
View File
@@ -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
platform/util/src/com/intellij/Patches.java
+1 -1
View File
@@ -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");
platform/util/src/com/intellij/openapi/util/objectTree/ThrowableInterner.java
+1 -1
View File
@@ -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;
platform/util/src/com/intellij/util/ui/UIUtil.java
+1 -1
View File
@@ -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) {