From aa5661e6b41e781f2e7b6b3e3fc163174f0687a8 Mon Sep 17 00:00:00 2001 From: Tom Tromey Date: Tue, 2 Jul 2002 19:43:06 +0000 Subject: 2002-07-02 Tom Tromey David Hovemeyer * java/text/ChoiceFormat.java (format(double,StringBuffer,FieldPosition)): Fix fencepost error in check loop. * java/text/MessageFormat.java (format(Object[],StringBuffer,FieldPosition): Pass all arguments to MessageFormat. Co-Authored-By: David Hovemeyer From-SVN: r55191 --- libjava/java/text/ChoiceFormat.java | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) (limited to 'libjava/java/text/ChoiceFormat.java') diff --git a/libjava/java/text/ChoiceFormat.java b/libjava/java/text/ChoiceFormat.java index 710a725990e..f7bdde1e294 100644 --- a/libjava/java/text/ChoiceFormat.java +++ b/libjava/java/text/ChoiceFormat.java @@ -1,5 +1,5 @@ /* ChoiceFormat.java -- Format over a range of numbers - Copyright (C) 1998, 1999, 2000, 2001 Free Software Foundation, Inc. + Copyright (C) 1998, 1999, 2000, 2001, 2002 Free Software Foundation, Inc. This file is part of GNU Classpath. @@ -259,14 +259,12 @@ public class ChoiceFormat extends NumberFormat if (choiceLimits.length == 0) return appendBuf; - int index = 0; + int index = 0; if (! Double.isNaN(num) && num >= choiceLimits[0]) { for (; index < choiceLimits.length - 1; ++index) { - if (choiceLimits[index] <= num - && index != choiceLimits.length - 2 - && num < choiceLimits[index + 1]) + if (choiceLimits[index] <= num && num < choiceLimits[index + 1]) break; } } -- cgit v1.2.3