azalea/kotlin-fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

CLI: drop CompilerArguments and unnecessary methods from *CompilerArguments classes

Browse Source 
Original commit: 31a4d91122
This commit is contained in:
Zalim Bashorov
2013-10-15 17:56:06 +04:00
parent 06549c6413
commit 4e5b04ce1f
2 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
jps/jps-plugin/src/org/jetbrains/jet/jps/JpsKotlinCompilerSettings.java
+1 -1
View File
@@ -29,7 +29,7 @@ public class JpsKotlinCompilerSettings extends JpsElementBase<JpsKotlinCompilerS
static final JpsElementChildRole<JpsKotlinCompilerSettings> ROLE = JpsElementChildRoleBase.create("Kotlin Compiler Settings"); static final JpsElementChildRole<JpsKotlinCompilerSettings> ROLE = JpsElementChildRoleBase.create("Kotlin Compiler Settings");
@NotNull @NotNull
public CommonCompilerArguments commonCompilerSettings = CommonCompilerArguments.DUMMY; public CommonCompilerArguments commonCompilerSettings = new CommonCompilerArguments.DummyImpl();
@NotNull @NotNull
public K2JVMCompilerArguments k2JvmCompilerSettings = new K2JVMCompilerArguments(); public K2JVMCompilerArguments k2JvmCompilerSettings = new K2JVMCompilerArguments();
@NotNull @NotNull
jps/jps-plugin/src/org/jetbrains/jet/jps/model/KotlinCommonCompilerSettingsSerializer.java
+1 -1
View File
@@ -36,7 +36,7 @@ class KotlinCommonCompilerSettingsSerializer extends JpsProjectExtensionSerializ
public void loadExtension(@NotNull JpsProject project, @NotNull Element componentTag) { public void loadExtension(@NotNull JpsProject project, @NotNull Element componentTag) {
CommonCompilerArguments settings = XmlSerializer.deserialize(componentTag, CommonCompilerArguments.DummyImpl.class); CommonCompilerArguments settings = XmlSerializer.deserialize(componentTag, CommonCompilerArguments.DummyImpl.class);
if (settings == null) { if (settings == null) {
settings = CommonCompilerArguments.DUMMY; settings = new CommonCompilerArguments.DummyImpl();
} }
JpsKotlinCompilerSettings.setCommonSettings(project, settings); JpsKotlinCompilerSettings.setCommonSettings(project, settings);