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:
+28
-21
@@ -15,6 +15,7 @@ import com.intellij.openapi.fileChooser.FileChooserDescriptorFactory;
|
||||
import com.intellij.openapi.project.Project;
|
||||
import com.intellij.openapi.ui.ComboBox;
|
||||
import com.intellij.openapi.ui.TextFieldWithBrowseButton;
|
||||
import com.intellij.openapi.util.SystemInfo;
|
||||
import com.intellij.openapi.util.text.StringUtil;
|
||||
import com.intellij.ui.ComponentUtil;
|
||||
import com.intellij.ui.components.JBTextField;
|
||||
@@ -128,25 +129,27 @@ public class MavenRunnerPanel {
|
||||
panel.add(myEnvVariablesComponent, c);
|
||||
c.gridwidth = 1;
|
||||
|
||||
JLabel labelScriptDir = new JLabel(MavenConfigurableBundle.message("maven.settings.runner.script.dir"));
|
||||
myScriptDirField = new TextFieldWithBrowseButton();
|
||||
myScriptDirField.addBrowseFolderListener(myProject, FileChooserDescriptorFactory.createSingleFolderDescriptor()
|
||||
.withTitle(MavenConfigurableBundle.message("maven.settings.runner.script.dir.title")));
|
||||
String scriptDirTooltip = MavenConfigurableBundle.message("maven.settings.runner.script.dir.tooltip");
|
||||
labelScriptDir.setToolTipText(scriptDirTooltip);
|
||||
myScriptDirField.setToolTipText(scriptDirTooltip);
|
||||
myScriptDirField.getTextField().setToolTipText(scriptDirTooltip);
|
||||
((JBTextField)myScriptDirField.getTextField()).getEmptyText().setText(PathManager.getTempPath());
|
||||
labelScriptDir.setLabelFor(myScriptDirField);
|
||||
c.gridx = 0;
|
||||
c.gridy++;
|
||||
c.weightx = 0;
|
||||
panel.add(labelScriptDir, c);
|
||||
c.gridx = 1;
|
||||
c.weightx = 1;
|
||||
c.insets.left = 10;
|
||||
panel.add(myScriptDirField, c);
|
||||
c.insets.left = 0;
|
||||
if (SystemInfo.isWindows) {
|
||||
JLabel labelScriptDir = new JLabel(MavenConfigurableBundle.message("maven.settings.runner.script.dir"));
|
||||
myScriptDirField = new TextFieldWithBrowseButton();
|
||||
myScriptDirField.addBrowseFolderListener(myProject, FileChooserDescriptorFactory.createSingleFolderDescriptor()
|
||||
.withTitle(MavenConfigurableBundle.message("maven.settings.runner.script.dir.title")));
|
||||
String scriptDirTooltip = MavenConfigurableBundle.message("maven.settings.runner.script.dir.tooltip");
|
||||
labelScriptDir.setToolTipText(scriptDirTooltip);
|
||||
myScriptDirField.setToolTipText(scriptDirTooltip);
|
||||
myScriptDirField.getTextField().setToolTipText(scriptDirTooltip);
|
||||
((JBTextField)myScriptDirField.getTextField()).getEmptyText().setText(PathManager.getTempPath());
|
||||
labelScriptDir.setLabelFor(myScriptDirField);
|
||||
c.gridx = 0;
|
||||
c.gridy++;
|
||||
c.weightx = 0;
|
||||
panel.add(labelScriptDir, c);
|
||||
c.gridx = 1;
|
||||
c.weightx = 1;
|
||||
c.insets.left = 10;
|
||||
panel.add(myScriptDirField, c);
|
||||
c.insets.left = 0;
|
||||
}
|
||||
|
||||
JPanel propertiesPanel = new JPanel(new BorderLayout());
|
||||
propertiesPanel.setBorder(IdeBorderFactory.createTitledBorder(MavenConfigurableBundle.message("maven.settings.runner.properties"), false));
|
||||
@@ -193,7 +196,9 @@ public class MavenRunnerPanel {
|
||||
myEnvVariablesComponent.setEnvs(data.getEnvironmentProperties());
|
||||
myEnvVariablesComponent.setPassParentEnvs(data.isPassParentEnv());
|
||||
|
||||
myScriptDirField.setText(data.getScriptDirectory());
|
||||
if (myScriptDirField != null) {
|
||||
myScriptDirField.setText(data.getScriptDirectory());
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
@@ -209,7 +214,9 @@ public class MavenRunnerPanel {
|
||||
data.setMavenProperties(myPropertiesPanel.getDataAsMap());
|
||||
data.setEnvironmentProperties(myEnvVariablesComponent.getEnvs());
|
||||
data.setPassParentEnv(myEnvVariablesComponent.isPassParentEnvs());
|
||||
data.setScriptDirectory(myScriptDirField.getText().trim());
|
||||
if (myScriptDirField != null) {
|
||||
data.setScriptDirectory(myScriptDirField.getText().trim());
|
||||
}
|
||||
}
|
||||
|
||||
public Project getProject() {
|
||||
|
||||
Reference in New Issue
Block a user