From 5a22f431315a4b7d8e1c549e474060658db9ca96 Mon Sep 17 00:00:00 2001 From: Nikolay Krasko Date: Wed, 6 Jun 2012 21:28:07 +0400 Subject: [PATCH] Constant for language name and several usage for this constant --- .../frontend/src/org/jetbrains/jet/plugin/JetFileType.java | 4 ++-- .../frontend/src/org/jetbrains/jet/plugin/JetLanguage.java | 6 ++++++ .../jet/plugin/formatter/JetCodeStyleSettingsProvider.java | 4 ++-- .../formatter/JetLanguageCodeStyleSettingsProvider.java | 2 +- .../jet/plugin/highlighter/JetColorSettingsPage.java | 3 ++- .../jet/plugin/liveTemplates/JetTemplateContextType.java | 2 +- .../jetbrains/jet/plugin/run/JetRunConfigurationType.java | 3 ++- 7 files changed, 16 insertions(+), 8 deletions(-) diff --git a/compiler/frontend/src/org/jetbrains/jet/plugin/JetFileType.java b/compiler/frontend/src/org/jetbrains/jet/plugin/JetFileType.java index 0acd69cf4c0..e16b7009fa3 100644 --- a/compiler/frontend/src/org/jetbrains/jet/plugin/JetFileType.java +++ b/compiler/frontend/src/org/jetbrains/jet/plugin/JetFileType.java @@ -43,13 +43,13 @@ public class JetFileType extends LanguageFileType { @Override @NotNull public String getName() { - return "Kotlin"; + return JetLanguage.NAME; } @Override @NotNull public String getDescription() { - return "Kotlin"; + return getName(); } @Override diff --git a/compiler/frontend/src/org/jetbrains/jet/plugin/JetLanguage.java b/compiler/frontend/src/org/jetbrains/jet/plugin/JetLanguage.java index 0992c45f8c1..fa5b04b30f6 100644 --- a/compiler/frontend/src/org/jetbrains/jet/plugin/JetLanguage.java +++ b/compiler/frontend/src/org/jetbrains/jet/plugin/JetLanguage.java @@ -23,8 +23,14 @@ import com.intellij.lang.Language; public class JetLanguage extends Language { public static JetLanguage INSTANCE = new JetLanguage(); + public static String NAME = "Kotlin"; private JetLanguage() { super("jet"); } + + @Override + public String getDisplayName() { + return NAME; + } } diff --git a/idea/src/org/jetbrains/jet/plugin/formatter/JetCodeStyleSettingsProvider.java b/idea/src/org/jetbrains/jet/plugin/formatter/JetCodeStyleSettingsProvider.java index 1b3a9404431..af0992657f8 100644 --- a/idea/src/org/jetbrains/jet/plugin/formatter/JetCodeStyleSettingsProvider.java +++ b/idea/src/org/jetbrains/jet/plugin/formatter/JetCodeStyleSettingsProvider.java @@ -31,7 +31,7 @@ public class JetCodeStyleSettingsProvider extends CodeStyleSettingsProvider { @Override public String getConfigurableDisplayName() { - return "Kotlin"; + return JetLanguage.NAME; } @Override @@ -47,7 +47,7 @@ public class JetCodeStyleSettingsProvider extends CodeStyleSettingsProvider { @NotNull @Override public Configurable createSettingsPage(CodeStyleSettings settings, CodeStyleSettings originalSettings) { - return new CodeStyleAbstractConfigurable(settings, originalSettings, "Kotlin") { + return new CodeStyleAbstractConfigurable(settings, originalSettings, JetLanguage.NAME) { @Override protected CodeStyleAbstractPanel createPanel(CodeStyleSettings settings) { return new TabbedLanguageCodeStylePanel(JetLanguage.INSTANCE, getCurrentSettings(), settings) { diff --git a/idea/src/org/jetbrains/jet/plugin/formatter/JetLanguageCodeStyleSettingsProvider.java b/idea/src/org/jetbrains/jet/plugin/formatter/JetLanguageCodeStyleSettingsProvider.java index 13933b9f249..7ead5318fc8 100644 --- a/idea/src/org/jetbrains/jet/plugin/formatter/JetLanguageCodeStyleSettingsProvider.java +++ b/idea/src/org/jetbrains/jet/plugin/formatter/JetLanguageCodeStyleSettingsProvider.java @@ -69,7 +69,7 @@ public class JetLanguageCodeStyleSettingsProvider extends LanguageCodeStyleSetti @Override public String getLanguageName() { - return "Kotlin"; + return JetLanguage.NAME; } @Override diff --git a/idea/src/org/jetbrains/jet/plugin/highlighter/JetColorSettingsPage.java b/idea/src/org/jetbrains/jet/plugin/highlighter/JetColorSettingsPage.java index 318d5dfa3f1..9bd425eb310 100644 --- a/idea/src/org/jetbrains/jet/plugin/highlighter/JetColorSettingsPage.java +++ b/idea/src/org/jetbrains/jet/plugin/highlighter/JetColorSettingsPage.java @@ -25,6 +25,7 @@ import com.intellij.openapi.options.colors.ColorSettingsPage; import org.jetbrains.annotations.NotNull; import org.jetbrains.jet.plugin.JetBundle; import org.jetbrains.jet.plugin.JetIcons; +import org.jetbrains.jet.plugin.JetLanguage; import javax.swing.*; import java.lang.reflect.Field; @@ -171,6 +172,6 @@ public class JetColorSettingsPage implements ColorSettingsPage { @NotNull @Override public String getDisplayName() { - return "Kotlin"; + return JetLanguage.NAME; } } diff --git a/idea/src/org/jetbrains/jet/plugin/liveTemplates/JetTemplateContextType.java b/idea/src/org/jetbrains/jet/plugin/liveTemplates/JetTemplateContextType.java index 1b94eba28c9..66e9f2e82e6 100644 --- a/idea/src/org/jetbrains/jet/plugin/liveTemplates/JetTemplateContextType.java +++ b/idea/src/org/jetbrains/jet/plugin/liveTemplates/JetTemplateContextType.java @@ -78,7 +78,7 @@ public abstract class JetTemplateContextType extends TemplateContextType { public static class Generic extends JetTemplateContextType { public Generic() { - super("KOTLIN", "Kotlin", EverywhereContextType.class); + super("KOTLIN", JetLanguage.NAME, EverywhereContextType.class); } @Override diff --git a/idea/src/org/jetbrains/jet/plugin/run/JetRunConfigurationType.java b/idea/src/org/jetbrains/jet/plugin/run/JetRunConfigurationType.java index 8d08fb898b5..b4f6cf67644 100644 --- a/idea/src/org/jetbrains/jet/plugin/run/JetRunConfigurationType.java +++ b/idea/src/org/jetbrains/jet/plugin/run/JetRunConfigurationType.java @@ -20,6 +20,7 @@ import com.intellij.execution.configurations.*; import com.intellij.openapi.project.Project; import org.jetbrains.annotations.NotNull; import org.jetbrains.jet.plugin.JetIcons; +import org.jetbrains.jet.plugin.JetLanguage; /** * @author yole @@ -30,7 +31,7 @@ public class JetRunConfigurationType extends ConfigurationTypeBase { } public JetRunConfigurationType() { - super("JetRunConfigurationType", "Kotlin", "Kotlin", JetIcons.LAUNCH); + super("JetRunConfigurationType", JetLanguage.NAME, JetLanguage.NAME, JetIcons.LAUNCH); addFactory(new JetRunConfigurationFactory(this)); }