MDS/openide
1
0
Fork 0
mirror of https://gitflic.ru/project/openide/openide.git synced 2026-09-18 09:34:34 +07:00
Code Issues Packages Projects Releases Wiki Activity

WEB-6724 Installation home of a previous WebStorm version is not accepted during start-up settings import

Browse Source
This commit is contained in:
Kirill Safonov
2013-03-01 21:49:45 +04:00
parent 60c05b6aa0
commit 4fd6cc48b6
2 changed files with 10 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
platform/platform-impl/src/com/intellij/openapi/application/ConfigImportHelper.java
+2 -2
View File
@@ -273,7 +273,7 @@ public class ConfigImportHelper {
// other binary scripts
final String executableName = StringUtil.toLowerCase(settings.getProductName(ThreeState.NO));
final String executableName = StringUtil.toLowerCase(settings.getExecutableName());
// * defaults:
addLaunchExecutableScriptsCandidates(files, executableName, bin);
// * customized files:
@@ -414,7 +414,7 @@ public class ConfigImportHelper {
if (new File(installationHome, OPTIONS_XML).exists()) return true;
if (new File(installationHome, CONFIG_RELATED_PATH + OPTIONS_XML).exists()) return true;
String mainJarName = StringUtil.toLowerCase(settings.getProductName(ThreeState.NO)) + ".jar";
String mainJarName = StringUtil.toLowerCase(settings.getMainJarName()) + ".jar";
//noinspection HardCodedStringLiteral
boolean quickTest = new File(new File(installationHome, "lib"), mainJarName).exists() &&
new File(installationHome, BIN_FOLDER).exists();
platform/platform-impl/src/com/intellij/openapi/application/ConfigImportSettings.java
+8
View File
@@ -30,6 +30,14 @@ import java.util.List;
*/
public class ConfigImportSettings {
public String getExecutableName() {
return getProductName(ThreeState.NO);
}
public String getMainJarName() {
return getProductName(ThreeState.NO);
}
protected String getProductName(ThreeState full) {
ApplicationNamesInfo namesInfo = ApplicationNamesInfo.getInstance();
if (full == ThreeState.YES) {