Skip to content

Fix Maven compile panel to respect Maven default JDK #9467

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
matthiasblaesing merged 1 commit into from
Jun 28, 2026
+58 −8
Merged

Fix Maven compile panel to respect Maven default JDK #9467

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
66 changes: 58 additions & 8 deletions java/maven/src/org/netbeans/modules/maven/customizer/CompilePanel.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,12 +30,14 @@
import java.util.HashMap;
import java.util.List;
import java.util.Map;
import java.util.Objects;
import java.util.Optional;
import java.util.logging.Level;
import java.util.logging.Logger;
import java.util.stream.Collectors;
import java.util.stream.IntStream;
import java.util.stream.Stream;

import javax.swing.AbstractListModel;
import javax.swing.ComboBoxModel;
import javax.swing.JLabel;
Expand All @@ -45,6 +47,7 @@
import javax.swing.event.ListDataListener;
import javax.swing.plaf.UIResource;
import javax.xml.namespace.QName;

import org.apache.maven.model.InputLocation;
import org.apache.maven.project.MavenProject;
import org.codehaus.plexus.component.configurator.expression.ExpressionEvaluator;
Expand Down Expand Up @@ -87,6 +90,7 @@
import static org.netbeans.modules.maven.api.Constants.HINT_JDK_PLATFORM;
import static org.netbeans.modules.maven.api.Constants.PLUGIN_COMPILER;
import static org.netbeans.modules.maven.api.Constants.SOURCE_PARAM;
import org.netbeans.modules.maven.options.MavenSettings;

/**
*
Expand All @@ -96,6 +100,23 @@ public class CompilePanel extends javax.swing.JPanel implements HelpCtx.Provider

private static final Logger LOG = Logger.getLogger(CompilePanel.class.getName());

private static JavaPlatform getDefaultMavenPlatform() {
String mavenDefaultJdk = MavenSettings.getDefault().getDefaultJdk();
if (mavenDefaultJdk != null && !mavenDefaultJdk.isEmpty()) {
for (JavaPlatform platform : JavaPlatformManager.getDefault().getInstalledPlatforms()) {
if (platform.isValid() && Objects.equals(platform.getProperties().get("platform.ant.name"), mavenDefaultJdk)) {
return platform;
}
}
}
return null;
}

private static JavaPlatform getDefaultPlatform() {
JavaPlatform defaultMavenPlatform = getDefaultMavenPlatform();
return defaultMavenPlatform == null ? JavaPlatform.getDefault() : defaultMavenPlatform;
}

private final ModelHandle2 handle;
private final Project project;
private static boolean warningShown = false;
Expand Down Expand Up @@ -317,7 +338,7 @@ public Union2<JavaPlatform, String> getValue() {
}
if (val != null) {
if (val.equals(DEFAULT_PLATFORM_VALUE)) {
return Union2.createFirst(JavaPlatformManager.getDefault().getDefaultPlatform());
return Union2.createFirst(getDefaultPlatform());
}
return Optional.ofNullable(BootClassPathImpl.getActivePlatform(val))
.filter(JavaPlatform::isValid)
Expand All @@ -334,20 +355,20 @@ public Union2<JavaPlatform, String> getValue() {

@Override
public Union2<JavaPlatform, String> getDefaultValue() {
return Union2.createFirst(JavaPlatformManager.getDefault().getDefaultPlatform());
return Union2.createFirst(getDefaultPlatform());
}

@Override
public void setValue(Union2<JavaPlatform, String> value) {
handle.removePOMModification(operation);
modifiedValue = null;
final Union2<JavaPlatform, String> platf = value == null ?
Union2.createFirst(JavaPlatformManager.getDefault().getDefaultPlatform()) :
Union2.createFirst(getDefaultPlatform()) :
value;
final String platformId;
if (platf.hasFirst()) {
final JavaPlatform jp = platf.first();
platformId = JavaPlatformManager.getDefault().getDefaultPlatform().equals(jp) ?
platformId = getDefaultPlatform().equals(jp) ?
null :
jp.getProperties().get("platform.ant.name"); //NOI18N
} else {
Expand Down Expand Up @@ -375,9 +396,15 @@ public void setValue(Union2<JavaPlatform, String> value) {
platformComboBoxUpdater.ancestorRemoved(null);
}

private Pair<String,JavaPlatform> getSelPlatform () {
private Pair<String, JavaPlatform> getSelPlatform() {
String platformId = project.getLookup().lookup(AuxiliaryProperties.class).get(HINT_JDK_PLATFORM, true);
return Pair.of(platformId,BootClassPathImpl.getActivePlatform(platformId));
if (platformId == null) {
JavaPlatform defaultMavenPlatform = getDefaultMavenPlatform();
if (defaultMavenPlatform != null) {
platformId = defaultMavenPlatform.getProperties().get("platform.ant.name");
}
}
return Pair.of(platformId, BootClassPathImpl.getActivePlatform(platformId));
}

@SuppressWarnings("unchecked")
Expand Down Expand Up @@ -908,6 +935,19 @@ private static POMExtensibilityElement getElement(POMComponent parent, String na
return null;
}

@NbBundle.Messages({
"# {0} - platform display name",
"TXT_MavenDefaultPlatformFmt={0} (Maven default)"
})
private static String getDisplayName(JavaPlatform javaPlatform) {
if (Objects.equals(javaPlatform, getDefaultMavenPlatform())
&& !Objects.equals(javaPlatform, JavaPlatform.getDefault())) {
return Bundle.TXT_MavenDefaultPlatformFmt(javaPlatform.getDisplayName());
} else {
return javaPlatform.getDisplayName();
}
}

static class PlatformsModel extends AbstractListModel implements ComboBoxModel, PropertyChangeListener {

private static final long serialVersionUID = 1L;
Expand Down Expand Up @@ -988,11 +1028,21 @@ private void getPlatforms(JavaPlatformManager jpm) {
}

private static String displayName(Union2<JavaPlatform, String> item) {
return item.hasFirst() ? item.first().getDisplayName() : item.second();
if (item.hasFirst()) {
return getDisplayName(item.first());
} else {
return item.second();
}
}

private Pair<String, JavaPlatform> getSelPlatform() {
String platformId = project.getLookup().lookup(AuxiliaryProperties.class).get(HINT_JDK_PLATFORM, true);
if (platformId == null) {
JavaPlatform defaultMavenPlatform = getDefaultMavenPlatform();
if (defaultMavenPlatform != null) {
platformId = defaultMavenPlatform.getProperties().get("platform.ant.name");
}
}
return Pair.of(platformId, BootClassPathImpl.getActivePlatform(platformId));
}
}
Expand All @@ -1017,7 +1067,7 @@ public Component getListCellRendererComponent(JList list, Object value,
if (value instanceof Union2) {
final Union2<JavaPlatform,String> u2 = (Union2<JavaPlatform,String>) value;
if (u2.hasFirst()) {
strValue = u2.first().getDisplayName();
strValue = getDisplayName(u2.first());
} else {
strValue = "<html><font color=\"#A40000\">" //NOI18N
+ Bundle.TXT_BrokenPlatformFmt(u2.second());
Expand Down
Loading