MDS/openide
1
0
Fork 0
mirror of https://gitflic.ru/project/openide/openide.git synced 2026-09-27 10:03:11 +07:00
Code Issues Packages Projects Releases Wiki Activity

Platform: not-null SimpleProgramParameters.getEnv

Browse Source
This commit is contained in:
Anton Makeev
2014-04-10 20:15:03 +02:00
parent 025232d50c
commit e1aa83075b
7 changed files with 15 additions and 37 deletions
Download Patch File Download Diff File Expand all files Collapse all files
java/execution/impl/src/com/intellij/execution/util/JavaParametersUtil.java
+2 -4
View File
@@ -56,10 +56,8 @@ public class JavaParametersUtil {
if (vmParameters != null) {
vmParameters = ProgramParametersUtil.expandPath(vmParameters, module, project);
if (parameters.getEnv() != null) {
for (Map.Entry<String, String> each : parameters.getEnv().entrySet()) {
vmParameters = StringUtil.replace(vmParameters, "$" + each.getKey() + "$", each.getValue(), false); //replace env usages
}
for (Map.Entry<String, String> each : parameters.getEnv().entrySet()) {
vmParameters = StringUtil.replace(vmParameters, "$" + each.getKey() + "$", each.getValue(), false); //replace env usages
}
}
platform/lang-api/src/com/intellij/execution/configurations/SimpleProgramParameters.java
+3 -5
View File
@@ -18,6 +18,7 @@ package com.intellij.execution.configurations;
import com.intellij.execution.configuration.EnvironmentVariablesComponent;
import gnu.trove.THashMap;
import org.jetbrains.annotations.NotNull;
import java.io.File;
import java.util.HashMap;
@@ -26,7 +27,7 @@ import java.util.Map;
public class SimpleProgramParameters {
private final ParametersList myProgramParameters = new ParametersList();
private String myWorkingDirectory;
private Map<String, String> myEnv;
private Map<String, String> myEnv = new THashMap<String, String>();
private boolean myPassParentEnvs = true;
public String getWorkingDirectory() {
@@ -45,15 +46,12 @@ public class SimpleProgramParameters {
return myProgramParameters;
}
@NotNull
public Map<String, String> getEnv() {
return myEnv;
}
public String addEnv(String name, String value) {
if (myEnv == null) {
myEnv = new THashMap<String, String>();
}
return myEnv.put(name, value);
}
platform/lang-impl/src/com/intellij/execution/util/ProgramParametersConfigurator.java
+5 -6
View File
@@ -43,13 +43,12 @@ public class ProgramParametersConfigurator {
parameters.setWorkingDirectory(getWorkingDir(configuration, project, module));
parameters.setupEnvs(configuration.getEnvs(), configuration.isPassParentEnvs());
if (parameters.getEnv() != null) {
Map<String, String> expanded = new HashMap<String, String>();
for (Map.Entry<String, String> each : parameters.getEnv().entrySet()) {
expanded.put(each.getKey(), expandPath(each.getValue(), module, project));
}
parameters.setEnv(expanded);
Map<String, String> expanded = new HashMap<String, String>();
for (Map.Entry<String, String> each : parameters.getEnv().entrySet()) {
expanded.put(each.getKey(), expandPath(each.getValue(), module, project));
}
parameters.setEnv(expanded);
}
@Nullable
plugins/groovy/src/org/jetbrains/plugins/groovy/griffon/GriffonFramework.java
+1 -8
View File
@@ -55,9 +55,7 @@ import org.jetbrains.plugins.groovy.mvc.*;
import javax.swing.*;
import java.io.File;
import java.io.IOException;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
import java.util.regex.Matcher;
import java.util.regex.Pattern;
@@ -238,12 +236,7 @@ public class GriffonFramework extends MvcFramework {
return params;
}
Map<String, String> env = params.getEnv();
if (env == null) {
env = new HashMap<String, String>();
params.setEnv(env);
}
env.put(getSdkHomePropertyName(), FileUtil.toSystemDependentName(sdkRoot.getPath()));
params.addEnv(getSdkHomePropertyName(), FileUtil.toSystemDependentName(sdkRoot.getPath()));
final VirtualFile lib = sdkRoot.findChild("lib");
if (lib != null) {
plugins/groovy/src/org/jetbrains/plugins/groovy/mvc/MvcFramework.java
+1 -7
View File
@@ -425,13 +425,7 @@ public abstract class MvcFramework {
if (sdk != null && sdk.getSdkType() instanceof JavaSdkType) {
String path = StringUtil.trimEnd(sdk.getHomePath(), File.separator);
if (StringUtil.isNotEmpty(path)) {
Map<String, String> env = params.getEnv();
if (env == null) {
env = new HashMap<String, String>();
params.setEnv(env);
}
env.put("JAVA_HOME", FileUtil.toSystemDependentName(path));
params.addEnv("JAVA_HOME", FileUtil.toSystemDependentName(path));
}
}
}
plugins/groovy/src/org/jetbrains/plugins/groovy/mvc/MvcRunConfiguration.java
+2 -6
View File
@@ -254,12 +254,8 @@ public abstract class MvcRunConfiguration extends ModuleBasedConfiguration<RunCo
protected void addEnvVars(final JavaParameters params) {
Map<String, String> envVars = new HashMap<String, String>(envs);
Map<String, String> oldEnv = params.getEnv();
if (oldEnv != null) {
envVars.putAll(oldEnv);
}
envVars.putAll(params.getEnv());
params.setupEnvs(envVars, passParentEnv);
MvcFramework.addJavaHome(params, myModule);
plugins/maven/src/main/java/org/jetbrains/idea/maven/execution/MavenJUnitPatcher.java
+1 -1
View File
@@ -85,7 +85,7 @@ public class MavenJUnitPatcher extends JUnitPatcher {
for (Element element : environmentVariables.getChildren()) {
String variableName = element.getName();
if (javaParameters.getEnv() == null || !javaParameters.getEnv().containsKey(variableName)) {
if (!javaParameters.getEnv().containsKey(variableName)) {
String value = resolveSurefireProperties(element.getValue());
if (isResolved(value)) {
javaParameters.addEnv(variableName, value);