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
This commit is contained in:
Zalim Bashorov
2013-10-24 13:13:17 +04:00
parent 3f4cd455e2
commit da718af8b7
18 changed files with 141 additions and 141 deletions
Download Patch File Download Diff File Expand all files Collapse all files
idea/src/META-INF/plugin.xml
+8 -8
View File
@@ -119,17 +119,17 @@
<projectService serviceInterface="org.jetbrains.jet.plugin.configuration.ModuleTypeCacheManager"
serviceImplementation="org.jetbrains.jet.plugin.configuration.ModuleTypeCacheManager"/>
<projectService serviceInterface="org.jetbrains.jet.plugin.compiler.configuration.KotlinCommonCompilerSettings"
serviceImplementation="org.jetbrains.jet.plugin.compiler.configuration.KotlinCommonCompilerSettings"/>
<projectService serviceInterface="org.jetbrains.jet.plugin.compiler.configuration.KotlinCommonCompilerArgumentsHolder"
serviceImplementation="org.jetbrains.jet.plugin.compiler.configuration.KotlinCommonCompilerArgumentsHolder"/>
<projectService serviceInterface="org.jetbrains.jet.plugin.compiler.configuration.Kotlin2JvmCompilerSettings"
serviceImplementation="org.jetbrains.jet.plugin.compiler.configuration.Kotlin2JvmCompilerSettings"/>
<projectService serviceInterface="org.jetbrains.jet.plugin.compiler.configuration.Kotlin2JvmCompilerArgumentsHolder"
serviceImplementation="org.jetbrains.jet.plugin.compiler.configuration.Kotlin2JvmCompilerArgumentsHolder"/>
<projectService serviceInterface="org.jetbrains.jet.plugin.compiler.configuration.Kotlin2JsCompilerSettings"
serviceImplementation="org.jetbrains.jet.plugin.compiler.configuration.Kotlin2JsCompilerSettings"/>
<projectService serviceInterface="org.jetbrains.jet.plugin.compiler.configuration.Kotlin2JsCompilerArgumentsHolder"
serviceImplementation="org.jetbrains.jet.plugin.compiler.configuration.Kotlin2JsCompilerArgumentsHolder"/>
<projectService serviceInterface="org.jetbrains.jet.plugin.compiler.configuration.KotlinAdditionalCompilerSettings"
serviceImplementation="org.jetbrains.jet.plugin.compiler.configuration.KotlinAdditionalCompilerSettings"/>
<projectService serviceInterface="org.jetbrains.jet.plugin.compiler.configuration.KotlinCompilerSettings"
serviceImplementation="org.jetbrains.jet.plugin.compiler.configuration.KotlinCompilerSettings"/>
<errorHandler implementation="org.jetbrains.jet.plugin.reporter.KotlinReportSubmitter"/>
idea/src/org/jetbrains/jet/plugin/compiler/JetCompiler.java
+8 -8
View File
@@ -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);
}
idea/src/org/jetbrains/jet/plugin/compiler/K2JSCompiler.java
+8 -8
View File
@@ -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()) {
idea/src/org/jetbrains/jet/plugin/compiler/configuration/Kotlin2JsCompilerSettings.java → idea/src/org/jetbrains/jet/plugin/compiler/configuration/Kotlin2JsCompilerArgumentsHolder.java
+5 -5
View File
@@ -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<K2JSCompilerArguments> {
public class Kotlin2JsCompilerArgumentsHolder extends BaseKotlinCompilerSettings<K2JSCompilerArguments> {
@NotNull
@Override
@@ -39,7 +39,7 @@ public class Kotlin2JsCompilerSettings extends BaseKotlinCompilerSettings<K2JSCo
return new K2JSCompilerArguments();
}
public static Kotlin2JsCompilerSettings getInstance(Project project) {
return ServiceManager.getService(project, Kotlin2JsCompilerSettings.class);
public static Kotlin2JsCompilerArgumentsHolder getInstance(Project project) {
return ServiceManager.getService(project, Kotlin2JsCompilerArgumentsHolder.class);
}
}
idea/src/org/jetbrains/jet/plugin/compiler/configuration/Kotlin2JvmCompilerSettings.java → idea/src/org/jetbrains/jet/plugin/compiler/configuration/Kotlin2JvmCompilerArgumentsHolder.java
+5 -5
View File
@@ -22,16 +22,16 @@ import org.jetbrains.annotations.NotNull;
import org.jetbrains.jet.cli.common.arguments.K2JVMCompilerArguments;
import static org.jetbrains.jet.compiler.SettingConstants.KOTLIN_COMPILER_SETTINGS_PATH;
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;
@State(
name = KOTLIN_TO_JVM_COMPILER_SETTINGS_SECTION,
name = KOTLIN_TO_JVM_COMPILER_ARGUMENTS_SECTION,
storages = {
@Storage(file = StoragePathMacros.PROJECT_FILE),
@Storage(file = KOTLIN_COMPILER_SETTINGS_PATH, scheme = StorageScheme.DIRECTORY_BASED)
}
)
public class Kotlin2JvmCompilerSettings extends BaseKotlinCompilerSettings<K2JVMCompilerArguments> {
public class Kotlin2JvmCompilerArgumentsHolder extends BaseKotlinCompilerSettings<K2JVMCompilerArguments> {
@NotNull
@Override
@@ -39,7 +39,7 @@ public class Kotlin2JvmCompilerSettings extends BaseKotlinCompilerSettings<K2JVM
return new K2JVMCompilerArguments();
}
public static Kotlin2JvmCompilerSettings getInstance(Project project) {
return ServiceManager.getService(project, Kotlin2JvmCompilerSettings.class);
public static Kotlin2JvmCompilerArgumentsHolder getInstance(Project project) {
return ServiceManager.getService(project, Kotlin2JvmCompilerArgumentsHolder.class);
}
}
idea/src/org/jetbrains/jet/plugin/compiler/configuration/KotlinCommonCompilerSettings.java → idea/src/org/jetbrains/jet/plugin/compiler/configuration/KotlinCommonCompilerArgumentsHolder.java
+5 -5
View File
@@ -21,17 +21,17 @@ import com.intellij.openapi.project.Project;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.jet.cli.common.arguments.CommonCompilerArguments;
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_PATH;
@State(
name = KOTLIN_COMMON_COMPILER_SETTINGS_SECTION,
name = KOTLIN_COMMON_COMPILER_ARGUMENTS_SECTION,
storages = {
@Storage(file = StoragePathMacros.PROJECT_FILE),
@Storage(file = KOTLIN_COMPILER_SETTINGS_PATH, scheme = StorageScheme.DIRECTORY_BASED)
}
)
public class KotlinCommonCompilerSettings extends BaseKotlinCompilerSettings<CommonCompilerArguments> {
public class KotlinCommonCompilerArgumentsHolder extends BaseKotlinCompilerSettings<CommonCompilerArguments> {
@NotNull
@Override
@@ -39,7 +39,7 @@ public class KotlinCommonCompilerSettings extends BaseKotlinCompilerSettings<Com
return new CommonCompilerArguments.DummyImpl();
}
public static KotlinCommonCompilerSettings getInstance(Project project) {
return ServiceManager.getService(project, KotlinCommonCompilerSettings.class);
public static KotlinCommonCompilerArgumentsHolder getInstance(Project project) {
return ServiceManager.getService(project, KotlinCommonCompilerArgumentsHolder.class);
}
}
idea/src/org/jetbrains/jet/plugin/compiler/configuration/KotlinCompilerConfigurableTab.java
+21 -21
View File
@@ -31,7 +31,7 @@ import org.jetbrains.annotations.NotNull;
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.compiler.AdditionalCompilerSettings;
import org.jetbrains.jet.compiler.CompilerSettings;
import org.jetbrains.jet.plugin.JetBundle;
import javax.swing.*;
@@ -39,9 +39,9 @@ import javax.swing.*;
import static org.jetbrains.jet.cli.common.arguments.CommonArgumentConstants.SUPPRESS_WARNINGS;
public class KotlinCompilerConfigurableTab implements SearchableConfigurable, Configurable.NoScroll{
private final CommonCompilerArguments commonCompilerSettings;
private final K2JSCompilerArguments k2jsCompilerSettings;
private final AdditionalCompilerSettings additionalCompilerSettings;
private final CommonCompilerArguments commonCompilerArguments;
private final K2JSCompilerArguments k2jsCompilerArguments;
private final CompilerSettings compilerSettings;
private final ConfigurableEP extPoint;
private JPanel contentPane;
private JCheckBox generateNoWarningsCheckBox;
@@ -55,9 +55,9 @@ public class KotlinCompilerConfigurableTab implements SearchableConfigurable, Co
public KotlinCompilerConfigurableTab(ConfigurableEP ep) {
this.extPoint = ep;
this.commonCompilerSettings = KotlinCommonCompilerSettings.getInstance(ep.getProject()).getSettings();
this.k2jsCompilerSettings = Kotlin2JsCompilerSettings.getInstance(ep.getProject()).getSettings();
this.additionalCompilerSettings = KotlinAdditionalCompilerSettings.getInstance(ep.getProject()).getSettings();
this.commonCompilerArguments = KotlinCommonCompilerArgumentsHolder.getInstance(ep.getProject()).getSettings();
this.k2jsCompilerArguments = Kotlin2JsCompilerArgumentsHolder.getInstance(ep.getProject()).getSettings();
this.compilerSettings = KotlinCompilerSettings.getInstance(ep.getProject()).getSettings();
additionalArgsOptionsField.attachLabel(additionalArgsLabel);
additionalArgsOptionsField.setDialogCaption(JetBundle.message("kotlin.compiler.option.additional.command.line.parameters.dialog.title"));
@@ -89,28 +89,28 @@ public class KotlinCompilerConfigurableTab implements SearchableConfigurable, Co
@Override
public boolean isModified() {
return ComparingUtils.isModified(generateNoWarningsCheckBox, isGenerateNoWarnings()) ||
ComparingUtils.isModified(additionalArgsOptionsField, additionalCompilerSettings.getAdditionalArguments()) ||
ComparingUtils.isModified(generateSourceMapsCheckBox, k2jsCompilerSettings.sourcemap) ||
isModified(outputPrefixFile, k2jsCompilerSettings.outputPrefix) ||
isModified(outputPostfixFile, k2jsCompilerSettings.outputPostfix);
ComparingUtils.isModified(additionalArgsOptionsField, compilerSettings.getAdditionalArguments()) ||
ComparingUtils.isModified(generateSourceMapsCheckBox, k2jsCompilerArguments.sourcemap) ||
isModified(outputPrefixFile, k2jsCompilerArguments.outputPrefix) ||
isModified(outputPostfixFile, k2jsCompilerArguments.outputPostfix);
}
@Override
public void apply() throws ConfigurationException {
setGenerateNoWarnings(generateNoWarningsCheckBox.isSelected());
additionalCompilerSettings.setAdditionalArguments(additionalArgsOptionsField.getText());
k2jsCompilerSettings.sourcemap = generateSourceMapsCheckBox.isSelected();
k2jsCompilerSettings.outputPrefix = StringUtil.nullize(outputPrefixFile.getText(), true);
k2jsCompilerSettings.outputPostfix = StringUtil.nullize(outputPostfixFile.getText(), true);
compilerSettings.setAdditionalArguments(additionalArgsOptionsField.getText());
k2jsCompilerArguments.sourcemap = generateSourceMapsCheckBox.isSelected();
k2jsCompilerArguments.outputPrefix = StringUtil.nullize(outputPrefixFile.getText(), true);
k2jsCompilerArguments.outputPostfix = StringUtil.nullize(outputPostfixFile.getText(), true);
}
@Override
public void reset() {
generateNoWarningsCheckBox.setSelected(isGenerateNoWarnings());
additionalArgsOptionsField.setText(additionalCompilerSettings.getAdditionalArguments());
generateSourceMapsCheckBox.setSelected(k2jsCompilerSettings.sourcemap);
outputPrefixFile.setText(k2jsCompilerSettings.outputPrefix);
outputPostfixFile.setText(k2jsCompilerSettings.outputPostfix);
additionalArgsOptionsField.setText(compilerSettings.getAdditionalArguments());
generateSourceMapsCheckBox.setSelected(k2jsCompilerArguments.sourcemap);
outputPrefixFile.setText(k2jsCompilerArguments.outputPrefix);
outputPostfixFile.setText(k2jsCompilerArguments.outputPostfix);
}
@Override
@@ -130,11 +130,11 @@ public class KotlinCompilerConfigurableTab implements SearchableConfigurable, Co
}
private boolean isGenerateNoWarnings() {
return commonCompilerSettings.suppressAllWarnings();
return commonCompilerArguments.suppressAllWarnings();
}
private void setGenerateNoWarnings(boolean selected) {
commonCompilerSettings.suppress = selected ? SUPPRESS_WARNINGS : null;
commonCompilerArguments.suppress = selected ? SUPPRESS_WARNINGS : null;
}
private static void setupFileChooser(
idea/src/org/jetbrains/jet/plugin/compiler/configuration/KotlinAdditionalCompilerSettings.java → idea/src/org/jetbrains/jet/plugin/compiler/configuration/KotlinCompilerSettings.java
+8 -8
View File
@@ -19,27 +19,27 @@ package org.jetbrains.jet.plugin.compiler.configuration;
import com.intellij.openapi.components.*;
import com.intellij.openapi.project.Project;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.jet.compiler.AdditionalCompilerSettings;
import org.jetbrains.jet.compiler.CompilerSettings;
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_PATH;
@State(
name = KOTLIN_ADDITIONAL_COMPILER_SETTINGS_SECTION,
name = KOTLIN_COMPILER_SETTINGS_SECTION,
storages = {
@Storage(file = StoragePathMacros.PROJECT_FILE),
@Storage(file = KOTLIN_COMPILER_SETTINGS_PATH, scheme = StorageScheme.DIRECTORY_BASED)
}
)
public class KotlinAdditionalCompilerSettings extends BaseKotlinCompilerSettings<AdditionalCompilerSettings> {
public class KotlinCompilerSettings extends BaseKotlinCompilerSettings<CompilerSettings> {
@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);
}
}