Fix release option in module dialog/page

Fixes broken commit c3f2219 . Fixed approach used here given in #1958 (comment)
eclipse-jdt · Jan 24, 2025 · 744f119 · 744f119
1 parent 8c58ba0
commit 744f119
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 14 deletions.
diff --git a/...ipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/wizards/buildpaths/ModuleDependenciesPage.java b/...ipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/wizards/buildpaths/ModuleDependenciesPage.java
@@ -346,13 +346,9 @@ protected void scanModules() {
 						}
 						try {
 							if (fCurrJProject.getModuleDescription() == null) { // cache default roots when compiling the unnamed module:
-								String release = fCurrJProject.getOption(JavaCore.COMPILER_RELEASE, true);
-								if (release == null) {
-									release = fCurrJProject.getOption(JavaCore.COMPILER_CODEGEN_TARGET_PLATFORM, true);
-								}
-								if (release == null) {
-									release = JavaCore.latestSupportedJavaVersion();
-								}
+								String release = JavaCore.ENABLED.equals(fCurrJProject.getOption(JavaCore.COMPILER_RELEASE, true))
+										? fCurrJProject.getOption(JavaCore.COMPILER_COMPLIANCE, true) : null;
+
 								fAllDefaultSystemModules= closure(JavaCore.defaultRootModules(Arrays.asList(fAllSystemRoots), release));
 							}
 						} catch (JavaModelException e) {

diff --git a/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/wizards/buildpaths/ModuleDialog.java b/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/wizards/buildpaths/ModuleDialog.java
@@ -803,13 +803,9 @@ private List<String> defaultIncludedModuleNamesForUnnamedModule() {
 					roots.add(el);
 				}
 			}
-			String release = fJavaElements[0].getJavaProject().getOption(JavaCore.COMPILER_RELEASE, true);
-			if (release == null) {
-				release = fJavaElements[0].getJavaProject().getOption(JavaCore.COMPILER_CODEGEN_TARGET_PLATFORM, true);
-			}
-			if (release == null) {
-				release = JavaCore.latestSupportedJavaVersion();
-			}
+			String release = JavaCore.ENABLED.equals(fJavaElements[0].getJavaProject().getOption(JavaCore.COMPILER_RELEASE, true))
+					? fJavaElements[0].getJavaProject().getOption(JavaCore.COMPILER_COMPLIANCE, true) : null;
+
 			return JavaCore.defaultRootModules(roots, release);
 		}
 		return Collections.emptyList();