mirror of
https://gitflic.ru/project/openide/openide.git
synced 2026-09-27 10:03:11 +07:00
ASPR-3486 Проблемы с Maven
This commit is contained in:
committed by
Nikita Iarychenko
parent
d8cd948cb4
commit
5368a365ce
+6
-2
@@ -74,7 +74,9 @@ public class MavenRunnerPanel {
|
||||
ui.envVariablesComponent.setEnvs(data.getEnvironmentProperties());
|
||||
ui.envVariablesComponent.setPassParentEnvs(data.isPassParentEnv());
|
||||
|
||||
ui.scriptDirField.setText(data.getScriptDirectory());
|
||||
if (ui.scriptDirField != null) {
|
||||
ui.scriptDirField.setText(data.getScriptDirectory());
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
@@ -91,7 +93,9 @@ public class MavenRunnerPanel {
|
||||
data.setMavenProperties(ui.propertiesPanel.getDataAsMap());
|
||||
data.setEnvironmentProperties(ui.envVariablesComponent.getEnvs());
|
||||
data.setPassParentEnv(ui.envVariablesComponent.isPassParentEnvs());
|
||||
data.setScriptDirectory(ui.scriptDirField.getText().trim());
|
||||
if (ui.scriptDirField != null) {
|
||||
data.setScriptDirectory(ui.scriptDirField.getText().trim());
|
||||
}
|
||||
}
|
||||
|
||||
public Project getProject() {
|
||||
|
||||
@@ -9,6 +9,7 @@ import com.intellij.openapi.application.PathManager
|
||||
import com.intellij.openapi.externalSystem.service.ui.ExternalSystemJdkComboBox
|
||||
import com.intellij.openapi.fileChooser.FileChooserDescriptorFactory
|
||||
import com.intellij.openapi.project.Project
|
||||
import com.intellij.openapi.util.SystemInfo
|
||||
import com.intellij.openapi.ui.ComboBox
|
||||
import com.intellij.openapi.ui.TextFieldWithBrowseButton
|
||||
import com.intellij.ui.ClientProperty
|
||||
@@ -42,7 +43,8 @@ internal class MavenRunnerUi(project: Project, runConfigurationMode: Boolean, pr
|
||||
@JvmField
|
||||
val propertiesPanel = MavenPropertiesPanel(properties)
|
||||
|
||||
lateinit var scriptDirField: TextFieldWithBrowseButton
|
||||
@JvmField
|
||||
var scriptDirField: TextFieldWithBrowseButton? = null
|
||||
|
||||
private lateinit var jdkRow: Row
|
||||
private lateinit var targetJdkRow: Row
|
||||
@@ -82,18 +84,20 @@ internal class MavenRunnerUi(project: Project, runConfigurationMode: Boolean, pr
|
||||
}
|
||||
}
|
||||
|
||||
row(MavenConfigurableBundle.message("maven.settings.runner.script.dir")) {
|
||||
val fileChooserDescriptor = FileChooserDescriptorFactory.createSingleFolderDescriptor()
|
||||
.withTitle(MavenConfigurableBundle.message("maven.settings.runner.script.dir.title"))
|
||||
scriptDirField = textFieldWithBrowseButton(fileChooserDescriptor, project)
|
||||
.align(AlignX.FILL)
|
||||
.applyToComponent {
|
||||
val scriptDirTooltip = MavenConfigurableBundle.message("maven.settings.runner.script.dir.tooltip")
|
||||
toolTipText = scriptDirTooltip
|
||||
textField.toolTipText = scriptDirTooltip
|
||||
(textField as JBTextField).emptyText.text = PathManager.getTempPath()
|
||||
}
|
||||
.component
|
||||
if (SystemInfo.isWindows) {
|
||||
row(MavenConfigurableBundle.message("maven.settings.runner.script.dir")) {
|
||||
val fileChooserDescriptor = FileChooserDescriptorFactory.createSingleFolderDescriptor()
|
||||
.withTitle(MavenConfigurableBundle.message("maven.settings.runner.script.dir.title"))
|
||||
scriptDirField = textFieldWithBrowseButton(fileChooserDescriptor, project)
|
||||
.align(AlignX.FILL)
|
||||
.applyToComponent {
|
||||
val scriptDirTooltip = MavenConfigurableBundle.message("maven.settings.runner.script.dir.tooltip")
|
||||
toolTipText = scriptDirTooltip
|
||||
textField.toolTipText = scriptDirTooltip
|
||||
(textField as JBTextField).emptyText.text = PathManager.getTempPath()
|
||||
}
|
||||
.component
|
||||
}
|
||||
}
|
||||
|
||||
group(MavenConfigurableBundle.message("maven.settings.runner.properties"), indent = false) {
|
||||
|
||||
Reference in New Issue
Block a user