Constant for language name and several usage for this constant

This commit is contained in:
Nikolay Krasko
2012-06-06 21:28:07 +04:00
parent 58385eabd8
commit 5a22f43131
7 changed files with 16 additions and 8 deletions
@@ -43,13 +43,13 @@ public class JetFileType extends LanguageFileType {
@Override @Override
@NotNull @NotNull
public String getName() { public String getName() {
return "Kotlin"; return JetLanguage.NAME;
} }
@Override @Override
@NotNull @NotNull
public String getDescription() { public String getDescription() {
return "Kotlin"; return getName();
} }
@Override @Override
@@ -23,8 +23,14 @@ import com.intellij.lang.Language;
public class JetLanguage extends Language { public class JetLanguage extends Language {
public static JetLanguage INSTANCE = new JetLanguage(); public static JetLanguage INSTANCE = new JetLanguage();
public static String NAME = "Kotlin";
private JetLanguage() { private JetLanguage() {
super("jet"); super("jet");
} }
@Override
public String getDisplayName() {
return NAME;
}
} }
@@ -31,7 +31,7 @@ public class JetCodeStyleSettingsProvider extends CodeStyleSettingsProvider {
@Override @Override
public String getConfigurableDisplayName() { public String getConfigurableDisplayName() {
return "Kotlin"; return JetLanguage.NAME;
} }
@Override @Override
@@ -47,7 +47,7 @@ public class JetCodeStyleSettingsProvider extends CodeStyleSettingsProvider {
@NotNull @NotNull
@Override @Override
public Configurable createSettingsPage(CodeStyleSettings settings, CodeStyleSettings originalSettings) { public Configurable createSettingsPage(CodeStyleSettings settings, CodeStyleSettings originalSettings) {
return new CodeStyleAbstractConfigurable(settings, originalSettings, "Kotlin") { return new CodeStyleAbstractConfigurable(settings, originalSettings, JetLanguage.NAME) {
@Override @Override
protected CodeStyleAbstractPanel createPanel(CodeStyleSettings settings) { protected CodeStyleAbstractPanel createPanel(CodeStyleSettings settings) {
return new TabbedLanguageCodeStylePanel(JetLanguage.INSTANCE, getCurrentSettings(), settings) { return new TabbedLanguageCodeStylePanel(JetLanguage.INSTANCE, getCurrentSettings(), settings) {
@@ -69,7 +69,7 @@ public class JetLanguageCodeStyleSettingsProvider extends LanguageCodeStyleSetti
@Override @Override
public String getLanguageName() { public String getLanguageName() {
return "Kotlin"; return JetLanguage.NAME;
} }
@Override @Override
@@ -25,6 +25,7 @@ import com.intellij.openapi.options.colors.ColorSettingsPage;
import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.NotNull;
import org.jetbrains.jet.plugin.JetBundle; import org.jetbrains.jet.plugin.JetBundle;
import org.jetbrains.jet.plugin.JetIcons; import org.jetbrains.jet.plugin.JetIcons;
import org.jetbrains.jet.plugin.JetLanguage;
import javax.swing.*; import javax.swing.*;
import java.lang.reflect.Field; import java.lang.reflect.Field;
@@ -171,6 +172,6 @@ public class JetColorSettingsPage implements ColorSettingsPage {
@NotNull @NotNull
@Override @Override
public String getDisplayName() { public String getDisplayName() {
return "Kotlin"; return JetLanguage.NAME;
} }
} }
@@ -78,7 +78,7 @@ public abstract class JetTemplateContextType extends TemplateContextType {
public static class Generic extends JetTemplateContextType { public static class Generic extends JetTemplateContextType {
public Generic() { public Generic() {
super("KOTLIN", "Kotlin", EverywhereContextType.class); super("KOTLIN", JetLanguage.NAME, EverywhereContextType.class);
} }
@Override @Override
@@ -20,6 +20,7 @@ import com.intellij.execution.configurations.*;
import com.intellij.openapi.project.Project; import com.intellij.openapi.project.Project;
import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.NotNull;
import org.jetbrains.jet.plugin.JetIcons; import org.jetbrains.jet.plugin.JetIcons;
import org.jetbrains.jet.plugin.JetLanguage;
/** /**
* @author yole * @author yole
@@ -30,7 +31,7 @@ public class JetRunConfigurationType extends ConfigurationTypeBase {
} }
public JetRunConfigurationType() { public JetRunConfigurationType() {
super("JetRunConfigurationType", "Kotlin", "Kotlin", JetIcons.LAUNCH); super("JetRunConfigurationType", JetLanguage.NAME, JetLanguage.NAME, JetIcons.LAUNCH);
addFactory(new JetRunConfigurationFactory(this)); addFactory(new JetRunConfigurationFactory(this));
} }