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

Fix display error message

Browse Source
This commit is contained in:
serso 2016-03-02 10:35:24 +01:00
parent 8cdd640132
commit 01c6597129
2 changed files with 9 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
jscl/src/main/java/jscl/text/ParseException.java
View File

@ -1,5 +1,6 @@
package jscl.text;
import org.solovyev.common.msg.AbstractMessage;
import org.solovyev.common.msg.Message;
import org.solovyev.common.msg.MessageLevel;
import org.solovyev.common.msg.MessageType;
@ -55,7 +56,7 @@ public class ParseException extends Exception implements Message {
@Override
public String getLocalizedMessage(@Nonnull Locale locale) {
final ResourceBundle rb = ResourceBundle.getBundle("jscl/text/msg/messages", locale);
return rb.getString(getMessageCode());
return AbstractMessage.makeMessage(locale, rb.getString(getMessageCode()), parameters, MessageType.error);
}
public int getPosition() {

12
jscl/src/main/java/org/solovyev/common/msg/AbstractMessage.java
View File

@ -118,14 +118,16 @@ public abstract class AbstractMessage implements Message {
*/
@Nonnull
public String getLocalizedMessage(@Nonnull Locale locale) {
String result = null;
return makeMessage(locale, getMessagePattern(locale), parameters, messageLevel);
}
final String messagePattern = getMessagePattern(locale);
if (!Strings.isEmpty(messagePattern)) {
result = Messages.prepareMessage(locale, messagePattern, parameters);
@Nonnull
public static String makeMessage(@Nonnull Locale locale, @Nullable String format, @Nonnull List<?> parameters, @Nonnull MessageLevel messageLevel) {
if (!Strings.isEmpty(format)) {
return Messages.prepareMessage(locale, format, parameters);
}
return Strings.getNotEmpty(result, messageLevel.getName() + ": message code = " + messageCode);
return messageLevel.getName() + ": message code = " + format;
}
@Nonnull