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

fallback url provided when legacy key conversion is not possible (IDEA-147130),

Browse Source 
'JetProfile' term changed to 'JetBrains Account' in UI error messages
This commit is contained in:
Eugene Zhuravlev
2015-11-06 15:46:54 +03:00
parent 3045138aef
commit 4515f3496e
2 changed files with 18 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
platform/core-api/src/com/intellij/openapi/application/ApplicationInfo.java
+1
View File
@@ -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();
platform/core-impl/src/com/intellij/openapi/application/impl/ApplicationInfoImpl.java
+17 -1
View File
@@ -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();
}
}