diff options
author | Matthew Piggott | 2011-04-15 13:34:52 +0000 |
---|---|---|
committer | Matthew Piggott | 2011-04-15 13:34:52 +0000 |
commit | 700cabc569f81da83fee39be27e461a5108a6f0c (patch) | |
tree | a2b670ed47776cce094ddd69d4170e76e000f493 /org.eclipse.m2e.core.ui/src | |
parent | 977c208d8cf86ad7736144a46f0f1c9dee7429e9 (diff) | |
download | m2e-core-700cabc569f81da83fee39be27e461a5108a6f0c.tar.gz m2e-core-700cabc569f81da83fee39be27e461a5108a6f0c.tar.xz m2e-core-700cabc569f81da83fee39be27e461a5108a6f0c.zip |
Bug 342913 - NPE in import wizard when discovery is not installed
Diffstat (limited to 'org.eclipse.m2e.core.ui/src')
-rw-r--r-- | org.eclipse.m2e.core.ui/src/org/eclipse/m2e/core/ui/internal/wizards/MavenImportWizard.java | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/org.eclipse.m2e.core.ui/src/org/eclipse/m2e/core/ui/internal/wizards/MavenImportWizard.java b/org.eclipse.m2e.core.ui/src/org/eclipse/m2e/core/ui/internal/wizards/MavenImportWizard.java index e7b49471..228e0169 100644 --- a/org.eclipse.m2e.core.ui/src/org/eclipse/m2e/core/ui/internal/wizards/MavenImportWizard.java +++ b/org.eclipse.m2e.core.ui/src/org/eclipse/m2e/core/ui/internal/wizards/MavenImportWizard.java @@ -176,19 +176,16 @@ public class MavenImportWizard extends AbstractMavenProjectWizard implements IIm if(doImport) { final IRunnableWithProgress ignoreJob = new IRunnableWithProgress() { - Collection<ILifecycleMappingLabelProvider> ignored = lifecycleMappingPage.getIgnore(); - - Collection<ILifecycleMappingLabelProvider> ignoreParent = lifecycleMappingPage.getIgnoreParent(); public void run(IProgressMonitor monitor) throws InvocationTargetException, InterruptedException { - for(ILifecycleMappingLabelProvider prov : ignored) { + for(ILifecycleMappingLabelProvider prov : lifecycleMappingPage.getIgnore()) { ILifecycleMappingRequirement req = prov.getKey(); if(req instanceof MojoExecutionMappingRequirement) { ignore(((MojoExecutionMappingRequirement) req).getExecution(), prov.getProjects()); } } - for(ILifecycleMappingLabelProvider prov : ignoreParent) { + for(ILifecycleMappingLabelProvider prov : lifecycleMappingPage.getIgnoreParent()) { ILifecycleMappingRequirement req = prov.getKey(); if(req instanceof MojoExecutionMappingRequirement) { ignoreAtDefinition(((MojoExecutionMappingRequirement) req).getExecution(), prov.getProjects()); @@ -224,7 +221,9 @@ public class MavenImportWizard extends AbstractMavenProjectWizard implements IIm public IStatus runInWorkspace(IProgressMonitor monitor) throws CoreException { try { importOperation.run(monitor); - ignoreJob.run(monitor); + if(lifecycleMappingPage != null) { + ignoreJob.run(monitor); + } } catch(InvocationTargetException e) { return AbstractCreateMavenProjectsOperation.toStatus(e); } catch(InterruptedException e) { |