From 3869afcf2ee7700f134c21750cd2a990a39d4030 Mon Sep 17 00:00:00 2001 From: Vladimir Krivosheev Date: Fri, 30 Dec 2016 15:48:14 +0100 Subject: [PATCH] =?UTF-8?q?do=20not=20write=20defaults=20=E2=80=94=20Maven?= =?UTF-8?q?ImportPreferences=20(different=20default=20value=20in=20test=20?= =?UTF-8?q?BUNDLED=5FMAVEN=5F2)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- platform/configuration-store-impl/testSrc/FileTreePrinter.kt | 2 +- .../jetbrains/idea/maven/project/MavenGeneralSettings.java | 3 ++- .../idea/maven/project/MavenWorkspaceSettingsComponent.java | 5 ++++- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/platform/configuration-store-impl/testSrc/FileTreePrinter.kt b/platform/configuration-store-impl/testSrc/FileTreePrinter.kt index 9e48687e0277..3f661dd03d1e 100644 --- a/platform/configuration-store-impl/testSrc/FileTreePrinter.kt +++ b/platform/configuration-store-impl/testSrc/FileTreePrinter.kt @@ -45,7 +45,7 @@ private fun printFile(file: Path, indent: Int, sb: StringBuilder) { sb.append("\u251c\u2500\u2500") sb.append(file.fileName.toString()) sb.append("\n") - sb.append(file.readChars()) + sb.append(file.readChars()).append("\n\n") } private fun getIndentString(indent: Int, sb: StringBuilder) { diff --git a/plugins/maven/src/main/java/org/jetbrains/idea/maven/project/MavenGeneralSettings.java b/plugins/maven/src/main/java/org/jetbrains/idea/maven/project/MavenGeneralSettings.java index cd0d7ac29b7f..359cbc900c56 100644 --- a/plugins/maven/src/main/java/org/jetbrains/idea/maven/project/MavenGeneralSettings.java +++ b/plugins/maven/src/main/java/org/jetbrains/idea/maven/project/MavenGeneralSettings.java @@ -15,6 +15,7 @@ */ package org.jetbrains.idea.maven.project; +import com.intellij.openapi.application.ApplicationManager; import com.intellij.openapi.util.Comparing; import com.intellij.openapi.util.text.StringUtil; import com.intellij.openapi.vfs.LocalFileSystem; @@ -38,7 +39,7 @@ import java.util.Set; public class MavenGeneralSettings implements Cloneable { private boolean workOffline = false; - private String mavenHome = MavenServerManager.BUNDLED_MAVEN_3; + private String mavenHome = ApplicationManager.getApplication().isUnitTestMode() ? MavenServerManager.BUNDLED_MAVEN_2 : MavenServerManager.BUNDLED_MAVEN_3; private String mavenSettingsFile = ""; private String overriddenLocalRepository = ""; private boolean printErrorStackTraces = false; diff --git a/plugins/maven/src/main/java/org/jetbrains/idea/maven/project/MavenWorkspaceSettingsComponent.java b/plugins/maven/src/main/java/org/jetbrains/idea/maven/project/MavenWorkspaceSettingsComponent.java index c7f28a38fc6c..7b06a98b003c 100644 --- a/plugins/maven/src/main/java/org/jetbrains/idea/maven/project/MavenWorkspaceSettingsComponent.java +++ b/plugins/maven/src/main/java/org/jetbrains/idea/maven/project/MavenWorkspaceSettingsComponent.java @@ -43,6 +43,7 @@ public class MavenWorkspaceSettingsComponent implements PersistentStateComponent return ServiceManager.getService(project, MavenWorkspaceSettingsComponent.class); } + @Override @NotNull public MavenWorkspaceSettings getState() { MavenExplicitProfiles profiles = MavenProjectsManager.getInstance(myProject).getExplicitProfiles(); @@ -51,6 +52,7 @@ public class MavenWorkspaceSettingsComponent implements PersistentStateComponent return mySettings; } + @Override public void loadState(MavenWorkspaceSettings state) { mySettings = state; applyDefaults(mySettings); @@ -68,7 +70,8 @@ public class MavenWorkspaceSettingsComponent implements PersistentStateComponent else { settings.generalSettings.setMavenHome(MavenServerManager.BUNDLED_MAVEN_3); } - } else { + } + else { MavenServerManager.getInstance().setMavenHome(settings.generalSettings.getMavenHome()); } }