439309 : Make 'Overriding managed version' problem severity configurable

Change-Id: I67be7eb713126acb7e543fff7e3809bb31ef084c
Signed-off-by: Fred Bricon <fbricon@gmail.com>

3 files changed, 9 insertions, 1 deletions

diff --git a/org.eclipse.m2e.core.ui/src/org/eclipse/m2e/core/ui/internal/Messages.java b/org.eclipse.m2e.core.ui/src/org/eclipse/m2e/core/ui/internal/Messages.java
index cd06f8a1..79875245 100644
--- a/org.eclipse.m2e.core.ui/src/org/eclipse/m2e/core/ui/internal/Messages.java
+++ b/org.eclipse.m2e.core.ui/src/org/eclipse/m2e/core/ui/internal/Messages.java
@@ -583,6 +583,8 @@ public class Messages extends NLS {
 
   public static String MavenWarningsPreferencePage_versionDupParent;
 
+  public static String MavenWarningsPreferencePage_overridingManagedPreferences;
+
   public static String MavenPreferencePage_warnIncompleteMapping;
 
   public static String OpenPomAction_33;
diff --git a/org.eclipse.m2e.core.ui/src/org/eclipse/m2e/core/ui/internal/messages.properties b/org.eclipse.m2e.core.ui/src/org/eclipse/m2e/core/ui/internal/messages.properties
index bcfc3c21..befb6b82 100644
--- a/org.eclipse.m2e.core.ui/src/org/eclipse/m2e/core/ui/internal/messages.properties
+++ b/org.eclipse.m2e.core.ui/src/org/eclipse/m2e/core/ui/internal/messages.properties
@@ -324,6 +324,7 @@ MavenWarningsPreferencePage_OutOfDate_Project_Config=Out-of-date project configu
 MavenWarningsPreferencePage_groupidDupParent="groupId" duplicate of parent groupId
 MavenWarningsPreferencePage_notCoveredMojoExecution=Plugin execution not covered by lifecycle configuration
 MavenWarningsPreferencePage_versionDupParent="version" duplicate of parent version
+MavenWarningsPreferencePage_overridingManagedPreferences=Overriding managed version
 MavenWarningsPreferencePage_changingProblemSeveritiesRequiresProjectUpdate=Changing problems severity requires updating the Maven projects for the changes to take effect. Do you want to update projects now?
 NestedProjectsComposite_Add_OutOfDate=Add out-of-date
 NestedProjectsComposite_Multiple_OOD_Projects_Link={0} unselected projects are out of date and should be updated. <A>Click here</A> to include them.
diff --git a/org.eclipse.m2e.core.ui/src/org/eclipse/m2e/core/ui/internal/preferences/WarningsPreferencePage.java b/org.eclipse.m2e.core.ui/src/org/eclipse/m2e/core/ui/internal/preferences/WarningsPreferencePage.java
index e58eb156..6de31f48 100644
--- a/org.eclipse.m2e.core.ui/src/org/eclipse/m2e/core/ui/internal/preferences/WarningsPreferencePage.java
+++ b/org.eclipse.m2e.core.ui/src/org/eclipse/m2e/core/ui/internal/preferences/WarningsPreferencePage.java
@@ -16,6 +16,7 @@ import static org.eclipse.m2e.core.internal.preferences.MavenPreferenceConstants
 import static org.eclipse.m2e.core.internal.preferences.MavenPreferenceConstants.P_DUP_OF_PARENT_VERSION_PB;
 import static org.eclipse.m2e.core.internal.preferences.MavenPreferenceConstants.P_NOT_COVERED_MOJO_EXECUTION_PB;
 import static org.eclipse.m2e.core.internal.preferences.MavenPreferenceConstants.P_OUT_OF_DATE_PROJECT_CONFIG_PB;
+import static org.eclipse.m2e.core.internal.preferences.MavenPreferenceConstants.P_OVERRIDING_MANAGED_VERSION_PB;
 
 import java.util.ArrayList;
 import java.util.Arrays;
@@ -53,7 +54,8 @@ public class WarningsPreferencePage extends FieldEditorPreferencePage implements
   private Composite parent;
 
   private static List<String> SENSIBLE_PREFERENCES = Arrays.asList(P_DUP_OF_PARENT_GROUPID_PB,
-      P_DUP_OF_PARENT_VERSION_PB, P_NOT_COVERED_MOJO_EXECUTION_PB, P_OUT_OF_DATE_PROJECT_CONFIG_PB);
+      P_DUP_OF_PARENT_VERSION_PB, P_NOT_COVERED_MOJO_EXECUTION_PB, P_OUT_OF_DATE_PROJECT_CONFIG_PB,
+      P_OVERRIDING_MANAGED_VERSION_PB);
 
   private Map<String, String> originalValues = new HashMap<String, String>();
 
@@ -85,6 +87,9 @@ public class WarningsPreferencePage extends FieldEditorPreferencePage implements
     addField(getDefaultCombo(P_NOT_COVERED_MOJO_EXECUTION_PB, //
         Messages.MavenWarningsPreferencePage_notCoveredMojoExecution, parent));
 
+    addField(getDefaultCombo(P_OVERRIDING_MANAGED_VERSION_PB, //
+        Messages.MavenWarningsPreferencePage_overridingManagedPreferences, parent));
+
     initOriginalValues();
 
   }