Skip to content

Make determination of execution environment compliance generic #750

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
iloveeclipse merged 1 commit into from
Jul 30, 2025
Merged

Make determination of execution environment compliance generic #750

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
51 changes: 14 additions & 37 deletions ...nching/launching/org/eclipse/jdt/internal/launching/environments/EnvironmentsManager.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,8 @@
import java.util.Set;
import java.util.SortedSet;
import java.util.TreeSet;
import java.util.regex.Matcher;
import java.util.regex.Pattern;

import javax.xml.parsers.DocumentBuilder;

Expand Down Expand Up @@ -64,6 +66,8 @@
*/
public class EnvironmentsManager implements IExecutionEnvironmentsManager, IVMInstallChangedListener, IPreferenceChangeListener {

private static final Pattern EE_PATTERN = Pattern.compile("(\\d+)"); //$NON-NLS-1$

/**
* Extension configuration element name.
*/
Expand Down Expand Up @@ -203,41 +207,15 @@ public synchronized Analyzer[] getAnalyzers() {

private String getExecutionEnvironmentCompliance(IExecutionEnvironment executionEnvironment) {
String desc = executionEnvironment.getId();
if (desc.indexOf(JavaCore.VERSION_25) != -1) {
return JavaCore.VERSION_25;
} else if (desc.indexOf(JavaCore.VERSION_24) != -1) {
return JavaCore.VERSION_24;
} else if (desc.indexOf(JavaCore.VERSION_23) != -1) {
return JavaCore.VERSION_23;
} else if (desc.indexOf(JavaCore.VERSION_22) != -1) {
return JavaCore.VERSION_22;
} else if (desc.indexOf(JavaCore.VERSION_21) != -1) {
return JavaCore.VERSION_21;
} else if (desc.indexOf(JavaCore.VERSION_20) != -1) {
return JavaCore.VERSION_20;
} else if (desc.indexOf(JavaCore.VERSION_19) != -1) {
return JavaCore.VERSION_19;
} else if (desc.indexOf(JavaCore.VERSION_18) != -1) {
return JavaCore.VERSION_18;
} else if (desc.indexOf(JavaCore.VERSION_17) != -1) {
return JavaCore.VERSION_17;
} else if (desc.indexOf(JavaCore.VERSION_16) != -1) {
return JavaCore.VERSION_16;
} else if (desc.indexOf(JavaCore.VERSION_15) != -1) {
return JavaCore.VERSION_15;
} else if (desc.indexOf(JavaCore.VERSION_14) != -1) {
return JavaCore.VERSION_14;
} else if (desc.indexOf(JavaCore.VERSION_13) != -1) {
return JavaCore.VERSION_13;
} else if (desc.indexOf(JavaCore.VERSION_12) != -1) {
return JavaCore.VERSION_12;
} else if (desc.indexOf(JavaCore.VERSION_11) != -1) {
return JavaCore.VERSION_11;
} else if (desc.indexOf(JavaCore.VERSION_10) != -1) {
return JavaCore.VERSION_10;
} else if (desc.indexOf(JavaCore.VERSION_9) != -1) {
return JavaCore.VERSION_9;
} else if (desc.indexOf(JavaCore.VERSION_1_8) != -1) {
// For java version > 1.8 we can simply extract the version from the string by searching the numbers
Matcher matcher = EE_PATTERN.matcher(desc);
if (matcher.find()) {
String group = matcher.group(1);
if (Integer.parseInt(group) >= 9) {
return group;
}
}
if (desc.indexOf(JavaCore.VERSION_1_8) != -1) {
return JavaCore.VERSION_1_8;
} else if (desc.indexOf(JavaCore.VERSION_1_7) != -1) {
return JavaCore.VERSION_1_7;
Expand All @@ -253,10 +231,9 @@ private String getExecutionEnvironmentCompliance(IExecutionEnvironment execution
return JavaCore.VERSION_1_2;
} else if (desc.indexOf(JavaCore.VERSION_1_1) != -1) {
return JavaCore.VERSION_1_1;
} else if (desc.indexOf("1.0") != -1) { //$NON-NLS-1$
} else {
return "1.0"; //$NON-NLS-1$
}
return JavaCore.VERSION_1_3;
}

private synchronized void initializeExtensions() {
Expand Down
Loading