diff options
author | Fred Bricon | 2014-04-29 15:16:01 +0000 |
---|---|---|
committer | Fred Bricon | 2014-05-02 15:19:56 +0000 |
commit | 8b7cfc032d23d8fe787d08623d7f2a92afce46eb (patch) | |
tree | a60920d6de97d34379389e0793bd9a07fedb706e /org.eclipse.m2e.core.ui | |
parent | 1bc6c82fcfdf61ca7205af0685f1efb519d10e64 (diff) | |
download | m2e-core-8b7cfc032d23d8fe787d08623d7f2a92afce46eb.tar.gz m2e-core-8b7cfc032d23d8fe787d08623d7f2a92afce46eb.tar.xz m2e-core-8b7cfc032d23d8fe787d08623d7f2a92afce46eb.zip |
433776 : Add ability to change 'Out-of-date' project errors into warnings
* renamed Warnings preference page into Errors/Warnings (to be consistent
with other Eclipse projects)
* Added an 'Out-of-date project configuration' problem combo with
ignore/warning/error values
* Changed existing '*** duplicate of parent version' checkboxes into combos with
ignore/warning/error values for more consistency
Preference keys for '*** duplicate of parent version' were changed to
accomodate the new String values. Existing/Legacy boolean based
preferences will not be converted automatically thus will be ignored.
Change-Id: Iae61416a2186b28e2a977158174a4bae2accd98a
Signed-off-by: Fred Bricon <fbricon@gmail.com>
Diffstat (limited to 'org.eclipse.m2e.core.ui')
4 files changed, 41 insertions, 14 deletions
diff --git a/org.eclipse.m2e.core.ui/plugin.properties b/org.eclipse.m2e.core.ui/plugin.properties index b30c9a98..3c98d8ba 100644 --- a/org.eclipse.m2e.core.ui/plugin.properties +++ b/org.eclipse.m2e.core.ui/plugin.properties @@ -78,7 +78,7 @@ page.installations.name = Installations page.usersettings.name = User Settings page.archetypes.name = Archetypes page.userinterface.name = User Interface -page.warnings.name = Warnings +page.warnings.name = Errors/Warnings page.lifecyclemapping.name = Lifecycle Mappings category.general.name = General wizard.install.name = Install or deploy an artifact to a Maven repository 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 0564efaa..b8e7033e 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 @@ -561,6 +561,14 @@ public class Messages extends NLS { public static String MavenSettingsPreferencePage_title; + public static String MavenWarningsPreferencePage_Error; + + public static String MavenWarningsPreferencePage_Ignore; + + public static String MavenWarningsPreferencePage_Warning; + + public static String MavenWarningsPreferencePage_OutOfDate_Project_Config; + public static String MavenWarningsPreferencePage_groupidDupParent; public static String MavenWarningsPreferencePage_versionDupParent; 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 25525786..b239d75a 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 @@ -313,8 +313,12 @@ MavenSettingsPreferencePage_globalSettingslink2=Global &Settings (<a href\="\#"> MavenSettingsPreferencePage_globalSettingslink_tooltip=Open editor for global settings MavenSettingsPreferencePage_task_updating=Updating progress for {0} MavenSettingsPreferencePage_title=Maven User Settings -MavenWarningsPreferencePage_groupidDupParent=Disable "{0}" warning -MavenWarningsPreferencePage_versionDupParent=Disable "{0}" warning +MavenWarningsPreferencePage_Error=Error +MavenWarningsPreferencePage_Ignore=Ignore +MavenWarningsPreferencePage_Warning=Warning +MavenWarningsPreferencePage_OutOfDate_Project_Config=Out-of-date project configuration +MavenWarningsPreferencePage_groupidDupParent="groupId" duplicate of parent groupId +MavenWarningsPreferencePage_versionDupParent="version" duplicate of parent version 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. NestedProjectsComposite_OutOfDateProjectBtn_AddOneProject_Tooltip=Add out-of-date project to the selection 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 48cc049c..a462b671 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 @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2012 Rob Newton. + * Copyright (c) 2012-2014 Rob Newton 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 @@ -7,24 +7,34 @@ * * Contributors: * Rob Newton - initial warnings preference page + * Fred Bricon (Red Hat, Inc.) - use combos for problem severity *******************************************************************************/ package org.eclipse.m2e.core.ui.internal.preferences; -import org.eclipse.jface.preference.BooleanFieldEditor; +import static org.eclipse.m2e.core.internal.preferences.MavenPreferenceConstants.P_DUP_OF_PARENT_GROUPID_PB; +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_OUT_OF_DATE_PROJECT_CONFIG_PB; + +import org.eclipse.jface.preference.ComboFieldEditor; +import org.eclipse.jface.preference.FieldEditor; import org.eclipse.jface.preference.FieldEditorPreferencePage; -import org.eclipse.osgi.util.NLS; import org.eclipse.swt.widgets.Composite; import org.eclipse.ui.IWorkbench; import org.eclipse.ui.IWorkbenchPreferencePage; -import org.eclipse.m2e.core.internal.preferences.MavenPreferenceConstants; +import org.eclipse.m2e.core.internal.preferences.ProblemSeverity; import org.eclipse.m2e.core.ui.internal.M2EUIPluginActivator; import org.eclipse.m2e.core.ui.internal.Messages; public class WarningsPreferencePage extends FieldEditorPreferencePage implements IWorkbenchPreferencePage { + public static String[][] ERROR_SEVERITIES = new String[][] { + new String[] {Messages.MavenWarningsPreferencePage_Ignore, ProblemSeverity.ignore.toString()}, + new String[] {Messages.MavenWarningsPreferencePage_Warning, ProblemSeverity.warning.toString()}, + new String[] {Messages.MavenWarningsPreferencePage_Error, ProblemSeverity.error.toString()}}; + private Composite parent; public WarningsPreferencePage() { @@ -42,14 +52,19 @@ public class WarningsPreferencePage extends FieldEditorPreferencePage implements */ public void createFieldEditors() { parent = getFieldEditorParent(); - String text; - text = NLS.bind(Messages.MavenWarningsPreferencePage_groupidDupParent, - org.eclipse.m2e.core.internal.Messages.MavenMarkerManager_duplicate_groupid); - addField(new BooleanFieldEditor(MavenPreferenceConstants.P_DISABLE_GROUPID_DUP_OF_PARENT_WARNING, text, parent)); + addField(getDefaultCombo(P_DUP_OF_PARENT_GROUPID_PB, // + Messages.MavenWarningsPreferencePage_groupidDupParent, parent)); + + addField(getDefaultCombo(P_DUP_OF_PARENT_VERSION_PB, // + Messages.MavenWarningsPreferencePage_versionDupParent, parent)); - text = NLS.bind(Messages.MavenWarningsPreferencePage_versionDupParent, - org.eclipse.m2e.core.internal.Messages.MavenMarkerManager_duplicate_version); - addField(new BooleanFieldEditor(MavenPreferenceConstants.P_DISABLE_VERSION_DUP_OF_PARENT_WARNING, text, parent)); + addField(getDefaultCombo(P_OUT_OF_DATE_PROJECT_CONFIG_PB, // + Messages.MavenWarningsPreferencePage_OutOfDate_Project_Config, parent)); } + + private FieldEditor getDefaultCombo(String key, String label, Composite parent) { + return new ComboFieldEditor(key, label, ERROR_SEVERITIES, parent); + } + } |