Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
Original file line number Diff line number Diff line change
Expand Up @@ -41,6 +41,7 @@ public class ExecutionEnvironmentAnalyzer implements IExecutionEnvironmentAnalyz

// XXX: Note that this string is not yet standardized by OSGi, see http://wiki.osgi.org/wiki/Execution_Environment

private static final String JavaSE_25 = "JavaSE-25"; //$NON-NLS-1$
private static final String JavaSE_24 = "JavaSE-24"; //$NON-NLS-1$
private static final String JavaSE_23 = "JavaSE-23"; //$NON-NLS-1$
private static final String JavaSE_22 = "JavaSE-22"; //$NON-NLS-1$
Expand Down Expand Up @@ -113,6 +114,7 @@ public class ExecutionEnvironmentAnalyzer implements IExecutionEnvironmentAnalyz
mappings.put(JavaSE_22, new String[] { JavaSE_21 });
mappings.put(JavaSE_23, new String[] { JavaSE_22 });
mappings.put(JavaSE_24, new String[] { JavaSE_23 });
mappings.put(JavaSE_25, new String[] { JavaSE_24 });
}
@Override
public CompatibleEnvironment[] analyze(IVMInstall vm, IProgressMonitor monitor) throws CoreException {
Expand All @@ -138,7 +140,9 @@ public CompatibleEnvironment[] analyze(IVMInstall vm, IProgressMonitor monitor)
types = getTypes(CDC_FOUNDATION_1_1);
}
} else {
if (javaVersion.startsWith("24")) { //$NON-NLS-1$
if (javaVersion.startsWith("25")) { //$NON-NLS-1$
types = getTypes(JavaSE_25);
} else if (javaVersion.startsWith("24")) { //$NON-NLS-1$
types = getTypes(JavaSE_24);
} else if (javaVersion.startsWith("23")) { //$NON-NLS-1$
types = getTypes(JavaSE_23);
Expand Down
1 change: 1 addition & 0 deletions org.eclipse.jdt.launching/plugin.properties
Original file line number Diff line number Diff line change
Expand Up @@ -86,6 +86,7 @@ environment.description.25 = Java Platform, Standard Edition 21
environment.description.26 = Java Platform, Standard Edition 22
environment.description.27 = Java Platform, Standard Edition 23
environment.description.28 = Java Platform, Standard Edition 24
environment.description.29 = Java Platform, Standard Edition 25

classpathVariableInitializer.deprecated = Use the JRE System Library instead

Expand Down
5 changes: 5 additions & 0 deletions org.eclipse.jdt.launching/plugin.xml
Original file line number Diff line number Diff line change
Expand Up @@ -394,6 +394,11 @@
id="JavaSE-24"
compliance="24">
</environment>
<environment
description="%environment.description.29"
id="JavaSE-25"
compliance="25">
</environment>
<analyzer
class="org.eclipse.jdt.internal.launching.environments.ExecutionEnvironmentAnalyzer"
id="org.eclipse.jdt.launching.eeAnalyzer"/>
Expand Down
Loading