From 8669a75914056ec57cd4d1ecdba44862a2333eb9 Mon Sep 17 00:00:00 2001 From: Roman Shein Date: Thu, 6 Feb 2014 15:58:08 +0400 Subject: [PATCH] Arrangement tokens creation patch. --- .../std/StdArrangementSettingsToken.java | 30 ++++++++++++++----- .../arrangement/std/StdArrangementTokens.java | 4 +-- 2 files changed, 25 insertions(+), 9 deletions(-) diff --git a/platform/lang-api/src/com/intellij/psi/codeStyle/arrangement/std/StdArrangementSettingsToken.java b/platform/lang-api/src/com/intellij/psi/codeStyle/arrangement/std/StdArrangementSettingsToken.java index 06e2c781611e..d6503f56e6f3 100644 --- a/platform/lang-api/src/com/intellij/psi/codeStyle/arrangement/std/StdArrangementSettingsToken.java +++ b/platform/lang-api/src/com/intellij/psi/codeStyle/arrangement/std/StdArrangementSettingsToken.java @@ -28,18 +28,34 @@ public class StdArrangementSettingsToken extends ArrangementSettingsToken { @NotNull private final StdArrangementTokenType myTokenType; - public StdArrangementSettingsToken(@NotNull String id, @NotNull StdArrangementTokenType tokenType) { - super(id, id.toLowerCase().replace("_", " ")); - myTokenType = tokenType; + @NotNull + public static StdArrangementSettingsToken tokenById(@NotNull String id, + @NotNull StdArrangementTokenType tokenType) { + return new StdArrangementSettingsToken(id, id.toLowerCase().replace("_", " "), tokenType); } - public StdArrangementSettingsToken (@NotNull String id, @NotNull @PropertyKey(resourceBundle = ApplicationBundle.BUNDLE) String key, - @NotNull StdArrangementTokenType tokenType) { - super(id, ApplicationBundle.message(key)); - myTokenType = tokenType; + @NotNull + public static StdArrangementSettingsToken token(@NotNull String id, + @NotNull String name, + @NotNull StdArrangementTokenType tokenType) { + return new StdArrangementSettingsToken(id, name, tokenType); + } + + @NotNull + public static StdArrangementSettingsToken tokenByBundle(@NotNull String id, + @NotNull @PropertyKey(resourceBundle = ApplicationBundle.BUNDLE) String key, + @NotNull StdArrangementTokenType tokenType) { + return new StdArrangementSettingsToken(id, ApplicationBundle.message(key), tokenType); } @NotNull public StdArrangementTokenType getTokenType() { return myTokenType; } + + private StdArrangementSettingsToken(@NotNull String id, + @NotNull String uiName, + @NotNull StdArrangementTokenType tokenType) { + super(id, uiName); + myTokenType = tokenType; + } } diff --git a/platform/lang-api/src/com/intellij/psi/codeStyle/arrangement/std/StdArrangementTokens.java b/platform/lang-api/src/com/intellij/psi/codeStyle/arrangement/std/StdArrangementTokens.java index 6977aa8b40e0..3dfff48acdbb 100644 --- a/platform/lang-api/src/com/intellij/psi/codeStyle/arrangement/std/StdArrangementTokens.java +++ b/platform/lang-api/src/com/intellij/psi/codeStyle/arrangement/std/StdArrangementTokens.java @@ -88,14 +88,14 @@ public class StdArrangementTokens { } private static StdArrangementSettingsToken token(@NotNull String id, @NotNull StdArrangementTokenType type) { - StdArrangementSettingsToken result = new StdArrangementSettingsToken(id, type); + StdArrangementSettingsToken result = StdArrangementSettingsToken.tokenById(id, type); TOKENS_BY_ID.put(id, result); return result; } private static StdArrangementSettingsToken token(@NotNull String id, @NotNull @PropertyKey(resourceBundle = ApplicationBundle.BUNDLE) String key, @NotNull StdArrangementTokenType type) { - StdArrangementSettingsToken result = new StdArrangementSettingsToken(id, key, type); + StdArrangementSettingsToken result = StdArrangementSettingsToken.tokenByBundle(id, key, type); TOKENS_BY_ID.put(id, result); return result; }