diff options
| author | Siva Velusamy <vsiva@google.com> | 2014-06-16 17:27:39 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2014-06-16 15:40:29 +0000 |
| commit | 91f38204dfb3221db1fc6c615529de3c183ee98c (patch) | |
| tree | d376b3b1e9ff71f24aede0a55e628b2bef152cd6 | |
| parent | b9c50822f8dbc1e38c39117aa14e69f9dfdb94ab (diff) | |
| parent | ac56866420dbdaaef953828c332ef88876d34c56 (diff) | |
| download | idea-91f38204dfb3221db1fc6c615529de3c183ee98c.tar.gz | |
Merge "Warn if using Open JDK." into idea133
| -rw-r--r-- | platform/platform-impl/src/com/intellij/ide/SystemHealthMonitor.java | 2 | ||||
| -rw-r--r-- | platform/platform-resources-en/src/messages/IdeBundle.properties | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/platform/platform-impl/src/com/intellij/ide/SystemHealthMonitor.java b/platform/platform-impl/src/com/intellij/ide/SystemHealthMonitor.java index 39886a2eb20a..419c4d1b2669 100644 --- a/platform/platform-impl/src/com/intellij/ide/SystemHealthMonitor.java +++ b/platform/platform-impl/src/com/intellij/ide/SystemHealthMonitor.java @@ -70,7 +70,7 @@ public class SystemHealthMonitor extends ApplicationComponent.Adapter { } private void checkJvm() { - if (StringUtil.containsIgnoreCase(System.getProperty("java.vm.name", ""), "OpenJDK") && !SystemInfo.isJavaVersionAtLeast("1.7")) { + if (StringUtil.containsIgnoreCase(System.getProperty("java.vm.name", ""), "OpenJDK")) { notifyUnsupportedJvm("unsupported.jvm.openjdk.message"); } else if (StringUtil.endsWithIgnoreCase(System.getProperty("java.version", ""), "-ea")) { diff --git a/platform/platform-resources-en/src/messages/IdeBundle.properties b/platform/platform-resources-en/src/messages/IdeBundle.properties index 0b09a63996e2..5edd6b966d9a 100644 --- a/platform/platform-resources-en/src/messages/IdeBundle.properties +++ b/platform/platform-resources-en/src/messages/IdeBundle.properties @@ -1107,7 +1107,7 @@ FileChooser.refreshActionLabelText=Refresh browsers.settings=Web Browsers updates.check.period.on.exit=On every exit -unsupported.jvm.openjdk.message=OpenJDK 6 is not supported. Please use Oracle Java or newer OpenJDK. +unsupported.jvm.openjdk.message=OpenJDK shows intermittent performance and UI issues. We recommend using the Oracle JRE/JDK. unsupported.jvm.ea.message=Early Access Java versions may cause compatibility issues. Please use stable release. unsupported.jvm.link=<br/><a href="#">Do not show again</a>. |