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

ApplicationConfiguration — fix env serialization

Browse Source
This commit is contained in:
Vladimir Krivosheev
2017-12-22 11:53:11 +01:00
parent e07ef58e4e
commit 5e6fa7a906
2 changed files with 5 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
java/execution/impl/src/com/intellij/execution/application/ApplicationConfiguration.java
+3 -7
View File
@@ -35,7 +35,6 @@ import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;
import java.util.Collection;
import java.util.LinkedHashMap;
import java.util.Map;
public class ApplicationConfiguration extends ModuleBasedConfiguration<JavaRunConfigurationModule>
@@ -52,8 +51,6 @@ public class ApplicationConfiguration extends ModuleBasedConfiguration<JavaRunCo
private ShortenCommandLine myShortenCommandLine = null;
private final Map<String, String> myEnvs = new LinkedHashMap<>();
public ApplicationConfiguration(final String name, final Project project, ApplicationConfigurationType applicationConfigurationType) {
this(name, project, applicationConfigurationType.getConfigurationFactories()[0]);
}
@@ -201,13 +198,12 @@ public class ApplicationConfiguration extends ModuleBasedConfiguration<JavaRunCo
@Override
@NotNull
public Map<String, String> getEnvs() {
return myEnvs;
return getOptions().getEnv();
}
@Override
public void setEnvs(@NotNull final Map<String, String> envs) {
myEnvs.clear();
myEnvs.putAll(envs);
public void setEnvs(@NotNull Map<String, String> envs) {
getOptions().setEnv(envs);
}
@Override
java/execution/impl/src/com/intellij/execution/application/ApplicationConfigurationOptions.kt
+2 -2
View File
@@ -24,7 +24,7 @@ open class ApplicationConfigurationOptions : JvmConfigurationOptions() {
@get:OptionTag("PASS_PARENT_ENVS")
var isPassParentEnv by property(true)
@get:OptionTag("envs")
@get:OptionTag(tag = "envs", nameAttribute = "")
@get:MapAnnotation(surroundWithTag = false, entryTagName = "env", keyAttributeName = "name", sortBeforeSave = false)
var env by property(LinkedHashMap())
var env by property(LinkedHashMap<String, String>())
}