Skip to content

Commit ee6b5fb

Browse files
trancexpressiloveeclipse
authored andcommitted
Add JavaSE-25 EE to launching
Fixes: #744 Signed-off-by: Simeon Andreev <simeon.danailov.andreev@gmail.com>
1 parent 67f98cf commit ee6b5fb

3 files changed

Lines changed: 11 additions & 1 deletion

File tree

org.eclipse.jdt.launching/launching/org/eclipse/jdt/internal/launching/environments/ExecutionEnvironmentAnalyzer.java

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,6 +41,7 @@ public class ExecutionEnvironmentAnalyzer implements IExecutionEnvironmentAnalyz
4141

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

44+
private static final String JavaSE_25 = "JavaSE-25"; //$NON-NLS-1$
4445
private static final String JavaSE_24 = "JavaSE-24"; //$NON-NLS-1$
4546
private static final String JavaSE_23 = "JavaSE-23"; //$NON-NLS-1$
4647
private static final String JavaSE_22 = "JavaSE-22"; //$NON-NLS-1$
@@ -113,6 +114,7 @@ public class ExecutionEnvironmentAnalyzer implements IExecutionEnvironmentAnalyz
113114
mappings.put(JavaSE_22, new String[] { JavaSE_21 });
114115
mappings.put(JavaSE_23, new String[] { JavaSE_22 });
115116
mappings.put(JavaSE_24, new String[] { JavaSE_23 });
117+
mappings.put(JavaSE_25, new String[] { JavaSE_24 });
116118
}
117119
@Override
118120
public CompatibleEnvironment[] analyze(IVMInstall vm, IProgressMonitor monitor) throws CoreException {
@@ -138,7 +140,9 @@ public CompatibleEnvironment[] analyze(IVMInstall vm, IProgressMonitor monitor)
138140
types = getTypes(CDC_FOUNDATION_1_1);
139141
}
140142
} else {
141-
if (javaVersion.startsWith("24")) { //$NON-NLS-1$
143+
if (javaVersion.startsWith("25")) { //$NON-NLS-1$
144+
types = getTypes(JavaSE_25);
145+
} else if (javaVersion.startsWith("24")) { //$NON-NLS-1$
142146
types = getTypes(JavaSE_24);
143147
} else if (javaVersion.startsWith("23")) { //$NON-NLS-1$
144148
types = getTypes(JavaSE_23);

org.eclipse.jdt.launching/plugin.properties

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -86,6 +86,7 @@ environment.description.25 = Java Platform, Standard Edition 21
8686
environment.description.26 = Java Platform, Standard Edition 22
8787
environment.description.27 = Java Platform, Standard Edition 23
8888
environment.description.28 = Java Platform, Standard Edition 24
89+
environment.description.29 = Java Platform, Standard Edition 25
8990

9091
classpathVariableInitializer.deprecated = Use the JRE System Library instead
9192

org.eclipse.jdt.launching/plugin.xml

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -394,6 +394,11 @@
394394
id="JavaSE-24"
395395
compliance="24">
396396
</environment>
397+
<environment
398+
description="%environment.description.29"
399+
id="JavaSE-25"
400+
compliance="25">
401+
</environment>
397402
<analyzer
398403
class="org.eclipse.jdt.internal.launching.environments.ExecutionEnvironmentAnalyzer"
399404
id="org.eclipse.jdt.launching.eeAnalyzer"/>

0 commit comments

Comments
 (0)