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

IDEA-105729 No change in the project when maven profile is activated with a property

Browse Source 
revert bad fix.
This commit is contained in:
Sergey Evdokimov
2013-04-30 15:54:42 +04:00
parent 018775608e
commit 7bf09eb645
1 changed files with 3 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files
plugins/maven/src/main/java/org/jetbrains/idea/maven/project/MavenProjectReader.java
+3 -21
View File
@@ -34,7 +34,8 @@ import org.jetbrains.idea.maven.utils.MavenLog;
import org.jetbrains.idea.maven.utils.MavenProcessCanceledException;
import org.jetbrains.idea.maven.utils.MavenUtil;
import java.io.*;
import java.io.File;
import java.io.IOException;
import java.util.*;
import static com.intellij.openapi.util.text.StringUtil.isEmptyOrSpaces;
@@ -145,26 +146,7 @@ public class MavenProjectReader {
}
private static void readModelBody(MavenModelBase mavenModelBase, MavenBuildBase mavenBuildBase, Element xmlModel) {
List<Element> profiles = MavenJDOMUtil.findChildrenByPath(xmlModel, "profiles", "profile");
List<String> modules = MavenJDOMUtil.findChildrenValuesByPath(xmlModel, "modules", "module");
boolean isModulesUnmodifiable = true;
for (Element profile : profiles) {
List<String> profileModules = MavenJDOMUtil.findChildrenValuesByPath(profile, "modules", "module");
if (profileModules.size() > 0) {
if (isModulesUnmodifiable) {
List<String> modifiableModulesList = new ArrayList<String>();
modifiableModulesList.addAll(modules);
modules = modifiableModulesList;
isModulesUnmodifiable = false;
}
modules.addAll(profileModules);
}
}
mavenModelBase.setModules(modules);
mavenModelBase.setModules(MavenJDOMUtil.findChildrenValuesByPath(xmlModel, "modules", "module"));
collectProperties(MavenJDOMUtil.findChildByPath(xmlModel, "properties"), mavenModelBase);
Element xmlBuild = MavenJDOMUtil.findChildByPath(xmlModel, "build");