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

IDEA-166362 Show warning notification concerning outdated boot java runtime

Browse Source 
Adjusted bundled JDK compatibility with underlying platform check
This commit is contained in:
Alexey Ushakov
2017-01-14 10:01:10 +03:00
parent 3bb0ad0f9a
commit cb184c33a8
1 changed files with 20 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
platform/platform-impl/src/com/intellij/ide/SystemHealthMonitor.java
+20 -6
View File
@@ -62,7 +62,7 @@ public class SystemHealthMonitor extends ApplicationComponent.Adapter {
private static final NotificationGroup GROUP = new NotificationGroup("System Health", NotificationDisplayType.STICKY_BALLOON, false);
private static final NotificationGroup LOG_GROUP = NotificationGroup.logOnlyGroup("System Health (minor)");
private static final String SWITCH_JDK_ACTION = "SwitchBootJdk";
public static final String LATEST_JDK_RELEASE = "1.8.0u112";
private static final String LATEST_JDK_RELEASE = "1.8.0u112";
private final PropertiesComponent myProperties;
@@ -87,11 +87,25 @@ public class SystemHealthMonitor extends ApplicationComponent.Adapter {
if (bundle != null && !bundle.isBundled()) {
Version version = bundle.getVersion();
Integer updateNumber = bundle.getUpdateNumber();
if (version != null && (version.lessThan(1, 8, 0) || (updateNumber != null && updateNumber < 112))) {
final String bundleVersion = version.toCompactString() + (updateNumber != null ? "u" + updateNumber : "");
if (JdkBundle.getBundledJDKAbsoluteLocation().exists() &&
(bundle.getBitness() == Bitness.x64 && (SystemInfo.isMacIntel64 || SystemInfo.isWindows || SystemInfo.isLinux)))
{
if (version != null && updateNumber != null && updateNumber < 112) {
final String bundleVersion = version.toCompactString() + "u" + updateNumber;
boolean showSwitchOption = false;
final File bundledJDKAbsoluteLocation = JdkBundle.getBundledJDKAbsoluteLocation();
if (bundledJDKAbsoluteLocation.exists() && bundle.getBitness() == Bitness.x64) {
if (!SystemInfo.isMacIntel64) {
if (SystemInfo.isWindows || SystemInfo.isLinux) {
JdkBundle bundledJdk = JdkBundle.createBundle(bundledJDKAbsoluteLocation, false, false);
if (bundledJdk.getVersion() != null)
showSwitchOption = true; // Version of bundled jdk is available, so the jdk is compatible with underlying OS
}
}
else {
showSwitchOption = true;
}
}
if (showSwitchOption) {
showNotification(new KeyHyperlinkAdapter("outdated.jvm.version.message1") {
@Override
protected void hyperlinkActivated(HyperlinkEvent e) {