|
35 | 35 | import org.eclipse.core.runtime.IStatus; |
36 | 36 | import org.eclipse.core.runtime.Status; |
37 | 37 | import org.eclipse.core.runtime.jobs.Job; |
38 | | -import org.eclipse.jface.dialogs.MessageDialog; |
39 | | -import org.eclipse.jface.dialogs.MessageDialogWithToggle; |
40 | 38 | import org.eclipse.jface.operation.IRunnableWithProgress; |
41 | 39 | import org.eclipse.jface.viewers.IStructuredSelection; |
42 | | -import org.eclipse.jface.window.Window; |
43 | 40 | import org.eclipse.jface.wizard.Wizard; |
44 | | -import org.eclipse.swt.SWT; |
45 | 41 | import org.eclipse.ui.IImportWizard; |
46 | 42 | import org.eclipse.ui.IWorkbench; |
47 | 43 |
|
|
55 | 51 | import org.eclipse.m2e.core.internal.lifecyclemapping.discovery.LifecycleMappingDiscoveryRequest; |
56 | 52 | import org.eclipse.m2e.core.internal.lifecyclemapping.discovery.MojoExecutionMappingConfiguration.MojoExecutionMappingRequirement; |
57 | 53 | import org.eclipse.m2e.core.internal.lifecyclemapping.model.LifecycleMappingMetadataSource; |
58 | | -import org.eclipse.m2e.core.internal.preferences.MavenPreferenceConstants; |
59 | 54 | import org.eclipse.m2e.core.lifecyclemapping.model.PluginExecutionAction; |
60 | 55 | import org.eclipse.m2e.core.project.IMavenProjectFacade; |
61 | 56 | import org.eclipse.m2e.core.project.configurator.MojoExecutionKey; |
@@ -114,7 +109,7 @@ public void addPages() { |
114 | 109 |
|
115 | 110 | @Override |
116 | 111 | public boolean performFinish() { |
117 | | - if(lifecycleMappingPage != null && !lifecycleMappingPage.isMappingComplete() && !warnIncompleteMapping()) { |
| 112 | + if(lifecycleMappingPage != null && !lifecycleMappingPage.isMappingComplete()) { |
118 | 113 | return false; |
119 | 114 | } |
120 | 115 |
|
@@ -249,23 +244,4 @@ public LifecycleMappingDiscoveryRequest getLifecycleMappingDiscoveryRequest() { |
249 | 244 | return mappingDiscoveryRequest; |
250 | 245 | } |
251 | 246 |
|
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 | | - } |
271 | 247 | } |
0 commit comments