From 02cf98d65c798d368fcec43ed64a001d513bdd4f Mon Sep 17 00:00:00 2001 From: Tor Norbye Date: Tue, 19 Aug 2014 12:53:10 -0700 Subject: Snapshot idea/138.1503 from git://git.jetbrains.org/idea/community.git Change-Id: Ie01af1d8710ec0ff51d90301bda1a18b0b5c0faf --- .../com/intellij/openapi/application/ConfigImportHelper.java | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-) (limited to 'platform/platform-impl/src/com/intellij/openapi/application/ConfigImportHelper.java') 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 36bd876c15b4..51809addc44c 100644 --- a/platform/platform-impl/src/com/intellij/openapi/application/ConfigImportHelper.java +++ b/platform/platform-impl/src/com/intellij/openapi/application/ConfigImportHelper.java @@ -1,5 +1,5 @@ /* - * Copyright 2000-2013 JetBrains s.r.o. + * Copyright 2000-2014 JetBrains s.r.o. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -22,7 +22,6 @@ import com.intellij.openapi.util.io.FileUtil; import com.intellij.openapi.util.text.StringUtil; import com.intellij.ui.AppUIUtil; import com.intellij.util.PlatformUtils; -import com.intellij.util.SystemProperties; import com.intellij.util.ThreeState; import org.jetbrains.annotations.NonNls; import org.jetbrains.annotations.NotNull; @@ -402,15 +401,12 @@ public class ConfigImportHelper { dir = dir.substring(1, dir.length() - 1); } if (replaceUserHome) { - if (dir.startsWith("~\\") || dir.startsWith("~//") || StringUtil.startsWithConcatenation(dir, "~", File.separator)) { - dir = SystemProperties.getUserHome() + dir.substring(1); - } + dir = FileUtil.expandUserHome(dir); } return dir; } - public static boolean isInstallationHomeOrConfig(@NotNull final String installationHome, - @NotNull final ConfigImportSettings settings) { + public static boolean isInstallationHomeOrConfig(@NotNull final String installationHome, @NotNull final ConfigImportSettings settings) { if (new File(installationHome, OPTIONS_XML).exists()) return true; if (new File(installationHome, CONFIG_RELATED_PATH + OPTIONS_XML).exists()) return true; -- cgit v1.2.3