TnSb/android-calculatorpp
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix more unit tests

Browse Source
This commit is contained in:
serso
2017-08-18 15:38:35 +02:00
parent f6e520eb56
commit f41a37fe31
12 changed files with 134 additions and 65 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
jscl/src/main/java/org/solovyev/common/msg/Messages.java
View File

@@ -22,12 +22,13 @@
package org.solovyev.common.msg;
import javax.annotation.Nonnull;
import javax.annotation.Nullable;
import java.text.MessageFormat;
import java.util.List;
import java.util.Locale;
import javax.annotation.Nonnull;
import javax.annotation.Nullable;
public final class Messages {
private Messages() {
@@ -40,24 +41,22 @@ public final class Messages {
}
/**
* @param locale locale for which default formatting will be applied
* @param messagePattern message pattern which will be used for {@link MessageFormat}
* @param parameters message parameters which will be used for {@link MessageFormat}
* @return formatted message string according to default locale formatting, nested messages are processed properly
* (for each message from parameter method {@link Message#getLocalizedMessage(Locale)} is called)
* @param locale locale for which default formatting will be applied
* @param pattern message pattern which will be used for {@link MessageFormat}
* @param parameters message parameters which will be used for {@link MessageFormat}
* @return formatted message string according to default locale formatting, nested messages are
* processed properly
* (for each message from parameter method {@link Message#getLocalizedMessage(Locale)} is
* called)
*/
@Nonnull
public static String prepareMessage(@Nonnull Locale locale, @Nonnull String messagePattern, @Nonnull List<?> parameters) {
public static String prepareMessage(@Nonnull Locale locale, @Nonnull String pattern, @Nonnull List<?> parameters) {
String result;
if (parameters.isEmpty()) {
result = messagePattern;
result = pattern;
} else {
final MessageFormat format = new MessageFormat(messagePattern);
format.setLocale(locale);
format.applyPattern(messagePattern);
final MessageFormat format = new MessageFormat(pattern, locale);
result = format.format(prepareParameters(parameters, locale));
}