Fix compilation for AS
This commit is contained in:
+1
-21
@@ -6,9 +6,6 @@
|
|||||||
package org.jetbrains.kotlin.tools.projectWizard.wizard.service
|
package org.jetbrains.kotlin.tools.projectWizard.wizard.service
|
||||||
|
|
||||||
import com.intellij.openapi.project.Project
|
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.TaskResult
|
||||||
import org.jetbrains.kotlin.tools.projectWizard.core.safe
|
import org.jetbrains.kotlin.tools.projectWizard.core.safe
|
||||||
import org.jetbrains.kotlin.tools.projectWizard.core.service.ProjectImportingWizardService
|
import org.jetbrains.kotlin.tools.projectWizard.core.service.ProjectImportingWizardService
|
||||||
@@ -25,23 +22,6 @@ class IdeaMavenWizardService(private val project: Project) : ProjectImportingWiz
|
|||||||
path: Path,
|
path: Path,
|
||||||
modulesIrs: List<ModuleIR>
|
modulesIrs: List<ModuleIR>
|
||||||
): TaskResult<Unit> = safe {
|
): TaskResult<Unit> = safe {
|
||||||
val mavenProjectManager = MavenProjectsManager.getInstance(project)
|
MavenProjectImporter(project).importProject(path)
|
||||||
|
|
||||||
val rootFile = LocalFileSystem.getInstance().findFileByPath(path.toString())!!
|
|
||||||
mavenProjectManager.addManagedFilesOrUnignore(rootFile.findAllPomFiles())
|
|
||||||
}
|
|
||||||
|
|
||||||
private fun VirtualFile.findAllPomFiles(): List<VirtualFile> {
|
|
||||||
val result = mutableListOf<VirtualFile>()
|
|
||||||
|
|
||||||
fun VirtualFile.find() {
|
|
||||||
when {
|
|
||||||
!isDirectory && name == "pom.xml" -> result += this
|
|
||||||
isDirectory -> children.forEach(VirtualFile::find)
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
find()
|
|
||||||
return result
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
+35
@@ -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<VirtualFile> {
|
||||||
|
val result = mutableListOf<VirtualFile>()
|
||||||
|
|
||||||
|
fun VirtualFile.find() {
|
||||||
|
when {
|
||||||
|
!isDirectory && name == "pom.xml" -> result += this
|
||||||
|
isDirectory -> children.forEach(VirtualFile::find)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
find()
|
||||||
|
return result
|
||||||
|
}
|
||||||
|
}
|
||||||
+15
@@ -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
|
||||||
|
}
|
||||||
|
}
|
||||||
+15
@@ -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
|
||||||
|
}
|
||||||
|
}
|
||||||
-1
@@ -2,7 +2,6 @@ package org.jetbrains.kotlin.tools.projectWizard.wizard.ui.firstStep
|
|||||||
|
|
||||||
import com.intellij.icons.AllIcons
|
import com.intellij.icons.AllIcons
|
||||||
import icons.GradleIcons
|
import icons.GradleIcons
|
||||||
import icons.MavenIcons
|
|
||||||
import icons.OpenapiIcons
|
import icons.OpenapiIcons
|
||||||
import org.jetbrains.kotlin.tools.projectWizard.core.entity.DropDownSettingType
|
import org.jetbrains.kotlin.tools.projectWizard.core.entity.DropDownSettingType
|
||||||
import org.jetbrains.kotlin.tools.projectWizard.core.entity.SettingReference
|
import org.jetbrains.kotlin.tools.projectWizard.core.entity.SettingReference
|
||||||
|
|||||||
Reference in New Issue
Block a user