From 711575e5dabfc53f14d875185e1111e9073f0199 Mon Sep 17 00:00:00 2001 From: bryce Date: Wed, 22 Sep 1999 04:41:26 +0000 Subject: 1999-09-16 Bryce McKinlay * java/text/MessageFormat.java (MessageFormat(String)): Set the default locale. * java/text/NumberFormat.java: Check that object is a Number. If not, throw IllegialArgumentException. git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@29574 138bc75d-0d04-0410-961f-82ee72b054a4 --- libjava/java/text/MessageFormat.java | 1 + libjava/java/text/NumberFormat.java | 6 +++++- 2 files changed, 6 insertions(+), 1 deletion(-) (limited to 'libjava/java/text') diff --git a/libjava/java/text/MessageFormat.java b/libjava/java/text/MessageFormat.java index 8b422357966..891a0c3e3d8 100644 --- a/libjava/java/text/MessageFormat.java +++ b/libjava/java/text/MessageFormat.java @@ -400,6 +400,7 @@ public class MessageFormat extends Format public MessageFormat (String pattern) { + locale = Locale.getDefault(); applyPattern (pattern); } diff --git a/libjava/java/text/NumberFormat.java b/libjava/java/text/NumberFormat.java index 6ee79b3b546..a3f7f95294c 100644 --- a/libjava/java/text/NumberFormat.java +++ b/libjava/java/text/NumberFormat.java @@ -37,7 +37,11 @@ public abstract class NumberFormat extends Format implements Cloneable public final StringBuffer format (Object obj, StringBuffer sbuf, FieldPosition pos) { - return format(((Number) obj).doubleValue(), sbuf, pos); + if (obj instanceof Number) + return format(((Number) obj).doubleValue(), sbuf, pos); + else + throw new IllegalArgumentException + ("Cannot format given Object as a Number"); } public abstract StringBuffer format (double number, -- cgit v1.2.3