From 06dc2caf41b46fc34421d45fafe3c36196ac0e6d Mon Sep 17 00:00:00 2001 From: Ilya Kirillov Date: Thu, 19 Dec 2019 15:07:12 +0300 Subject: [PATCH] Fix compilation for AS --- .../wizard/service/IdeaMavenWizardService.kt | 22 +----------- .../wizard/service/MavenProjectImporter.kt | 35 +++++++++++++++++++ .../service/MavenProjectImporter.kt.as35 | 15 ++++++++ .../service/MavenProjectImporter.kt.as36 | 15 ++++++++ .../BuildSystemTypeSettingComponent.kt | 1 - 5 files changed, 66 insertions(+), 22 deletions(-) create mode 100644 idea/idea-new-project-wizard/src/org/jetbrains/kotlin/tools/projectWizard/wizard/service/MavenProjectImporter.kt create mode 100644 idea/idea-new-project-wizard/src/org/jetbrains/kotlin/tools/projectWizard/wizard/service/MavenProjectImporter.kt.as35 create mode 100644 idea/idea-new-project-wizard/src/org/jetbrains/kotlin/tools/projectWizard/wizard/service/MavenProjectImporter.kt.as36 diff --git a/idea/idea-new-project-wizard/src/org/jetbrains/kotlin/tools/projectWizard/wizard/service/IdeaMavenWizardService.kt b/idea/idea-new-project-wizard/src/org/jetbrains/kotlin/tools/projectWizard/wizard/service/IdeaMavenWizardService.kt index db06ae831ee..b8767ed2ce9 100644 --- a/idea/idea-new-project-wizard/src/org/jetbrains/kotlin/tools/projectWizard/wizard/service/IdeaMavenWizardService.kt +++ b/idea/idea-new-project-wizard/src/org/jetbrains/kotlin/tools/projectWizard/wizard/service/IdeaMavenWizardService.kt @@ -6,9 +6,6 @@ package org.jetbrains.kotlin.tools.projectWizard.wizard.service import com.intellij.openapi.project.Project -import com.intellij.openapi.vfs.LocalFileSystem -import com.intellij.openapi.vfs.VirtualFile -import org.jetbrains.idea.maven.project.MavenProjectsManager import org.jetbrains.kotlin.tools.projectWizard.core.TaskResult import org.jetbrains.kotlin.tools.projectWizard.core.safe import org.jetbrains.kotlin.tools.projectWizard.core.service.ProjectImportingWizardService @@ -25,23 +22,6 @@ class IdeaMavenWizardService(private val project: Project) : ProjectImportingWiz path: Path, modulesIrs: List ): TaskResult = safe { - val mavenProjectManager = MavenProjectsManager.getInstance(project) - - val rootFile = LocalFileSystem.getInstance().findFileByPath(path.toString())!! - mavenProjectManager.addManagedFilesOrUnignore(rootFile.findAllPomFiles()) - } - - private fun VirtualFile.findAllPomFiles(): List { - val result = mutableListOf() - - fun VirtualFile.find() { - when { - !isDirectory && name == "pom.xml" -> result += this - isDirectory -> children.forEach(VirtualFile::find) - } - } - - find() - return result + MavenProjectImporter(project).importProject(path) } } \ No newline at end of file diff --git a/idea/idea-new-project-wizard/src/org/jetbrains/kotlin/tools/projectWizard/wizard/service/MavenProjectImporter.kt b/idea/idea-new-project-wizard/src/org/jetbrains/kotlin/tools/projectWizard/wizard/service/MavenProjectImporter.kt new file mode 100644 index 00000000000..d52fc5fd706 --- /dev/null +++ b/idea/idea-new-project-wizard/src/org/jetbrains/kotlin/tools/projectWizard/wizard/service/MavenProjectImporter.kt @@ -0,0 +1,35 @@ +/* + * Copyright 2010-2019 JetBrains s.r.o. and Kotlin Programming Language contributors. + * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file. + */ + +package org.jetbrains.kotlin.tools.projectWizard.wizard.service + +import com.intellij.openapi.project.Project +import com.intellij.openapi.vfs.LocalFileSystem +import com.intellij.openapi.vfs.VirtualFile +import org.jetbrains.idea.maven.project.MavenProjectsManager +import java.nio.file.Path + +class MavenProjectImporter(private val project: Project) { + fun importProject(path: Path) { + val mavenProjectManager = MavenProjectsManager.getInstance(project) + + val rootFile = LocalFileSystem.getInstance().findFileByPath(path.toString())!! + mavenProjectManager.addManagedFilesOrUnignore(rootFile.findAllPomFiles()) + } + + private fun VirtualFile.findAllPomFiles(): List { + val result = mutableListOf() + + fun VirtualFile.find() { + when { + !isDirectory && name == "pom.xml" -> result += this + isDirectory -> children.forEach(VirtualFile::find) + } + } + + find() + return result + } +} \ No newline at end of file diff --git a/idea/idea-new-project-wizard/src/org/jetbrains/kotlin/tools/projectWizard/wizard/service/MavenProjectImporter.kt.as35 b/idea/idea-new-project-wizard/src/org/jetbrains/kotlin/tools/projectWizard/wizard/service/MavenProjectImporter.kt.as35 new file mode 100644 index 00000000000..47feb237c39 --- /dev/null +++ b/idea/idea-new-project-wizard/src/org/jetbrains/kotlin/tools/projectWizard/wizard/service/MavenProjectImporter.kt.as35 @@ -0,0 +1,15 @@ +/* + * Copyright 2010-2019 JetBrains s.r.o. and Kotlin Programming Language contributors. + * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file. + */ + +package org.jetbrains.kotlin.tools.projectWizard.wizard.service + +import com.intellij.openapi.project.Project +import java.nio.file.Path + +class MavenProjectImporter(private val project: Project) { + fun importProject(path: Path) { + // AS does not support Maven + } +} \ No newline at end of file diff --git a/idea/idea-new-project-wizard/src/org/jetbrains/kotlin/tools/projectWizard/wizard/service/MavenProjectImporter.kt.as36 b/idea/idea-new-project-wizard/src/org/jetbrains/kotlin/tools/projectWizard/wizard/service/MavenProjectImporter.kt.as36 new file mode 100644 index 00000000000..47feb237c39 --- /dev/null +++ b/idea/idea-new-project-wizard/src/org/jetbrains/kotlin/tools/projectWizard/wizard/service/MavenProjectImporter.kt.as36 @@ -0,0 +1,15 @@ +/* + * Copyright 2010-2019 JetBrains s.r.o. and Kotlin Programming Language contributors. + * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file. + */ + +package org.jetbrains.kotlin.tools.projectWizard.wizard.service + +import com.intellij.openapi.project.Project +import java.nio.file.Path + +class MavenProjectImporter(private val project: Project) { + fun importProject(path: Path) { + // AS does not support Maven + } +} \ No newline at end of file diff --git a/idea/idea-new-project-wizard/src/org/jetbrains/kotlin/tools/projectWizard/wizard/ui/firstStep/BuildSystemTypeSettingComponent.kt b/idea/idea-new-project-wizard/src/org/jetbrains/kotlin/tools/projectWizard/wizard/ui/firstStep/BuildSystemTypeSettingComponent.kt index 07d94c4969b..a6fa17d1d0e 100644 --- a/idea/idea-new-project-wizard/src/org/jetbrains/kotlin/tools/projectWizard/wizard/ui/firstStep/BuildSystemTypeSettingComponent.kt +++ b/idea/idea-new-project-wizard/src/org/jetbrains/kotlin/tools/projectWizard/wizard/ui/firstStep/BuildSystemTypeSettingComponent.kt @@ -2,7 +2,6 @@ package org.jetbrains.kotlin.tools.projectWizard.wizard.ui.firstStep import com.intellij.icons.AllIcons import icons.GradleIcons -import icons.MavenIcons import icons.OpenapiIcons import org.jetbrains.kotlin.tools.projectWizard.core.entity.DropDownSettingType import org.jetbrains.kotlin.tools.projectWizard.core.entity.SettingReference