From 84890122776d48c7a15310bf9124aabfadce5023 Mon Sep 17 00:00:00 2001 From: Zalim Bashorov Date: Thu, 24 Oct 2013 13:13:17 +0400 Subject: [PATCH] Minor refactoring -- rename some classes and variables. Original commit: da718af8b7023f4d9c2670521b85c2f568a12713 --- .../jet/jps/JpsKotlinCompilerSettings.java | 50 +++++++++---------- .../jet/jps/build/KotlinBuilder.java | 14 +++--- ...Kotlin2JsCompilerArgumentsSerializer.java} | 10 ++-- ...otlin2JvmCompilerArgumentsSerializer.java} | 10 ++-- ...linCommonCompilerArgumentsSerializer.java} | 10 ++-- ... => KotlinCompilerSettingsSerializer.java} | 16 +++--- .../model/KotlinModelSerializerService.java | 8 +-- 7 files changed, 59 insertions(+), 59 deletions(-) rename jps/jps-plugin/src/org/jetbrains/jet/jps/model/{Kotlin2JsCompilerSettingsSerializer.java => Kotlin2JsCompilerArgumentsSerializer.java} (86%) rename jps/jps-plugin/src/org/jetbrains/jet/jps/model/{Kotlin2JvmCompilerSettingsSerializer.java => Kotlin2JvmCompilerArgumentsSerializer.java} (85%) rename jps/jps-plugin/src/org/jetbrains/jet/jps/model/{KotlinCommonCompilerSettingsSerializer.java => KotlinCommonCompilerArgumentsSerializer.java} (85%) rename jps/jps-plugin/src/org/jetbrains/jet/jps/model/{KotlinAdditionalCompilerSettingsSerializer.java => KotlinCompilerSettingsSerializer.java} (69%) 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 bdf56d787b0..e22c1971769 100644 --- a/jps/jps-plugin/src/org/jetbrains/jet/jps/JpsKotlinCompilerSettings.java +++ b/jps/jps-plugin/src/org/jetbrains/jet/jps/JpsKotlinCompilerSettings.java @@ -20,7 +20,7 @@ import org.jetbrains.annotations.NotNull; import org.jetbrains.jet.cli.common.arguments.CommonCompilerArguments; import org.jetbrains.jet.cli.common.arguments.K2JSCompilerArguments; import org.jetbrains.jet.cli.common.arguments.K2JVMCompilerArguments; -import org.jetbrains.jet.compiler.AdditionalCompilerSettings; +import org.jetbrains.jet.compiler.CompilerSettings; import org.jetbrains.jps.model.JpsElementChildRole; import org.jetbrains.jps.model.JpsProject; import org.jetbrains.jps.model.ex.JpsElementBase; @@ -30,22 +30,22 @@ public class JpsKotlinCompilerSettings extends JpsElementBase ROLE = JpsElementChildRoleBase.create("Kotlin Compiler Settings"); @NotNull - private CommonCompilerArguments commonCompilerSettings = new CommonCompilerArguments.DummyImpl(); + private CommonCompilerArguments commonCompilerArguments = new CommonCompilerArguments.DummyImpl(); @NotNull - private K2JVMCompilerArguments k2JvmCompilerSettings = new K2JVMCompilerArguments(); + private K2JVMCompilerArguments k2JvmCompilerArguments = new K2JVMCompilerArguments(); @NotNull - private K2JSCompilerArguments k2JsCompilerSettings = new K2JSCompilerArguments(); + private K2JSCompilerArguments k2JsCompilerArguments = new K2JSCompilerArguments(); @NotNull - private AdditionalCompilerSettings additionalCompilerSettings = new AdditionalCompilerSettings(); + private CompilerSettings compilerSettings = new CompilerSettings(); @NotNull @Override public JpsKotlinCompilerSettings createCopy() { JpsKotlinCompilerSettings copy = new JpsKotlinCompilerSettings(); - copy.commonCompilerSettings = this.commonCompilerSettings; - copy.k2JvmCompilerSettings = this.k2JvmCompilerSettings; - copy.k2JsCompilerSettings = this.k2JsCompilerSettings; - copy.additionalCompilerSettings = this.additionalCompilerSettings; + copy.commonCompilerArguments = this.commonCompilerArguments; + copy.k2JvmCompilerArguments = this.k2JvmCompilerArguments; + copy.k2JsCompilerArguments = this.k2JsCompilerArguments; + copy.compilerSettings = this.compilerSettings; return copy; } @@ -74,38 +74,38 @@ public class JpsKotlinCompilerSettings extends JpsElementBase 1) { @@ -141,9 +141,9 @@ public class KotlinBuilder extends ModuleLevelBuilder { File outputFile = new File(outputDir, representativeTarget.getModule().getName() + ".js"); List libraryFiles = JpsJsModuleUtils.getLibraryFilesAndDependencies(representativeTarget); - K2JSCompilerArguments k2JsSettings = JpsKotlinCompilerSettings.getK2JsSettings(project); + K2JSCompilerArguments k2JsArguments = JpsKotlinCompilerSettings.getK2JsCompilerArguments(project); - runK2JsCompiler(commonSettings, k2JsSettings, additionalSettings, messageCollector, environment, + runK2JsCompiler(commonArguments, k2JsArguments, compilerSettings, messageCollector, environment, outputItemCollector, sourceFiles, libraryFiles, outputFile); } else { @@ -161,9 +161,9 @@ public class KotlinBuilder extends ModuleLevelBuilder { return ExitCode.NOTHING_DONE; } - K2JVMCompilerArguments k2JvmSettings = JpsKotlinCompilerSettings.getK2JvmSettings(project); + K2JVMCompilerArguments k2JvmArguments = JpsKotlinCompilerSettings.getK2JvmCompilerArguments(project); - runK2JvmCompiler(commonSettings, k2JvmSettings, additionalSettings, messageCollector, environment, + runK2JvmCompiler(commonArguments, k2JvmArguments, compilerSettings, messageCollector, environment, moduleFile, outputItemCollector); } diff --git a/jps/jps-plugin/src/org/jetbrains/jet/jps/model/Kotlin2JsCompilerSettingsSerializer.java b/jps/jps-plugin/src/org/jetbrains/jet/jps/model/Kotlin2JsCompilerArgumentsSerializer.java similarity index 86% rename from jps/jps-plugin/src/org/jetbrains/jet/jps/model/Kotlin2JsCompilerSettingsSerializer.java rename to jps/jps-plugin/src/org/jetbrains/jet/jps/model/Kotlin2JsCompilerArgumentsSerializer.java index e0d061646bd..64590df88e6 100644 --- a/jps/jps-plugin/src/org/jetbrains/jet/jps/model/Kotlin2JsCompilerSettingsSerializer.java +++ b/jps/jps-plugin/src/org/jetbrains/jet/jps/model/Kotlin2JsCompilerArgumentsSerializer.java @@ -25,11 +25,11 @@ import org.jetbrains.jps.model.JpsProject; import org.jetbrains.jps.model.serialization.JpsProjectExtensionSerializer; import static org.jetbrains.jet.compiler.SettingConstants.KOTLIN_COMPILER_SETTINGS_FILE; -import static org.jetbrains.jet.compiler.SettingConstants.KOTLIN_TO_JS_COMPILER_SETTINGS_SECTION; +import static org.jetbrains.jet.compiler.SettingConstants.KOTLIN_TO_JS_COMPILER_ARGUMENTS_SECTION; -class Kotlin2JsCompilerSettingsSerializer extends JpsProjectExtensionSerializer { - Kotlin2JsCompilerSettingsSerializer() { - super(KOTLIN_COMPILER_SETTINGS_FILE, KOTLIN_TO_JS_COMPILER_SETTINGS_SECTION); +class Kotlin2JsCompilerArgumentsSerializer extends JpsProjectExtensionSerializer { + Kotlin2JsCompilerArgumentsSerializer() { + super(KOTLIN_COMPILER_SETTINGS_FILE, KOTLIN_TO_JS_COMPILER_ARGUMENTS_SECTION); } @Override @@ -39,7 +39,7 @@ class Kotlin2JsCompilerSettingsSerializer extends JpsProjectExtensionSerializer settings = new K2JSCompilerArguments(); } - JpsKotlinCompilerSettings.setK2JsSettings(project, settings); + JpsKotlinCompilerSettings.setK2JsCompilerArguments(project, settings); } @Override diff --git a/jps/jps-plugin/src/org/jetbrains/jet/jps/model/Kotlin2JvmCompilerSettingsSerializer.java b/jps/jps-plugin/src/org/jetbrains/jet/jps/model/Kotlin2JvmCompilerArgumentsSerializer.java similarity index 85% rename from jps/jps-plugin/src/org/jetbrains/jet/jps/model/Kotlin2JvmCompilerSettingsSerializer.java rename to jps/jps-plugin/src/org/jetbrains/jet/jps/model/Kotlin2JvmCompilerArgumentsSerializer.java index 8f9752b55a3..2138bbd38d5 100644 --- a/jps/jps-plugin/src/org/jetbrains/jet/jps/model/Kotlin2JvmCompilerSettingsSerializer.java +++ b/jps/jps-plugin/src/org/jetbrains/jet/jps/model/Kotlin2JvmCompilerArgumentsSerializer.java @@ -25,11 +25,11 @@ import org.jetbrains.jps.model.JpsProject; import org.jetbrains.jps.model.serialization.JpsProjectExtensionSerializer; import static org.jetbrains.jet.compiler.SettingConstants.KOTLIN_COMPILER_SETTINGS_FILE; -import static org.jetbrains.jet.compiler.SettingConstants.KOTLIN_TO_JVM_COMPILER_SETTINGS_SECTION; +import static org.jetbrains.jet.compiler.SettingConstants.KOTLIN_TO_JVM_COMPILER_ARGUMENTS_SECTION; -class Kotlin2JvmCompilerSettingsSerializer extends JpsProjectExtensionSerializer { - Kotlin2JvmCompilerSettingsSerializer() { - super(KOTLIN_COMPILER_SETTINGS_FILE, KOTLIN_TO_JVM_COMPILER_SETTINGS_SECTION); +class Kotlin2JvmCompilerArgumentsSerializer extends JpsProjectExtensionSerializer { + Kotlin2JvmCompilerArgumentsSerializer() { + super(KOTLIN_COMPILER_SETTINGS_FILE, KOTLIN_TO_JVM_COMPILER_ARGUMENTS_SECTION); } @Override @@ -39,7 +39,7 @@ class Kotlin2JvmCompilerSettingsSerializer extends JpsProjectExtensionSerializer settings = new K2JVMCompilerArguments(); } - JpsKotlinCompilerSettings.setK2JvmSettings(project, settings); + JpsKotlinCompilerSettings.setK2JvmCompilerArguments(project, settings); } @Override diff --git a/jps/jps-plugin/src/org/jetbrains/jet/jps/model/KotlinCommonCompilerSettingsSerializer.java b/jps/jps-plugin/src/org/jetbrains/jet/jps/model/KotlinCommonCompilerArgumentsSerializer.java similarity index 85% rename from jps/jps-plugin/src/org/jetbrains/jet/jps/model/KotlinCommonCompilerSettingsSerializer.java rename to jps/jps-plugin/src/org/jetbrains/jet/jps/model/KotlinCommonCompilerArgumentsSerializer.java index 4522c25792d..793f1625103 100644 --- a/jps/jps-plugin/src/org/jetbrains/jet/jps/model/KotlinCommonCompilerSettingsSerializer.java +++ b/jps/jps-plugin/src/org/jetbrains/jet/jps/model/KotlinCommonCompilerArgumentsSerializer.java @@ -24,12 +24,12 @@ import org.jetbrains.jet.jps.JpsKotlinCompilerSettings; import org.jetbrains.jps.model.JpsProject; import org.jetbrains.jps.model.serialization.JpsProjectExtensionSerializer; -import static org.jetbrains.jet.compiler.SettingConstants.KOTLIN_COMMON_COMPILER_SETTINGS_SECTION; +import static org.jetbrains.jet.compiler.SettingConstants.KOTLIN_COMMON_COMPILER_ARGUMENTS_SECTION; import static org.jetbrains.jet.compiler.SettingConstants.KOTLIN_COMPILER_SETTINGS_FILE; -class KotlinCommonCompilerSettingsSerializer extends JpsProjectExtensionSerializer { - KotlinCommonCompilerSettingsSerializer() { - super(KOTLIN_COMPILER_SETTINGS_FILE, KOTLIN_COMMON_COMPILER_SETTINGS_SECTION); +class KotlinCommonCompilerArgumentsSerializer extends JpsProjectExtensionSerializer { + KotlinCommonCompilerArgumentsSerializer() { + super(KOTLIN_COMPILER_SETTINGS_FILE, KOTLIN_COMMON_COMPILER_ARGUMENTS_SECTION); } @Override @@ -39,7 +39,7 @@ class KotlinCommonCompilerSettingsSerializer extends JpsProjectExtensionSerializ settings = new CommonCompilerArguments.DummyImpl(); } - JpsKotlinCompilerSettings.setCommonSettings(project, settings); + JpsKotlinCompilerSettings.setCommonCompilerArguments(project, settings); } @Override diff --git a/jps/jps-plugin/src/org/jetbrains/jet/jps/model/KotlinAdditionalCompilerSettingsSerializer.java b/jps/jps-plugin/src/org/jetbrains/jet/jps/model/KotlinCompilerSettingsSerializer.java similarity index 69% rename from jps/jps-plugin/src/org/jetbrains/jet/jps/model/KotlinAdditionalCompilerSettingsSerializer.java rename to jps/jps-plugin/src/org/jetbrains/jet/jps/model/KotlinCompilerSettingsSerializer.java index ccb86bae311..c49532277fc 100644 --- a/jps/jps-plugin/src/org/jetbrains/jet/jps/model/KotlinAdditionalCompilerSettingsSerializer.java +++ b/jps/jps-plugin/src/org/jetbrains/jet/jps/model/KotlinCompilerSettingsSerializer.java @@ -19,27 +19,27 @@ package org.jetbrains.jet.jps.model; import com.intellij.util.xmlb.XmlSerializer; import org.jdom.Element; import org.jetbrains.annotations.NotNull; -import org.jetbrains.jet.compiler.AdditionalCompilerSettings; +import org.jetbrains.jet.compiler.CompilerSettings; import org.jetbrains.jet.jps.JpsKotlinCompilerSettings; import org.jetbrains.jps.model.JpsProject; import org.jetbrains.jps.model.serialization.JpsProjectExtensionSerializer; -import static org.jetbrains.jet.compiler.SettingConstants.KOTLIN_ADDITIONAL_COMPILER_SETTINGS_SECTION; +import static org.jetbrains.jet.compiler.SettingConstants.KOTLIN_COMPILER_SETTINGS_SECTION; import static org.jetbrains.jet.compiler.SettingConstants.KOTLIN_COMPILER_SETTINGS_FILE; -class KotlinAdditionalCompilerSettingsSerializer extends JpsProjectExtensionSerializer { - KotlinAdditionalCompilerSettingsSerializer() { - super(KOTLIN_COMPILER_SETTINGS_FILE, KOTLIN_ADDITIONAL_COMPILER_SETTINGS_SECTION); +class KotlinCompilerSettingsSerializer extends JpsProjectExtensionSerializer { + KotlinCompilerSettingsSerializer() { + super(KOTLIN_COMPILER_SETTINGS_FILE, KOTLIN_COMPILER_SETTINGS_SECTION); } @Override public void loadExtension(@NotNull JpsProject project, @NotNull Element componentTag) { - AdditionalCompilerSettings settings = XmlSerializer.deserialize(componentTag, AdditionalCompilerSettings.class); + CompilerSettings settings = XmlSerializer.deserialize(componentTag, CompilerSettings.class); if (settings == null) { - settings = new AdditionalCompilerSettings(); + settings = new CompilerSettings(); } - JpsKotlinCompilerSettings.setAdditionalSettings(project, settings); + JpsKotlinCompilerSettings.setCompilerSettings(project, settings); } @Override diff --git a/jps/jps-plugin/src/org/jetbrains/jet/jps/model/KotlinModelSerializerService.java b/jps/jps-plugin/src/org/jetbrains/jet/jps/model/KotlinModelSerializerService.java index e7885d2f643..feef8743763 100644 --- a/jps/jps-plugin/src/org/jetbrains/jet/jps/model/KotlinModelSerializerService.java +++ b/jps/jps-plugin/src/org/jetbrains/jet/jps/model/KotlinModelSerializerService.java @@ -27,9 +27,9 @@ public class KotlinModelSerializerService extends JpsModelSerializerExtension { @NotNull @Override public List getProjectExtensionSerializers() { - return Arrays.asList(new KotlinCommonCompilerSettingsSerializer(), - new Kotlin2JvmCompilerSettingsSerializer(), - new Kotlin2JsCompilerSettingsSerializer(), - new KotlinAdditionalCompilerSettingsSerializer()); + return Arrays.asList(new KotlinCommonCompilerArgumentsSerializer(), + new Kotlin2JvmCompilerArgumentsSerializer(), + new Kotlin2JsCompilerArgumentsSerializer(), + new KotlinCompilerSettingsSerializer()); } }