From da718af8b7023f4d9c2670521b85c2f568a12713 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. --- ...lerSettings.java => CompilerSettings.java} | 2 +- .../jet/compiler/SettingConstants.java | 8 +-- .../compiler/runner/KotlinCompilerRunner.java | 18 +++---- idea/src/META-INF/plugin.xml | 16 +++--- .../jet/plugin/compiler/JetCompiler.java | 16 +++--- .../jet/plugin/compiler/K2JSCompiler.java | 16 +++--- ... => Kotlin2JsCompilerArgumentsHolder.java} | 10 ++-- ...=> Kotlin2JvmCompilerArgumentsHolder.java} | 10 ++-- ... KotlinCommonCompilerArgumentsHolder.java} | 10 ++-- .../KotlinCompilerConfigurableTab.java | 42 ++++++++-------- ...tings.java => KotlinCompilerSettings.java} | 16 +++--- .../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 +-- 18 files changed, 141 insertions(+), 141 deletions(-) rename ide-compiler-runner/src/org/jetbrains/jet/compiler/{AdditionalCompilerSettings.java => CompilerSettings.java} (96%) rename idea/src/org/jetbrains/jet/plugin/compiler/configuration/{Kotlin2JsCompilerSettings.java => Kotlin2JsCompilerArgumentsHolder.java} (82%) rename idea/src/org/jetbrains/jet/plugin/compiler/configuration/{Kotlin2JvmCompilerSettings.java => Kotlin2JvmCompilerArgumentsHolder.java} (82%) rename idea/src/org/jetbrains/jet/plugin/compiler/configuration/{KotlinCommonCompilerSettings.java => KotlinCommonCompilerArgumentsHolder.java} (81%) rename idea/src/org/jetbrains/jet/plugin/compiler/configuration/{KotlinAdditionalCompilerSettings.java => KotlinCompilerSettings.java} (68%) rename jps-plugin/src/org/jetbrains/jet/jps/model/{Kotlin2JsCompilerSettingsSerializer.java => Kotlin2JsCompilerArgumentsSerializer.java} (86%) rename jps-plugin/src/org/jetbrains/jet/jps/model/{Kotlin2JvmCompilerSettingsSerializer.java => Kotlin2JvmCompilerArgumentsSerializer.java} (85%) rename jps-plugin/src/org/jetbrains/jet/jps/model/{KotlinCommonCompilerSettingsSerializer.java => KotlinCommonCompilerArgumentsSerializer.java} (85%) rename jps-plugin/src/org/jetbrains/jet/jps/model/{KotlinAdditionalCompilerSettingsSerializer.java => KotlinCompilerSettingsSerializer.java} (69%) diff --git a/ide-compiler-runner/src/org/jetbrains/jet/compiler/AdditionalCompilerSettings.java b/ide-compiler-runner/src/org/jetbrains/jet/compiler/CompilerSettings.java similarity index 96% rename from ide-compiler-runner/src/org/jetbrains/jet/compiler/AdditionalCompilerSettings.java rename to ide-compiler-runner/src/org/jetbrains/jet/compiler/CompilerSettings.java index dcd2745926a..79a93274eb7 100644 --- a/ide-compiler-runner/src/org/jetbrains/jet/compiler/AdditionalCompilerSettings.java +++ b/ide-compiler-runner/src/org/jetbrains/jet/compiler/CompilerSettings.java @@ -18,7 +18,7 @@ package org.jetbrains.jet.compiler; import org.jetbrains.annotations.NotNull; -public class AdditionalCompilerSettings { +public class CompilerSettings { private static final String DEFAULT_ADDITIONAL_ARGUMENTS = "-version -printArgs"; @NotNull diff --git a/ide-compiler-runner/src/org/jetbrains/jet/compiler/SettingConstants.java b/ide-compiler-runner/src/org/jetbrains/jet/compiler/SettingConstants.java index b3ca7376a9e..afac67c74cb 100644 --- a/ide-compiler-runner/src/org/jetbrains/jet/compiler/SettingConstants.java +++ b/ide-compiler-runner/src/org/jetbrains/jet/compiler/SettingConstants.java @@ -21,10 +21,10 @@ import static com.intellij.openapi.components.StoragePathMacros.PROJECT_CONFIG_D public class SettingConstants { private SettingConstants() {} - public static final String KOTLIN_COMMON_COMPILER_SETTINGS_SECTION = "KotlinCommonCompilerSettings"; - public static final String KOTLIN_TO_JS_COMPILER_SETTINGS_SECTION = "Kotlin2JsCompilerSettings"; - public static final String KOTLIN_TO_JVM_COMPILER_SETTINGS_SECTION = "Kotlin2JvmCompilerSettings"; - public static final String KOTLIN_ADDITIONAL_COMPILER_SETTINGS_SECTION = "KotlinAdditionalCompilerSettings"; + public static final String KOTLIN_COMMON_COMPILER_ARGUMENTS_SECTION = "KotlinCommonCompilerArguments"; + public static final String KOTLIN_TO_JS_COMPILER_ARGUMENTS_SECTION = "Kotlin2JsCompilerArguments"; + public static final String KOTLIN_TO_JVM_COMPILER_ARGUMENTS_SECTION = "Kotlin2JvmCompilerArguments"; + public static final String KOTLIN_COMPILER_SETTINGS_SECTION = "KotlinCompilerSettings"; public static final String KOTLIN_COMPILER_SETTINGS_FILE = "kotlinc.xml"; public static final String KOTLIN_COMPILER_SETTINGS_PATH = PROJECT_CONFIG_DIR + "/" + KOTLIN_COMPILER_SETTINGS_FILE; diff --git a/ide-compiler-runner/src/org/jetbrains/jet/compiler/runner/KotlinCompilerRunner.java b/ide-compiler-runner/src/org/jetbrains/jet/compiler/runner/KotlinCompilerRunner.java index 06a1011079c..fea7d88b883 100644 --- a/ide-compiler-runner/src/org/jetbrains/jet/compiler/runner/KotlinCompilerRunner.java +++ b/ide-compiler-runner/src/org/jetbrains/jet/compiler/runner/KotlinCompilerRunner.java @@ -30,7 +30,7 @@ import org.jetbrains.jet.cli.common.messages.CompilerMessageLocation; import org.jetbrains.jet.cli.common.messages.CompilerMessageSeverity; import org.jetbrains.jet.cli.common.messages.MessageCollector; import org.jetbrains.jet.cli.common.messages.MessageCollectorUtil; -import org.jetbrains.jet.compiler.AdditionalCompilerSettings; +import org.jetbrains.jet.compiler.CompilerSettings; import java.io.File; import java.io.PrintStream; @@ -45,23 +45,23 @@ public class KotlinCompilerRunner { public static void runK2JvmCompiler( CommonCompilerArguments commonArguments, K2JVMCompilerArguments k2jvmArguments, - AdditionalCompilerSettings additionalSettings, + CompilerSettings compilerSettings, MessageCollector messageCollector, CompilerEnvironment environment, File moduleFile, OutputItemsCollector collector ) { K2JVMCompilerArguments arguments = mergeBeans(commonArguments, k2jvmArguments); - setupK2JvmSettings(moduleFile, arguments); + setupK2JvmArguments(moduleFile, arguments); - runCompiler(K2JVM_COMPILER, arguments, additionalSettings.getAdditionalArguments(), + runCompiler(K2JVM_COMPILER, arguments, compilerSettings.getAdditionalArguments(), DEFAULT_K2JVM_ARGUMENTS, messageCollector, collector, environment); } public static void runK2JsCompiler( CommonCompilerArguments commonArguments, K2JSCompilerArguments k2jsArguments, - AdditionalCompilerSettings additionalSettings, + CompilerSettings compilerSettings, MessageCollector messageCollector, CompilerEnvironment environment, OutputItemsCollector collector, @@ -70,9 +70,9 @@ public class KotlinCompilerRunner { File outputFile ) { K2JSCompilerArguments arguments = mergeBeans(commonArguments, k2jsArguments); - setupK2JsSettings(outputFile, sourceFiles, libraryFiles, arguments); + setupK2JsArguments(outputFile, sourceFiles, libraryFiles, arguments); - runCompiler(K2JS_COMPILER, arguments, additionalSettings.getAdditionalArguments(), + runCompiler(K2JS_COMPILER, arguments, compilerSettings.getAdditionalArguments(), DEFAULT_K2JS_ARGUMENTS, messageCollector, collector, environment); } @@ -135,7 +135,7 @@ public class KotlinCompilerRunner { settings.verbose = true; } - private static void setupK2JvmSettings( + private static void setupK2JvmArguments( File moduleFile, K2JVMCompilerArguments settings ) { @@ -149,7 +149,7 @@ public class KotlinCompilerRunner { settings.noJdk = true; } - private static void setupK2JsSettings( + private static void setupK2JsArguments( File outputFile, List sourceFiles, List libraryFiles, diff --git a/idea/src/META-INF/plugin.xml b/idea/src/META-INF/plugin.xml index c92c1bd07bb..cb73ddb93d4 100644 --- a/idea/src/META-INF/plugin.xml +++ b/idea/src/META-INF/plugin.xml @@ -119,17 +119,17 @@ - + - + - + - + diff --git a/idea/src/org/jetbrains/jet/plugin/compiler/JetCompiler.java b/idea/src/org/jetbrains/jet/plugin/compiler/JetCompiler.java index 266bafeb303..72d25e37fc3 100644 --- a/idea/src/org/jetbrains/jet/plugin/compiler/JetCompiler.java +++ b/idea/src/org/jetbrains/jet/plugin/compiler/JetCompiler.java @@ -35,12 +35,12 @@ import org.jetbrains.annotations.NotNull; import org.jetbrains.jet.cli.common.arguments.CommonCompilerArguments; import org.jetbrains.jet.cli.common.arguments.K2JVMCompilerArguments; import org.jetbrains.jet.cli.common.messages.MessageCollector; -import org.jetbrains.jet.compiler.AdditionalCompilerSettings; +import org.jetbrains.jet.compiler.CompilerSettings; import org.jetbrains.jet.compiler.runner.*; import org.jetbrains.jet.plugin.JetFileType; -import org.jetbrains.jet.plugin.compiler.configuration.Kotlin2JvmCompilerSettings; -import org.jetbrains.jet.plugin.compiler.configuration.KotlinAdditionalCompilerSettings; -import org.jetbrains.jet.plugin.compiler.configuration.KotlinCommonCompilerSettings; +import org.jetbrains.jet.plugin.compiler.configuration.Kotlin2JvmCompilerArgumentsHolder; +import org.jetbrains.jet.plugin.compiler.configuration.KotlinCommonCompilerArgumentsHolder; +import org.jetbrains.jet.plugin.compiler.configuration.KotlinCompilerSettings; import org.jetbrains.jet.plugin.framework.KotlinFrameworkDetector; import java.io.File; @@ -142,11 +142,11 @@ public class JetCompiler implements TranslatingCompiler { File scriptFile, OutputItemsCollector outputItemsCollector ) { - CommonCompilerArguments commonArguments = KotlinCommonCompilerSettings.getInstance(project).getSettings(); - K2JVMCompilerArguments k2jvmArguments = Kotlin2JvmCompilerSettings.getInstance(project).getSettings(); - AdditionalCompilerSettings additionalSettings = KotlinAdditionalCompilerSettings.getInstance(project).getSettings(); + CommonCompilerArguments commonArguments = KotlinCommonCompilerArgumentsHolder.getInstance(project).getSettings(); + K2JVMCompilerArguments k2jvmArguments = Kotlin2JvmCompilerArgumentsHolder.getInstance(project).getSettings(); + CompilerSettings compilerSettings = KotlinCompilerSettings.getInstance(project).getSettings(); - KotlinCompilerRunner.runK2JvmCompiler(commonArguments, k2jvmArguments, additionalSettings, + KotlinCompilerRunner.runK2JvmCompiler(commonArguments, k2jvmArguments, compilerSettings, messageCollector, environment, scriptFile, outputItemsCollector); } diff --git a/idea/src/org/jetbrains/jet/plugin/compiler/K2JSCompiler.java b/idea/src/org/jetbrains/jet/plugin/compiler/K2JSCompiler.java index 040d2c43cab..73d2ac41c67 100644 --- a/idea/src/org/jetbrains/jet/plugin/compiler/K2JSCompiler.java +++ b/idea/src/org/jetbrains/jet/plugin/compiler/K2JSCompiler.java @@ -34,14 +34,14 @@ import org.jetbrains.annotations.Nullable; import org.jetbrains.jet.cli.common.arguments.CommonCompilerArguments; import org.jetbrains.jet.cli.common.arguments.K2JSCompilerArguments; import org.jetbrains.jet.cli.common.messages.MessageCollector; -import org.jetbrains.jet.compiler.AdditionalCompilerSettings; +import org.jetbrains.jet.compiler.CompilerSettings; import org.jetbrains.jet.compiler.runner.CompilerEnvironment; import org.jetbrains.jet.compiler.runner.KotlinCompilerRunner; import org.jetbrains.jet.compiler.runner.OutputItemsCollectorImpl; import org.jetbrains.jet.plugin.JetFileType; -import org.jetbrains.jet.plugin.compiler.configuration.Kotlin2JsCompilerSettings; -import org.jetbrains.jet.plugin.compiler.configuration.KotlinAdditionalCompilerSettings; -import org.jetbrains.jet.plugin.compiler.configuration.KotlinCommonCompilerSettings; +import org.jetbrains.jet.plugin.compiler.configuration.Kotlin2JsCompilerArgumentsHolder; +import org.jetbrains.jet.plugin.compiler.configuration.KotlinCommonCompilerArgumentsHolder; +import org.jetbrains.jet.plugin.compiler.configuration.KotlinCompilerSettings; import org.jetbrains.jet.plugin.framework.KotlinFrameworkDetector; import java.io.File; @@ -101,11 +101,11 @@ public final class K2JSCompiler implements TranslatingCompiler { OutputItemsCollectorImpl outputItemsCollector = new OutputItemsCollectorImpl(); Project project = module.getProject(); - CommonCompilerArguments commonArguments = KotlinCommonCompilerSettings.getInstance(project).getSettings(); - K2JSCompilerArguments k2jsArguments = Kotlin2JsCompilerSettings.getInstance(project).getSettings(); - AdditionalCompilerSettings additionalSettings = KotlinAdditionalCompilerSettings.getInstance(project).getSettings(); + CommonCompilerArguments commonArguments = KotlinCommonCompilerArgumentsHolder.getInstance(project).getSettings(); + K2JSCompilerArguments k2jsArguments = Kotlin2JsCompilerArgumentsHolder.getInstance(project).getSettings(); + CompilerSettings compilerSettings = KotlinCompilerSettings.getInstance(project).getSettings(); - KotlinCompilerRunner.runK2JsCompiler(commonArguments, k2jsArguments, additionalSettings, messageCollector, environment, + KotlinCompilerRunner.runK2JsCompiler(commonArguments, k2jsArguments, compilerSettings, messageCollector, environment, outputItemsCollector, srcFiles, libraryFiles, outFile); if (!ApplicationManager.getApplication().isUnitTestMode()) { diff --git a/idea/src/org/jetbrains/jet/plugin/compiler/configuration/Kotlin2JsCompilerSettings.java b/idea/src/org/jetbrains/jet/plugin/compiler/configuration/Kotlin2JsCompilerArgumentsHolder.java similarity index 82% rename from idea/src/org/jetbrains/jet/plugin/compiler/configuration/Kotlin2JsCompilerSettings.java rename to idea/src/org/jetbrains/jet/plugin/compiler/configuration/Kotlin2JsCompilerArgumentsHolder.java index 57435be338d..cb4220b9417 100644 --- a/idea/src/org/jetbrains/jet/plugin/compiler/configuration/Kotlin2JsCompilerSettings.java +++ b/idea/src/org/jetbrains/jet/plugin/compiler/configuration/Kotlin2JsCompilerArgumentsHolder.java @@ -22,16 +22,16 @@ import org.jetbrains.annotations.NotNull; import org.jetbrains.jet.cli.common.arguments.K2JSCompilerArguments; import static org.jetbrains.jet.compiler.SettingConstants.KOTLIN_COMPILER_SETTINGS_PATH; -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; @State( - name = KOTLIN_TO_JS_COMPILER_SETTINGS_SECTION, + name = KOTLIN_TO_JS_COMPILER_ARGUMENTS_SECTION, storages = { @Storage(file = StoragePathMacros.PROJECT_FILE), @Storage(file = KOTLIN_COMPILER_SETTINGS_PATH, scheme = StorageScheme.DIRECTORY_BASED) } ) -public class Kotlin2JsCompilerSettings extends BaseKotlinCompilerSettings { +public class Kotlin2JsCompilerArgumentsHolder extends BaseKotlinCompilerSettings { @NotNull @Override @@ -39,7 +39,7 @@ public class Kotlin2JsCompilerSettings extends BaseKotlinCompilerSettings { +public class Kotlin2JvmCompilerArgumentsHolder extends BaseKotlinCompilerSettings { @NotNull @Override @@ -39,7 +39,7 @@ public class Kotlin2JvmCompilerSettings extends BaseKotlinCompilerSettings { +public class KotlinCommonCompilerArgumentsHolder extends BaseKotlinCompilerSettings { @NotNull @Override @@ -39,7 +39,7 @@ public class KotlinCommonCompilerSettings extends BaseKotlinCompilerSettings { +public class KotlinCompilerSettings extends BaseKotlinCompilerSettings { @NotNull @Override - protected AdditionalCompilerSettings createSettings() { - return new AdditionalCompilerSettings(); + protected CompilerSettings createSettings() { + return new CompilerSettings(); } - public static KotlinAdditionalCompilerSettings getInstance(Project project) { - return ServiceManager.getService(project, KotlinAdditionalCompilerSettings.class); + public static KotlinCompilerSettings getInstance(Project project) { + return ServiceManager.getService(project, KotlinCompilerSettings.class); } } diff --git a/jps-plugin/src/org/jetbrains/jet/jps/JpsKotlinCompilerSettings.java b/jps-plugin/src/org/jetbrains/jet/jps/JpsKotlinCompilerSettings.java index bdf56d787b0..e22c1971769 100644 --- a/jps-plugin/src/org/jetbrains/jet/jps/JpsKotlinCompilerSettings.java +++ b/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-plugin/src/org/jetbrains/jet/jps/model/Kotlin2JsCompilerSettingsSerializer.java b/jps-plugin/src/org/jetbrains/jet/jps/model/Kotlin2JsCompilerArgumentsSerializer.java similarity index 86% rename from jps-plugin/src/org/jetbrains/jet/jps/model/Kotlin2JsCompilerSettingsSerializer.java rename to jps-plugin/src/org/jetbrains/jet/jps/model/Kotlin2JsCompilerArgumentsSerializer.java index e0d061646bd..64590df88e6 100644 --- a/jps-plugin/src/org/jetbrains/jet/jps/model/Kotlin2JsCompilerSettingsSerializer.java +++ b/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-plugin/src/org/jetbrains/jet/jps/model/Kotlin2JvmCompilerSettingsSerializer.java b/jps-plugin/src/org/jetbrains/jet/jps/model/Kotlin2JvmCompilerArgumentsSerializer.java similarity index 85% rename from jps-plugin/src/org/jetbrains/jet/jps/model/Kotlin2JvmCompilerSettingsSerializer.java rename to jps-plugin/src/org/jetbrains/jet/jps/model/Kotlin2JvmCompilerArgumentsSerializer.java index 8f9752b55a3..2138bbd38d5 100644 --- a/jps-plugin/src/org/jetbrains/jet/jps/model/Kotlin2JvmCompilerSettingsSerializer.java +++ b/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-plugin/src/org/jetbrains/jet/jps/model/KotlinCommonCompilerSettingsSerializer.java b/jps-plugin/src/org/jetbrains/jet/jps/model/KotlinCommonCompilerArgumentsSerializer.java similarity index 85% rename from jps-plugin/src/org/jetbrains/jet/jps/model/KotlinCommonCompilerSettingsSerializer.java rename to jps-plugin/src/org/jetbrains/jet/jps/model/KotlinCommonCompilerArgumentsSerializer.java index 4522c25792d..793f1625103 100644 --- a/jps-plugin/src/org/jetbrains/jet/jps/model/KotlinCommonCompilerSettingsSerializer.java +++ b/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-plugin/src/org/jetbrains/jet/jps/model/KotlinAdditionalCompilerSettingsSerializer.java b/jps-plugin/src/org/jetbrains/jet/jps/model/KotlinCompilerSettingsSerializer.java similarity index 69% rename from jps-plugin/src/org/jetbrains/jet/jps/model/KotlinAdditionalCompilerSettingsSerializer.java rename to jps-plugin/src/org/jetbrains/jet/jps/model/KotlinCompilerSettingsSerializer.java index ccb86bae311..c49532277fc 100644 --- a/jps-plugin/src/org/jetbrains/jet/jps/model/KotlinAdditionalCompilerSettingsSerializer.java +++ b/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-plugin/src/org/jetbrains/jet/jps/model/KotlinModelSerializerService.java b/jps-plugin/src/org/jetbrains/jet/jps/model/KotlinModelSerializerService.java index e7885d2f643..feef8743763 100644 --- a/jps-plugin/src/org/jetbrains/jet/jps/model/KotlinModelSerializerService.java +++ b/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()); } }