IDEA-81733 Groovy script configuration loses environment variables

This commit is contained in:
Maxim.Medvedev
2012-02-22 19:33:06 +04:00
parent 52307d6cc8
commit 5420c19cc9
4 changed files with 8 additions and 5 deletions
@@ -182,7 +182,8 @@ public class ApplicationConfiguration extends ModuleBasedConfiguration<JavaRunCo
}
public void setEnvs(@NotNull final Map<String, String> envs) {
this.myEnvs = envs;
myEnvs.clear();
myEnvs.putAll(envs);
}
public boolean isPassParentEnvs() {
@@ -23,7 +23,8 @@ public abstract class AbstractRunConfiguration extends ModuleBasedConfiguration<
}
public void setEnvs(final Map<String, String> envs) {
myEnvs = envs;
myEnvs.clear();
myEnvs.putAll(envs);
}
public boolean isPassParentEnvs() {
@@ -72,7 +72,8 @@ public class EnvironmentVariablesComponent extends LabeledComponent<TextFieldWit
}
public void setEnvs(@NotNull Map<String, String> envs) {
myEnvs = envs;
myEnvs.clear();
myEnvs.putAll(envs);
@NonNls final StringBuilder buf = StringBuilderSpinAllocator.alloc();
try {
for (String variable : myEnvs.keySet()) {
@@ -50,7 +50,7 @@ import com.intellij.psi.PsiFile;
import com.intellij.psi.PsiManager;
import com.intellij.util.PathUtil;
import com.intellij.util.SystemProperties;
import com.intellij.util.containers.hash.HashMap;
import com.intellij.util.containers.hash.LinkedHashMap;
import org.jdom.Element;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;
@@ -77,7 +77,7 @@ public class GroovyScriptRunConfiguration extends ModuleBasedConfiguration<RunCo
private boolean isDebugEnabled;
@Nullable private String scriptParams;
@Nullable private String scriptPath;
private final Map<String, String> envs = new HashMap<String, String>();
private final Map<String, String> envs = new LinkedHashMap<String, String>();
public boolean passParentEnv = true;
public GroovyScriptRunConfiguration(final String name, final Project project, final ConfigurationFactory factory) {