From 4e5b04ce1f632b537b370d64690321a02b2c8d1a Mon Sep 17 00:00:00 2001 From: Zalim Bashorov Date: Tue, 15 Oct 2013 17:56:06 +0400 Subject: [PATCH] CLI: drop CompilerArguments and unnecessary methods from *CompilerArguments classes Original commit: 31a4d91122741531ff79c73f31cbb7930c05f2e0 --- .../src/org/jetbrains/jet/jps/JpsKotlinCompilerSettings.java | 2 +- .../jet/jps/model/KotlinCommonCompilerSettingsSerializer.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/jps/jps-plugin/src/org/jetbrains/jet/jps/JpsKotlinCompilerSettings.java b/jps/jps-plugin/src/org/jetbrains/jet/jps/JpsKotlinCompilerSettings.java index 2ca6b28331f..29cbeb5a775 100644 --- a/jps/jps-plugin/src/org/jetbrains/jet/jps/JpsKotlinCompilerSettings.java +++ b/jps/jps-plugin/src/org/jetbrains/jet/jps/JpsKotlinCompilerSettings.java @@ -29,7 +29,7 @@ public class JpsKotlinCompilerSettings extends JpsElementBase ROLE = JpsElementChildRoleBase.create("Kotlin Compiler Settings"); @NotNull - public CommonCompilerArguments commonCompilerSettings = CommonCompilerArguments.DUMMY; + public CommonCompilerArguments commonCompilerSettings = new CommonCompilerArguments.DummyImpl(); @NotNull public K2JVMCompilerArguments k2JvmCompilerSettings = new K2JVMCompilerArguments(); @NotNull diff --git a/jps/jps-plugin/src/org/jetbrains/jet/jps/model/KotlinCommonCompilerSettingsSerializer.java b/jps/jps-plugin/src/org/jetbrains/jet/jps/model/KotlinCommonCompilerSettingsSerializer.java index 9a284e1ebad..4522c25792d 100644 --- a/jps/jps-plugin/src/org/jetbrains/jet/jps/model/KotlinCommonCompilerSettingsSerializer.java +++ b/jps/jps-plugin/src/org/jetbrains/jet/jps/model/KotlinCommonCompilerSettingsSerializer.java @@ -36,7 +36,7 @@ class KotlinCommonCompilerSettingsSerializer extends JpsProjectExtensionSerializ public void loadExtension(@NotNull JpsProject project, @NotNull Element componentTag) { CommonCompilerArguments settings = XmlSerializer.deserialize(componentTag, CommonCompilerArguments.DummyImpl.class); if (settings == null) { - settings = CommonCompilerArguments.DUMMY; + settings = new CommonCompilerArguments.DummyImpl(); } JpsKotlinCompilerSettings.setCommonSettings(project, settings);