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

Bug fix: compile target level must be >= compile source level

Browse Source
This commit is contained in:
Sergey Evdokimov
2012-04-12 15:40:32 +04:00
parent 65ffcc4919
commit c8e00d25db
1 changed files with 9 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
plugins/maven/src/main/java/org/jetbrains/idea/maven/importing/MavenProjectImporter.java
+9 -7
View File
@@ -34,6 +34,7 @@ import com.intellij.util.Function;
import com.intellij.util.containers.Stack;
import gnu.trove.THashMap;
import gnu.trove.THashSet;
import org.jetbrains.annotations.Nullable;
import org.jetbrains.idea.maven.model.MavenArtifact;
import org.jetbrains.idea.maven.project.*;
import org.jetbrains.idea.maven.utils.MavenLog;
@@ -368,8 +369,8 @@ public class MavenProjectImporter {
private void configSettings() {
MavenUtil.invokeAndWaitWriteAction(myProject, new Runnable() {
public void run() {
String level = calcTargetLevel();
if (level == null) return;
String minPossibleTargetLevel = calcMinPossibleTargetLevel();
if (minPossibleTargetLevel == null) return;
String options = JavacSettings.getInstance(myProject).ADDITIONAL_OPTIONS_STRING;
Pattern pattern = Pattern.compile("(-target (\\S+))");
@@ -378,23 +379,24 @@ public class MavenProjectImporter {
if (matcher.find()) {
String currentValue = MavenProject.normalizeCompilerLevel(matcher.group(2));
if (currentValue == null || compareCompilerLevel(level, currentValue) < 0) {
if (currentValue == null || compareCompilerLevel(minPossibleTargetLevel, currentValue) > 0) {
StringBuffer buffer = new StringBuffer();
matcher.appendReplacement(buffer, "-target " + level);
matcher.appendReplacement(buffer, "-target " + minPossibleTargetLevel);
matcher.appendTail(buffer);
options = buffer.toString();
}
}
else {
if (!StringUtil.isEmptyOrSpaces(options)) options += " ";
options += "-target " + level;
options += "-target " + minPossibleTargetLevel;
}
JavacSettings.getInstance(myProject).ADDITIONAL_OPTIONS_STRING = options;
}
});
}
private String calcTargetLevel() {
@Nullable
private String calcMinPossibleTargetLevel() {
String maxSource = null;
String minTarget = null;
for (MavenProject each : myAllProjects) {
@@ -406,7 +408,7 @@ public class MavenProjectImporter {
return (maxSource != null && compareCompilerLevel(minTarget, maxSource) < 0) ? maxSource : minTarget;
}
private int compareCompilerLevel(String left, String right) {
private static int compareCompilerLevel(String left, String right) {
if (left == null && right == null) return 0;
if (left == null) return -1;
if (right == null) return 1;