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

Minor refactoring -- rename some classes and variables.

Browse Source 
Original commit: da718af8b7
This commit is contained in:
Zalim Bashorov
2013-10-24 13:13:17 +04:00
parent 39172ceed6
commit 8489012277
7 changed files with 59 additions and 59 deletions
Download Patch File Download Diff File Expand all files Collapse all files
jps/jps-plugin/src/org/jetbrains/jet/jps/JpsKotlinCompilerSettings.java
+25 -25
View File
@@ -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<JpsKotlinCompilerS
static final JpsElementChildRole<JpsKotlinCompilerSettings> 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<JpsKotlinCompilerS
}
@NotNull
public static CommonCompilerArguments getCommonSettings(@NotNull JpsProject project) {
return getSettings(project).commonCompilerSettings;
public static CommonCompilerArguments getCommonCompilerArguments(@NotNull JpsProject project) {
return getSettings(project).commonCompilerArguments;
}
public static void setCommonSettings(@NotNull JpsProject project, @NotNull CommonCompilerArguments commonCompilerSettings) {
getOrCreateSettings(project).commonCompilerSettings = commonCompilerSettings;
public static void setCommonCompilerArguments(@NotNull JpsProject project, @NotNull CommonCompilerArguments commonCompilerSettings) {
getOrCreateSettings(project).commonCompilerArguments = commonCompilerSettings;
}
@NotNull
public static K2JVMCompilerArguments getK2JvmSettings(@NotNull JpsProject project) {
return getSettings(project).k2JvmCompilerSettings;
public static K2JVMCompilerArguments getK2JvmCompilerArguments(@NotNull JpsProject project) {
return getSettings(project).k2JvmCompilerArguments;
}
public static void setK2JvmSettings(@NotNull JpsProject project, @NotNull K2JVMCompilerArguments k2JvmCompilerSettings) {
getOrCreateSettings(project).k2JvmCompilerSettings = k2JvmCompilerSettings;
public static void setK2JvmCompilerArguments(@NotNull JpsProject project, @NotNull K2JVMCompilerArguments k2JvmCompilerArguments) {
getOrCreateSettings(project).k2JvmCompilerArguments = k2JvmCompilerArguments;
}
@NotNull
public static K2JSCompilerArguments getK2JsSettings(@NotNull JpsProject project) {
return getSettings(project).k2JsCompilerSettings;
public static K2JSCompilerArguments getK2JsCompilerArguments(@NotNull JpsProject project) {
return getSettings(project).k2JsCompilerArguments;
}
public static void setK2JsSettings(@NotNull JpsProject project, @NotNull K2JSCompilerArguments k2JsCompilerSettings) {
getOrCreateSettings(project).k2JsCompilerSettings = k2JsCompilerSettings;
public static void setK2JsCompilerArguments(@NotNull JpsProject project, @NotNull K2JSCompilerArguments k2JsCompilerArguments) {
getOrCreateSettings(project).k2JsCompilerArguments = k2JsCompilerArguments;
}
@NotNull
public static AdditionalCompilerSettings getAdditionalSettings(@NotNull JpsProject project) {
return getSettings(project).additionalCompilerSettings;
public static CompilerSettings getCompilerSettings(@NotNull JpsProject project) {
return getSettings(project).compilerSettings;
}
public static void setAdditionalSettings(@NotNull JpsProject project, @NotNull AdditionalCompilerSettings additionalCompilerSettings) {
getOrCreateSettings(project).additionalCompilerSettings = additionalCompilerSettings;
public static void setCompilerSettings(@NotNull JpsProject project, @NotNull CompilerSettings compilerSettings) {
getOrCreateSettings(project).compilerSettings = compilerSettings;
}
}
jps/jps-plugin/src/org/jetbrains/jet/jps/build/KotlinBuilder.java
+7 -7
View File
@@ -27,7 +27,7 @@ import org.jetbrains.jet.cli.common.arguments.K2JVMCompilerArguments;
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.compiler.AdditionalCompilerSettings;
import org.jetbrains.jet.compiler.CompilerSettings;
import org.jetbrains.jet.compiler.runner.CompilerEnvironment;
import org.jetbrains.jet.compiler.runner.CompilerRunnerConstants;
import org.jetbrains.jet.compiler.runner.OutputItemsCollectorImpl;
@@ -117,8 +117,8 @@ public class KotlinBuilder extends ModuleLevelBuilder {
OutputItemsCollectorImpl outputItemCollector = new OutputItemsCollectorImpl();
JpsProject project = representativeTarget.getModule().getProject();
CommonCompilerArguments commonSettings = JpsKotlinCompilerSettings.getCommonSettings(project);
AdditionalCompilerSettings additionalSettings = JpsKotlinCompilerSettings.getAdditionalSettings(project);
CommonCompilerArguments commonArguments = JpsKotlinCompilerSettings.getCommonCompilerArguments(project);
CompilerSettings compilerSettings = JpsKotlinCompilerSettings.getCompilerSettings(project);
if (JpsUtils.isJsKotlinModule(representativeTarget)) {
if (chunk.getModules().size() > 1) {
@@ -141,9 +141,9 @@ public class KotlinBuilder extends ModuleLevelBuilder {
File outputFile = new File(outputDir, representativeTarget.getModule().getName() + ".js");
List<String> 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);
}
jps/jps-plugin/src/org/jetbrains/jet/jps/model/Kotlin2JsCompilerSettingsSerializer.java → jps/jps-plugin/src/org/jetbrains/jet/jps/model/Kotlin2JsCompilerArgumentsSerializer.java
+5 -5
View File
@@ -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
jps/jps-plugin/src/org/jetbrains/jet/jps/model/Kotlin2JvmCompilerSettingsSerializer.java → jps/jps-plugin/src/org/jetbrains/jet/jps/model/Kotlin2JvmCompilerArgumentsSerializer.java
+5 -5
View File
@@ -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
jps/jps-plugin/src/org/jetbrains/jet/jps/model/KotlinCommonCompilerSettingsSerializer.java → jps/jps-plugin/src/org/jetbrains/jet/jps/model/KotlinCommonCompilerArgumentsSerializer.java
+5 -5
View File
@@ -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
jps/jps-plugin/src/org/jetbrains/jet/jps/model/KotlinAdditionalCompilerSettingsSerializer.java → jps/jps-plugin/src/org/jetbrains/jet/jps/model/KotlinCompilerSettingsSerializer.java
+8 -8
View File
@@ -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
jps/jps-plugin/src/org/jetbrains/jet/jps/model/KotlinModelSerializerService.java
+4 -4
View File
@@ -27,9 +27,9 @@ public class KotlinModelSerializerService extends JpsModelSerializerExtension {
@NotNull
@Override
public List<? extends JpsProjectExtensionSerializer> getProjectExtensionSerializers() {
return Arrays.asList(new KotlinCommonCompilerSettingsSerializer(),
new Kotlin2JvmCompilerSettingsSerializer(),
new Kotlin2JsCompilerSettingsSerializer(),
new KotlinAdditionalCompilerSettingsSerializer());
return Arrays.asList(new KotlinCommonCompilerArgumentsSerializer(),
new Kotlin2JvmCompilerArgumentsSerializer(),
new Kotlin2JsCompilerArgumentsSerializer(),
new KotlinCompilerSettingsSerializer());
}
}