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

cleanup

Browse Source
This commit is contained in:
Vladimir Krivosheev
2016-09-09 15:14:02 +02:00
parent e9c2fd5a21
commit 6b6bf11fcd
2 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
plugins/maven/src/main/java/org/jetbrains/idea/maven/project/MavenWorkspaceSettings.java
+2 -3
View File
@@ -1,5 +1,5 @@
/*
* Copyright 2000-2009 JetBrains s.r.o.
* Copyright 2000-2016 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.
@@ -35,5 +35,4 @@ public class MavenWorkspaceSettings {
disabledProfiles.clear();
disabledProfiles.addAll(profiles);
}
}
}
plugins/maven/src/main/java/org/jetbrains/idea/maven/project/MavenWorkspaceSettingsComponent.java
+4 -3
View File
@@ -56,10 +56,11 @@ public class MavenWorkspaceSettingsComponent implements PersistentStateComponent
}
private static void applyDefaults(MavenWorkspaceSettings settings) {
if(StringUtil.isEmptyOrSpaces(settings.generalSettings.getMavenHome())) {
if(MavenServerManager.getInstance().isUsedMaven2ForProjectImport() || ApplicationManager.getApplication().isUnitTestMode()) {
if (StringUtil.isEmptyOrSpaces(settings.generalSettings.getMavenHome())) {
if (MavenServerManager.getInstance().isUsedMaven2ForProjectImport() || ApplicationManager.getApplication().isUnitTestMode()) {
settings.generalSettings.setMavenHome(MavenServerManager.BUNDLED_MAVEN_2);
} else {
}
else {
settings.generalSettings.setMavenHome(MavenServerManager.BUNDLED_MAVEN_3);
}
}