Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorkalyan prasad2018-06-06 11:05:39 +0000
committerKalyan Prasad Tatavarthi2018-06-19 09:06:18 +0000
commit3532dc4e3827a45ef29364c5c448955cee605fa1 (patch)
tree704db39dfe1f84db9174e5dd4498798dae7a56f9
parent5f482c37d104fd634476677fdfb43e55ea23168f (diff)
downloadeclipse.jdt.debug-3532dc4e3827a45ef29364c5c448955cee605fa1.tar.gz
eclipse.jdt.debug-3532dc4e3827a45ef29364c5c448955cee605fa1.tar.xz
eclipse.jdt.debug-3532dc4e3827a45ef29364c5c448955cee605fa1.zip
Bug 534298 - [quick fix] The New Preference
"PREF_COMPLIANCE_COMPATIBLE_JRE_NOT_AVAILABLE" creates a new problem marker But does not provide Quick Fix for the problem marker Change-Id: Ib557db44163d61330f0b9e16e0884e7351536d41 Signed-off-by: kalyan prasad <kalyan_prasad@in.ibm.com>
-rw-r--r--org.eclipse.jdt.debug.ui/META-INF/MANIFEST.MF112
-rw-r--r--org.eclipse.jdt.debug.ui/plugin.xml10
-rw-r--r--org.eclipse.jdt.debug.ui/pom.xml4
-rw-r--r--org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/launcher/JreResolutionGenerator.java11
-rw-r--r--org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/launcher/LauncherMessages.java3
-rw-r--r--org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/launcher/LauncherMessages.properties2
-rw-r--r--org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/launcher/OpenPropertyPageResolution.java98
-rw-r--r--org.eclipse.jdt.launching/META-INF/MANIFEST.MF2
-rw-r--r--org.eclipse.jdt.launching/launching/org/eclipse/jdt/internal/launching/EECompilationParticipant.java4
-rw-r--r--org.eclipse.jdt.launching/launching/org/eclipse/jdt/launching/JavaRuntime.java7
-rw-r--r--org.eclipse.jdt.launching/plugin.properties2
-rw-r--r--org.eclipse.jdt.launching/plugin.xml10
-rw-r--r--org.eclipse.jdt.launching/pom.xml2
13 files changed, 202 insertions, 65 deletions
diff --git a/org.eclipse.jdt.debug.ui/META-INF/MANIFEST.MF b/org.eclipse.jdt.debug.ui/META-INF/MANIFEST.MF
index 0b2dc666e..2b84f9ede 100644
--- a/org.eclipse.jdt.debug.ui/META-INF/MANIFEST.MF
+++ b/org.eclipse.jdt.debug.ui/META-INF/MANIFEST.MF
@@ -1,56 +1,56 @@
-Manifest-Version: 1.0
-Bundle-ManifestVersion: 2
-Bundle-Name: %pluginName
-Bundle-SymbolicName: org.eclipse.jdt.debug.ui; singleton:=true
-Bundle-Version: 3.9.0.qualifier
-Bundle-Activator: org.eclipse.jdt.internal.debug.ui.JDIDebugUIPlugin
-Bundle-Vendor: %providerName
-Bundle-Localization: plugin
-Export-Package: org.eclipse.jdt.debug.ui,
- org.eclipse.jdt.debug.ui.actions,
- org.eclipse.jdt.debug.ui.breakpoints,
- org.eclipse.jdt.debug.ui.console,
- org.eclipse.jdt.debug.ui.launchConfigurations,
- org.eclipse.jdt.internal.debug.core.refactoring;x-internal:=true,
- org.eclipse.jdt.internal.debug.ui;x-internal:=true,
- org.eclipse.jdt.internal.debug.ui.actions;x-friends:="org.eclipse.ant.ui",
- org.eclipse.jdt.internal.debug.ui.breakpoints;x-internal:=true,
- org.eclipse.jdt.internal.debug.ui.classpath;x-friends:="org.eclipse.ant.ui",
- org.eclipse.jdt.internal.debug.ui.console;x-internal:=true,
- org.eclipse.jdt.internal.debug.ui.contentassist;x-internal:=true,
- org.eclipse.jdt.internal.debug.ui.display;x-internal:=true,
- org.eclipse.jdt.internal.debug.ui.heapwalking;x-internal:=true,
- org.eclipse.jdt.internal.debug.ui.jres;x-friends:="org.eclipse.ant.ui",
- org.eclipse.jdt.internal.debug.ui.launcher;x-friends:="org.eclipse.ant.ui",
- org.eclipse.jdt.internal.debug.ui.monitors;x-internal:=true,
- org.eclipse.jdt.internal.debug.ui.propertypages;x-internal:=true,
- org.eclipse.jdt.internal.debug.ui.search;x-internal:=true,
- org.eclipse.jdt.internal.debug.ui.snippeteditor;x-internal:=true,
- org.eclipse.jdt.internal.debug.ui.sourcelookup;x-internal:=true,
- org.eclipse.jdt.internal.debug.ui.threadgroups;x-internal:=true,
- org.eclipse.jdt.internal.debug.ui.variables;x-internal:=true
-Require-Bundle: org.eclipse.ui.ide;bundle-version="[3.5.0,4.0.0)",
- org.eclipse.jface.text;bundle-version="[3.5.0,4.0.0)",
- org.eclipse.ui.workbench.texteditor;bundle-version="[3.5.0,4.0.0)",
- org.eclipse.ui.editors;bundle-version="[3.5.0,4.0.0)",
- org.eclipse.ui;bundle-version="[3.5.0,4.0.0)",
- org.eclipse.core.filebuffers;bundle-version="[3.5.0,4.0.0)",
- org.eclipse.core.variables;bundle-version="[3.2.0,4.0.0)",
- org.eclipse.core.expressions;bundle-version="[3.4.0,4.0.0)",
- org.eclipse.jdt.core;bundle-version="[3.14.0,4.0.0)",
- org.eclipse.debug.ui;bundle-version="[3.13.0,4.0.0)",
- org.eclipse.jdt.debug;bundle-version="[3.10.0,4.0.0)",
- org.eclipse.jdt.launching;bundle-version="[3.7.0,4.0.0)",
- org.eclipse.jdt.ui;bundle-version="[3.8.0,4.0.0)",
- org.eclipse.core.runtime;bundle-version="[3.11.0,4.0.0)",
- org.eclipse.ltk.core.refactoring;bundle-version="[3.5.0,4.0.0)",
- org.eclipse.ui.console;bundle-version="[3.4.0,4.0.0)",
- org.eclipse.jdt.core.manipulation;bundle-version="[1.3.0,2.0.0)",
- org.eclipse.search;bundle-version="[3.5.0,4.0.0)",
- com.ibm.icu,
- org.eclipse.ui.forms;bundle-version="[3.4.0,4.0.0)",
- org.eclipse.core.resources,
- org.eclipse.debug.core;bundle-version="[3.9.0,4.0.0)"
-Bundle-ActivationPolicy: lazy
-Bundle-RequiredExecutionEnvironment: JavaSE-1.8
-Automatic-Module-Name: org.eclipse.jdt.debug.ui
+Manifest-Version: 1.0
+Bundle-ManifestVersion: 2
+Bundle-Name: %pluginName
+Bundle-SymbolicName: org.eclipse.jdt.debug.ui; singleton:=true
+Bundle-Version: 3.9.100.qualifier
+Bundle-Activator: org.eclipse.jdt.internal.debug.ui.JDIDebugUIPlugin
+Bundle-Vendor: %providerName
+Bundle-Localization: plugin
+Export-Package: org.eclipse.jdt.debug.ui,
+ org.eclipse.jdt.debug.ui.actions,
+ org.eclipse.jdt.debug.ui.breakpoints,
+ org.eclipse.jdt.debug.ui.console,
+ org.eclipse.jdt.debug.ui.launchConfigurations,
+ org.eclipse.jdt.internal.debug.core.refactoring;x-internal:=true,
+ org.eclipse.jdt.internal.debug.ui;x-internal:=true,
+ org.eclipse.jdt.internal.debug.ui.actions;x-friends:="org.eclipse.ant.ui",
+ org.eclipse.jdt.internal.debug.ui.breakpoints;x-internal:=true,
+ org.eclipse.jdt.internal.debug.ui.classpath;x-friends:="org.eclipse.ant.ui",
+ org.eclipse.jdt.internal.debug.ui.console;x-internal:=true,
+ org.eclipse.jdt.internal.debug.ui.contentassist;x-internal:=true,
+ org.eclipse.jdt.internal.debug.ui.display;x-internal:=true,
+ org.eclipse.jdt.internal.debug.ui.heapwalking;x-internal:=true,
+ org.eclipse.jdt.internal.debug.ui.jres;x-friends:="org.eclipse.ant.ui",
+ org.eclipse.jdt.internal.debug.ui.launcher;x-friends:="org.eclipse.ant.ui",
+ org.eclipse.jdt.internal.debug.ui.monitors;x-internal:=true,
+ org.eclipse.jdt.internal.debug.ui.propertypages;x-internal:=true,
+ org.eclipse.jdt.internal.debug.ui.search;x-internal:=true,
+ org.eclipse.jdt.internal.debug.ui.snippeteditor;x-internal:=true,
+ org.eclipse.jdt.internal.debug.ui.sourcelookup;x-internal:=true,
+ org.eclipse.jdt.internal.debug.ui.threadgroups;x-internal:=true,
+ org.eclipse.jdt.internal.debug.ui.variables;x-internal:=true
+Require-Bundle: org.eclipse.ui.ide;bundle-version="[3.5.0,4.0.0)",
+ org.eclipse.jface.text;bundle-version="[3.5.0,4.0.0)",
+ org.eclipse.ui.workbench.texteditor;bundle-version="[3.5.0,4.0.0)",
+ org.eclipse.ui.editors;bundle-version="[3.5.0,4.0.0)",
+ org.eclipse.ui;bundle-version="[3.5.0,4.0.0)",
+ org.eclipse.core.filebuffers;bundle-version="[3.5.0,4.0.0)",
+ org.eclipse.core.variables;bundle-version="[3.2.0,4.0.0)",
+ org.eclipse.core.expressions;bundle-version="[3.4.0,4.0.0)",
+ org.eclipse.jdt.core;bundle-version="[3.14.0,4.0.0)",
+ org.eclipse.debug.ui;bundle-version="[3.13.0,4.0.0)",
+ org.eclipse.jdt.debug;bundle-version="[3.10.0,4.0.0)",
+ org.eclipse.jdt.launching;bundle-version="[3.7.0,4.0.0)",
+ org.eclipse.jdt.ui;bundle-version="[3.8.0,4.0.0)",
+ org.eclipse.core.runtime;bundle-version="[3.11.0,4.0.0)",
+ org.eclipse.ltk.core.refactoring;bundle-version="[3.5.0,4.0.0)",
+ org.eclipse.ui.console;bundle-version="[3.4.0,4.0.0)",
+ org.eclipse.jdt.core.manipulation;bundle-version="[1.3.0,2.0.0)",
+ org.eclipse.search;bundle-version="[3.5.0,4.0.0)",
+ com.ibm.icu,
+ org.eclipse.ui.forms;bundle-version="[3.4.0,4.0.0)",
+ org.eclipse.core.resources,
+ org.eclipse.debug.core;bundle-version="[3.9.0,4.0.0)"
+Bundle-ActivationPolicy: lazy
+Bundle-RequiredExecutionEnvironment: JavaSE-1.8
+Automatic-Module-Name: org.eclipse.jdt.debug.ui
diff --git a/org.eclipse.jdt.debug.ui/plugin.xml b/org.eclipse.jdt.debug.ui/plugin.xml
index 518f02456..0290a9349 100644
--- a/org.eclipse.jdt.debug.ui/plugin.xml
+++ b/org.eclipse.jdt.debug.ui/plugin.xml
@@ -2889,6 +2889,10 @@ M4 = Platform-specific fourth key
class="org.eclipse.jdt.internal.debug.ui.launcher.JreResolutionGenerator"
markerType="org.eclipse.jdt.launching.jreContainerMarker">
</markerResolutionGenerator>
+ <markerResolutionGenerator
+ class="org.eclipse.jdt.internal.debug.ui.launcher.JreResolutionGenerator"
+ markerType="org.eclipse.jdt.launching.jreCompilerComplianceMarker">
+ </markerResolutionGenerator>
</extension>
<!-- Adds the launch and java debug actions whenever a java relevant part is open -->
<extension
@@ -3500,7 +3504,11 @@ M4 = Platform-specific fourth key
point="org.eclipse.ui.ide.markerSupport">
<markerAttributeGrouping
defaultGroupingEntry="org.eclipse.jdt.ui.category.buildpath"
- markerType="org.eclipse.jdt.launching.jreContainerMarker"/>
+ markerType="org.eclipse.jdt.launching.jreContainerMarker">
+ </markerAttributeGrouping>
+ <markerAttributeGrouping
+ defaultGroupingEntry="org.eclipse.jdt.ui.category.buildpath"
+ markerType="org.eclipse.jdt.launching.jreCompilerComplianceMarker"/>
<markerTypeCategory
name="%JavaLineBPmarkerTypeCategory.name">
<markerTypeReference
diff --git a/org.eclipse.jdt.debug.ui/pom.xml b/org.eclipse.jdt.debug.ui/pom.xml
index 2a5ec95c2..f04dd1169 100644
--- a/org.eclipse.jdt.debug.ui/pom.xml
+++ b/org.eclipse.jdt.debug.ui/pom.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
- Copyright (c) 2012, 2017 Eclipse Foundation and others.
+ Copyright (c) 2012, 2018 Eclipse Foundation and others.
All rights reserved. This program and the accompanying materials
are made available under the terms of the Eclipse Distribution License v1.0
which accompanies this distribution, and is available at
@@ -18,7 +18,7 @@
</parent>
<groupId>org.eclipse.jdt</groupId>
<artifactId>org.eclipse.jdt.debug.ui</artifactId>
- <version>3.9.0-SNAPSHOT</version>
+ <version>3.9.100-SNAPSHOT</version>
<packaging>eclipse-plugin</packaging>
<properties>
<code.ignoredWarnings>-warn:+resource,-deprecation,unavoidableGenericProblems</code.ignoredWarnings>
diff --git a/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/launcher/JreResolutionGenerator.java b/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/launcher/JreResolutionGenerator.java
index 830b11b38..a204e0bf5 100644
--- a/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/launcher/JreResolutionGenerator.java
+++ b/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/launcher/JreResolutionGenerator.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2000, 2015 IBM Corporation and others.
+ * Copyright (c) 2000, 2018 IBM Corporation and others.
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
@@ -23,6 +23,7 @@ import org.eclipse.jdt.core.JavaCore;
import org.eclipse.jdt.internal.debug.ui.jres.ExecutionEnvironmentsPreferencePage;
import org.eclipse.jdt.internal.debug.ui.jres.JREsPreferencePage;
import org.eclipse.jdt.launching.JavaRuntime;
+import org.eclipse.jdt.ui.JavaUI;
import org.eclipse.ui.IMarkerResolution;
import org.eclipse.ui.IMarkerResolutionGenerator2;
@@ -44,6 +45,11 @@ public class JreResolutionGenerator implements IMarkerResolutionGenerator2 {
new String[] {ExecutionEnvironmentsPreferencePage.ID, JREsPreferencePage.ID},
LauncherMessages.JreResolutionGenerator_open_ee_prefs,
LauncherMessages.JreResolutionGenerator_opens_ee_prefs)};
+ } else if (JavaRuntime.JRE_COMPILER_COMPLIANCE_MARKER.equals(marker.getType())) {
+ IJavaProject project = getJavaProject(marker);
+ return new IMarkerResolution[] { new OpenPropertyPageResolution(project, JavaUI.ID_COMPILER_COMPLIANCE_PROPERTY_PAGE, new String[] {
+ JavaUI.ID_COMPILER_COMPLIANCE_PROPERTY_PAGE,
+ JavaUI.ID_JAVA_BUILD_PREFERENCE_PROPERTY_PAGE }, LauncherMessages.JreResolutionGenerator_open_cc_props, LauncherMessages.JreResolutionGenerator_opens_cc_props) };
}
int id = marker.getAttribute(IJavaModelMarker.ID, -1);
switch (id) {
@@ -109,7 +115,8 @@ public class JreResolutionGenerator implements IMarkerResolutionGenerator2 {
try {
String type = marker.getType();
return IJavaModelMarker.BUILDPATH_PROBLEM_MARKER.equals(type) ||
- JavaRuntime.JRE_CONTAINER_MARKER.equals(type);
+ JavaRuntime.JRE_CONTAINER_MARKER.equals(type) ||
+ JavaRuntime.JRE_COMPILER_COMPLIANCE_MARKER.equals(type);
} catch (CoreException ce) {}
return false;
}
diff --git a/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/launcher/LauncherMessages.java b/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/launcher/LauncherMessages.java
index c2fd9e5fe..b2bfa9024 100644
--- a/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/launcher/LauncherMessages.java
+++ b/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/launcher/LauncherMessages.java
@@ -197,6 +197,9 @@ public class LauncherMessages extends NLS {
public static String JreResolutionGenerator_open_ee_prefs;
public static String JreResolutionGenerator_opens_ee_prefs;
+ public static String JreResolutionGenerator_open_cc_props;
+ public static String JreResolutionGenerator_opens_cc_props;
+
public static String ProjectClasspathArugumentSelector_0;
public static String ProjectClasspathArugumentSelector_1;
diff --git a/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/launcher/LauncherMessages.properties b/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/launcher/LauncherMessages.properties
index 8a67b3e75..4cd96bd20 100644
--- a/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/launcher/LauncherMessages.properties
+++ b/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/launcher/LauncherMessages.properties
@@ -170,6 +170,8 @@ VMArgumentsBlock_4=Variable&s...
JavaArgumentsTab_5=Var&iables...
JreResolutionGenerator_open_ee_prefs=Open the Execution Environments preference page
JreResolutionGenerator_opens_ee_prefs=Opens the Execution Environments preference page
+JreResolutionGenerator_open_cc_props=Open the Compiler Compliance property page
+JreResolutionGenerator_opens_cc_props=Opens the Compiler Compliance property page
AbstractJavaMainTab_0=&Project:
AbstractJavaMainTab_1=&Browse...
AbstractJavaMainTab_2=&Search...
diff --git a/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/launcher/OpenPropertyPageResolution.java b/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/launcher/OpenPropertyPageResolution.java
new file mode 100644
index 000000000..c1d456817
--- /dev/null
+++ b/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/launcher/OpenPropertyPageResolution.java
@@ -0,0 +1,98 @@
+/*******************************************************************************
+ * Copyright (c) 2018 IBM Corporation and others.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * IBM Corporation - initial API and implementation
+ *******************************************************************************/
+package org.eclipse.jdt.internal.debug.ui.launcher;
+
+import org.eclipse.core.resources.IMarker;
+import org.eclipse.core.runtime.IAdaptable;
+import org.eclipse.core.runtime.IProgressMonitor;
+import org.eclipse.core.runtime.IStatus;
+import org.eclipse.core.runtime.Status;
+import org.eclipse.core.runtime.jobs.Job;
+import org.eclipse.debug.internal.ui.SWTFactory;
+import org.eclipse.swt.graphics.Image;
+import org.eclipse.ui.IMarkerResolution2;
+import org.eclipse.ui.progress.UIJob;
+
+/**
+ * Marker resolution to open a preference page
+ *
+ * @since 3.5
+ */
+public class OpenPropertyPageResolution implements IMarkerResolution2 {
+
+ private String pageid = null;
+ private String label = null;
+ private String description = null;
+ private String[] additional = null;
+ private IAdaptable element = null;
+
+ /**
+ * Constructor
+ *
+ * @param element the element whose property page needs to be shown
+ * @param pageid the id of the page to show
+ * @param additional the page ids of additional pages to show as well
+ * @param label the label to show for the resolution
+ * @param description the description to show for the resolution
+ */
+ public OpenPropertyPageResolution(IAdaptable element, String pageid, String[] additional, String label, String description) {
+ this.element = element;
+ this.pageid = pageid;
+ this.additional = additional;
+ this.label = label;
+ this.description = description;
+ }
+
+ /* (non-Javadoc)
+ * @see org.eclipse.ui.IMarkerResolution2#getDescription()
+ */
+ @Override
+ public String getDescription() {
+ return this.description;
+ }
+
+ /* (non-Javadoc)
+ * @see org.eclipse.ui.IMarkerResolution2#getImage()
+ */
+ @Override
+ public Image getImage() {
+ return null;
+ }
+
+ /* (non-Javadoc)
+ * @see org.eclipse.ui.IMarkerResolution#getLabel()
+ */
+ @Override
+ public String getLabel() {
+ return this.label;
+ }
+
+ /* (non-Javadoc)
+ * @see org.eclipse.ui.IMarkerResolution#run(org.eclipse.core.resources.IMarker)
+ */
+ @Override
+ public void run(IMarker marker) {
+ UIJob job = new UIJob(""){ //$NON-NLS-1$
+ @Override
+ public IStatus runInUIThread(IProgressMonitor monitor) {
+ SWTFactory.showPropertyPage(
+ OpenPropertyPageResolution.this.element,
+ OpenPropertyPageResolution.this.pageid,
+ OpenPropertyPageResolution.this.additional);
+ return Status.OK_STATUS;
+ }
+ };
+ job.setSystem(true);
+ job.setPriority(Job.INTERACTIVE);
+ job.schedule();
+ }
+
+}
diff --git a/org.eclipse.jdt.launching/META-INF/MANIFEST.MF b/org.eclipse.jdt.launching/META-INF/MANIFEST.MF
index 3222a4a16..34cc5a4f6 100644
--- a/org.eclipse.jdt.launching/META-INF/MANIFEST.MF
+++ b/org.eclipse.jdt.launching/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
Bundle-ManifestVersion: 2
Bundle-Name: %pluginName
Bundle-SymbolicName: org.eclipse.jdt.launching; singleton:=true
-Bundle-Version: 3.10.0.qualifier
+Bundle-Version: 3.11.0.qualifier
Bundle-Activator: org.eclipse.jdt.internal.launching.LaunchingPlugin
Bundle-Vendor: %providerName
Bundle-Localization: plugin
diff --git a/org.eclipse.jdt.launching/launching/org/eclipse/jdt/internal/launching/EECompilationParticipant.java b/org.eclipse.jdt.launching/launching/org/eclipse/jdt/internal/launching/EECompilationParticipant.java
index 4b15dd51d..cd19cfd83 100644
--- a/org.eclipse.jdt.launching/launching/org/eclipse/jdt/internal/launching/EECompilationParticipant.java
+++ b/org.eclipse.jdt.launching/launching/org/eclipse/jdt/internal/launching/EECompilationParticipant.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2008, 2016 IBM Corporation and others.
+ * Copyright (c) 2008, 2018 IBM Corporation and others.
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
@@ -146,7 +146,7 @@ public class EECompilationParticipant extends CompilationParticipant {
String message = NLS.bind(LaunchingMessages.LaunchingPlugin_39, new String[] { id, eeId });
int sev = getSeverityLevel(JavaRuntime.PREF_COMPILER_COMPLIANCE_DOES_NOT_MATCH_JRE, project.getProject());
if (sev != -1) {
- createProblemMarker(project, message, sev, "org.eclipse.jdt.core.problem", LaunchingMessages.LaunchingPlugin_40); //$NON-NLS-1$
+ createProblemMarker(project, message, sev, JavaRuntime.JRE_COMPILER_COMPLIANCE_MARKER, LaunchingMessages.LaunchingPlugin_40);
}
}
}
diff --git a/org.eclipse.jdt.launching/launching/org/eclipse/jdt/launching/JavaRuntime.java b/org.eclipse.jdt.launching/launching/org/eclipse/jdt/launching/JavaRuntime.java
index db8218b35..6c73e7de6 100644
--- a/org.eclipse.jdt.launching/launching/org/eclipse/jdt/launching/JavaRuntime.java
+++ b/org.eclipse.jdt.launching/launching/org/eclipse/jdt/launching/JavaRuntime.java
@@ -207,6 +207,13 @@ public final class JavaRuntime {
public static final String JRE_CONTAINER_MARKER = LaunchingPlugin.getUniqueIdentifier() + ".jreContainerMarker"; //$NON-NLS-1$
/**
+ * Marker type identifier for JRE compiler compliance problems.
+ *
+ * @since 3.11
+ */
+ public static final String JRE_COMPILER_COMPLIANCE_MARKER = LaunchingPlugin.getUniqueIdentifier() + ".jreCompilerComplianceMarker"; //$NON-NLS-1$
+
+ /**
* A status code indicating that a JRE could not be resolved for a project.
* When a JRE cannot be resolved for a project by this plug-in's container
* initializer, an exception is thrown with this status code. A status handler
diff --git a/org.eclipse.jdt.launching/plugin.properties b/org.eclipse.jdt.launching/plugin.properties
index b218c2765..070dda059 100644
--- a/org.eclipse.jdt.launching/plugin.properties
+++ b/org.eclipse.jdt.launching/plugin.properties
@@ -35,6 +35,8 @@ providerName=Eclipse.org
jreContainerMarkerProblemName=JRE System Library Problem
+jreComplilerComplianceMarkerProblemName=JRE Compiler Compliance Problem
+
appletLabel= Java Applet
javaAppletDelegate.description=The Eclipse JDT Java Applet Launcher supports running and debugging Java applets.
diff --git a/org.eclipse.jdt.launching/plugin.xml b/org.eclipse.jdt.launching/plugin.xml
index 078925754..bd69c2437 100644
--- a/org.eclipse.jdt.launching/plugin.xml
+++ b/org.eclipse.jdt.launching/plugin.xml
@@ -250,6 +250,13 @@
name= "%jreContainerMarkerProblemName">
<super type="org.eclipse.core.resources.problemmarker"/>
<persistent value="true"/>
+ </extension>
+ <extension
+ id="jreCompilerComplianceMarker"
+ name="%jreComplilerComplianceMarkerProblemName"
+ point="org.eclipse.core.resources.markers">
+ <super type="org.eclipse.core.resources.problemmarker"/>
+ <persistent value="true"/>
</extension>
<extension
@@ -335,6 +342,9 @@
<managedMarker
markerType="org.eclipse.jdt.launching.jreContainerMarker">
</managedMarker>
+ <managedMarker
+ markerType="org.eclipse.jdt.launching.jreCompilerComplianceMarker">
+ </managedMarker>
</compilationParticipant>
</extension>
<extension
diff --git a/org.eclipse.jdt.launching/pom.xml b/org.eclipse.jdt.launching/pom.xml
index 2bdca728d..cde6c0faf 100644
--- a/org.eclipse.jdt.launching/pom.xml
+++ b/org.eclipse.jdt.launching/pom.xml
@@ -18,7 +18,7 @@
</parent>
<groupId>org.eclipse.jdt</groupId>
<artifactId>org.eclipse.jdt.launching</artifactId>
- <version>3.10.0-SNAPSHOT</version>
+ <version>3.11.0-SNAPSHOT</version>
<packaging>eclipse-plugin</packaging>
<build>

Back to the top