diff --git a/java/idea-ui/src/com/intellij/projectImport/ProjectOpenProcessorBase.kt b/java/idea-ui/src/com/intellij/projectImport/ProjectOpenProcessorBase.kt index 941c3a72c0d7..8a071e60e635 100644 --- a/java/idea-ui/src/com/intellij/projectImport/ProjectOpenProcessorBase.kt +++ b/java/idea-ui/src/com/intellij/projectImport/ProjectOpenProcessorBase.kt @@ -159,7 +159,7 @@ abstract class ProjectOpenProcessorBase> : ProjectOp } if (importToProject) { - options = options.copy(beforeOpen = { project -> importToProject(projectToClose, wizardContext, project) }) + options = options.copy(beforeOpen = { project -> importToProject(project, projectToClose, wizardContext) }) } try { @@ -178,7 +178,7 @@ abstract class ProjectOpenProcessorBase> : ProjectOp return null } - private fun importToProject(projectToClose: Project?, wizardContext: WizardContext, projectToOpen: Project): Boolean { + private fun importToProject(projectToOpen: Project, projectToClose: Project?, wizardContext: WizardContext): Boolean { if (!builder.validate(projectToClose, projectToOpen)) { return false } diff --git a/platform/lang-api/src/com/intellij/ide/util/projectWizard/ProjectBuilder.java b/platform/lang-api/src/com/intellij/ide/util/projectWizard/ProjectBuilder.java index a6cc48200654..2ecfef73783c 100644 --- a/platform/lang-api/src/com/intellij/ide/util/projectWizard/ProjectBuilder.java +++ b/platform/lang-api/src/com/intellij/ide/util/projectWizard/ProjectBuilder.java @@ -25,7 +25,7 @@ public abstract class ProjectBuilder { return commit(project, null, DefaultModulesProvider.createForProject(project)); } - public boolean validate(Project current, Project dest) { + public boolean validate(@Nullable Project currentProject, @NotNull Project project) { return true; } diff --git a/platform/lang-impl/src/com/intellij/ide/util/projectWizard/ExistingModuleLoader.java b/platform/lang-impl/src/com/intellij/ide/util/projectWizard/ExistingModuleLoader.java index e136ac582651..1d81c60839e7 100644 --- a/platform/lang-impl/src/com/intellij/ide/util/projectWizard/ExistingModuleLoader.java +++ b/platform/lang-impl/src/com/intellij/ide/util/projectWizard/ExistingModuleLoader.java @@ -1,4 +1,4 @@ -// Copyright 2000-2019 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file. +// Copyright 2000-2020 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file. package com.intellij.ide.util.projectWizard; import com.intellij.CommonBundle; @@ -20,6 +20,7 @@ import com.intellij.openapi.util.JDOMUtil; import org.jdom.Element; import org.jdom.JDOMException; import org.jetbrains.annotations.NotNull; +import org.jetbrains.annotations.Nullable; import org.jetbrains.jps.model.serialization.PathMacroUtil; import java.io.File; @@ -32,7 +33,7 @@ import java.util.Set; /** * @author Eugene Zhuravlev */ -public class ExistingModuleLoader extends ModuleBuilder { +public final class ExistingModuleLoader extends ModuleBuilder { private static final Logger LOG = Logger.getInstance(ExistingModuleLoader.class); public static ExistingModuleLoader setUpLoader(final String moduleFilePath) { @@ -62,19 +63,22 @@ public class ExistingModuleLoader extends ModuleBuilder { } @Override - public ModuleType getModuleType() { + public ModuleType getModuleType() { return null; // no matter } @Override - public boolean validate(final Project current, final Project dest) { - if (getName() == null) return false; + public boolean validate(@Nullable Project currentProject, @NotNull Project project) { + if (getName() == null) { + return false; + } + String moduleFilePath = getModuleFilePath(); if (moduleFilePath == null) return false; final Path file = Paths.get(moduleFilePath); if (Files.exists(file)) { try { - final ConversionResult result = ConversionService.getInstance().convertModule(dest, file); + final ConversionResult result = ConversionService.getInstance().convertModule(project, file); if (result.openingIsCanceled()) { return false; } @@ -84,7 +88,7 @@ public class ExistingModuleLoader extends ModuleBuilder { usedMacros.removeAll(PathMacros.getInstance().getAllMacroNames()); if (usedMacros.size() > 0) { - final boolean ok = ProjectMacrosUtil.showMacrosConfigurationDialog(current, usedMacros); + final boolean ok = ProjectMacrosUtil.showMacrosConfigurationDialog(currentProject, usedMacros); if (!ok) { return false; } @@ -95,7 +99,7 @@ public class ExistingModuleLoader extends ModuleBuilder { return false; } } else { - Messages.showErrorDialog(current, IdeBundle.message("title.module.file.does.not.exist", moduleFilePath), + Messages.showErrorDialog(currentProject, IdeBundle.message("title.module.file.does.not.exist", moduleFilePath), CommonBundle.getErrorTitle()); return false; } 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 f4d192d39a98..13f6eead763c 100644 --- a/plugins/eclipse/src/org/jetbrains/idea/eclipse/importWizard/EclipseImportBuilder.java +++ b/plugins/eclipse/src/org/jetbrains/idea/eclipse/importWizard/EclipseImportBuilder.java @@ -164,7 +164,7 @@ public final class EclipseImportBuilder extends ProjectImportBuilder imp } @Override - public boolean validate(final Project currentProject, final Project dstProject) { + public boolean validate(@Nullable Project currentProject, @NotNull Project project) { final Ref refEx = new Ref<>(); final Set variables = new HashSet<>(); final Map naturesNames = new HashMap<>(); @@ -187,11 +187,11 @@ public final class EclipseImportBuilder extends ProjectImportBuilder imp }, EclipseBundle.message("eclipse.import.converting"), false, currentProject); if (!refEx.isNull()) { - Messages.showErrorDialog(dstProject, refEx.get().getMessage(), getTitle()); + Messages.showErrorDialog(project, refEx.get().getMessage(), getTitle()); return false; } - if (!ProjectMacrosUtil.checkNonIgnoredMacros(dstProject, variables)) { + if (!ProjectMacrosUtil.checkNonIgnoredMacros(project, variables)) { return false; } diff --git a/plugins/gradle/java/src/service/project/wizard/JavaGradleProjectImportBuilder.kt b/plugins/gradle/java/src/service/project/wizard/JavaGradleProjectImportBuilder.kt index d73532b4b9de..e20fff83ee13 100644 --- a/plugins/gradle/java/src/service/project/wizard/JavaGradleProjectImportBuilder.kt +++ b/plugins/gradle/java/src/service/project/wizard/JavaGradleProjectImportBuilder.kt @@ -40,8 +40,6 @@ internal class JavaGradleProjectImportBuilder : ProjectImportBuilder(), Dep override fun isMarked(element: Any): Boolean = true - override fun setList(list: List) {} - override fun setOpenProjectSettingsAfter(on: Boolean) {} private fun getPathToBeImported(path: String): String { @@ -58,7 +56,7 @@ internal class JavaGradleProjectImportBuilder : ProjectImportBuilder(), Dep } } - override fun validate(current: Project?, project: Project): Boolean { + override fun validate(currentProject: Project?, project: Project): Boolean { return canLinkAndRefreshGradleProject(fileToImport, project) }