From 44af95272f2746cdc8fe0cea741dc6def3084a18 Mon Sep 17 00:00:00 2001 From: "Vladislav.Soroka" Date: Thu, 12 Feb 2015 12:51:13 +0300 Subject: [PATCH] IDEA-136232 Maven: Maven home directory: the value of M2_HOME is shown twice --- .../org/jetbrains/idea/maven/project/MavenEnvironmentForm.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/plugins/maven/src/main/java/org/jetbrains/idea/maven/project/MavenEnvironmentForm.java b/plugins/maven/src/main/java/org/jetbrains/idea/maven/project/MavenEnvironmentForm.java index 204a92bf0fa9..65b7b51169ed 100644 --- a/plugins/maven/src/main/java/org/jetbrains/idea/maven/project/MavenEnvironmentForm.java +++ b/plugins/maven/src/main/java/org/jetbrains/idea/maven/project/MavenEnvironmentForm.java @@ -146,7 +146,8 @@ public class MavenEnvironmentForm implements PanelWithAnchor { public void getData(MavenGeneralSettings data) { final String resolvedMavenHome = resolveMavenHome(data.getMavenHome()); - mavenHomeField.setText(ObjectUtils.chooseNotNull(resolvedMavenHome, data.getMavenHome())); + final String mavenHome = ObjectUtils.chooseNotNull(resolvedMavenHome, data.getMavenHome()); + mavenHomeField.setText(mavenHome != null ? FileUtil.toSystemIndependentName(mavenHome): null); mavenHomeField.addCurrentTextToHistory(); updateMavenVersionLabel(); userSettingsFileOverrider.reset(data.getUserSettingsFile());