From 11213429facad4ecf95f0b46f3d1949a8e22ebd3 Mon Sep 17 00:00:00 2001 From: anna Date: Tue, 24 Jul 2012 14:25:31 +0200 Subject: [PATCH] EA-37640 - IAE: ModuleManager.getInstance --- .../idea/eclipse/importWizard/EclipseImportBuilder.java | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/plugins/eclipse/src/org/jetbrains/idea/eclipse/importWizard/EclipseImportBuilder.java b/plugins/eclipse/src/org/jetbrains/idea/eclipse/importWizard/EclipseImportBuilder.java index ba3d2df79d46..20fb50f51178 100644 --- a/plugins/eclipse/src/org/jetbrains/idea/eclipse/importWizard/EclipseImportBuilder.java +++ b/plugins/eclipse/src/org/jetbrains/idea/eclipse/importWizard/EclipseImportBuilder.java @@ -411,11 +411,15 @@ public class EclipseImportBuilder extends ProjectImportBuilder implement } public Parameters getParameters() { + return getParameters(getCurrentProject()); + } + + public Parameters getParameters(final Project project) { if (parameters == null) { parameters = new Parameters(); parameters.existingModuleNames = new HashSet(); - if (isUpdate()) { - for (Module module : ModuleManager.getInstance(getCurrentProject()).getModules()) { + if (isUpdate() && project != null) { + for (Module module : ModuleManager.getInstance(project).getModules()) { parameters.existingModuleNames.add(module.getName()); } }