mirrors/gcc
1
0
Fork 0
mirror of https://gcc.gnu.org/git/gcc.git synced 2024-11-26 12:23:59 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

2004-05-30 Michael Koch <konqueror@gmx.de>

Browse Source 
* java/text/DecimalFormat.java
	(parse): Fixed parsing of decimal strings. Number of maximum
	digits to be read should now work.
	* java/text/SimpleDateFormat.java
	(SimpleDateFormat): Set maximumFractionDigit to 0 for the number
	formatter. This fixes DateFormatTest.

From-SVN: r82449
This commit is contained in:
Michael Koch 2004-05-30 13:42:24 +00:00 committed by Michael Koch
parent 1b2545bcf2
commit 289f9db7db
3 changed files with 22 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
libjava/ChangeLog
View File

@ -1,3 +1,12 @@
2004-05-30 Michael Koch <konqueror@gmx.de>
* java/text/DecimalFormat.java
(parse): Fixed parsing of decimal strings. Number of maximum
digits to be read should now work.
* java/text/SimpleDateFormat.java
(SimpleDateFormat): Set maximumFractionDigit to 0 for the number
formatter. This fixes DateFormatTest.
2004-05-30 Michael Koch <konqueror@gmx.de>
* java/nio/Buffer.java

16
libjava/java/text/DecimalFormat.java
View File

@ -42,13 +42,11 @@ import gnu.java.text.FormatBuffer;
import gnu.java.text.FormatCharacterIterator;
import gnu.java.text.StringFormatBuffer;
import java.io.IOException;
import java.io.ObjectInputStream;
import java.util.Currency;
import java.util.HashMap;
import java.util.Locale;
import java.util.MissingResourceException;
import java.util.ResourceBundle;
import java.io.ObjectInputStream;
import java.io.IOException;
/**
* @author Tom Tromey <tromey@cygnus.com>
@ -849,7 +847,7 @@ public class DecimalFormat extends NumberFormat
// FIXME: handle Inf and NaN.
// FIXME: do we have to respect minimum digits?
// What about leading zeros? What about multiplier?
// What about multiplier?
StringBuffer buf = int_buf;
StringBuffer frac_buf = null;
@ -857,7 +855,13 @@ public class DecimalFormat extends NumberFormat
int start_index = index;
int max = str.length();
int exp_index = -1;
int last = index + MAXIMUM_INTEGER_DIGITS;
int last = index + maximumIntegerDigits;
if (maximumFractionDigits > 0)
last += maximumFractionDigits + 1;
if (useExponentialNotation)
last += minExponentDigits + 1;
if (last > 0 && max > last)
max = last;

3
libjava/java/text/SimpleDateFormat.java
View File

@ -189,6 +189,7 @@ public class SimpleDateFormat extends DateFormat
numberFormat = NumberFormat.getInstance(locale);
numberFormat.setGroupingUsed (false);
numberFormat.setParseIntegerOnly (true);
numberFormat.setMaximumFractionDigits (0);
}
/**
@ -216,6 +217,7 @@ public class SimpleDateFormat extends DateFormat
numberFormat = NumberFormat.getInstance(locale);
numberFormat.setGroupingUsed (false);
numberFormat.setParseIntegerOnly (true);
numberFormat.setMaximumFractionDigits (0);
}
/**
@ -234,6 +236,7 @@ public class SimpleDateFormat extends DateFormat
numberFormat = NumberFormat.getInstance();
numberFormat.setGroupingUsed (false);
numberFormat.setParseIntegerOnly (true);
numberFormat.setMaximumFractionDigits (0);
}
// What is the difference between localized and unlocalized? The