IDEA-136855 (warning message clarified)
authorRoman Shevchenko <roman.shevchenko@jetbrains.com>
Tue, 24 Feb 2015 16:04:04 +0000 (17:04 +0100)
committerRoman Shevchenko <roman.shevchenko@jetbrains.com>
Tue, 24 Feb 2015 16:04:35 +0000 (17:04 +0100)
platform/platform-impl/src/com/intellij/openapi/updateSettings/impl/UpdateCheckerComponent.java
platform/platform-impl/src/com/intellij/openapi/updateSettings/impl/UpdateSettingsConfigurable.java
platform/platform-resources-en/src/messages/IdeBundle.properties

index f4436da4a5ee6776ce0a10bee7810dfb22c40ab0..fe6193d38899fd83b0536f6437d45efefc2eb524 100644 (file)
@@ -25,6 +25,7 @@ import com.intellij.openapi.components.ApplicationComponent;
 import com.intellij.openapi.updateSettings.impl.pluginsAdvertisement.PluginsAdvertiser;
 import com.intellij.openapi.util.Disposer;
 import com.intellij.openapi.util.Ref;
+import com.intellij.openapi.util.SystemInfo;
 import com.intellij.openapi.util.text.StringUtil;
 import com.intellij.util.Alarm;
 import com.intellij.util.net.NetUtils;
@@ -59,7 +60,8 @@ public class UpdateCheckerComponent implements ApplicationComponent {
         @Override
         public void run() {
           String title = IdeBundle.message("update.notifications.title");
-          String message = IdeBundle.message("update.sni.disabled.notification");
+          boolean tooOld = !SystemInfo.isJavaVersionAtLeast("1.7");
+          String message = IdeBundle.message(tooOld ? "update.sni.not.available.notification" : "update.sni.disabled.notification");
           UpdateChecker.NOTIFICATIONS.createNotification(title, message, NotificationType.ERROR, null).notify(null);
         }
       }, ModalityState.NON_MODAL);
index 9da0dbd415ead2df2b2f5c19db12364ccfe13c81..b179036d36ef4e20bafffa8789a6909d7ec200ec 100644 (file)
@@ -25,6 +25,7 @@ import com.intellij.openapi.options.Configurable;
 import com.intellij.openapi.options.ConfigurationException;
 import com.intellij.openapi.options.SearchableConfigurable;
 import com.intellij.openapi.project.Project;
+import com.intellij.openapi.util.SystemInfo;
 import com.intellij.ui.CollectionComboBoxModel;
 import com.intellij.util.net.NetUtils;
 import com.intellij.util.text.DateFormatUtil;
@@ -167,7 +168,9 @@ public class UpdateSettingsConfigurable extends BaseConfigurable implements Sear
 
       if (!NetUtils.isSniEnabled()) {
         myUseSecureConnection.setEnabled(false);
-        myUseSecureConnection.setToolTipText(IdeBundle.message("update.sni.disabled.notification"));
+        boolean tooOld = !SystemInfo.isJavaVersionAtLeast("1.7");
+        String message = IdeBundle.message(tooOld ? "update.sni.not.available.notification" : "update.sni.disabled.notification");
+        myUseSecureConnection.setToolTipText(message);
       }
     }
 
index b010f2373daa621a38be826826e11da9d52e9f74..806c0c72e97f4a5c5bb526841a00dc6345423974 100644 (file)
@@ -944,6 +944,7 @@ update.downloading.patch.error=Failed to download patch file:\n{0}
 update.plugins.update.action=&Update
 update.restart.plugins.update.action=&Update and Restart
 update.shutdown.plugins.update.action=&Update and Shutdown
+update.sni.not.available.notification=Secure update is not supported on Java 6. Sorry.
 update.sni.disabled.notification=Secure update is impossible with SNI disabled
 
 hierarchy.method.next.occurence.name=Go to next method