Arrangement tokens creation patch.

This commit is contained in:
Roman Shein
2014-02-06 16:02:25 +04:00
committed by jamesbrain
parent 294cccf1f1
commit 8669a75914
2 changed files with 25 additions and 9 deletions
@@ -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;
}
}
@@ -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;
}