diff options
author | Fred Bricon | 2015-09-29 19:41:40 +0000 |
---|---|---|
committer | Fred Bricon | 2015-09-29 19:41:40 +0000 |
commit | ca6508c2a8fcee8105c6df64775dadf363e3a078 (patch) | |
tree | 513fe2e9032e97de1aea39efbac07b104072cbf3 /org.eclipse.m2e.editor.xml | |
parent | 494c2f808b1b59dc0eb7da7b84ebbd21ce5d3e44 (diff) | |
download | m2e-core-ca6508c2a8fcee8105c6df64775dadf363e3a078.tar.gz m2e-core-ca6508c2a8fcee8105c6df64775dadf363e3a078.tar.xz m2e-core-ca6508c2a8fcee8105c6df64775dadf363e3a078.zip |
439309 : Make 'Overriding managed version' problem severity configurable
Change-Id: I67be7eb713126acb7e543fff7e3809bb31ef084c
Signed-off-by: Fred Bricon <fbricon@gmail.com>
Diffstat (limited to 'org.eclipse.m2e.editor.xml')
-rw-r--r-- | org.eclipse.m2e.editor.xml/src/main/java/org/eclipse/m2e/editor/xml/internal/MarkerLocationService.java | 17 |
1 files changed, 15 insertions, 2 deletions
diff --git a/org.eclipse.m2e.editor.xml/src/main/java/org/eclipse/m2e/editor/xml/internal/MarkerLocationService.java b/org.eclipse.m2e.editor.xml/src/main/java/org/eclipse/m2e/editor/xml/internal/MarkerLocationService.java index 28bd9ee9..bbd9d8b7 100644 --- a/org.eclipse.m2e.editor.xml/src/main/java/org/eclipse/m2e/editor/xml/internal/MarkerLocationService.java +++ b/org.eclipse.m2e.editor.xml/src/main/java/org/eclipse/m2e/editor/xml/internal/MarkerLocationService.java @@ -299,6 +299,10 @@ public class MarkerLocationService implements IMarkerLocationService, IEditorMar private static void checkManagedDependencies(IMavenMarkerManager mavenMarkerManager, Element root, IResource pomFile, MavenProject mavenproject, String type, IStructuredDocument document) throws CoreException { + ProblemSeverity overridingManagedVersionSeverity = getOverridingManagedVersionSeverity(); + if(ProblemSeverity.ignore.equals(overridingManagedVersionSeverity)) { + return; + } List<Element> candidates = new ArrayList<Element>(); Element dependencies = findChild(root, PomEdits.DEPENDENCIES); @@ -372,7 +376,7 @@ public class MarkerLocationService implements IMarkerLocationService, IEditorMar String msg = versionString.equals(managedVersion) ? org.eclipse.m2e.core.internal.Messages.MavenMarkerManager_redundant_managed_title : org.eclipse.m2e.core.internal.Messages.MavenMarkerManager_managed_title; IMarker mark = mavenMarkerManager.addMarker(pomFile, type, NLS.bind(msg, managedVersion, artString), - document.getLineOfOffset(off.getStartOffset()) + 1, IMarker.SEVERITY_WARNING); + document.getLineOfOffset(off.getStartOffset()) + 1, overridingManagedVersionSeverity.getSeverity()); mark.setAttribute(IMavenConstants.MARKER_ATTR_EDITOR_HINT, IMavenConstants.EDITOR_HINT_MANAGED_DEPENDENCY_OVERRIDE); mark.setAttribute(IMarker.CHAR_START, off.getStartOffset()); @@ -402,6 +406,10 @@ public class MarkerLocationService implements IMarkerLocationService, IEditorMar private static void checkManagedPlugins(IMavenMarkerManager mavenMarkerManager, Element root, IResource pomFile, MavenProject mavenproject, String type, IStructuredDocument document) throws CoreException { + ProblemSeverity overridingManagedVersionSeverity = getOverridingManagedVersionSeverity(); + if(ProblemSeverity.ignore.equals(overridingManagedVersionSeverity)) { + return; + } List<Element> candidates = new ArrayList<Element>(); Element build = findChild(root, PomEdits.BUILD); if(build == null) { @@ -484,7 +492,7 @@ public class MarkerLocationService implements IMarkerLocationService, IEditorMar String msg = versionString.equals(managedVersion) ? org.eclipse.m2e.core.internal.Messages.MavenMarkerManager_redundant_managed_title : org.eclipse.m2e.core.internal.Messages.MavenMarkerManager_managed_title; IMarker mark = mavenMarkerManager.addMarker(pomFile, type, NLS.bind(msg, managedVersion, artString), - document.getLineOfOffset(off.getStartOffset()) + 1, IMarker.SEVERITY_WARNING); + document.getLineOfOffset(off.getStartOffset()) + 1, overridingManagedVersionSeverity.getSeverity()); mark.setAttribute(IMavenConstants.MARKER_ATTR_EDITOR_HINT, IMavenConstants.EDITOR_HINT_MANAGED_PLUGIN_OVERRIDE); mark.setAttribute(IMarker.CHAR_START, off.getStartOffset()); @@ -558,6 +566,11 @@ public class MarkerLocationService implements IMarkerLocationService, IEditorMar .getString(MavenPreferenceConstants.P_DUP_OF_PARENT_VERSION_PB)); } + private static ProblemSeverity getOverridingManagedVersionSeverity() { + return ProblemSeverity.get(M2EUIPluginActivator.getDefault().getPreferenceStore() + .getString(MavenPreferenceConstants.P_OVERRIDING_MANAGED_VERSION_PB)); + } + /** * @param mavenMarkerManager * @param pomFile |