MDS/openide
1
0
Fork 0
mirror of https://gitflic.ru/project/openide/openide.git synced 2026-09-27 10:03:11 +07:00
Code Issues Packages Projects Releases Wiki Activity

cleanup

Browse Source 
GitOrigin-RevId: a1af320bd7846e9f851372b1f929f0bec1040b01
This commit is contained in:
Vladimir Krivosheev
2020-06-08 19:12:54 +03:00
committed by intellij-monorepo-bot
parent 80cbf6747d
commit 3cbfff9f7b
5 changed files with 19 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files
java/idea-ui/src/com/intellij/projectImport/ProjectOpenProcessorBase.kt
+2 -2
View File
@@ -159,7 +159,7 @@ abstract class ProjectOpenProcessorBase<T : ProjectImportBuilder<*>> : 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<T : ProjectImportBuilder<*>> : 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
}
platform/lang-api/src/com/intellij/ide/util/projectWizard/ProjectBuilder.java
+1 -1
View File
@@ -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;
}
platform/lang-impl/src/com/intellij/ide/util/projectWizard/ExistingModuleLoader.java
+12 -8
View File
@@ -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;
}
plugins/eclipse/src/org/jetbrains/idea/eclipse/importWizard/EclipseImportBuilder.java
+3 -3
View File
@@ -164,7 +164,7 @@ public final class EclipseImportBuilder extends ProjectImportBuilder<String> imp
}
@Override
public boolean validate(final Project currentProject, final Project dstProject) {
public boolean validate(@Nullable Project currentProject, @NotNull Project project) {
final Ref<Exception> refEx = new Ref<>();
final Set<String> variables = new HashSet<>();
final Map<String, String> naturesNames = new HashMap<>();
@@ -187,11 +187,11 @@ public final class EclipseImportBuilder extends ProjectImportBuilder<String> 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;
}
plugins/gradle/java/src/service/project/wizard/JavaGradleProjectImportBuilder.kt
+1 -3
View File
@@ -40,8 +40,6 @@ internal class JavaGradleProjectImportBuilder : ProjectImportBuilder<Any>(), Dep
override fun isMarked(element: Any): Boolean = true
override fun setList(list: List<Any>) {}
override fun setOpenProjectSettingsAfter(on: Boolean) {}
private fun getPathToBeImported(path: String): String {
@@ -58,7 +56,7 @@ internal class JavaGradleProjectImportBuilder : ProjectImportBuilder<Any>(), Dep
}
}
override fun validate(current: Project?, project: Project): Boolean {
override fun validate(currentProject: Project?, project: Project): Boolean {
return canLinkAndRefreshGradleProject(fileToImport, project)
}