From 4fd6cc48b6cd9ce020756ed75704dde17ebfc63c Mon Sep 17 00:00:00 2001 From: Kirill Safonov Date: Fri, 1 Mar 2013 21:46:45 +0400 Subject: [PATCH] WEB-6724 Installation home of a previous WebStorm version is not accepted during start-up settings import --- .../intellij/openapi/application/ConfigImportHelper.java | 4 ++-- .../openapi/application/ConfigImportSettings.java | 8 ++++++++ 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/platform/platform-impl/src/com/intellij/openapi/application/ConfigImportHelper.java b/platform/platform-impl/src/com/intellij/openapi/application/ConfigImportHelper.java index 70182a6b62c2..6661e852f001 100644 --- a/platform/platform-impl/src/com/intellij/openapi/application/ConfigImportHelper.java +++ b/platform/platform-impl/src/com/intellij/openapi/application/ConfigImportHelper.java @@ -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(); diff --git a/platform/platform-impl/src/com/intellij/openapi/application/ConfigImportSettings.java b/platform/platform-impl/src/com/intellij/openapi/application/ConfigImportSettings.java index e9889f7baa9f..65b0f1c71018 100644 --- a/platform/platform-impl/src/com/intellij/openapi/application/ConfigImportSettings.java +++ b/platform/platform-impl/src/com/intellij/openapi/application/ConfigImportSettings.java @@ -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) {