From 4515f3496e6b1f2499c07c7828b9dcf7083a9ca5 Mon Sep 17 00:00:00 2001
From: Eugene Zhuravlev <jeka@intellij.com>
Date: Fri, 6 Nov 2015 15:35:31 +0300
Subject: [PATCH] fallback url provided when legacy key conversion is not
 possible (IDEA-147130), 'JetProfile' term changed to 'JetBrains Account' in
 UI error messages

---
 .../openapi/application/ApplicationInfo.java   |  1 +
 .../application/impl/ApplicationInfoImpl.java  | 18 +++++++++++++++++-
 2 files changed, 18 insertions(+), 1 deletion(-)

diff --git a/platform/core-api/src/com/intellij/openapi/application/ApplicationInfo.java b/platform/core-api/src/com/intellij/openapi/application/ApplicationInfo.java
index 3b57b78c053c..2b1d076af620 100644
--- a/platform/core-api/src/com/intellij/openapi/application/ApplicationInfo.java
+++ b/platform/core-api/src/com/intellij/openapi/application/ApplicationInfo.java
@@ -36,6 +36,7 @@ public abstract class ApplicationInfo {
   public abstract String getThirdPartySoftwareURL();
   public abstract String getJetbrainsTvUrl();
   public abstract String getEvalLicenseUrl();
+  public abstract String getKeyConversionUrl();
 
   public abstract Rectangle getAboutLogoRect();
   public abstract boolean hasHelp();
diff --git a/platform/core-impl/src/com/intellij/openapi/application/impl/ApplicationInfoImpl.java b/platform/core-impl/src/com/intellij/openapi/application/impl/ApplicationInfoImpl.java
index 6ea1233625a1..3fe63183d244 100644
--- a/platform/core-impl/src/com/intellij/openapi/application/impl/ApplicationInfoImpl.java
+++ b/platform/core-impl/src/com/intellij/openapi/application/impl/ApplicationInfoImpl.java
@@ -110,6 +110,7 @@ public class ApplicationInfoImpl extends ApplicationInfoEx {
   private String myThirdPartySoftwareUrl;
   private String myJetbrainsTvUrl;
   private String myEvalLicenseUrl = "https://www.jetbrains.com/company/useterms.html";
+  private String myKeyConversionUrl = "https://www.jetbrains.com/shop/eform/keys-exchange";
 
   private Rectangle myAboutLogoRect;
 
@@ -187,6 +188,8 @@ public class ApplicationInfoImpl extends ApplicationInfoEx {
   private static final String STEPS_PROVIDER = "provider";
   private static final String ELEMENT_EVALUATION = "evaluation";
   private static final String ATTRIBUTE_EVAL_LICENSE_URL = "license-url";
+  private static final String ELEMENT_LICENSING = "licensing";
+  private static final String ATTRIBUTE_KEY_CONVERSION_URL = "key-conversion-url";
   private static final String ESSENTIAL_PLUGIN = "essential-plugin";
 
   private static final String DEFAULT_PLUGINS_HOST = "http://plugins.jetbrains.com";
@@ -541,6 +544,11 @@ public class ApplicationInfoImpl extends ApplicationInfoEx {
     return myEvalLicenseUrl;
   }
 
+  @Override
+  public String getKeyConversionUrl() {
+    return myKeyConversionUrl;
+  }
+
   @Override
   public Rectangle getAboutLogoRect() {
     return myAboutLogoRect;
@@ -836,7 +844,15 @@ public class ApplicationInfoImpl extends ApplicationInfoEx {
     if (evaluationElement != null) {
       final String url = evaluationElement.getAttributeValue(ATTRIBUTE_EVAL_LICENSE_URL);
       if (url != null && !url.isEmpty()) {
-        myEvalLicenseUrl = url;
+        myEvalLicenseUrl = url.trim();
+      }
+    }
+ 
+    Element licensingElement = parentNode.getChild(ELEMENT_LICENSING);
+    if (licensingElement != null) {
+      final String url = licensingElement.getAttributeValue(ATTRIBUTE_KEY_CONVERSION_URL);
+      if (url != null && !url.isEmpty()) {
+        myKeyConversionUrl = url.trim();
       }
     }