Skip to content

Commit 75e4941

Browse files
committed
Do not "warn" on incomplete mappings
M2E has had a dialog that warns the user if there are "incomplete" mappings, but actually the user can't do anything useful. Also m2e for a while handles missing mappings with reduced severity (e.g. by just add a warning marker) and now even executes them by default. Because of this, the preference an dialog has even lesser value and only disturbs the user and is therefore obsolete.
1 parent c2fecd3 commit 75e4941

File tree

3 files changed

+1
-30
lines changed

3 files changed

+1
-30
lines changed

org.eclipse.m2e.core.ui/src/org/eclipse/m2e/core/ui/internal/preferences/UserInterfacePreferencePage.java

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -47,8 +47,5 @@ public void createFieldEditors() {
4747
parent = getFieldEditorParent();
4848
addField(new BooleanFieldEditor(MavenPreferenceConstants.P_DEFAULT_POM_EDITOR_PAGE, Messages.pomEditorDefaultPage,
4949
parent));
50-
51-
addField(new BooleanFieldEditor(MavenPreferenceConstants.P_WARN_INCOMPLETE_MAPPING,
52-
Messages.MavenPreferencePage_warnIncompleteMapping, getFieldEditorParent()));
5350
}
5451
}

org.eclipse.m2e.core.ui/src/org/eclipse/m2e/core/ui/internal/wizards/MavenDiscoveryProposalWizard.java

Lines changed: 1 addition & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -35,13 +35,9 @@
3535
import org.eclipse.core.runtime.IStatus;
3636
import org.eclipse.core.runtime.Status;
3737
import org.eclipse.core.runtime.jobs.Job;
38-
import org.eclipse.jface.dialogs.MessageDialog;
39-
import org.eclipse.jface.dialogs.MessageDialogWithToggle;
4038
import org.eclipse.jface.operation.IRunnableWithProgress;
4139
import org.eclipse.jface.viewers.IStructuredSelection;
42-
import org.eclipse.jface.window.Window;
4340
import org.eclipse.jface.wizard.Wizard;
44-
import org.eclipse.swt.SWT;
4541
import org.eclipse.ui.IImportWizard;
4642
import org.eclipse.ui.IWorkbench;
4743

@@ -55,7 +51,6 @@
5551
import org.eclipse.m2e.core.internal.lifecyclemapping.discovery.LifecycleMappingDiscoveryRequest;
5652
import org.eclipse.m2e.core.internal.lifecyclemapping.discovery.MojoExecutionMappingConfiguration.MojoExecutionMappingRequirement;
5753
import org.eclipse.m2e.core.internal.lifecyclemapping.model.LifecycleMappingMetadataSource;
58-
import org.eclipse.m2e.core.internal.preferences.MavenPreferenceConstants;
5954
import org.eclipse.m2e.core.lifecyclemapping.model.PluginExecutionAction;
6055
import org.eclipse.m2e.core.project.IMavenProjectFacade;
6156
import org.eclipse.m2e.core.project.configurator.MojoExecutionKey;
@@ -114,7 +109,7 @@ public void addPages() {
114109

115110
@Override
116111
public boolean performFinish() {
117-
if(lifecycleMappingPage != null && !lifecycleMappingPage.isMappingComplete() && !warnIncompleteMapping()) {
112+
if(lifecycleMappingPage != null && !lifecycleMappingPage.isMappingComplete()) {
118113
return false;
119114
}
120115

@@ -249,23 +244,4 @@ public LifecycleMappingDiscoveryRequest getLifecycleMappingDiscoveryRequest() {
249244
return mappingDiscoveryRequest;
250245
}
251246

252-
private boolean skipIncompleteWarning() {
253-
return M2EUIPluginActivator.getDefault().getPreferenceStore()
254-
.getBoolean(MavenPreferenceConstants.P_WARN_INCOMPLETE_MAPPING);
255-
}
256-
257-
private boolean warnIncompleteMapping() {
258-
if(!skipIncompleteWarning()) {
259-
MessageDialogWithToggle dialog = MessageDialogWithToggle.open(MessageDialog.CONFIRM, getShell(),
260-
Messages.MavenImportWizard_titleIncompleteMapping, Messages.MavenImportWizard_messageIncompleteMapping,
261-
Messages.MavenImportWizard_hideWarningMessage, false, null, null, SWT.SHEET);
262-
if(dialog.getReturnCode() == Window.OK) {
263-
M2EUIPluginActivator.getDefault().getPreferenceStore()
264-
.setValue(MavenPreferenceConstants.P_WARN_INCOMPLETE_MAPPING, dialog.getToggleState());
265-
return true;
266-
}
267-
return false;
268-
}
269-
return true;
270-
}
271247
}

org.eclipse.m2e.core/src/org/eclipse/m2e/core/internal/preferences/MavenPreferenceConstants.java

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -93,8 +93,6 @@ public interface MavenPreferenceConstants {
9393
/** boolean */
9494
String P_FULL_INDEX = PREFIX + "fullIndex"; //$NON-NLS-1$
9595

96-
String P_WARN_INCOMPLETE_MAPPING = PREFIX + "warn_incomplete_mapping"; //$NON-NLS-1$
97-
9896
/** boolean **/
9997
String P_DEFAULT_POM_EDITOR_PAGE = "eclipse.m2.defaultPomEditorPage"; //$NON-NLS-1$
10098

0 commit comments

Comments
 (0)