fixes #2148 (#2149)

eclipse-jdt · Mar 12, 2024 · ce86c46 · ce86c46
1 parent c7be6c0
commit ce86c46
Showing 1 changed file with 16 additions and 2 deletions.
diff --git a/...pse.jdt.core.tests.model/src/org/eclipse/jdt/core/tests/model/AbstractJavaModelTests.java b/...pse.jdt.core.tests.model/src/org/eclipse/jdt/core/tests/model/AbstractJavaModelTests.java
@@ -3503,7 +3503,11 @@ protected void setUpProjectCompliance(IJavaProject javaProject, String complianc
 				newJclSrcString = "JCL18_SRC"; // Use the same source
 			}
 		} else {
-			if (compliance.equals("21")) {
+			if (compliance.equals("22")) {
+				// Reuse the same 17 stuff as of now. No real need for a new one
+				newJclLibString = "JCL_17_LIB";
+				newJclSrcString = "JCL_17_SRC";
+			} else			if (compliance.equals("21")) {
 				// Reuse the same 14 stuff as of now. No real need for a new one
 				newJclLibString = "JCL_17_LIB";
 				newJclSrcString = "JCL_17_SRC";
@@ -3594,11 +3598,13 @@ public boolean isJCLPath(IPath path) {
 		IPath jcl14Lib = new Path("JCL14_LIB");
 		IPath jcl17Lib = new Path("JCL_17_LIB");
 		IPath jcl21Lib = new Path("JCL_21_LIB");
+		IPath jcl22Lib = new Path("JCL_22_LIB");
 		IPath jclFull = new Path("JCL18_FULL");
 
 		return path.equals(jclLib) || path.equals(jcl5Lib) || path.equals(jcl8Lib) || path.equals(jcl9Lib)
 				|| path.equals(jcl10Lib) ||  path.equals(jcl11Lib) || path.equals(jcl12Lib) || path.equals(jcl13Lib)
-				|| path.equals(jcl14Lib) || path.equals(jcl17Lib) || path.equals(jcl21Lib) || path.equals(jclFull);
+				|| path.equals(jcl14Lib) || path.equals(jcl17Lib) || path.equals(jcl21Lib) || path.equals(jcl22Lib)
+				|| path.equals(jclFull);
 	}
 	public void setUpJCLClasspathVariables(String compliance) throws JavaModelException, IOException {
 		setUpJCLClasspathVariables(compliance, false);
@@ -3717,6 +3723,14 @@ public void setUpJCLClasspathVariables(String compliance, boolean useFullJCL) th
 					new IPath[] {getExternalJCLPath("17"), getExternalJCLSourcePath("17"), getExternalJCLRootSourcePath()},
 					null);
 			}
+		} else if ("22".equals(compliance)) {
+			if (JavaCore.getClasspathVariable("JCL_22_LIB") == null) {
+				setupExternalJCL("jclMin17");
+				JavaCore.setClasspathVariables(
+					new String[] {"JCL_17_LIB", "JCL_17_SRC", "JCL_SRCROOT"},
+					new IPath[] {getExternalJCLPath("17"), getExternalJCLSourcePath("17"), getExternalJCLRootSourcePath()},
+					null);
+			}
 		} else {
 			if (JavaCore.getClasspathVariable("JCL_LIB") == null) {
 				setupExternalJCL("jclMin");