diff options
| author | H. Väisänen <hvaisane@joyx.joensuu.fi> | 2003-07-24 15:43:04 +0000 |
|---|---|---|
| committer | Tom Tromey <tromey@gcc.gnu.org> | 2003-07-24 15:43:04 +0000 |
| commit | bb477ffa482e7d6b2db93be4557a62a5fb9d185f (patch) | |
| tree | 62f8c3ebc4be39738e23865f9c0d1586dd49db48 /libjava/java/text | |
| parent | 270606acd83d0e07c669b896e06671ac2334f471 (diff) | |
| download | gcc-bb477ffa482e7d6b2db93be4557a62a5fb9d185f.zip gcc-bb477ffa482e7d6b2db93be4557a62a5fb9d185f.tar.gz gcc-bb477ffa482e7d6b2db93be4557a62a5fb9d185f.tar.bz2 | |
SimpleDateFormat.java (format): Zero pad unless field size is 2.
2003-07-24 H. V�is�nen <hvaisane@joyx.joensuu.fi>
* java/text/SimpleDateFormat.java (format) [YEAR_FIELD]: Zero pad
unless field size is 2.
From-SVN: r69744
Diffstat (limited to 'libjava/java/text')
| -rw-r--r-- | libjava/java/text/SimpleDateFormat.java | 12 |
1 files changed, 8 insertions, 4 deletions
diff --git a/libjava/java/text/SimpleDateFormat.java b/libjava/java/text/SimpleDateFormat.java index 67523e1..b43c6cd 100644 --- a/libjava/java/text/SimpleDateFormat.java +++ b/libjava/java/text/SimpleDateFormat.java @@ -430,11 +430,15 @@ public class SimpleDateFormat extends DateFormat buffer.append(formatData.eras[calendar.get(Calendar.ERA)]); break; case YEAR_FIELD: - temp = String.valueOf(calendar.get(Calendar.YEAR)); - if (p.size < 4) - buffer.append(temp.substring(temp.length()-2)); + // If we have two digits, then we truncate. Otherwise, we + // use the size of the pattern, and zero pad. + if (p.size == 2) + { + temp = String.valueOf(calendar.get(Calendar.YEAR)); + buffer.append(temp.substring(temp.length() - 2)); + } else - buffer.append(temp); + withLeadingZeros(calendar.get(Calendar.YEAR), p.size, buffer); break; case MONTH_FIELD: if (p.size < 3) |