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

do not write defaults — MavenImportPreferences (different default value in test BUNDLED_MAVEN_2)

Browse Source
This commit is contained in:
Vladimir Krivosheev
2016-12-30 15:48:14 +01:00
parent 44be16f73c
commit 3869afcf2e
3 changed files with 7 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
platform/configuration-store-impl/testSrc/FileTreePrinter.kt
+1 -1
View File
@@ -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) {
plugins/maven/src/main/java/org/jetbrains/idea/maven/project/MavenGeneralSettings.java
+2 -1
View File
@@ -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;
plugins/maven/src/main/java/org/jetbrains/idea/maven/project/MavenWorkspaceSettingsComponent.java
+4 -1
View File
@@ -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());
}
}